.gitignore

@@ -88,8 +88,5 @@ sw.*
 # Mac OSX
 .DS_Store
 
-# Events unarchived files
-static/*/*.json
 
-# UI build archive
+static/*/*.json
-dist.zip

.nvmrc

@@ -1 +1 @@
-v14.21.3
+14

README.md

@@ -4,7 +4,7 @@
 
 ## Building locally
 
-- Install [Node.js](https://nodejs.org) version 16
+- Install [Node.js](https://nodejs.org) version 14
   - If you are using [nvm](https://github.com/creationix/nvm#installation) (recommended) running `nvm use` will automatically choose the right node version for you.
 - Install [Yarn](https://yarnpkg.com/en/docs/install)
 - Install dependencies: `yarn`

abis/OffchainOracle.abi.json

@@ -0,0 +1,181 @@
+[
+  {
+    "inputs": [
+      { "internalType": "contract MultiWrapper", "name": "_multiWrapper", "type": "address" },
+      { "internalType": "contract IOracle[]", "name": "existingOracles", "type": "address[]" },
+      { "internalType": "enum OffchainOracle.OracleType[]", "name": "oracleTypes", "type": "uint8[]" },
+      { "internalType": "contract IERC20[]", "name": "existingConnectors", "type": "address[]" },
+      { "internalType": "contract IERC20", "name": "wBase", "type": "address" }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": false, "internalType": "contract IERC20", "name": "connector", "type": "address" }
+    ],
+    "name": "ConnectorAdded",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": false, "internalType": "contract IERC20", "name": "connector", "type": "address" }
+    ],
+    "name": "ConnectorRemoved",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": false, "internalType": "contract MultiWrapper", "name": "multiWrapper", "type": "address" }
+    ],
+    "name": "MultiWrapperUpdated",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": false, "internalType": "contract IOracle", "name": "oracle", "type": "address" },
+      {
+        "indexed": false,
+        "internalType": "enum OffchainOracle.OracleType",
+        "name": "oracleType",
+        "type": "uint8"
+      }
+    ],
+    "name": "OracleAdded",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": false, "internalType": "contract IOracle", "name": "oracle", "type": "address" },
+      {
+        "indexed": false,
+        "internalType": "enum OffchainOracle.OracleType",
+        "name": "oracleType",
+        "type": "uint8"
+      }
+    ],
+    "name": "OracleRemoved",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "internalType": "address", "name": "previousOwner", "type": "address" },
+      { "indexed": true, "internalType": "address", "name": "newOwner", "type": "address" }
+    ],
+    "name": "OwnershipTransferred",
+    "type": "event"
+  },
+  {
+    "inputs": [{ "internalType": "contract IERC20", "name": "connector", "type": "address" }],
+    "name": "addConnector",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "contract IOracle", "name": "oracle", "type": "address" },
+      { "internalType": "enum OffchainOracle.OracleType", "name": "oracleKind", "type": "uint8" }
+    ],
+    "name": "addOracle",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "connectors",
+    "outputs": [{ "internalType": "contract IERC20[]", "name": "allConnectors", "type": "address[]" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "contract IERC20", "name": "srcToken", "type": "address" },
+      { "internalType": "contract IERC20", "name": "dstToken", "type": "address" },
+      { "internalType": "bool", "name": "useWrappers", "type": "bool" }
+    ],
+    "name": "getRate",
+    "outputs": [{ "internalType": "uint256", "name": "weightedRate", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "contract IERC20", "name": "srcToken", "type": "address" },
+      { "internalType": "bool", "name": "useSrcWrappers", "type": "bool" }
+    ],
+    "name": "getRateToEth",
+    "outputs": [{ "internalType": "uint256", "name": "weightedRate", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "multiWrapper",
+    "outputs": [{ "internalType": "contract MultiWrapper", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "oracles",
+    "outputs": [
+      { "internalType": "contract IOracle[]", "name": "allOracles", "type": "address[]" },
+      { "internalType": "enum OffchainOracle.OracleType[]", "name": "oracleTypes", "type": "uint8[]" }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "owner",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "contract IERC20", "name": "connector", "type": "address" }],
+    "name": "removeConnector",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "contract IOracle", "name": "oracle", "type": "address" },
+      { "internalType": "enum OffchainOracle.OracleType", "name": "oracleKind", "type": "uint8" }
+    ],
+    "name": "removeOracle",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "renounceOwnership",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "contract MultiWrapper", "name": "_multiWrapper", "type": "address" }],
+    "name": "setMultiWrapper",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "newOwner", "type": "address" }],
+    "name": "transferOwnership",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]

abis/OvmGasPriceOracle.abi.json

@@ -0,0 +1,151 @@
+[
+  {
+    "inputs": [{ "internalType": "address", "name": "_owner", "type": "address" }],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "", "type": "uint256" }],
+    "name": "DecimalsUpdated",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "", "type": "uint256" }],
+    "name": "GasPriceUpdated",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "", "type": "uint256" }],
+    "name": "L1BaseFeeUpdated",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "", "type": "uint256" }],
+    "name": "OverheadUpdated",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "internalType": "address", "name": "previousOwner", "type": "address" },
+      { "indexed": true, "internalType": "address", "name": "newOwner", "type": "address" }
+    ],
+    "name": "OwnershipTransferred",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "", "type": "uint256" }],
+    "name": "ScalarUpdated",
+    "type": "event"
+  },
+  {
+    "inputs": [],
+    "name": "decimals",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "gasPrice",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "bytes", "name": "_data", "type": "bytes" }],
+    "name": "getL1Fee",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "bytes", "name": "_data", "type": "bytes" }],
+    "name": "getL1GasUsed",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "l1BaseFee",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "overhead",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "owner",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "renounceOwnership",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "scalar",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "uint256", "name": "_decimals", "type": "uint256" }],
+    "name": "setDecimals",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "uint256", "name": "_gasPrice", "type": "uint256" }],
+    "name": "setGasPrice",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "uint256", "name": "_baseFee", "type": "uint256" }],
+    "name": "setL1BaseFee",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "uint256", "name": "_overhead", "type": "uint256" }],
+    "name": "setOverhead",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "uint256", "name": "_scalar", "type": "uint256" }],
+    "name": "setScalar",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "newOwner", "type": "address" }],
+    "name": "transferOwnership",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]

components/settings/SettingsModalBox.vue

@@ -4,10 +4,7 @@
       <div class="box-modal-title">{{ $t('withdrawalSettings') }}</div>
       <button type="button" class="delete" @click="$parent.cancel('escape')" />
     </header>
-    <b-tabs v-if="isRelayersAvailable" v-model="withdrawType" :animated="false" class="is-modal">
+    <b-tabs v-model="withdrawType" :animated="false" class="is-modal">
-      <RelayerTab />
-    </b-tabs>
-    <b-tabs v-else v-model="withdrawType" :animated="false" class="is-modal">
       <RelayerTab />
       <WalletTab />
     </b-tabs>
@@ -49,11 +46,7 @@ export default {
   computed: {
     ...mapState('application', {
       defaultWithdrawType: 'withdrawType'
-    }),
+    })
-    ...mapState('relayer', ['isLoadingRelayers', 'validRelayers']),
-    isRelayersAvailable() {
-      return !this.isLoadingRelayers && this.validRelayers.length > 0;
-    }
   },
   created() {
     this.withdrawType = this.defaultWithdrawType

components/withdraw/Withdraw.vue

@@ -192,7 +192,7 @@ export default {
     ...mapState('relayer', ['isLoadingRelayers']),
     ...mapGetters('txHashKeeper', ['txExplorerUrl']),
     ...mapGetters('application', ['isNotEnoughTokens', 'selectedStatisticCurrency']),
-    ...mapGetters('metamask', ['networkConfig', 'netId', 'isLoggedIn']),
+    ...mapGetters('metamask', ['networkConfig', 'netId', 'isLoggedIn', 'nativeCurrency']),
     notEnoughDeposits() {
       if (this.depositsPast < 5) {
         return true
@@ -200,7 +200,7 @@ export default {
       return false
     },
     shouldSettingsShow() {
-      return !this.isLoading && !this.error.type && !this.hasErrorNote
+      return !this.hasErrorNote && !this.error.message
     },
     hasErrorNote() {
       const note = this.withdrawNote.split('-')[4]
@@ -337,7 +337,9 @@ export default {
               })
             }
             this.$store.dispatch('application/setAndUpdateStatistic', { currency, amount: Number(amount) })
-            this.$store.dispatch('fees/calculateWithdrawalFeeViaRelayer', {})
+            if (currency !== this.nativeCurrency) {
+              this.$store.dispatch('application/setDefaultEthToReceive', { currency })
+            }
             this.$store.dispatch('loading/updateProgress', { progress: -1 })
             this.depositsPast = Number(depositsPast) <= 0 ? 0 : depositsPast
             this.depositTxHash = txHash

components/withdraw/WithdrawTotal.vue

@@ -18,9 +18,7 @@
       </div>
       <div v-if="withdrawType === 'relayer'" class="withdraw-data-item">
         {{ $t('networkFee') }}
-        <span data-test="label_network_fee"
+        <span data-test="label_network_fee">{{ toDecimals(networkFee, 18, 6) }} {{ networkCurrency }}</span>
-          >{{ toDecimals(withdrawalNetworkFee, 18, 6) }} {{ networkCurrency }}</span
-        >
       </div>
       <div v-if="withdrawType === 'relayer'" class="withdraw-data-item">
         {{ $t('relayerFee') }}
@@ -71,13 +69,13 @@ export default {
   },
   computed: {
     ...mapState('application', ['selectedStatistic']),
-    ...mapState('fees', ['withdrawalNetworkFee', 'withdrawalFeeViaRelayer']),
     ...mapGetters('metamask', ['networkConfig', 'nativeCurrency']),
     ...mapGetters('metamask', {
       networkCurrency: 'currency'
     }),
-    ...mapGetters('fees', ['gasPriceInGwei']),
+    ...mapGetters('gasPrices', ['gasPriceInGwei']),
     ...mapGetters('token', ['toDecimals', 'fromDecimals']),
+    ...mapGetters('application', ['networkFee']),
     ...mapGetters('price', ['tokenRate']),
     relayerFee() {
       const { amount } = this.selectedStatistic
@@ -93,7 +91,7 @@ export default {
       const tornadoServiceFee = this.relayerFee
       const { currency } = this.selectedStatistic
       const { decimals } = this.networkConfig.tokens[currency]
-      const ethFee = this.withdrawalNetworkFee
+      const ethFee = this.networkFee
       if (currency === this.nativeCurrency) {
         return ethFee.add(tornadoServiceFee)
       }
@@ -119,12 +117,17 @@ export default {
       return fromWei(this.ethToReceive)
     },
     total() {
-      const { amount } = this.selectedStatistic
+      const { amount, currency } = this.selectedStatistic
       let total = toBN(this.fromDecimals(amount.toString()))
 
       if (this.withdrawType === 'relayer') {
-        const relayerFee = this.withdrawalFeeViaRelayer
+        const relayerFee = this.totalRelayerFee
+
+        if (currency === this.nativeCurrency) {
           total = total.sub(relayerFee)
+        } else {
+          total = total.sub(relayerFee).sub(this.ethToReceiveInToken)
+        }
       }
 
       return this.toDecimals(total, null, 6)

layouts/default.vue

@@ -65,7 +65,7 @@ export default {
   created() {
     this.checkRecoveryKey()
     this.newNotify()
-    this.$store.dispatch('fees/setDefaultGasPrice')
+    this.$store.dispatch('gasPrices/setDefault')
   },
   mounted() {
     this.$preventMultitabs()
@@ -80,7 +80,7 @@ export default {
             await this.selectRpc({ netId: 1, action: this.preselectRpc })
           }
 
-          this.$store.dispatch('fees/fetchGasPrice')
+          this.$store.dispatch('gasPrices/fetchGasPrice')
           this.$store.dispatch('price/fetchTokenPrice', {}, { root: true })
           try {
             this.$store.dispatch('application/loadAllNotesData')

modules/account/store/actions/checkExistAccount.js

@@ -21,7 +21,7 @@ export async function checkExistAccount({ getters, dispatch, rootState, rootGett
 
     const isExist = Boolean(Array.isArray(events) && Boolean(events.length))
 
-    console.log('Is encrypted note events exist: ', isExist)
+    console.log('isExist', isExist)
 
     dispatch('createMutation', {
       type: 'CHECK_ACCOUNT',

networkConfig.js

@@ -29,9 +29,9 @@ export default {
         name: 'MevblockerRPC',
         url: 'https://rpc.mevblocker.io'
       },
-      oneRPC: {
+      llamaRPC: {
-        name: '1RPC',
+        name: 'llamarpc',
-        url: 'https://1rpc.io/eth'
+        url: 'https://eth.llamarpc.com'
       }
     },
     multicall: '0xeefba1e63905ef1d7acba5a8513c70307c1ce441',
@@ -401,17 +401,17 @@ export default {
     multicall: '0xe86e3989c74293Acc962156cd3F525c07b6a1B6e',
     echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
     rpcUrls: {
-      publicRpc: {
+      publicRpc1: {
         name: 'Avalanche RPC',
-        url: 'https://api.avax.network/ext/bc/C/rpc'
+        url: 'https://endpoints.omniatech.io/v1/avax/mainnet/public'
       },
       meowRPC: {
         name: 'Meow RPC',
         url: 'https://avax.meowrpc.com'
       },
-      oneRPC: {
+      communityRPC: {
-        name: 'OneRPC',
+        name: 'Tornado RPC',
-        url: 'https://1rpc.io/avax/c'
+        url: 'https://avalanche-rpc.tornado.ws/ext/bc/C/rpc'
       }
     },
     tokens: {
@@ -459,10 +459,6 @@ export default {
       chainnodes: {
         name: 'Tornado RPC',
         url: 'https://goerli.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
-      },
-      gatewayRPC: {
-        name: 'Gateway RPC',
-        url: 'https://rpc.goerli.eth.gateway.fm'
       }
     },
     tokens: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tornadocash-classic-ui",
-  "version": "1.2.0",
+  "version": "1.1.0",
   "description": "Private ethereum transactions",
   "author": "Tornado Cash Team",
   "scripts": {
@@ -23,10 +23,9 @@
     "@apollo/client": "^3.3.20",
     "@metamask/onboarding": "^1.0.0",
     "@nuxtjs/moment": "^1.6.0",
-    "@tornado/fixed-merkle-tree": "0.7",
+    "@tornado/gas-price-oracle": "^0.5.3",
-    "@tornado/snarkjs": "0.1.20",
+    "@tornado/snarkjs": "0.1.20-p2",
-    "@tornado/tornado-oracles": "^2.1.0",
+    "@tornado/websnark": "0.0.4-p1",
-    "@tornado/websnark": "0.0.4",
     "@walletconnect/web3-provider": "1.7.8",
     "ajv": "^6.10.2",
     "arraybuffer-loader": "^1.0.8",
@@ -40,6 +39,7 @@
     "eth-ens-namehash": "^2.0.8",
     "eth-sig-util": "^2.5.3",
     "file-saver": "^2.0.5",
+    "fixed-merkle-tree": "^0.7.3",
     "form-data": "^3.0.0",
     "graphql": "^15.5.1",
     "idb": "^6.0.0",

plugins/idb.js

@@ -262,7 +262,7 @@ export default async (ctx, inject) => {
 
     Object.keys(tokens).forEach((token) => {
       Object.keys(tokens[token].instanceAddress).forEach((amount) => {
-        if (nativeCurrency === token) {
+        if (nativeCurrency === token && netId === 1) {
           stores.push({
             name: `stringify_bloom_${netId}_${token}_${amount}`,
             keyPath: 'hashBloom'

scripts/updateTree.js

@@ -3,7 +3,7 @@ import 'dotenv/config'
 import fs from 'fs'
 
 import BloomFilter from 'bloomfilter.js'
-import { MerkleTree } from '@tornado/fixed-merkle-tree'
+import { MerkleTree } from 'fixed-merkle-tree'
 import { buildMimcSponge } from 'circomlibjs'
 
 import networkConfig, { enabledChains } from '../networkConfig'

scripts/updateZip.js

@@ -17,13 +17,13 @@ function updateEncrypted(netId) {
 async function updateCommon(netId) {
   const { nativeCurrency, tokens } = networkConfig[`netId${netId}`]
 
-  for (const type of EVENTS) {
+  console.log(Object.keys(tokens[nativeCurrency].instanceAddress))
-    for (const [tokenName, tokenInfo] of Object.entries(tokens)) {
+
-      console.log(`${tokenInfo.symbol}: ${Object.keys(tokenInfo.instanceAddress)}`)
+  for await (const type of EVENTS) {
-      for (const instance of Object.keys(tokenInfo.instanceAddress)) {
+    for await (const instance of Object.keys(tokens[nativeCurrency].instanceAddress)) {
       console.warn('instance', instance)
 
-        const filename = `${type.toLowerCase()}s_${netId}_${tokenName}_${instance}.json`
+      const filename = `${type.toLowerCase()}s_${netId}_${nativeCurrency}_${instance}.json`
 
       const isSaved = save(`${EVENTS_PATH}${filename}`)
 
@@ -37,7 +37,6 @@ async function updateCommon(netId) {
     }
   }
 }
-}
 
 function testCommon(netId, type, filename) {
   const { deployedBlock } = networkConfig[`netId${netId}`]

services/merkleTree.js

@@ -1,4 +1,4 @@
-import { MerkleTree, PartialMerkleTree } from '@tornado/fixed-merkle-tree'
+import { MerkleTree, PartialMerkleTree } from 'fixed-merkle-tree'
 
 import { trees } from '@/constants'
 import { download } from '@/store/snark'