forked from tornadocash/classic-ui
Compare commits
No commits in common. "fix-progress" and "master" have entirely different histories.
fix-progre
...
master
@ -1,6 +1,8 @@
|
||||
PINATA_API_KEY=
|
||||
PINATA_SECRET_API_KEY=
|
||||
|
||||
CHAINNODES_KEY=
|
||||
|
||||
WC_BRIDGE=
|
||||
|
||||
STORE_NAME=
|
||||
|
||||
1
.github/workflows/nodejs.yml
vendored
1
.github/workflows/nodejs.yml
vendored
@ -32,6 +32,7 @@ jobs:
|
||||
- name: Build
|
||||
run: yarn generate
|
||||
env:
|
||||
CHAINNODES_KEY: ${{ secrets.CHAINNODES_KEY }}
|
||||
WC_BRIDGE: ${{ secrets.WC_BRIDGE }}
|
||||
OLD_STORE_NAME: ${{ secrets.OLD_STORE_NAME }}
|
||||
STORE_NAME: ${{ secrets.STORE_NAME }}
|
||||
|
||||
@ -317,8 +317,8 @@
|
||||
mask-image: url('../img/icons/ethereum.svg');
|
||||
}
|
||||
|
||||
&-ethereum-sepolia {
|
||||
mask-image: url('../img/icons/ethereum.svg');
|
||||
&-ethereum-goerli {
|
||||
mask-image: url('../img/icons/goerli.svg');
|
||||
}
|
||||
|
||||
&-optimism {
|
||||
|
||||
@ -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'
|
||||
|
||||
@ -3,15 +3,14 @@
|
||||
<div class="loading-container">
|
||||
<div class="loading-tornado" data-test="tornado_loader"></div>
|
||||
<div class="loading-message">{{ message }}...</div>
|
||||
<div v-if="progress >= 0" class="loading-message">{{ progress }}%</div>
|
||||
<approve-loader v-if="isApprove" />
|
||||
</div>
|
||||
</b-loading>
|
||||
</template>
|
||||
<script>
|
||||
import { mapState, mapGetters } from 'vuex'
|
||||
|
||||
import ApproveLoader from './ApproveLoader'
|
||||
|
||||
export default {
|
||||
components: {
|
||||
ApproveLoader
|
||||
@ -19,7 +18,7 @@ export default {
|
||||
computed: {
|
||||
...mapGetters('metamask', ['isWalletConnect']),
|
||||
...mapState('metamask', ['providerName']),
|
||||
...mapState('loading', ['enabled', 'message', 'type']),
|
||||
...mapState('loading', ['enabled', 'message', 'progress', 'type']),
|
||||
isApprove() {
|
||||
return this.type === 'approve'
|
||||
}
|
||||
|
||||
@ -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
|
||||
}
|
||||
|
||||
@ -18,9 +18,9 @@
|
||||
</template>
|
||||
<template v-slot:description>{{ notice.description }}</template>
|
||||
</i18n>
|
||||
<!-- a v-if="notice.nova" href="https://nova.tornado.ws/" target="_blank" rel="noopener noreferrer">
|
||||
<a v-if="notice.nova" href="https://nova.tornado.ws/" target="_blank" rel="noopener noreferrer">
|
||||
Tornado Cash Nova
|
||||
</a -->
|
||||
</a>
|
||||
<a
|
||||
v-if="notice.txHash"
|
||||
:href="txExplorerUrl(notice.txHash)"
|
||||
|
||||
@ -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() {
|
||||
|
||||
@ -338,6 +338,7 @@ export default {
|
||||
}
|
||||
this.$store.dispatch('application/setAndUpdateStatistic', { currency, amount: Number(amount) })
|
||||
this.$store.dispatch('fees/calculateWithdrawalFeeViaRelayer', {})
|
||||
this.$store.dispatch('loading/updateProgress', { progress: -1 })
|
||||
this.depositsPast = Number(depositsPast) <= 0 ? 0 : depositsPast
|
||||
this.depositTxHash = txHash
|
||||
this.depositTimestamp = timestamp
|
||||
|
||||
@ -52,6 +52,9 @@ export const cachedEventsLength = {
|
||||
mainnet: {
|
||||
ENCRYPTED_NOTES: 16898
|
||||
},
|
||||
goerli: {
|
||||
ENCRYPTED_NOTES: 1662
|
||||
},
|
||||
bsc: {
|
||||
ENCRYPTED_NOTES: 11333
|
||||
}
|
||||
|
||||
@ -64,7 +64,7 @@ export default {
|
||||
},
|
||||
created() {
|
||||
this.checkRecoveryKey()
|
||||
// this.newNotify()
|
||||
this.newNotify()
|
||||
this.$store.dispatch('fees/setDefaultGasPrice')
|
||||
},
|
||||
mounted() {
|
||||
@ -125,7 +125,6 @@ export default {
|
||||
width: 440
|
||||
})
|
||||
},
|
||||
/**
|
||||
newNotify() {
|
||||
const hasNotify = window.localStorage.getItem('hasNotify')
|
||||
|
||||
@ -145,7 +144,6 @@ export default {
|
||||
window.localStorage.setItem('hasNotify', true)
|
||||
}
|
||||
},
|
||||
**/
|
||||
handleOpenModal() {
|
||||
const recoveryKey = this.$sessionStorage.getItem(this.accounts.encrypt)
|
||||
if (recoveryKey) {
|
||||
|
||||
142
networkConfig.js
142
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,9 +21,9 @@ export default {
|
||||
networkName: 'Ethereum Mainnet',
|
||||
deployedBlock: 9116966,
|
||||
rpcUrls: {
|
||||
tornadoRPC: {
|
||||
chainnodes: {
|
||||
name: 'Tornado RPC',
|
||||
url: 'https://tornadocash-rpc.com/mainnet'
|
||||
url: 'https://mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
|
||||
},
|
||||
mevblockerRPC: {
|
||||
name: 'MevblockerRPC',
|
||||
@ -74,8 +74,6 @@ export default {
|
||||
decimals: 8,
|
||||
gasLimit: '425000'
|
||||
},
|
||||
/**
|
||||
* Instances frozen due to sanctions
|
||||
usdc: {
|
||||
instanceAddress: {
|
||||
'100': '0xd96f2B1c14Db8458374d9Aca76E26c3D18364307',
|
||||
@ -96,7 +94,6 @@ export default {
|
||||
decimals: 6,
|
||||
gasLimit: '100000'
|
||||
},
|
||||
**/
|
||||
wbtc: {
|
||||
instanceAddress: {
|
||||
'0.1': '0x178169B423a011fff22B9e3F3abeA13414dDD0F1',
|
||||
@ -144,9 +141,9 @@ export default {
|
||||
multicall: '0x41263cba59eb80dc200f3e2544eda4ed6a90e76c',
|
||||
echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
|
||||
rpcUrls: {
|
||||
tornadoRPC: {
|
||||
chainnodes: {
|
||||
name: 'Tornado RPC',
|
||||
url: 'https://tornadocash-rpc.com/bsc'
|
||||
url: 'https://bsc-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
|
||||
},
|
||||
oneRPC: {
|
||||
name: '1RPC',
|
||||
@ -195,6 +192,10 @@ export default {
|
||||
multicall: '0x11ce4B23bD875D7F5C6a31084f55fDe1e9A87507',
|
||||
echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
|
||||
rpcUrls: {
|
||||
chainnodes: {
|
||||
name: 'Tornado RPC',
|
||||
url: 'https://polygon-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
|
||||
},
|
||||
oneRpc: {
|
||||
name: '1RPC',
|
||||
url: 'https://1rpc.io/matic'
|
||||
@ -243,9 +244,9 @@ export default {
|
||||
echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
|
||||
ovmGasPriceOracleContract: '0x420000000000000000000000000000000000000F',
|
||||
rpcUrls: {
|
||||
tornadoRPC: {
|
||||
chainnodes: {
|
||||
name: 'Tornado RPC',
|
||||
url: 'https://tornadocash-rpc.com/op'
|
||||
url: 'https://optimism-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
|
||||
},
|
||||
oneRpc: {
|
||||
name: '1RPC',
|
||||
@ -294,6 +295,10 @@ export default {
|
||||
multicall: '0x842eC2c7D803033Edf55E478F461FC547Bc54EB2',
|
||||
echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
|
||||
rpcUrls: {
|
||||
chainnodes: {
|
||||
name: 'Tornado RPC',
|
||||
url: 'https://arbitrum-one.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
|
||||
},
|
||||
oneRpc: {
|
||||
name: '1rpc',
|
||||
url: 'https://1rpc.io/arb'
|
||||
@ -345,9 +350,9 @@ export default {
|
||||
multicall: '0xb5b692a88bdfc81ca69dcb1d924f59f0413a602a',
|
||||
echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
|
||||
rpcUrls: {
|
||||
tornadoRPC: {
|
||||
chainnodes: {
|
||||
name: 'Tornado RPC',
|
||||
url: 'https://tornadocash-rpc.com/gnosis'
|
||||
url: 'https://gnosis-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
|
||||
},
|
||||
blockPi: {
|
||||
name: 'BlockPi',
|
||||
@ -428,72 +433,115 @@ export default {
|
||||
},
|
||||
'tornado-proxy-light.contract.tornadocash.eth': '0x0D5550d52428E7e3175bfc9550207e4ad3859b17'
|
||||
},
|
||||
netId11155111: {
|
||||
netId5: {
|
||||
rpcCallRetryAttempt: 15,
|
||||
gasPrices: {
|
||||
instant: 2,
|
||||
fast: 2,
|
||||
standard: 2,
|
||||
low: 2
|
||||
instant: 80,
|
||||
fast: 50,
|
||||
standard: 25,
|
||||
low: 8
|
||||
},
|
||||
nativeCurrency: 'eth',
|
||||
currencyName: 'ETH',
|
||||
currencyName: 'gETH',
|
||||
explorerUrl: {
|
||||
tx: 'https://sepolia.etherscan.io/tx/',
|
||||
address: 'https://sepolia.etherscan.io/address/',
|
||||
block: 'https://sepolia.etherscan.io/block/'
|
||||
tx: 'https://goerli.etherscan.io/tx/',
|
||||
address: 'https://goerli.etherscan.io/address/',
|
||||
block: 'https://goerli.etherscan.io/block/'
|
||||
},
|
||||
merkleTreeHeight: 20,
|
||||
emptyElement: '21663839004416932945382355908790599225266501822907911457504978515578255421292',
|
||||
networkName: 'Ethereum Sepolia',
|
||||
deployedBlock: 5594395,
|
||||
multicall: '0xcA11bde05977b3631167028862bE2a173976CA11',
|
||||
echoContractAccount: '0xcDD1fc3F5ac2782D83449d3AbE80D6b7B273B0e5',
|
||||
aggregatorContract: '0x4088712AC9fad39ea133cdb9130E465d235e9642',
|
||||
networkName: 'Ethereum Goerli',
|
||||
deployedBlock: 3781595,
|
||||
multicall: '0x77dca2c955b15e9de4dbbcf1246b4b85b651e50e',
|
||||
echoContractAccount: '0x37e6859804b6499d1e4a86d70a5fdd5de6a0ac65',
|
||||
aggregatorContract: '0x8cb1436F64a3c33aD17bb42F94e255c4c0E871b2',
|
||||
rpcUrls: {
|
||||
tornadoRPC: {
|
||||
chainnodes: {
|
||||
name: 'Tornado RPC',
|
||||
url: 'https://tornadocash-rpc.com/sepolia'
|
||||
url: 'https://goerli.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607'
|
||||
},
|
||||
sepolia: {
|
||||
name: 'Sepolia RPC',
|
||||
url: 'https://rpc.sepolia.org'
|
||||
gatewayRPC: {
|
||||
name: 'Gateway RPC',
|
||||
url: 'https://rpc.goerli.eth.gateway.fm'
|
||||
}
|
||||
},
|
||||
tokens: {
|
||||
eth: {
|
||||
instanceAddress: {
|
||||
'0.1': '0x8C4A04d872a6C1BE37964A21ba3a138525dFF50b',
|
||||
'1': '0x8cc930096B4Df705A007c4A039BDFA1320Ed2508',
|
||||
'10': '0x8D10d506D29Fc62ABb8A290B99F66dB27Fc43585',
|
||||
'100': '0x44c5C92ed73dB43888210264f0C8b36Fd68D8379'
|
||||
'0.1': '0x6Bf694a291DF3FeC1f7e69701E3ab6c592435Ae7',
|
||||
'1': '0x3aac1cC67c2ec5Db4eA850957b967Ba153aD6279',
|
||||
'10': '0x723B78e67497E85279CB204544566F4dC5d2acA0',
|
||||
'100': '0x0E3A09dDA6B20aFbB34aC7cD4A6881493f3E7bf7'
|
||||
},
|
||||
symbol: 'ETH',
|
||||
decimals: 18
|
||||
},
|
||||
dai: {
|
||||
instanceAddress: {
|
||||
'100': '0x6921fd1a97441dd603a997ED6DDF388658daf754',
|
||||
'1000': '0x50a637770F5d161999420F7d70d888DE47207145',
|
||||
'10000': '0xecD649870407cD43923A816Cc6334a5bdf113621',
|
||||
'100000': '0x73B4BD04bF83206B6e979BE2507098F92EDf4F90'
|
||||
'100': '0x76D85B4C0Fc497EeCc38902397aC608000A06607',
|
||||
'1000': '0xCC84179FFD19A1627E79F8648d09e095252Bc418',
|
||||
'10000': '0xD5d6f8D9e784d0e26222ad3834500801a68D027D',
|
||||
'100000': '0x407CcEeaA7c95d2FE2250Bf9F2c105aA7AAFB512'
|
||||
},
|
||||
tokenAddress: '0xFF34B3d4Aee8ddCd6F9AFFFB6Fe49bD371b8a357',
|
||||
tokenAddress: '0xdc31Ee1784292379Fbb2964b3B9C4124D8F89C60',
|
||||
symbol: 'DAI',
|
||||
decimals: 18,
|
||||
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,
|
||||
NOTE_ACCOUNT_BLOCK: 5594395,
|
||||
ENCRYPTED_NOTES_BLOCK: 5594395,
|
||||
GOVERNANCE_BLOCK: 3945171,
|
||||
NOTE_ACCOUNT_BLOCK: 4131375,
|
||||
ENCRYPTED_NOTES_BLOCK: 4131375,
|
||||
MINING_BLOCK_TIME: 15
|
||||
},
|
||||
'torn.contract.tornadocash.eth': '0x3AE6667167C0f44394106E197904519D808323cA',
|
||||
'governance.contract.tornadocash.eth': '0xe5324cD7602eeb387418e594B87aCADee08aeCAD',
|
||||
'tornado-router.contract.tornadocash.eth': '0x1572AFE6949fdF51Cb3E0856216670ae9Ee160Ee'
|
||||
'torn.contract.tornadocash.eth': '0x77777FeDdddFfC19Ff86DB637967013e6C6A116C',
|
||||
'governance.contract.tornadocash.eth': '0x5efda50f22d34F262c29268506C5Fa42cB56A1Ce',
|
||||
'tornado-proxy.contract.tornadocash.eth': '0x454d870a72e29d5e5697f635128d18077bd04c60'
|
||||
}
|
||||
}
|
||||
|
||||
@ -187,6 +187,7 @@ export default {
|
||||
new webpack.IgnorePlugin(/worker_threads/),
|
||||
new webpack.DefinePlugin({
|
||||
'process.env': JSON.stringify({
|
||||
CHAINNODES_KEY: process.env.CHAINNODES_KEY,
|
||||
WC_BRIDGE: process.env.WC_BRIDGE,
|
||||
OLD_STORE_NAME: process.env.OLD_STORE_NAME,
|
||||
STORE_NAME: process.env.STORE_NAME,
|
||||
@ -224,7 +225,7 @@ export default {
|
||||
},
|
||||
|
||||
provider: {
|
||||
rpcUrl: 'https://tornadocash-rpc.com'
|
||||
rpcUrl: `https://mainnet.chainnodes.org/${process.env.CHAINNODES_KEY}`
|
||||
},
|
||||
|
||||
// todo make custom loading page
|
||||
|
||||
11
package.json
11
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: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",
|
||||
"dev": "cross-env NODE_OPTIONS='--max-old-space-size=8192' nuxt",
|
||||
"build": "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 && 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",
|
||||
"generate": "cross-env NODE_OPTIONS='--max-old-space-size=8192' nuxt generate && cp dist/404.html dist/ipfs-404.html",
|
||||
"check:sync": "node -r esm scripts/checkEventsSync.js",
|
||||
"ipfsUpload": "node scripts/ipfsUpload.js",
|
||||
"deploy:ipfs": "yarn generate && yarn ipfsUpload"
|
||||
|
||||
@ -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()
|
||||
@ -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')
|
||||
}
|
||||
@ -7,6 +7,13 @@ import InstanceABI from '@/abis/Instance.abi.json'
|
||||
import { CONTRACT_INSTANCES, eventsType, httpConfig } from '@/constants'
|
||||
import { sleep, flattenNArray, formatEvents, capitalizeFirstLetter } from '@/utils'
|
||||
|
||||
let store
|
||||
if (process.browser) {
|
||||
window.onNuxtReady(({ $store }) => {
|
||||
store = $store
|
||||
})
|
||||
}
|
||||
|
||||
class EventService {
|
||||
constructor({ netId, amount, currency, factoryMethods }) {
|
||||
this.idb = window.$nuxt.$indexedDB(netId)
|
||||
@ -29,6 +36,15 @@ class EventService {
|
||||
return `${type}s_${this.netId}_${this.currency}_${this.amount}`
|
||||
}
|
||||
|
||||
updateEventProgress(percentage, type) {
|
||||
if (store) {
|
||||
store.dispatch('loading/updateProgress', {
|
||||
message: `Fetching past ${type} events`,
|
||||
progress: Math.ceil(percentage * 100)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
async getEvents(type) {
|
||||
let cachedEvents = await this.getEventsFromDB(type)
|
||||
|
||||
@ -329,6 +345,8 @@ class EventService {
|
||||
const batchCount = Math.ceil(batchDigest / batchSize)
|
||||
|
||||
if (fromBlock < currentBlockNumber) {
|
||||
this.updateEventProgress(0, type)
|
||||
|
||||
for (let batchIndex = 0; batchIndex < batchCount; batchIndex++) {
|
||||
const isLastBatch = batchIndex === batchCount - 1
|
||||
const params = new Array(batchSize).fill('').map((_, i) => {
|
||||
@ -343,6 +361,8 @@ class EventService {
|
||||
failed = failed.concat(requests.filter((e) => e.isFailedBatch))
|
||||
lastBlock = params[batchSize - 1].toBlock
|
||||
|
||||
const progressIndex = batchIndex - failed.length / batchSize
|
||||
|
||||
if (isLastBatch && failed.length !== 0) {
|
||||
const failedBatch = await Promise.all(this.createBatchRequest(failed))
|
||||
const failedReqs = flattenNArray(failedBatch)
|
||||
@ -354,6 +374,7 @@ class EventService {
|
||||
throw new Error('Failed to batch events')
|
||||
}
|
||||
}
|
||||
this.updateEventProgress(progressIndex / batchCount, type)
|
||||
}
|
||||
|
||||
return {
|
||||
@ -391,11 +412,10 @@ class EventService {
|
||||
async getEventsFromBlock({ fromBlock, graphMethod, type }) {
|
||||
try {
|
||||
// ToDo think about undefined
|
||||
const graphEvents = await this.getEventsFromGraph({ fromBlock, methodName: graphMethod })
|
||||
const lastSyncBlock = fromBlock > graphEvents?.lastBlock ? fromBlock : graphEvents?.lastBlock
|
||||
const rpcEvents = await this.getEventsFromRpc({ fromBlock: lastSyncBlock, type })
|
||||
const rpcEvents = await this.getEventsFromRpc({ fromBlock, type })
|
||||
|
||||
const allEvents = [].concat(rpcEvents || [])
|
||||
|
||||
const allEvents = [].concat(graphEvents?.events || [], rpcEvents || [])
|
||||
if (allEvents.length) {
|
||||
return {
|
||||
events: allEvents,
|
||||
|
||||
@ -20,14 +20,14 @@ const link = ({ getContext }) => {
|
||||
}
|
||||
|
||||
const CHAIN_GRAPH_URLS = {
|
||||
1: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/mainnet-tornado-subgraph',
|
||||
10: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/optimism-tornado-subgraph',
|
||||
56: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/bsc-tornado-subgraph',
|
||||
100: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/xdai-tornado-subgraph',
|
||||
137: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/matic-tornado-subgraph',
|
||||
42161: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/arbitrum-tornado-subgraph',
|
||||
43114: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/avalanche-tornado-subgraph',
|
||||
11155111: 'https://tornadocash-rpc.com/subgraphs/name/tornadocash/sepolia-tornado-subgraph'
|
||||
1: 'https://api.thegraph.com/subgraphs/name/tornadocash/mainnet-tornado-subgraph',
|
||||
5: 'https://api.thegraph.com/subgraphs/name/tornadocash/goerli-tornado-subgraph',
|
||||
10: 'https://api.thegraph.com/subgraphs/name/tornadocash/optimism-tornado-subgraph',
|
||||
56: 'https://api.thegraph.com/subgraphs/name/tornadocash/bsc-tornado-subgraph',
|
||||
100: 'https://api.thegraph.com/subgraphs/name/tornadocash/xdai-tornado-subgraph',
|
||||
137: 'https://api.thegraph.com/subgraphs/name/tornadocash/matic-tornado-subgraph',
|
||||
42161: 'https://api.thegraph.com/subgraphs/name/tornadocash/arbitrum-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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -410,6 +410,7 @@ const actions = {
|
||||
|
||||
const networksWithCache = {
|
||||
1: cachedEventsLength.mainnet.ENCRYPTED_NOTES,
|
||||
5: cachedEventsLength.goerli.ENCRYPTED_NOTES,
|
||||
56: cachedEventsLength.bsc.ENCRYPTED_NOTES
|
||||
}
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
export const state = () => {
|
||||
return {
|
||||
message: '',
|
||||
progress: -1,
|
||||
enabled: false,
|
||||
type: null
|
||||
}
|
||||
@ -9,14 +10,16 @@ export const state = () => {
|
||||
export const getters = {}
|
||||
|
||||
export const mutations = {
|
||||
ENABLE(state, { message, type }) {
|
||||
ENABLE(state, { message, progress, type }) {
|
||||
state.message = message
|
||||
state.enabled = true
|
||||
state.progress = progress
|
||||
state.type = type
|
||||
},
|
||||
DISABLE(state) {
|
||||
state.message = ''
|
||||
state.enabled = false
|
||||
state.progress = -1
|
||||
state.type = null
|
||||
}
|
||||
}
|
||||
@ -28,6 +31,9 @@ export const actions = {
|
||||
changeText({ commit }, { message, type }) {
|
||||
commit('ENABLE', { message, type })
|
||||
},
|
||||
updateProgress({ commit }, { message, progress }) {
|
||||
commit('ENABLE', { message, progress })
|
||||
},
|
||||
disable({ commit }) {
|
||||
commit('DISABLE')
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user