Merge pull request #2150 from torusresearch/feat/ethereum-update

Update ethereum deps

Author: lionellbriones

package-lock.json

@@ -30,16 +30,17 @@
     "test:e2e:mobile": "env MOBILE_ENV=true mocha --timeout=60000 ./test/e2e"
   },
   "dependencies": {
-    "@ethereumjs/common": "^2.6.5",
-    "@ethereumjs/tx": "^3.5.2",
-    "@gtm-support/vue2-gtm": "^1.3.0",
+    "@ethereumjs/common": "^3.1.1",
+    "@ethereumjs/tx": "^4.1.1",
+    "@ethereumjs/util": "^8.0.5",
+    "@gtm-support/vue2-gtm": "^2.0.0",
     "@metamask/contract-metadata": "^2.2.0",
-    "@metamask/eth-sig-util": "^4.0.1",
+    "@metamask/eth-sig-util": "^5.0.2",
     "@metamask/obs-store": "^7.0.0",
     "@rsksmart/rsk-utils": "^1.1.0",
-    "@sentry/browser": "^7.38.0",
-    "@sentry/tracing": "^7.38.0",
-    "@sentry/vue": "^7.38.0",
+    "@sentry/browser": "^7.41.0",
+    "@sentry/tracing": "^7.41.0",
+    "@sentry/vue": "^7.41.0",
     "@toruslabs/broadcast-channel": "^6.1.1",
     "@toruslabs/eccrypto": "^1.1.8",
     "@toruslabs/http-helpers": "^3.2.0",
@@ -49,32 +50,32 @@
     "@toruslabs/openlogin-jrpc": "^3.0.0",
     "@toruslabs/openlogin-subkey": "^3.0.0",
     "@toruslabs/openlogin-utils": "^3.0.0",
-    "@uniswap/default-token-list": "^5.2.0",
+    "@uniswap/default-token-list": "^9.0.1",
     "@uniswap/router-sdk": "^1.4.0",
-    "@uniswap/sdk-core": "^3.1.1",
+    "@uniswap/sdk-core": "^3.2.1",
     "@uniswap/smart-order-router": "^2.10.2",
     "@uniswap/v3-sdk": "^3.9.0",
     "@walletconnect/core": "^1.8.0",
     "@walletconnect/iso-crypto": "^1.8.0",
     "await-semaphore": "^0.1.3",
     "bignumber.js": "^9.1.1",
+    "bn.js": "^5.2.1",
     "bowser": "^2.11.0",
     "copy-to-clipboard": "^3.3.3",
-    "core-js": "^3.28.0",
+    "core-js": "^3.29.0",
     "create-hash": "^1.2.0",
     "das-sdk": "^1.9.3",
     "deepmerge": "^4.3.0",
-    "eth-block-tracker": "^6.1.0",
-    "eth-json-rpc-filters": "^5.1.0",
+    "eth-block-tracker": "^7.0.0",
+    "eth-json-rpc-filters": "^6.0.0",
     "eth-json-rpc-infura": "^5.1.0",
-    "eth-json-rpc-middleware": "^8.1.0",
+    "eth-json-rpc-middleware": "^9.0.1",
     "eth-query": "^2.1.2",
     "eth-rpc-errors": "^4.0.3",
-    "ethereumjs-util": "^7.1.5",
     "ethereumjs-wallet": "^1.0.2",
     "ethers": "^5.7.2",
     "ethjs-query": "^0.3.8",
-    "fast-json-patch": "^2.2.1",
+    "fast-json-patch": "^3.1.1",
     "human-standard-collectible-abi": "^1.0.2",
     "human-standard-token-abi": "^2.0.0",
     "jsonschema": "^1.4.1",
@@ -93,7 +94,7 @@
     "vue-i18n": "^8.27.2",
     "vue-json-pretty": "^1.9.2",
     "vue-qr": "^3.2.4",
-    "vue-qrcode-reader": "^3.1.1",
+    "vue-qrcode-reader": "^3.1.2",
     "vue-router": "^3.6.5",
     "vue-spinner": "^1.0.4",
     "vuetify": "^2.6.14",
@@ -114,7 +115,7 @@
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/preset-env": "^7.20.2",
     "@babel/register": "^7.21.0",
-    "@sentry/cli": "^2.13.0",
+    "@sentry/cli": "^2.14.4",
     "@vue/cli-plugin-babel": "^5.0.8",
     "@vue/cli-plugin-eslint": "^5.0.8",
     "@vue/cli-plugin-pwa": "^5.0.8",
@@ -126,9 +127,9 @@
     "crypto-browserify": "^3.12.0",
     "dotenv": "^16.0.3",
     "empty-module": "0.0.2",
-    "eslint": "^8.34.0",
+    "eslint": "^8.35.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint-config-prettier": "^8.7.0",
     "eslint-config-problems": "^7.0.1",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.27.5",
@@ -138,30 +139,30 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-switch-case": "^1.1.2",
-    "eslint-plugin-unicorn": "^44.0.2",
+    "eslint-plugin-unicorn": "^46.0.0",
     "eslint-plugin-vue": "^9.9.0",
     "eslint-plugin-vue-scoped-css": "^2.4.0",
     "express": "^4.18.2",
     "fibers": "^5.0.3",
-    "ganache": "^7.7.5",
+    "ganache": "^7.7.6",
     "https-browserify": "^1.0.0",
     "husky": "^8.0.3",
-    "jsdom": "^20.0.3",
+    "jsdom": "^21.1.0",
     "jsdom-global": "^3.0.2",
     "lint-staged": "^13.1.2",
     "lodash-es": "^4.17.21",
-    "luxon": "^3.2.1",
+    "luxon": "^3.3.0",
     "mocha": "^10.2.0",
     "nock": "13.3.0",
     "node-fetch": "^3.3.0",
     "nyc": "^15.1.0",
     "os-browserify": "^0.3.0",
     "prettier": "^2.8.4",
     "process": "^0.11.10",
-    "puppeteer": "^19.7.2",
+    "puppeteer": "^19.7.3",
     "sass": "~1.32.13",
     "sass-loader": "^13.2.0",
-    "sinon": "^14.0.2",
+    "sinon": "^15.0.1",
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",
     "stylus": "^0.59.0",

package.json

@@ -610,7 +610,7 @@ export default {
       return `~ ${totalCost} ${this.selectedCurrency}`
     },
     currencyMultiplier() {
-      const currencyMultiplierNumber = this.selectedCurrency !== 'ETH' ? this.currencyData[this.selectedCurrency.toLowerCase()] || 1 : 1
+      const currencyMultiplierNumber = this.selectedCurrency === 'ETH' ? 1 : this.currencyData[this.selectedCurrency.toLowerCase()] || 1
       return new BigNumber(currencyMultiplierNumber)
     },
     getCurrencyRate() {
@@ -660,18 +660,7 @@ export default {
         this.id = id
         this.message = data
         this.sender = from
-      } else if (type !== TRANSACTION_TYPES.STANDARD_TRANSACTION) {
-        const { msgParams: { message, typedMessages } = {}, id = '' } = msgParams || {}
-        let finalTypedMessages = typedMessages
-        try {
-          finalTypedMessages = typedMessages && JSON.parse(typedMessages)
-        } catch (error) {
-          log.error(error)
-        }
-        this.id = id
-        this.message = message
-        this.typedMessages = finalTypedMessages
-      } else {
+      } else if (type === TRANSACTION_TYPES.STANDARD_TRANSACTION) {
         let finalValue = new BigNumber('0')
         const { simulationFails, id, transactionCategory, methodParams, contractParams, txParams: txObject, userInfo } = txParams || {}
         const { value, to, data, from: sender, gas, gasPrice, maxFeePerGas, maxPriorityFeePerGas } = txObject || {}
@@ -782,7 +771,7 @@ export default {
         this.gasEstimate = new BigNumber(gas, 16) // gas number
         this.gasEstimateDefault = new BigNumber(gas, 16) // gas number
         this.txData = data // data hex
-        this.txDataParams = txDataParameters !== '' ? JSON.stringify(txDataParameters, null, 2) : ''
+        this.txDataParams = txDataParameters === '' ? '' : JSON.stringify(txDataParameters, null, 2)
         this.sender = sender // address of sender
         this.gasCost = this.gasEstimate.times(gweiGasPrice).div(new BigNumber('10').pow(new BigNumber('9')))
         this.txFees = this.gasCost.times(this.currencyMultiplier)
@@ -804,6 +793,17 @@ export default {
           this.errorMsg = ''
           this.topUpErrorShow = false
         }
+      } else {
+        const { msgParams: { message, typedMessages } = {}, id = '' } = msgParams || {}
+        let finalTypedMessages = typedMessages
+        try {
+          finalTypedMessages = typedMessages && JSON.parse(typedMessages)
+        } catch (error) {
+          log.error(error)
+        }
+        this.id = id
+        this.message = message
+        this.typedMessages = finalTypedMessages
       }
       this.type = type // type of tx
     },

src/components/Confirm/ConfirmForm/ConfirmForm.vue

@@ -120,7 +120,7 @@ export default {
           return this.supportedNetworks[this.network].networkName
         }
 
-        finalNetwork = !state.networkType.networkName ? state.networkType.host : state.networkType.networkName
+        finalNetwork = state.networkType.networkName ? state.networkType.networkName : state.networkType.host
         return finalNetwork
       },
     }),

src/components/Confirm/PermissionConfirm/PermissionConfirm.vue

@@ -149,9 +149,9 @@
 /* eslint-disable import/default */
 /* eslint-disable import/no-webpack-loader-syntax */
 /* eslint-disable import/extensions */
+import { bufferToHex, stripHexPrefix } from '@ethereumjs/util'
 import { BroadcastChannel } from '@toruslabs/broadcast-channel'
 import { randomId } from '@toruslabs/openlogin-utils'
-import { bufferToHex, stripHexPrefix } from 'ethereumjs-util'
 import log from 'loglevel'
 import WalletWorker from 'worker-loader!../../../utils/wallet.worker.js'
 
@@ -245,22 +245,7 @@ export default {
           this.setErrorState(new Error('Unable to parse keystore file'))
           return
         }
-        if (!window.Worker) {
-          this.$store
-            .dispatch('importAccount', { keyData: [keyData, this.jsonPassword], strategy: 'JSON File' })
-            .then((privKey) => {
-              this.onClose()
-              this.keyStoreFileContents = ''
-              this.jsonPassword = ''
-              this.showJsonPassword = false
-              this.isLoadingKeystore = false
-              this.informClients(privKey)
-              this.$refs.jsonFileForm.resetValidation()
-            })
-            .catch((error) => {
-              this.setErrorState(error)
-            })
-        } else {
+        if (window.Worker) {
           const worker = new WalletWorker()
           worker.addEventListener('message', (event) => {
             const { privateKey: bufferPrivateKey } = event.data
@@ -286,6 +271,21 @@ export default {
             this.isLoadingKeystore = false
           })
           worker.postMessage({ type: 'unlockWallet', data: [keyData, this.jsonPassword] })
+        } else {
+          this.$store
+            .dispatch('importAccount', { keyData: [keyData, this.jsonPassword], strategy: 'JSON File' })
+            .then((privKey) => {
+              this.onClose()
+              this.keyStoreFileContents = ''
+              this.jsonPassword = ''
+              this.showJsonPassword = false
+              this.isLoadingKeystore = false
+              this.informClients(privKey)
+              this.$refs.jsonFileForm.resetValidation()
+            })
+            .catch((error) => {
+              this.setErrorState(error)
+            })
         }
       }
     },

src/components/WalletAccount/AccountImport/AccountImport.vue

@@ -186,7 +186,7 @@ export default {
     ...mapGetters(['supportedNetworks']),
     ...mapState(['networkType']),
     networks() {
-      return [...Object.values(this.supportedNetworks)]
+      return Object.values(this.supportedNetworks)
     },
     isRPCSelected() {
       return this.selectedNetwork.host === RPC

src/components/WalletSettings/Network/Network.vue

@@ -165,7 +165,7 @@
 /* eslint-disable import/default */
 /* eslint-disable import/no-webpack-loader-syntax */
 /* eslint-disable import/extensions */
-import { stripHexPrefix } from 'ethereumjs-util'
+import { stripHexPrefix } from '@ethereumjs/util'
 import Wallet from 'ethereumjs-wallet'
 import log from 'loglevel'
 import { mapState } from 'vuex'
@@ -216,11 +216,7 @@ export default {
       if (this.$refs.downloadForm.validate()) {
         this.isLoadingDownloadWallet = true
 
-        if (!window.Worker) {
-          const finishedWallet = await this.createWallet(this.keyStorePassword)
-          this.exportKeyStoreFile(finishedWallet)
-          this.isLoadingDownloadWallet = false
-        } else {
+        if (window.Worker) {
           const worker = new WalletWorker()
           worker.addEventListener('message', (ev) => {
             const finishedWallet = ev.data
@@ -233,6 +229,10 @@ export default {
           })
           // log.info(this.keyStorePassword, this.selectedKey)
           worker.postMessage({ type: 'createWallet', data: [this.keyStorePassword, this.selectedKey] })
+        } else {
+          const finishedWallet = await this.createWallet(this.keyStorePassword)
+          this.exportKeyStoreFile(finishedWallet)
+          this.isLoadingDownloadWallet = false
         }
       }
     },

src/components/WalletSettings/PrivateKeys/PrivateKeys.vue

@@ -86,7 +86,8 @@
 </template>
 
 <script>
-import { addHexPrefix, BN, isValidPrivate, stripHexPrefix, toBuffer } from 'ethereumjs-util'
+import { addHexPrefix, isValidPrivate, stripHexPrefix, toBuffer } from '@ethereumjs/util'
+import BN from 'bn.js'
 import log from 'loglevel'
 
 export default {

src/components/WalletSettings/TorusKeyDialog/TorusKeyDialog.vue

@@ -325,7 +325,7 @@ export default {
     },
     gasFees(newValue, oldValue) {
       if (!isEqual(newValue, oldValue)) {
-        this.updateDetails(this.newSelectedSpeed !== '' ? this.newSelectedSpeed : this.oldSelectedSpeed)
+        this.updateDetails(this.newSelectedSpeed === '' ? this.oldSelectedSpeed : this.newSelectedSpeed)
       }
     },
     showAdvance(value) {

src/components/helpers/TransactionFeeAdvanced/TransactionFeeAdvanced.vue

@@ -282,7 +282,7 @@ export default {
       this.newNonce = this.nonce >= 0 ? this.nonce : this.nonceItems[0]
     },
     convertedDisplay(amount, multiplier) {
-      return !BigNumber.isBigNumber(amount) ? new BigNumber(amount).times(multiplier) : amount.times(multiplier)
+      return BigNumber.isBigNumber(amount) ? amount.times(multiplier) : new BigNumber(amount).times(multiplier)
     },
   },
 }