assets/styles/components/_icon.scss

@@ -317,8 +317,8 @@
     mask-image: url('../img/icons/ethereum.svg');
   }
 
-  &-ethereum-sepolia {
+  &-ethereum-goerli {
-    mask-image: url('../img/icons/ethereum.svg');
+    mask-image: url('../img/icons/goerli.svg');
   }
 
   &-optimism {

components/Footer.vue

@@ -34,14 +34,6 @@
                   rel="noopener noreferrer"
                   icon-right="stats"
                 ></b-button>
-                <b-button
-                  tag="a"
-                  type="is-icon"
-                  href="https://t.me/tornadoofficial"
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  icon-right="telegram"
-                ></b-button>
                 <b-button
                   tag="a"
                   type="is-icon"
@@ -109,7 +101,7 @@ export default {
     ...mapGetters('metamask', ['networkConfig', 'netId']),
     ...mapGetters('txHashKeeper', ['addressExplorerUrl']),
     duneLink() {
-      const mainnetNetworks = [1]
+      const mainnetNetworks = [1, 5]
 
       if (mainnetNetworks.includes(Number(this.netId))) {
         return 'https://dune.xyz/poma/tornado-cash_1'

components/NetworkNavbarIcon.vue

@@ -17,6 +17,8 @@ export default {
       switch (this.netId) {
         case 1:
           return 'Ethereum'
+        case 5:
+          return 'Goerli'
         case 56:
           return 'BSC Mainnet'
         case 137:
@@ -25,8 +27,6 @@ export default {
           return 'Arbitrum'
         case 43114:
           return 'Avalanche'
-        case 11155111:
-          return 'Sepolia'
         default:
           return this.networkName
       }

components/settings/SettingsModalBox.vue

@@ -52,7 +52,7 @@ export default {
     }),
     ...mapState('relayer', ['isLoadingRelayers', 'validRelayers']),
     isRelayersAvailable() {
-      return !this.isLoadingRelayers && this.validRelayers.length > 0
+      return !this.isLoadingRelayers && this.validRelayers.length > 0;
     }
   },
   created() {

constants/variables.js

@@ -43,8 +43,6 @@ export const ACTION_GAS = Object.freeze({
   [ACTION.ARB_WITHDRAW]: 1900000
 })
 
-export const WITHDRAW_GAS_LIMIT = 600_000
-
 export const GAS_PRICES = ['low', 'standard', 'fast']
 
 export const addressType = { type: 'string', pattern: '^0x[a-fA-F0-9]{40}$' }
@@ -54,6 +52,9 @@ export const cachedEventsLength = {
   mainnet: {
     ENCRYPTED_NOTES: 16898
   },
+  goerli: {
+    ENCRYPTED_NOTES: 1662
+  },
   bsc: {
     ENCRYPTED_NOTES: 11333
   }

networkConfig.js

@@ -1,5 +1,5 @@
 export const blockSyncInterval = 10000
-export const enabledChains = ['1', '10', '56', '100', '137', '42161', '43114', '11155111']
+export const enabledChains = ['1', '5', '10', '56', '100', '137', '42161', '43114']
 export default {
   netId1: {
     rpcCallRetryAttempt: 15,
@@ -21,12 +21,8 @@ export default {
     networkName: 'Ethereum Mainnet',
     deployedBlock: 9116966,
     rpcUrls: {
-      tornadoRPC: {
-        name: 'Tornado RPC',
-        url: 'https://tornadocash-rpc.com/mainnet'
-      },
       chainnodes: {
-        name: 'Chainnodes RPC',
+        name: 'Tornado RPC',
         url: 'https://mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
       },
       mevblockerRPC: {
@@ -42,7 +38,6 @@ export default {
     routerContract: '0xd90e2f925DA726b50C4Ed8D0Fb90Ad053324F31b',
     registryContract: '0x58E8dCC13BE9780fC42E8723D8EaD4CF46943dF2',
     echoContractAccount: '0x9B27DD5Bb15d42DC224FCD0B7caEbBe16161Df42',
-    offchainOracleContract: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
     aggregatorContract: '0xE8F47A78A6D52D317D0D2FFFac56739fE14D1b49',
     tokens: {
       eth: {
@@ -63,10 +58,9 @@ export default {
           '100000': '0x23773E65ed146A459791799d01336DB287f25334'
         },
         tokenAddress: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
-        tokenGasLimit: 70_000,
         symbol: 'DAI',
         decimals: 18,
-        gasLimit: 700_000
+        gasLimit: '55000'
       },
       cdai: {
         instanceAddress: {
@@ -76,23 +70,19 @@ export default {
           '5000000': '0xD21be7248e0197Ee08E0c20D4a96DEBdaC3D20Af'
         },
         tokenAddress: '0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643',
-        tokenGasLimit: 200_000,
         symbol: 'cDAI',
         decimals: 8,
-        gasLimit: 700_000
+        gasLimit: '425000'
       },
-      /**
-       * Instances frozen due to sanctions
       usdc: {
         instanceAddress: {
           '100': '0xd96f2B1c14Db8458374d9Aca76E26c3D18364307',
           '1000': '0x4736dCf1b7A3d580672CcE6E7c65cd5cc9cFBa9D'
         },
         tokenAddress: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-        tokenGasLimit: 70_000,
         symbol: 'USDC',
         decimals: 6,
-        gasLimit: 700_000,
+        gasLimit: '80000'
       },
       usdt: {
         instanceAddress: {
@@ -100,12 +90,10 @@ export default {
           '1000': '0x0836222F2B2B24A3F36f98668Ed8F0B38D1a872f'
         },
         tokenAddress: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
-        tokenGasLimit: 70_000,
         symbol: 'USDT',
         decimals: 6,
-        gasLimit: 700_000,
+        gasLimit: '100000'
       },
-      **/
       wbtc: {
         instanceAddress: {
           '0.1': '0x178169B423a011fff22B9e3F3abeA13414dDD0F1',
@@ -113,10 +101,9 @@ export default {
           '10': '0xbB93e510BbCD0B7beb5A853875f9eC60275CF498'
         },
         tokenAddress: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
-        tokenGasLimit: 70_000,
         symbol: 'WBTC',
         decimals: 8,
-        gasLimit: 700_000
+        gasLimit: '85000'
       }
     },
     ensSubdomainKey: 'mainnet-tornado',
@@ -153,14 +140,9 @@ export default {
     deployedBlock: 8158799,
     multicall: '0x41263cba59eb80dc200f3e2544eda4ed6a90e76c',
     echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
-    offchainOracleContract: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
     rpcUrls: {
-      tornadoRPC: {
-        name: 'Tornado RPC',
-        url: 'https://tornadocash-rpc.com/bsc'
-      },
       chainnodes: {
-        name: 'Chainnodes RPC',
+        name: 'Tornado RPC',
         url: 'https://bsc-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
       },
       oneRPC: {
@@ -209,12 +191,9 @@ export default {
     deployedBlock: 16257962,
     multicall: '0x11ce4B23bD875D7F5C6a31084f55fDe1e9A87507',
     echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
-    offchainOracleContract: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
-    gasPriceOracleContract: '0xF81A8D8D3581985D3969fe53bFA67074aDFa8F3C',
-    gasStationApi: 'https://polygon-oracle.tornadocash-rpc.com',
     rpcUrls: {
       chainnodes: {
-        name: 'Chainnodes RPC',
+        name: 'Tornado RPC',
         url: 'https://polygon-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
       },
       oneRpc: {
@@ -263,15 +242,10 @@ export default {
     deployedBlock: 2243689,
     multicall: '0x35A6Cdb2C9AD4a45112df4a04147EB07dFA01aB7',
     echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
-    offchainOracleContract: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
+    ovmGasPriceOracleContract: '0x420000000000000000000000000000000000000F',
-    optimismL1FeeOracleAddress: '0x420000000000000000000000000000000000000F',
     rpcUrls: {
-      tornadoRPC: {
-        name: 'Tornado RPC',
-        url: 'https://tornadocash-rpc.com/op'
-      },
       chainnodes: {
-        name: 'Chainnodes RPC',
+        name: 'Tornado RPC',
         url: 'https://optimism-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
       },
       oneRpc: {
@@ -320,14 +294,9 @@ export default {
     deployedBlock: 3430648,
     multicall: '0x842eC2c7D803033Edf55E478F461FC547Bc54EB2',
     echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
-    offchainOracleContract: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
     rpcUrls: {
-      tornadoRPC: {
-        name: 'Tornado RPC',
-        url: 'https://tornadocash-rpc.com/arbitrum'
-      },
       chainnodes: {
-        name: 'Chainnodes RPC',
+        name: 'Tornado RPC',
         url: 'https://arbitrum-one.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
       },
       oneRpc: {
@@ -380,14 +349,9 @@ export default {
     deployedBlock: 17754561,
     multicall: '0xb5b692a88bdfc81ca69dcb1d924f59f0413a602a',
     echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
-    offchainOracleContract: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
     rpcUrls: {
-      tornadoRPC: {
-        name: 'Tornado RPC',
-        url: 'https://tornadocash-rpc.com/gnosis'
-      },
       chainnodes: {
-        name: 'Chainnodes RPC',
+        name: 'Tornado RPC',
         url: 'https://gnosis-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
       },
       blockPi: {
@@ -436,7 +400,6 @@ export default {
     deployedBlock: 4429818,
     multicall: '0xe86e3989c74293Acc962156cd3F525c07b6a1B6e',
     echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
-    offchainOracleContract: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
     rpcUrls: {
       publicRpc: {
         name: 'Avalanche RPC',
@@ -470,77 +433,115 @@ export default {
     },
     'tornado-proxy-light.contract.tornadocash.eth': '0x0D5550d52428E7e3175bfc9550207e4ad3859b17'
   },
-  netId11155111: {
+  netId5: {
     rpcCallRetryAttempt: 15,
     gasPrices: {
-      instant: 2,
+      instant: 80,
-      fast: 2,
+      fast: 50,
-      standard: 2,
+      standard: 25,
-      low: 2
+      low: 8
     },
     nativeCurrency: 'eth',
-    currencyName: 'ETH',
+    currencyName: 'gETH',
     explorerUrl: {
-      tx: 'https://sepolia.etherscan.io/tx/',
+      tx: 'https://goerli.etherscan.io/tx/',
-      address: 'https://sepolia.etherscan.io/address/',
+      address: 'https://goerli.etherscan.io/address/',
-      block: 'https://sepolia.etherscan.io/block/'
+      block: 'https://goerli.etherscan.io/block/'
     },
     merkleTreeHeight: 20,
     emptyElement: '21663839004416932945382355908790599225266501822907911457504978515578255421292',
-    networkName: 'Ethereum Sepolia',
+    networkName: 'Ethereum Goerli',
-    deployedBlock: 5594395,
+    deployedBlock: 3781595,
-    multicall: '0xcA11bde05977b3631167028862bE2a173976CA11',
+    multicall: '0x77dca2c955b15e9de4dbbcf1246b4b85b651e50e',
-    echoContractAccount: '0xcDD1fc3F5ac2782D83449d3AbE80D6b7B273B0e5',
+    echoContractAccount: '0x37e6859804b6499d1e4a86d70a5fdd5de6a0ac65',
-    aggregatorContract: '0x4088712AC9fad39ea133cdb9130E465d235e9642',
+    aggregatorContract: '0x8cb1436F64a3c33aD17bb42F94e255c4c0E871b2',
     rpcUrls: {
-      tornadoRPC: {
-        name: 'Tornado RPC',
-        url: 'https://tornadocash-rpc.com/sepolia'
-      },
-      sepolia: {
-        name: 'Sepolia RPC',
-        url: 'https://rpc.sepolia.org'
-      },
       chainnodes: {
-        name: 'Chainnodes RPC',
+        name: 'Tornado RPC',
-        url: 'https://sepolia.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
+        url: 'https://goerli.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
+      },
+      gatewayRPC: {
+        name: 'Gateway RPC',
+        url: 'https://rpc.goerli.eth.gateway.fm'
       }
     },
     tokens: {
       eth: {
         instanceAddress: {
-          '0.1': '0x8C4A04d872a6C1BE37964A21ba3a138525dFF50b',
+          '0.1': '0x6Bf694a291DF3FeC1f7e69701E3ab6c592435Ae7',
-          '1': '0x8cc930096B4Df705A007c4A039BDFA1320Ed2508',
+          '1': '0x3aac1cC67c2ec5Db4eA850957b967Ba153aD6279',
-          '10': '0x8D10d506D29Fc62ABb8A290B99F66dB27Fc43585',
+          '10': '0x723B78e67497E85279CB204544566F4dC5d2acA0',
-          '100': '0x44c5C92ed73dB43888210264f0C8b36Fd68D8379'
+          '100': '0x0E3A09dDA6B20aFbB34aC7cD4A6881493f3E7bf7'
         },
         symbol: 'ETH',
         decimals: 18
       },
       dai: {
         instanceAddress: {
-          '100': '0x6921fd1a97441dd603a997ED6DDF388658daf754',
+          '100': '0x76D85B4C0Fc497EeCc38902397aC608000A06607',
-          '1000': '0x50a637770F5d161999420F7d70d888DE47207145',
+          '1000': '0xCC84179FFD19A1627E79F8648d09e095252Bc418',
-          '10000': '0xecD649870407cD43923A816Cc6334a5bdf113621',
+          '10000': '0xD5d6f8D9e784d0e26222ad3834500801a68D027D',
-          '100000': '0x73B4BD04bF83206B6e979BE2507098F92EDf4F90'
+          '100000': '0x407CcEeaA7c95d2FE2250Bf9F2c105aA7AAFB512'
         },
-        tokenAddress: '0xFF34B3d4Aee8ddCd6F9AFFFB6Fe49bD371b8a357',
+        tokenAddress: '0xdc31Ee1784292379Fbb2964b3B9C4124D8F89C60',
-        tokenGasLimit: 70_000,
         symbol: 'DAI',
         decimals: 18,
-        gasLimit: 700_000
+        gasLimit: '55000'
+      },
+      cdai: {
+        instanceAddress: {
+          '5000': '0x833481186f16Cece3f1Eeea1a694c42034c3a0dB',
+          '50000': '0xd8D7DE3349ccaA0Fde6298fe6D7b7d0d34586193',
+          '500000': '0x8281Aa6795aDE17C8973e1aedcA380258Bc124F9',
+          '5000000': '0x57b2B8c82F065de8Ef5573f9730fC1449B403C9f'
+        },
+        tokenAddress: '0x822397d9a55d0fefd20F5c4bCaB33C5F65bd28Eb',
+        symbol: 'cDAI',
+        decimals: 8,
+        gasLimit: '425000'
+      },
+      usdc: {
+        instanceAddress: {
+          '100': '0x05E0b5B40B7b66098C2161A5EE11C5740A3A7C45',
+          '1000': '0x23173fE8b96A4Ad8d2E17fB83EA5dcccdCa1Ae52'
+        },
+        tokenAddress: '0xD87Ba7A50B2E7E660f678A895E4B72E7CB4CCd9C',
+        symbol: 'USDC',
+        decimals: 6,
+        gasLimit: '80000'
+      },
+      usdt: {
+        instanceAddress: {
+          '100': '0x538Ab61E8A9fc1b2f93b3dd9011d662d89bE6FE6',
+          '1000': '0x94Be88213a387E992Dd87DE56950a9aef34b9448'
+        },
+        tokenAddress: '0xb7FC2023D96AEa94Ba0254AA5Aeb93141e4aad66',
+        symbol: 'USDT',
+        decimals: 6,
+        gasLimit: '100000'
+      },
+      wbtc: {
+        instanceAddress: {
+          '0.1': '0x242654336ca2205714071898f67E254EB49ACdCe',
+          '1': '0x776198CCF446DFa168347089d7338879273172cF',
+          '10': '0xeDC5d01286f99A066559F60a585406f3878a033e'
+        },
+        tokenAddress: '0xC04B0d3107736C32e19F1c62b2aF67BE61d63a05',
+        symbol: 'WBTC',
+        decimals: 8,
+        gasLimit: '85000'
       }
     },
-    ensSubdomainKey: 'sepolia-tornado',
+    ensSubdomainKey: 'goerli-tornado',
     pollInterval: 15,
     constants: {
-      GOVERNANCE_BLOCK: 5594395,
+      GOVERNANCE_BLOCK: 3945171,
-      NOTE_ACCOUNT_BLOCK: 5594395,
+      NOTE_ACCOUNT_BLOCK: 4131375,
-      ENCRYPTED_NOTES_BLOCK: 5594395,
+      ENCRYPTED_NOTES_BLOCK: 4131375,
       MINING_BLOCK_TIME: 15
     },
-    'torn.contract.tornadocash.eth': '0x3AE6667167C0f44394106E197904519D808323cA',
+    'torn.contract.tornadocash.eth': '0x77777FeDdddFfC19Ff86DB637967013e6C6A116C',
-    'governance.contract.tornadocash.eth': '0xe5324cD7602eeb387418e594B87aCADee08aeCAD',
+    'governance.contract.tornadocash.eth': '0x5efda50f22d34F262c29268506C5Fa42cB56A1Ce',
-    'tornado-router.contract.tornadocash.eth': '0x1572AFE6949fdF51Cb3E0856216670ae9Ee160Ee'
+    'tornado-proxy.contract.tornadocash.eth': '0x454d870a72e29d5e5697f635128d18077bd04c60'
   }
 }

nuxt.config.js

@@ -178,24 +178,6 @@ export default {
       if (ctx.isClient) {
         config.devtool = hasSourceMaps
       }
-      config.module.rules.push({
-        test: /\.(js|cjs|mjs|jsx)$/,
-        include: /node_modules/,
-        type: 'javascript/auto',
-        use: {
-          loader: 'babel-loader',
-          options: {
-            compact: false,
-            presets: [['@babel/preset-env', { targets: 'defaults' }]],
-            plugins: [
-              '@babel/plugin-transform-private-methods',
-              '@babel/plugin-transform-class-properties',
-              '@babel/plugin-transform-optional-chaining',
-              '@babel/plugin-transform-nullish-coalescing-operator'
-            ]
-          }
-        }
-      })
       config.module.rules.push({
         test: /\.bin$/,
         use: 'arraybuffer-loader'

package.json

@@ -7,19 +7,14 @@
     "lint": "eslint --ext .js,.vue --ignore-path .gitignore .",
     "precommit": "yarn lint",
     "test": "jest",
-    "fix:vuex": "node ./scripts/vuex.js",
+    "dev": "cross-env NODE_OPTIONS='--max-old-space-size=8192' nuxt",
-    "dev": "cross-env NODE_OPTIONS=\"--max_old_space_size=8192\" nuxt",
+    "build": "nuxt build",
-    "dev:lts": "yarn fix:vuex && cross-env NODE_OPTIONS=\"--max_old_space_size=8192 --openssl-legacy-provider\" nuxt",
-    "build": "cross-env NODE_OPTIONS=\"--max_old_space_size=8192\" nuxt build",
-    "build:lts": "yarn fix:vuex && cross-env NODE_OPTIONS=\"--max_old_space_size=8192 --openssl-legacy-provider\" nuxt build",
     "start": "nuxt start",
     "update:zip": "node -r esm scripts/updateZip.js",
     "update:events": "node -r esm scripts/updateEvents.js --network",
     "update:encrypted": "node -r esm scripts/updateEncryptedEvents.js --network",
     "update:tree": "node -r esm scripts/updateTree.js --network",
-    "update:copy": "node -r esm scripts/copyFile.js dist/404.html dist/ipfs-404.html",
+    "generate": "cross-env NODE_OPTIONS='--max-old-space-size=8192' nuxt generate && cp dist/404.html dist/ipfs-404.html",
-    "generate": "cross-env NODE_OPTIONS=\"--max_old_space_size=8192\" nuxt generate && yarn update:copy",
-    "generate:lts": "yarn fix:vuex && cross-env NODE_OPTIONS=\"--max_old_space_size=8192 --openssl-legacy-provider\" nuxt generate && yarn update:copy",
     "check:sync": "node -r esm scripts/checkEventsSync.js",
     "ipfsUpload": "node scripts/ipfsUpload.js",
     "deploy:ipfs": "yarn generate && yarn ipfsUpload"
@@ -30,7 +25,7 @@
     "@nuxtjs/moment": "^1.6.0",
     "@tornado/fixed-merkle-tree": "0.7",
     "@tornado/snarkjs": "0.1.20",
-    "@tornado/tornado-oracles": "git+https://git.tornado.ws/tornadocontrib/tornado-oracles.git#0e9fe6970d54995f00cf3dbc1cfc73d9f7365a62",
+    "@tornado/tornado-oracles": "^2.1.0",
     "@tornado/websnark": "0.0.4",
     "@walletconnect/web3-provider": "1.7.8",
     "ajv": "^6.10.2",
@@ -44,7 +39,6 @@
     "dotenv": "^8.2.0",
     "eth-ens-namehash": "^2.0.8",
     "eth-sig-util": "^2.5.3",
-    "ethers": "^6.12.1",
     "file-saver": "^2.0.5",
     "form-data": "^3.0.0",
     "graphql": "^15.5.1",
@@ -65,7 +59,6 @@
     "web3": "1.5.2"
   },
   "devDependencies": {
-    "@babel/preset-env": "7.24.4",
     "@nuxtjs/eslint-config": "^1.1.2",
     "@nuxtjs/eslint-module": "^1.1.0",
     "@vue/test-utils": "^1.0.0-beta.27",

scripts/copyFile.js

@@ -1,15 +0,0 @@
-import { argv } from 'process'
-import { copyFile } from 'fs'
-
-function copyFiles() {
-  const [, , inFile, outFile] = argv
-
-  copyFile(inFile, outFile, function(err) {
-    if (err) {
-      throw err
-    }
-
-    console.log(`Copied ${inFile} to ${outFile}`)
-  })
-}
-copyFiles()

scripts/vuex.js

@@ -1,24 +0,0 @@
-/**
- * Manually patch vuex to support Node.js >= 18.x
- * 
- * See issue https://github.com/vuejs/vuex/issues/2160
- * https://github.com/vuejs/vuex/commit/397e9fba45c8b4ec0c4a33d2578e34829bd348d7
- */
-const fs = require('fs')
-
-const pkgJson = JSON.parse(fs.readFileSync('./node_modules/vuex/package.json', { encoding: 'utf8' }))
-const backupJson = JSON.stringify(pkgJson, null, 2)
-
-let changes = false
-
-if (!pkgJson.exports['./*']) {
-  pkgJson.exports['./*'] = './*'
-
-  changes = true
-}
-
-
-if (changes) {
-  fs.writeFileSync('./node_modules/vuex/package.backup.json', backupJson + '\n')
-  fs.writeFileSync('./node_modules/vuex/package.json', JSON.stringify(pkgJson, null, 2) + '\n')
-}

services/events.js

@@ -412,11 +412,10 @@ class EventService {
   async getEventsFromBlock({ fromBlock, graphMethod, type }) {
     try {
       // ToDo think about undefined
-      const graphEvents = await this.getEventsFromGraph({ fromBlock, methodName: graphMethod })
+      const rpcEvents = await this.getEventsFromRpc({ fromBlock, type })
-      const lastSyncBlock = fromBlock > graphEvents?.lastBlock ? fromBlock : graphEvents?.lastBlock
+
-      const rpcEvents = await this.getEventsFromRpc({ fromBlock: lastSyncBlock, type })
+      const allEvents = [].concat(rpcEvents || [])
 
-      const allEvents = [].concat(graphEvents?.events || [], rpcEvents || [])
       if (allEvents.length) {
         return {
           events: allEvents,

services/graph.js

@@ -20,14 +20,14 @@ const link = ({ getContext }) => {
 }
 
 const CHAIN_GRAPH_URLS = {
-  1: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/mainnet-tornado-subgraph',
+  1: 'https://api.thegraph.com/subgraphs/name/tornadocash/mainnet-tornado-subgraph',
-  10: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/optimism-tornado-subgraph',
+  5: 'https://api.thegraph.com/subgraphs/name/tornadocash/goerli-tornado-subgraph',
-  56: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/bsc-tornado-subgraph',
+  10: 'https://api.thegraph.com/subgraphs/name/tornadocash/optimism-tornado-subgraph',
-  100: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/xdai-tornado-subgraph',
+  56: 'https://api.thegraph.com/subgraphs/name/tornadocash/bsc-tornado-subgraph',
-  137: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/matic-tornado-subgraph',
+  100: 'https://api.thegraph.com/subgraphs/name/tornadocash/xdai-tornado-subgraph',
-  42161: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/arbitrum-tornado-subgraph',
+  137: 'https://api.thegraph.com/subgraphs/name/tornadocash/matic-tornado-subgraph',
-  43114: 'https://api.thegraph.com/subgraphs/name/tornadocash/avalanche-tornado-subgraph',
+  42161: 'https://api.thegraph.com/subgraphs/name/tornadocash/arbitrum-tornado-subgraph',
-  11155111: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/sepolia-tornado-subgraph'
+  43114: 'https://api.thegraph.com/subgraphs/name/tornadocash/avalanche-tornado-subgraph'
 }
 
 const defaultOptions = {
@@ -45,7 +45,7 @@ const client = new ApolloClient({
 })
 
 const registryClient = new ApolloClient({
-  uri: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/tornado-relayer-registry',
+  uri: 'https://api.thegraph.com/subgraphs/name/tornadocash/tornado-relayer-registry',
   cache: new InMemoryCache(),
   credentials: 'omit',
   defaultOptions

services/lookupAddress.js

@@ -1,13 +1,12 @@
 // from https://github.com/ChainSafe/web3.js/issues/2683#issuecomment-547348416
 
 import namehash from 'eth-ens-namehash'
+import { BigNumber, utils } from 'ethers'
 import ABI from 'web3-eth-ens/lib/resources/ABI/Resolver'
 import uniq from 'lodash/uniq'
 import chunk from 'lodash/chunk'
 import { CHUNK_COUNT_PER_BATCH_REQUEST } from '@/constants'
 
-const { isAddress } = require('web3-utils')
-
 export const createBatchRequestCallback = (resolve, reject) => (error, data) => {
   if (error) {
     reject(error)
@@ -66,7 +65,8 @@ const createFetchEnsNames = (web3, batch, results) => async (data) => {
       batch.add(requestData)
     })
 
-    const isZeroAddress = ensName.trim().length && isAddress(ensName) && BigInt(ensName) === BigInt(0)
+    const isZeroAddress =
+      ensName.trim().length && utils.isAddress(ensName) && BigNumber.from(ensName).isZero()
 
     if (isZeroAddress) return results
 

services/registry/index.js

@@ -3,7 +3,6 @@ import namehash from 'eth-ens-namehash'
 import { BigNumber as BN } from 'bignumber.js'
 import { toChecksumAddress, isAddress } from 'web3-utils'
 
-import { graph } from '@/services'
 import networkConfig from '@/networkConfig'
 import { REGISTRY_DEPLOYED_BLOCK } from '@/constants'
 import { sleep, flattenNArray } from '@/utils'
@@ -170,21 +169,9 @@ class RelayerRegister {
   fetchRelayers = async () => {
     const blockRange = 10000
     // eslint-disable-next-line prefer-const
-    let { blockFrom, blockTo, cachedEvents } = await this.getCachedData()
+    let { blockTo, cachedEvents } = await this.getCachedData()
     let allRelayers = cachedEvents
 
-    if (!cachedEvents || !cachedEvents.length) {
-      const { lastSyncBlock, events } = await graph.getAllRegisters(blockFrom)
-
-      if (events.length) {
-        blockTo = lastSyncBlock + 1
-        cachedEvents = events.map((el) => ({
-          ensName: el.ensName,
-          relayerAddress: toChecksumAddress(el.address)
-        }))
-      }
-    }
-
     const currentBlockNumber = await this.provider.getBlockNumber()
     const fromBlock = cachedEvents.length === 0 ? REGISTRY_DEPLOYED_BLOCK[1] : blockTo
     const blockDifference = currentBlockNumber - fromBlock
@@ -194,7 +181,7 @@ class RelayerRegister {
       let registerRelayerEvents
       let lastSyncBlock = blockTo
 
-      if (blockDifference <= 0) {
+      if (cachedEvents.length > 0 || blockDifference === 0) {
         return cachedEvents
       } else if (blockDifference >= blockRange) {
         toBlock = currentBlockNumber
@@ -270,22 +257,12 @@ class RelayerRegister {
   }
 
   getValidRelayers = async (relayers, ensSubdomainKey) => {
-    const relayersSet = new Set()
+    const relayerNameHashes = relayers.map((r) => namehash.hash(r.ensName))
-
-    const uniqueRelayers = relayers.filter(({ ensName }) => {
-      if (!relayersSet.has(ensName)) {
-        relayersSet.add(ensName)
-        return true
-      }
-      return false
-    })
-
-    const relayerNameHashes = uniqueRelayers.map((r) => namehash.hash(r.ensName))
 
     const relayersData = await this.aggregator.methods.relayersData(relayerNameHashes, subdomains).call()
 
     const validRelayers = relayersData.reduce(
-      (acc, curr, index) => this.filterRelayer(acc, curr, ensSubdomainKey, uniqueRelayers[index]),
+      (acc, curr, index) => this.filterRelayer(acc, curr, ensSubdomainKey, relayers[index]),
       []
     )
 

store/application.js

@@ -1,7 +1,6 @@
 /* eslint-disable camelcase */
 /* eslint-disable no-console, import/order */
 import Web3 from 'web3'
-import { ZeroAddress } from 'ethers'
 
 import networkConfig from '@/networkConfig'
 import { cachedEventsLength, eventsType, httpConfig } from '@/constants'
@@ -107,29 +106,26 @@ const mutations = {
 }
 
 const getters = {
-  getWeb3: (state, getters, rootState, rootGetters) => {
-    const netId = rootGetters['metamask/netId']
-    const { url } = rootState.settings[`netId${netId}`].rpc
-    const httpProvider = new Web3.providers.HttpProvider(url, httpConfig)
-    return new Web3(httpProvider)
-  },
   eventsInterface: (state, getters, rootState, rootGetters) => {
     const netId = rootGetters['metamask/netId']
     const { url } = rootState.settings[`netId${netId}`].rpc
     return new EventsFactory(url)
   },
-  instanceContract: (state, getters) => ({ currency, amount, netId }) => {
+  instanceContract: (state, getters, rootState) => ({ currency, amount, netId }) => {
     const config = networkConfig[`netId${netId}`]
+    const { url } = rootState.settings[`netId${netId}`].rpc
     const address = config.tokens[currency].instanceAddress[amount]
-    const web3 = getters.getWeb3
+    const httpProvider = new Web3.providers.HttpProvider(url, httpConfig)
+    const web3 = new Web3(httpProvider)
     return new web3.eth.Contract(InstanceABI, address)
   },
-  multicallContract: (state, getters) => ({ netId }) => {
+  multicallContract: (state, getters, rootState) => ({ netId }) => {
     const config = networkConfig[`netId${netId}`]
-    const web3 = getters.getWeb3
+    const { url } = rootState.settings[`netId${netId}`].rpc
+    const web3 = new Web3(url)
     return new web3.eth.Contract(MulticallABI, config.multicall)
   },
-  tornadoProxyContract: (state, getters) => ({ netId }) => {
+  tornadoProxyContract: (state, getters, rootState) => ({ netId }) => {
     const {
       'tornado-proxy.contract.tornadocash.eth': tornadoProxy,
       'tornado-router.contract.tornadocash.eth': tornadoRouter,
@@ -137,7 +133,8 @@ const getters = {
     } = networkConfig[`netId${netId}`]
 
     const proxyContract = tornadoRouter || tornadoProxy || tornadoProxyLight
-    const web3 = getters.getWeb3
+    const { url } = rootState.settings[`netId${netId}`].rpc
+    const web3 = new Web3(url)
     return new web3.eth.Contract(TornadoProxyABI, proxyContract)
   },
   currentContract: (state, getters) => (params) => {
@@ -153,16 +150,11 @@ const getters = {
     const tornadoProxy = getters.tornadoProxyContract({ netId })
     const tornadoInstance = getters.instanceContract({ currency, amount, netId })
 
-    const { withdrawType } = state
-    const relayer = rootState.relayer.selectedRelayer.address
-    const { ethAccount } = rootState.metamask
-
     const calldata = tornadoProxy.methods
       .withdraw(tornadoInstance._address, proof, ...withdrawCallArgs)
       .encodeABI()
 
     return {
-      from: withdrawType === 'relayer' ? relayer : ethAccount,
       to: tornadoProxy._address,
       data: calldata,
       value: withdrawCallArgs[5] || 0
@@ -418,6 +410,7 @@ const actions = {
 
       const networksWithCache = {
         1: cachedEventsLength.mainnet.ENCRYPTED_NOTES,
+        5: cachedEventsLength.goerli.ENCRYPTED_NOTES,
         56: cachedEventsLength.bsc.ENCRYPTED_NOTES
       }
 
@@ -518,7 +511,6 @@ const actions = {
   },
   async sendDeposit({ state, rootState, getters, rootGetters, dispatch, commit }, { isEncrypted }) {
     try {
-      const web3 = getters.getWeb3
       const { commitment, note, prefix } = state
       // eslint-disable-next-line prefer-const
       let [, currency, amount, netId] = prefix.split('-')
@@ -557,7 +549,7 @@ const actions = {
         value: numberToHex(value),
         data
       }
-      const gasLimit = Math.floor((await web3.eth.estimateGas(incompletedTx)) * 1.2)
+      const gasLimit = await rootGetters['fees/oracle'].getGasLimit(incompletedTx, 'other', 10)
 
       const callParams = {
         method: 'eth_sendTransaction',
@@ -674,69 +666,36 @@ const actions = {
     { rootGetters, rootState, state, getters, dispatch },
     { root, note, tree, recipient, leafIndex }
   ) {
-    const { circuit, provingKey } = await getTornadoKeys()
-
-    if (!groth16) {
-      groth16 = await buildGroth16()
-    }
-
-    const web3 = getters.getWeb3
-
-    const { nullifierHash, secret, nullifier, amount, currency } = note
-
-    const { denomination, isNativeCurrency } = rootGetters['fees/selectedInstance']
-    const withdrawType = state.withdrawType
-
     const { pathElements, pathIndices } = tree.path(leafIndex)
     console.log('pathElements, pathIndices', pathElements, pathIndices)
 
-    const defaultGasLimit = rootGetters['fees/gasLimit']()
+    const nativeCurrency = rootGetters['metamask/nativeCurrency']
-    let gasLimit = defaultGasLimit
+    const withdrawType = state.withdrawType
 
-    async function getProof() {
+    let relayer = BigInt(0)
-      let relayer = ZeroAddress
     let fee = BigInt(0)
     let refund = BigInt(0)
 
-      if (withdrawType === 'relayer') {
+    async function calculateSnarkProof() {
-        // Recalculate proof with actual fee and refund
-        await dispatch(
-          'fees/calculateWithdrawalFeeViaRelayer',
-          {
-            tx: {
-              gasLimit
-            }
-          },
-          { root: true }
-        )
-
-        relayer = rootState.relayer.selectedRelayer.address
-        fee = BigInt(rootState.fees.withdrawalFeeViaRelayer)
-
-        if (fee > denomination) {
-          throw new Error(
-            'Relayer fee exceeds the withdraw amount, disable relayer withdrawal or use other amount'
-          )
-        }
-      }
-
-      if (!isNativeCurrency) {
-        refund = rootGetters['fees/ethRefund']
-      }
-
       const input = {
         // public
         fee,
         root,
         refund,
-        relayer: BigInt(relayer),
+        relayer,
         recipient: BigInt(recipient),
-        nullifierHash,
+        nullifierHash: note.nullifierHash,
         // private
         pathIndices,
         pathElements,
-        secret,
+        secret: note.secret,
-        nullifier
+        nullifier: note.nullifier
+      }
+
+      const { circuit, provingKey } = await getTornadoKeys()
+
+      if (!groth16) {
+        groth16 = await buildGroth16()
       }
 
       console.log('Start generating SNARK proof', input)
@@ -753,41 +712,31 @@ const actions = {
         toFixedHex(input.refund)
       ]
       console.timeEnd('SNARK proof time')
-
+      return { args, proof }
-      return {
-        relayer,
-        fee,
-        proof,
-        args
-      }
     }
 
-    // eslint-disable-next-line prefer-const
+    // Don't need to calculate or estimate relayer fee, so, return proof immediately
-    let { proof, args } = await getProof()
+    if (withdrawType !== 'relayer') return calculateSnarkProof()
 
+    relayer = BigInt(rootState.relayer.selectedRelayer.address)
+    fee = BigInt(rootState.fees.withdrawalFeeViaRelayer)
+    const naiveProof = await calculateSnarkProof()
+    if (Number(note.netId) === 1) return naiveProof // Don't need to smart-estimate fee if we use V4 withdrawal
+
+    const { proof: dummyProof, args: dummyArgs } = naiveProof
     const withdrawalTx = getters.relayerWithdrawalTxData({
-      proof,
+      proof: dummyProof,
-      withdrawCallArgs: args,
+      withdrawCallArgs: dummyArgs,
-      amount,
+      amount: note.amount,
-      currency
+      currency: note.currency
     })
+    if (note.currency !== nativeCurrency) refund = BigInt(state.ethToReceive.toString())
 
-    gasLimit = BigInt(await web3.eth.estimateGas(withdrawalTx))
+    await dispatch('fees/calculateWithdrawalFeeViaRelayer', { tx: withdrawalTx }, { root: true })
+    fee = BigInt(rootState.fees.withdrawalFeeViaRelayer)
 
-    // If required gasLimit is above default, calculate the snark proof again
+    // Recalculate proof with actual fee and refund
-    if (gasLimit > defaultGasLimit) {
+    return calculateSnarkProof()
-      ;({ proof, args } = await getProof())
-
-      const withdrawalTx = getters.relayerWithdrawalTxData({
-        proof,
-        withdrawCallArgs: args,
-        amount,
-        currency
-      })
-      gasLimit = BigInt(await web3.eth.estimateGas(withdrawalTx))
-    }
-
-    return { proof, args }
   },
   async prepareWithdraw({ dispatch, commit }, { note, recipient }) {
     commit('REMOVE_PROOF', { note })
@@ -817,7 +766,6 @@ const actions = {
   },
   async withdraw({ state, rootState, rootGetters, dispatch, getters }, { note }) {
     try {
-      const web3 = getters.getWeb3
       const [, currency, amount, netId] = note.split('-')
       const config = networkConfig[`netId${netId}`]
       const { proof, args } = state.notes[note]
@@ -835,7 +783,7 @@ const actions = {
         to: contractInstance._address,
         from: ethAccount
       }
-      const gasLimit = Math.floor((await web3.eth.estimateGas(incompletedTx)) * 1.1)
+      const gasLimit = await rootGetters['fees/oracle'].getGasLimit(incompletedTx, 'other', 20)
 
       const callParams = {
         method: 'eth_sendTransaction',
@@ -976,8 +924,8 @@ const actions = {
       console.error(`Method loadWithdrawalData has error: ${e}`)
     }
   },
-  setDefaultEthToReceive({ commit, rootGetters }, { gasPrice, refundGasLimit }) {
+  async setDefaultEthToReceive({ commit, rootGetters }, { currency }) {
-    const ethToReceive = rootGetters['fees/oracle'].defaultEthRefund(gasPrice, refundGasLimit).toString()
+    const ethToReceive = await rootGetters['fees/oracle'].calculateRefundInETH(currency.toLowerCase())
     commit('SAVE_ETH_TO_RECEIVE', { ethToReceive })
     commit('SAVE_DEFAULT_ETH_TO_RECEIVE', { ethToReceive })
   },

store/fees.js

@@ -1,122 +1,35 @@
 /* eslint-disable no-console */
-import { toWei, toBN } from 'web3-utils'
+import { toWei, fromWei, toBN } from 'web3-utils'
-import { formatUnits, parseUnits } from 'ethers'
+import { TornadoFeeOracleV4, TornadoFeeOracleV5 } from '@tornado/tornado-oracles'
-import { ChainId, TornadoFeeOracle, getProvider } from '@tornado/tornado-oracles'
-import { WITHDRAW_GAS_LIMIT } from '@/constants/variables'
 
 export const state = () => {
   return {
     gasPriceParams: { gasPrice: toWei(toBN(50), 'gwei') },
-    l1Fee: toBN(0),
     withdrawalNetworkFee: toBN(0),
     withdrawalFeeViaRelayer: toBN(0)
   }
 }
 
 export const getters = {
-  provider: (state, getters, rootState, rootGetters) => {
-    const netId = Number(rootGetters['metamask/netId'])
-    const { url: rpcUrl } = rootState.settings[`netId${netId}`].rpc
-    const config = rootGetters['metamask/networkConfig']
-
-    return getProvider(netId, rpcUrl, config)
-  },
   oracle: (state, getters, rootState, rootGetters) => {
     const netId = Number(rootGetters['metamask/netId'])
     const { url: rpcUrl } = rootState.settings[`netId${netId}`].rpc
-    const config = rootGetters['metamask/networkConfig']
+    const { gasPrices } = rootGetters['metamask/networkConfig']
 
-    return new TornadoFeeOracle(netId, rpcUrl, config)
+    // Return old oracle for backwards compatibility, if chain is ETH Mainnet
+    return netId === 1
+      ? new TornadoFeeOracleV4(netId, rpcUrl, gasPrices)
+      : new TornadoFeeOracleV5(netId, rpcUrl, gasPrices)
   },
   getGasPriceParams: (state) => {
     return state.gasPriceParams
   },
-  getMetamaskGasPriceParams: (state) => {
+  gasPrice: (state, getters) => {
-    const feeData = state.gasPriceParams
+    const { gasPrice, maxFeePerGas } = getters.getGasPriceParams
-
+    return maxFeePerGas || gasPrice
-    const gasParams = feeData.maxFeePerGas
-      ? {
-          maxFeePerGas: '0x' + feeData.maxFeePerGas.toString(16),
-          maxPriorityFeePerGas: '0x' + feeData.maxPriorityFeePerGas.toString(16)
-        }
-      : {
-          gasPrice: '0x' + feeData.gasPrice.toString(16)
-        }
-
-    return gasParams
-  },
-  l1Fee: (state) => {
-    return state.l1Fee
-  },
-  selectedInstance: (state, getters, rootState, rootGetters) => {
-    const nativeCurrency = rootGetters['metamask/nativeCurrency']
-    const { tokens } = rootGetters['metamask/networkConfig']
-    const { currency, amount } = rootState.application.selectedStatistic
-
-    const {
-      instanceAddress: instanceAddresses,
-      decimals,
-      gasLimit: instanceGasLimit,
-      tokenGasLimit
-    } = tokens[currency]
-
-    const { [amount]: instanceAddress } = instanceAddresses
-
-    const isNativeCurrency = currency.toLowerCase() === nativeCurrency
-
-    const firstAmount = Object.keys(instanceAddresses).sort((a, b) => Number(a) - Number(b))[0]
-    const isFirstAmount = Number(amount) === Number(firstAmount)
-
-    const denomination = parseUnits(String(amount), decimals)
-
-    const tokenPriceInWei = rootState.price.prices[currency.toLowerCase()]
-
-    return {
-      instanceAddress,
-      currency: currency.toLowerCase(),
-      amount: String(amount),
-      decimals,
-      denomination,
-      isNativeCurrency,
-      isFirstAmount,
-      instanceGasLimit,
-      tokenGasLimit,
-      tokenPriceInWei
-    }
-  },
-  gasPrice: (state, getters, rootState, rootGetters) => {
-    const netId = Number(rootGetters['metamask/netId'])
-    const gasPriceParams = getters.getGasPriceParams
-
-    let gasPrice = BigInt(
-      gasPriceParams.maxFeePerGas
-        ? gasPriceParams.maxFeePerGas.toString()
-        : gasPriceParams.gasPrice.toString()
-    )
-
-    // to-do: manually bump gas price for BSC, remove this when we are able to check gasPrice from relayer status
-    if (netId === ChainId.BSC && gasPrice < parseUnits('3.3', 'gwei')) {
-      gasPrice = parseUnits('3.3', 'gwei')
-    }
-
-    return gasPrice
   },
   gasPriceInGwei: (state, getters) => {
-    return formatUnits(getters.gasPrice, 'gwei')
+    return fromWei(getters.gasPrice, 'gwei')
-  },
-  gasLimit: (state, getters) => ({ gas, gasLimit } = {}) => {
-    const { instanceGasLimit } = getters.selectedInstance
-    return BigInt(gas || gasLimit || instanceGasLimit || WITHDRAW_GAS_LIMIT)
-  },
-  refundGasLimit: (state, getters) => {
-    const { isFirstAmount, tokenGasLimit } = getters.selectedInstance
-    return isFirstAmount && tokenGasLimit ? BigInt(tokenGasLimit) : undefined
-  },
-  ethRefund: (state, getters, rootState) => {
-    return rootState.application.ethToReceive || 0
-  },
-  relayerFeePercent: (state, getters, rootState) => {
-    return rootState.relayer.selectedRelayer.tornadoServiceFee
   }
 }
 
@@ -129,9 +42,6 @@ export const mutations = {
   },
   SAVE_WITHDRAWAL_FEE_VIA_RELAYER(state, fee) {
     state.withdrawalFeeViaRelayer = fee
-  },
-  SAVE_L1_FEE(state, fee) {
-    state.l1Fee = fee
   }
 }
 
@@ -140,20 +50,8 @@ export const actions = {
     const { pollInterval } = rootGetters['metamask/networkConfig']
 
     try {
-      const feeData = await getters.provider.getFeeData()
+      const gasPriceParams = await getters.oracle.getGasPriceParams()
-
+      commit('SAVE_GAS_PARAMS', gasPriceParams)
-      const gasParams = feeData.maxFeePerGas
-        ? {
-            maxFeePerGas: feeData.maxFeePerGas.toString(),
-            maxPriorityFeePerGas: feeData.maxPriorityFeePerGas
-              ? feeData.maxPriorityFeePerGas.toString()
-              : null
-          }
-        : {
-            gasPrice: feeData.gasPrice ? feeData.gasPrice.toString() : parseUnits('50', 'gwei').toString()
-          }
-
-      commit('SAVE_GAS_PARAMS', gasParams)
     } catch (e) {
       console.error('fetchGasPrice', e)
     } finally {
@@ -164,66 +62,32 @@ export const actions = {
     const { gasPrices } = rootGetters['metamask/networkConfig']
     commit('SAVE_GAS_PARAMS', { gasPrice: toWei(gasPrices?.fast?.toFixed(9) || 0, 'gwei') })
   },
-  calculateWithdrawalNetworkFee({ getters, commit }, { tx }) {
+  async calculateWithdrawalNetworkFee({ getters, commit }, { tx }) {
-    const gasPrice = getters.gasPrice
+    const withdrawalGas = await getters.oracle.getGas(tx, 'user_withdrawal')
-    const gasLimit = BigInt(tx?.gas || tx?.gasLimit || WITHDRAW_GAS_LIMIT)
 
-    const gasCost = gasPrice * gasLimit
+    commit('SAVE_WITHDRAWAL_NETWORK_FEE', toBN(withdrawalGas))
-
-    commit('SAVE_WITHDRAWAL_NETWORK_FEE', toBN(gasCost.toString()))
-
-    return gasCost
   },
-  async calculateL1Fee({ commit, getters }, { tx }) {
+  async calculateWithdrawalFeeViaRelayer({ dispatch, getters, commit, rootGetters, rootState }, { tx }) {
-    const oracle = getters.oracle
+    const feePercent = rootState.relayer.selectedRelayer.tornadoServiceFee
+    const { currency, amount } = rootState.application.selectedStatistic
+    const nativeCurrency = rootGetters['metamask/nativeCurrency']
+    const { decimals } = rootGetters['metamask/networkConfig'].tokens[currency]
 
-    const l1Fee = await oracle.fetchL1OptimismFee(tx)
+    await dispatch('calculateWithdrawalNetworkFee', { tx })
+    if (currency !== nativeCurrency)
+      await dispatch('application/setDefaultEthToReceive', { currency }, { root: true })
 
-    commit('SAVE_L1_FEE', toBN(l1Fee.toString()))
+    const withdrawalFee = await getters.oracle.calculateWithdrawalFeeViaRelayer(
-  },
+      'user_withdrawal',
-  async calculateWithdrawalFeeViaRelayer({ dispatch, getters, commit }, { tx }) {
+      tx,
-    const { decimals, denomination, isNativeCurrency, tokenPriceInWei } = getters.selectedInstance
+      feePercent,
+      currency.toLowerCase(),
+      amount,
+      decimals,
+      rootState.application.ethToReceive || 0,
+      rootState.price.prices[currency.toLowerCase()]
+    )
 
-    const oracle = getters.oracle
+    commit('SAVE_WITHDRAWAL_FEE_VIA_RELAYER', toBN(withdrawalFee))
-    const gasPrice = getters.gasPrice
-    const gasLimit = getters.gasLimit(tx)
-    const refundGasLimit = getters.refundGasLimit
-    const relayerFeePercent = getters.relayerFeePercent
-
-    await dispatch('calculateL1Fee', { tx })
-    dispatch('calculateWithdrawalNetworkFee', { tx })
-
-    const l1Fee = getters.l1Fee
-
-    if (!isNativeCurrency) {
-      dispatch('application/setDefaultEthToReceive', { gasPrice, refundGasLimit }, { root: true })
-
-      const ethRefund = getters.ethRefund
-
-      const relayerFee = oracle.calculateRelayerFee({
-        gasPrice,
-        gasLimit,
-        l1Fee,
-        denomination,
-        ethRefund,
-        tokenPriceInWei,
-        tokenDecimals: decimals,
-        relayerFeePercent,
-        isEth: isNativeCurrency
-      })
-
-      commit('SAVE_WITHDRAWAL_FEE_VIA_RELAYER', toBN(relayerFee.toString()))
-      return
-    }
-
-    const relayerFee = oracle.calculateRelayerFee({
-      gasPrice,
-      gasLimit,
-      l1Fee,
-      denomination,
-      relayerFeePercent
-    })
-
-    commit('SAVE_WITHDRAWAL_FEE_VIA_RELAYER', toBN(relayerFee.toString()))
   }
 }

store/governance/gov.js

@@ -2,7 +2,7 @@
 /* eslint-disable import/order */
 
 import Web3 from 'web3'
-import { AbiCoder, concat } from 'ethers'
+import { utils } from 'ethers'
 import { ToastProgrammatic as Toast } from 'buefy'
 
 import networkConfig from '@/networkConfig'
@@ -14,8 +14,6 @@ import { httpConfig } from '@/constants'
 
 const { numberToHex, toWei, fromWei, toBN, hexToNumber, hexToNumberString } = require('web3-utils')
 
-const defaultAbiCoder = AbiCoder.defaultAbiCoder()
-
 const state = () => {
   return {
     approvalAmount: 'unlimited',
@@ -393,8 +391,8 @@ const actions = {
 
       if (contact || message) {
         const value = JSON.stringify([contact, message])
-        const tail = defaultAbiCoder.encode(['string'], [value])
+        const tail = utils.defaultAbiCoder.encode(['string'], [value])
-        dataWithTail = concat([data, tail])
+        dataWithTail = utils.hexConcat([data, tail])
       }
 
       const gas = await web3.eth.estimateGas({

store/governance/proposal.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 /* eslint-disable import/order */
 
-import { AbiCoder, dataLength, dataSlice } from 'ethers'
+import { utils } from 'ethers'
 import uniqBy from 'lodash/uniqBy'
 import chunk from 'lodash/chunk'
 
@@ -10,8 +10,6 @@ import { CHUNK_COUNT_PER_BATCH_REQUEST } from '@/constants'
 
 const { toWei, fromWei, toBN } = require('web3-utils')
 
-const defaultAbiCoder = AbiCoder.defaultAbiCoder()
-
 const CACHE_TX = {}
 const CACHE_BLOCK = {}
 
@@ -20,12 +18,15 @@ const parseComment = (calldata, govInstance) => {
   if (!calldata || !govInstance) return empty
 
   const methodLength = 4 // length of castDelegatedVote method
-  const result = defaultAbiCoder.decode(['address[]', 'uint256', 'bool'], dataSlice(calldata, methodLength))
+  const result = utils.defaultAbiCoder.decode(
+    ['address[]', 'uint256', 'bool'],
+    utils.hexDataSlice(calldata, methodLength)
+  )
   const data = govInstance.methods.castDelegatedVote(...result).encodeABI()
-  const length = dataLength(data)
+  const dataLength = utils.hexDataLength(data)
 
   try {
-    const str = defaultAbiCoder.decode(['string'], dataSlice(calldata, length))
+    const str = utils.defaultAbiCoder.decode(['string'], utils.hexDataSlice(calldata, dataLength))
     const [contact, message] = JSON.parse(str)
     return { contact, message }
   } catch {

store/metamask.js

@@ -505,26 +505,82 @@ const actions = {
       throw new Error(err.message)
     }
   },
-  async addNetwork({ rootGetters }, { netId }) {
+  async addNetwork(_, { netId }) {
-    const config = networkConfig[`netId${netId}`]
+    const METAMASK_LIST = {
-    const { url } = rootGetters['settings/getRpc'](netId)
+      56: {
-
+        chainId: '0x38',
-    await this.$provider.sendRequest({
+        chainName: 'Binance Smart Chain Mainnet',
-      method: 'wallet_addEthereumChain',
+        rpcUrls: ['https://bscrpc.com'],
-      params: [
-        {
-          chainId: `0x${Number(netId).toString(16)}`,
-          chainName: config.networkName,
-          rpcUrls: [url],
         nativeCurrency: {
-            name: config.networkName,
+          name: 'Binance Chain Native Token',
-            symbol: config.currencyName,
+          symbol: 'BNB',
           decimals: 18
         },
-          blockExplorerUrls: [config.explorerUrl.tx.replace('/tx', '')]
+        blockExplorerUrls: ['https://bscscan.com']
+      },
+      10: {
+        chainId: '0xa',
+        chainName: 'Optimism',
+        rpcUrls: ['https://mainnet.optimism.io/'],
+        nativeCurrency: {
+          name: 'Ether',
+          symbol: 'ETH',
+          decimals: 18
+        },
+        blockExplorerUrls: ['https://optimistic.etherscan.io']
+      },
+      100: {
+        chainId: '0x64',
+        chainName: 'Gnosis',
+        rpcUrls: ['https://development.tornadocash.community/rpc/v1'],
+        nativeCurrency: {
+          name: 'xDAI',
+          symbol: 'xDAI',
+          decimals: 18
+        },
+        blockExplorerUrls: ['https://blockscout.com/xdai/mainnet']
+      },
+      137: {
+        chainId: '0x89',
+        chainName: 'Polygon Mainnet',
+        rpcUrls: ['https://polygon-rpc.com'],
+        nativeCurrency: {
+          name: 'MATIC',
+          symbol: 'MATIC',
+          decimals: 18
+        },
+        blockExplorerUrls: ['https://polygonscan.com']
+      },
+      42161: {
+        chainId: '0xA4B1',
+        chainName: 'Arbitrum One',
+        rpcUrls: ['https://arb1.arbitrum.io/rpc'],
+        nativeCurrency: {
+          name: 'Ether',
+          symbol: 'ETH',
+          decimals: 18
+        },
+        blockExplorerUrls: ['https://arbiscan.io']
+      },
+      43114: {
+        chainId: '0xA86A',
+        chainName: 'Avalanche C-Chain',
+        rpcUrls: ['https://api.avax.network/ext/bc/C/rpc'],
+        nativeCurrency: {
+          name: 'Avalanche',
+          symbol: 'AVAX',
+          decimals: 18
+        },
+        blockExplorerUrls: ['https://snowtrace.io']
       }
-      ]
+    }
+
+    if (METAMASK_LIST[netId]) {
+      await this.$provider.sendRequest({
+        method: 'wallet_addEthereumChain',
+        params: [METAMASK_LIST[netId]]
       })
+    }
   },
   async checkNetworkVersion() {
     try {

store/price.js

@@ -18,25 +18,8 @@ export const getters = {
   priceOracle: (state, getters, rootState, rootGetters) => {
     const netId = Number(rootGetters['metamask/netId'])
     const { url: rpcUrl } = rootState.settings[`netId${netId}`].rpc
-    const config = rootGetters['metamask/networkConfig']
 
-    return new TokenPriceOracle(netId, rpcUrl, config)
+    return new TokenPriceOracle(rpcUrl)
-  },
-  tokens: (state, getters, rootStater, rootGetters) => {
-    const config = rootGetters['metamask/networkConfig']
-    const { 'torn.contract.tornadocash.eth': tornContract, tokens } = config
-    return [
-      {
-        tokenAddress: tornContract,
-        symbol: 'TORN',
-        decimals: 18
-      },
-      ...Object.values(tokens)
-        .map(({ tokenAddress, symbol, decimals }) =>
-          tokenAddress ? { tokenAddress, symbol, decimals } : undefined
-        )
-        .filter((t) => t)
-    ]
   },
   tokenRate: (state, getters, rootState) => {
     return state.prices[rootState.application.selectedStatistic.currency]
@@ -66,10 +49,8 @@ export const actions = {
       return
     }
 
-    const tokens = getters.tokens
-
     try {
-      const prices = await getters.priceOracle.fetchPrices(tokens)
+      const prices = await getters.priceOracle.fetchPrices()
       console.log('prices', prices)
       commit('SAVE_TOKEN_PRICES', prices)