diff --git a/README.md b/README.md
index 84d5fd4..21c3f8a 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
## Building locally
-- Install [Node.js](https://nodejs.org) version 14
+- Install [Node.js](https://nodejs.org) version 16
- 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`
diff --git a/components/settings/SettingsModalBox.vue b/components/settings/SettingsModalBox.vue
index f920044..4925c8e 100644
--- a/components/settings/SettingsModalBox.vue
+++ b/components/settings/SettingsModalBox.vue
@@ -4,7 +4,10 @@
{{ $t('withdrawalSettings') }}
-
+
+
+
+
@@ -46,7 +49,11 @@ export default {
computed: {
...mapState('application', {
defaultWithdrawType: 'withdrawType'
- })
+ }),
+ ...mapState('relayer', ['isLoadingRelayers', 'validRelayers']),
+ isRelayersAvailable() {
+ return !this.isLoadingRelayers && this.validRelayers.length > 0;
+ }
},
created() {
this.withdrawType = this.defaultWithdrawType
diff --git a/components/withdraw/Withdraw.vue b/components/withdraw/Withdraw.vue
index da90dde..d99b25d 100644
--- a/components/withdraw/Withdraw.vue
+++ b/components/withdraw/Withdraw.vue
@@ -200,7 +200,7 @@ export default {
return false
},
shouldSettingsShow() {
- return !this.hasErrorNote && !this.error.message
+ return !this.isLoading && !this.error.type && !this.hasErrorNote
},
hasErrorNote() {
const note = this.withdrawNote.split('-')[4]
diff --git a/networkConfig.js b/networkConfig.js
index 74bd170..2fbd980 100644
--- a/networkConfig.js
+++ b/networkConfig.js
@@ -29,9 +29,9 @@ export default {
name: 'MevblockerRPC',
url: 'https://rpc.mevblocker.io'
},
- llamaRPC: {
- name: 'llamarpc',
- url: 'https://eth.llamarpc.com'
+ oneRPC: {
+ name: '1RPC',
+ url: 'https://1rpc.io/eth'
}
},
multicall: '0xeefba1e63905ef1d7acba5a8513c70307c1ce441',
@@ -401,17 +401,17 @@ export default {
multicall: '0xe86e3989c74293Acc962156cd3F525c07b6a1B6e',
echoContractAccount: '0xa75BF2815618872f155b7C4B0C81bF990f5245E4',
rpcUrls: {
- publicRpc1: {
+ publicRpc: {
name: 'Avalanche RPC',
- url: 'https://endpoints.omniatech.io/v1/avax/mainnet/public'
+ url: 'https://api.avax.network/ext/bc/C/rpc'
},
meowRPC: {
name: 'Meow RPC',
url: 'https://avax.meowrpc.com'
},
- communityRPC: {
- name: 'Tornado RPC',
- url: 'https://avalanche-rpc.tornado.ws/ext/bc/C/rpc'
+ oneRPC: {
+ name: 'OneRPC',
+ url: 'https://1rpc.io/avax/c'
}
},
tokens: {
@@ -459,6 +459,10 @@ 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: {
diff --git a/package.json b/package.json
index 8023222..da101c6 100644
--- a/package.json
+++ b/package.json
@@ -23,9 +23,10 @@
"@apollo/client": "^3.3.20",
"@metamask/onboarding": "^1.0.0",
"@nuxtjs/moment": "^1.6.0",
- "@tornado/snarkjs": "0.1.20-p2",
+ "@tornado/fixed-merkle-tree": "0.7",
+ "@tornado/snarkjs": "0.1.20",
"@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",
@@ -39,7 +40,6 @@
"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",
diff --git a/scripts/updateTree.js b/scripts/updateTree.js
index bb21b16..a91673f 100644
--- a/scripts/updateTree.js
+++ b/scripts/updateTree.js
@@ -3,7 +3,7 @@ import 'dotenv/config'
import fs from 'fs'
import BloomFilter from 'bloomfilter.js'
-import { MerkleTree } from 'fixed-merkle-tree'
+import { MerkleTree } from '@tornado/fixed-merkle-tree'
import { buildMimcSponge } from 'circomlibjs'
import networkConfig, { enabledChains } from '../networkConfig'
diff --git a/scripts/updateZip.js b/scripts/updateZip.js
index f05b91e..ee0b2ec 100644
--- a/scripts/updateZip.js
+++ b/scripts/updateZip.js
@@ -17,21 +17,22 @@ function updateEncrypted(netId) {
async function updateCommon(netId) {
const { nativeCurrency, tokens } = networkConfig[`netId${netId}`]
- console.log(Object.keys(tokens[nativeCurrency].instanceAddress))
+ for (const type of EVENTS) {
+ for (const [tokenName, tokenInfo] of Object.entries(tokens)) {
+ console.log(`${tokenInfo.symbol}: ${Object.keys(tokenInfo.instanceAddress)}`)
+ for (const instance of Object.keys(tokenInfo.instanceAddress)) {
+ console.warn('instance', instance)
- for await (const type of EVENTS) {
- 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}`)
- const isSaved = save(`${EVENTS_PATH}${filename}`)
-
- if (isSaved) {
- try {
- testCommon(netId, type, filename)
- } catch (err) {
- console.error(err.message)
+ if (isSaved) {
+ try {
+ testCommon(netId, type, filename)
+ } catch (err) {
+ console.error(err.message)
+ }
}
}
}
diff --git a/services/merkleTree.js b/services/merkleTree.js
index 42fd482..1c45201 100644
--- a/services/merkleTree.js
+++ b/services/merkleTree.js
@@ -1,4 +1,4 @@
-import { MerkleTree, PartialMerkleTree } from 'fixed-merkle-tree'
+import { MerkleTree, PartialMerkleTree } from '@tornado/fixed-merkle-tree'
import { trees } from '@/constants'
import { download } from '@/store/snark'
diff --git a/static/events/deposits_137_matic_100.json.gz b/static/events/deposits_137_matic_100.json.gz
index 8635de8..1c92307 100644
Binary files a/static/events/deposits_137_matic_100.json.gz and b/static/events/deposits_137_matic_100.json.gz differ
diff --git a/static/events/deposits_137_matic_1000.json.gz b/static/events/deposits_137_matic_1000.json.gz
index e522569..bb8d6a1 100644
Binary files a/static/events/deposits_137_matic_1000.json.gz and b/static/events/deposits_137_matic_1000.json.gz differ
diff --git a/static/events/deposits_137_matic_10000.json.gz b/static/events/deposits_137_matic_10000.json.gz
index 3cbc794..7dfea5f 100644
Binary files a/static/events/deposits_137_matic_10000.json.gz and b/static/events/deposits_137_matic_10000.json.gz differ
diff --git a/static/events/deposits_1_cdai_5000.json.gz b/static/events/deposits_1_cdai_5000.json.gz
index e69de29..6efd992 100644
Binary files a/static/events/deposits_1_cdai_5000.json.gz and b/static/events/deposits_1_cdai_5000.json.gz differ
diff --git a/static/events/deposits_1_cdai_50000.json.gz b/static/events/deposits_1_cdai_50000.json.gz
index e69de29..75907e3 100644
Binary files a/static/events/deposits_1_cdai_50000.json.gz and b/static/events/deposits_1_cdai_50000.json.gz differ
diff --git a/static/events/deposits_1_cdai_500000.json.gz b/static/events/deposits_1_cdai_500000.json.gz
index e69de29..e5c7620 100644
Binary files a/static/events/deposits_1_cdai_500000.json.gz and b/static/events/deposits_1_cdai_500000.json.gz differ
diff --git a/static/events/deposits_1_cdai_5000000.json.gz b/static/events/deposits_1_cdai_5000000.json.gz
index e69de29..5c8705b 100644
Binary files a/static/events/deposits_1_cdai_5000000.json.gz and b/static/events/deposits_1_cdai_5000000.json.gz differ
diff --git a/static/events/deposits_1_dai_100.json.gz b/static/events/deposits_1_dai_100.json.gz
index e69de29..25bfec2 100644
Binary files a/static/events/deposits_1_dai_100.json.gz and b/static/events/deposits_1_dai_100.json.gz differ
diff --git a/static/events/deposits_1_dai_1000.json.gz b/static/events/deposits_1_dai_1000.json.gz
index e69de29..efd7c30 100644
Binary files a/static/events/deposits_1_dai_1000.json.gz and b/static/events/deposits_1_dai_1000.json.gz differ
diff --git a/static/events/deposits_1_dai_10000.json.gz b/static/events/deposits_1_dai_10000.json.gz
index e69de29..d0dbfea 100644
Binary files a/static/events/deposits_1_dai_10000.json.gz and b/static/events/deposits_1_dai_10000.json.gz differ
diff --git a/static/events/deposits_1_dai_100000.json.gz b/static/events/deposits_1_dai_100000.json.gz
index e69de29..f70cfd4 100644
Binary files a/static/events/deposits_1_dai_100000.json.gz and b/static/events/deposits_1_dai_100000.json.gz differ
diff --git a/static/events/deposits_1_eth_0.1.json.gz b/static/events/deposits_1_eth_0.1.json.gz
index 9dbcd78..bf4f924 100644
Binary files a/static/events/deposits_1_eth_0.1.json.gz and b/static/events/deposits_1_eth_0.1.json.gz differ
diff --git a/static/events/deposits_1_eth_1.json.gz b/static/events/deposits_1_eth_1.json.gz
index 7549b74..00ef0de 100644
Binary files a/static/events/deposits_1_eth_1.json.gz and b/static/events/deposits_1_eth_1.json.gz differ
diff --git a/static/events/deposits_1_eth_10.json.gz b/static/events/deposits_1_eth_10.json.gz
index 5a91751..83716fe 100644
Binary files a/static/events/deposits_1_eth_10.json.gz and b/static/events/deposits_1_eth_10.json.gz differ
diff --git a/static/events/deposits_1_eth_100.json.gz b/static/events/deposits_1_eth_100.json.gz
index d4a0229..213236c 100644
Binary files a/static/events/deposits_1_eth_100.json.gz and b/static/events/deposits_1_eth_100.json.gz differ
diff --git a/static/events/deposits_1_usdc_100.json.gz b/static/events/deposits_1_usdc_100.json.gz
index e69de29..9305a88 100644
Binary files a/static/events/deposits_1_usdc_100.json.gz and b/static/events/deposits_1_usdc_100.json.gz differ
diff --git a/static/events/deposits_1_usdc_1000.json.gz b/static/events/deposits_1_usdc_1000.json.gz
index e69de29..d95cf62 100644
Binary files a/static/events/deposits_1_usdc_1000.json.gz and b/static/events/deposits_1_usdc_1000.json.gz differ
diff --git a/static/events/deposits_1_usdt_100.json.gz b/static/events/deposits_1_usdt_100.json.gz
index e69de29..09d4831 100644
Binary files a/static/events/deposits_1_usdt_100.json.gz and b/static/events/deposits_1_usdt_100.json.gz differ
diff --git a/static/events/deposits_1_usdt_1000.json.gz b/static/events/deposits_1_usdt_1000.json.gz
index e69de29..4c7a6c9 100644
Binary files a/static/events/deposits_1_usdt_1000.json.gz and b/static/events/deposits_1_usdt_1000.json.gz differ
diff --git a/static/events/deposits_1_wbtc_0.1.json.gz b/static/events/deposits_1_wbtc_0.1.json.gz
index e69de29..8ec63b1 100644
Binary files a/static/events/deposits_1_wbtc_0.1.json.gz and b/static/events/deposits_1_wbtc_0.1.json.gz differ
diff --git a/static/events/deposits_1_wbtc_1.json.gz b/static/events/deposits_1_wbtc_1.json.gz
index e69de29..35829e0 100644
Binary files a/static/events/deposits_1_wbtc_1.json.gz and b/static/events/deposits_1_wbtc_1.json.gz differ
diff --git a/static/events/deposits_1_wbtc_10.json.gz b/static/events/deposits_1_wbtc_10.json.gz
index e69de29..0396764 100644
Binary files a/static/events/deposits_1_wbtc_10.json.gz and b/static/events/deposits_1_wbtc_10.json.gz differ
diff --git a/static/events/deposits_42161_eth_0.1.json.gz b/static/events/deposits_42161_eth_0.1.json.gz
index 347de23..7e2b671 100644
Binary files a/static/events/deposits_42161_eth_0.1.json.gz and b/static/events/deposits_42161_eth_0.1.json.gz differ
diff --git a/static/events/deposits_42161_eth_1.json.gz b/static/events/deposits_42161_eth_1.json.gz
index 221bf73..ceaf71c 100644
Binary files a/static/events/deposits_42161_eth_1.json.gz and b/static/events/deposits_42161_eth_1.json.gz differ
diff --git a/static/events/deposits_42161_eth_10.json.gz b/static/events/deposits_42161_eth_10.json.gz
index 7fa8ade..5cf71bd 100644
Binary files a/static/events/deposits_42161_eth_10.json.gz and b/static/events/deposits_42161_eth_10.json.gz differ
diff --git a/static/events/deposits_56_bnb_0.1.json.gz b/static/events/deposits_56_bnb_0.1.json.gz
index ea7916d..8c22485 100644
Binary files a/static/events/deposits_56_bnb_0.1.json.gz and b/static/events/deposits_56_bnb_0.1.json.gz differ
diff --git a/static/events/deposits_56_bnb_1.json.gz b/static/events/deposits_56_bnb_1.json.gz
index 3225b5a..87f79d7 100644
Binary files a/static/events/deposits_56_bnb_1.json.gz and b/static/events/deposits_56_bnb_1.json.gz differ
diff --git a/static/events/deposits_56_bnb_10.json.gz b/static/events/deposits_56_bnb_10.json.gz
index a600b12..3a9605f 100644
Binary files a/static/events/deposits_56_bnb_10.json.gz and b/static/events/deposits_56_bnb_10.json.gz differ
diff --git a/static/events/deposits_56_bnb_100.json.gz b/static/events/deposits_56_bnb_100.json.gz
index b337a09..85cf071 100644
Binary files a/static/events/deposits_56_bnb_100.json.gz and b/static/events/deposits_56_bnb_100.json.gz differ
diff --git a/static/events/withdrawals_137_matic_100.json.gz b/static/events/withdrawals_137_matic_100.json.gz
index 0d5798c..f9de7a7 100644
Binary files a/static/events/withdrawals_137_matic_100.json.gz and b/static/events/withdrawals_137_matic_100.json.gz differ
diff --git a/static/events/withdrawals_137_matic_1000.json.gz b/static/events/withdrawals_137_matic_1000.json.gz
index 174542a..de1a41c 100644
Binary files a/static/events/withdrawals_137_matic_1000.json.gz and b/static/events/withdrawals_137_matic_1000.json.gz differ
diff --git a/static/events/withdrawals_137_matic_10000.json.gz b/static/events/withdrawals_137_matic_10000.json.gz
index ca1181f..ea286a0 100644
Binary files a/static/events/withdrawals_137_matic_10000.json.gz and b/static/events/withdrawals_137_matic_10000.json.gz differ
diff --git a/static/events/withdrawals_1_cdai_5000.json.gz b/static/events/withdrawals_1_cdai_5000.json.gz
index e69de29..6d336c6 100644
Binary files a/static/events/withdrawals_1_cdai_5000.json.gz and b/static/events/withdrawals_1_cdai_5000.json.gz differ
diff --git a/static/events/withdrawals_1_cdai_50000.json.gz b/static/events/withdrawals_1_cdai_50000.json.gz
index e69de29..82c621c 100644
Binary files a/static/events/withdrawals_1_cdai_50000.json.gz and b/static/events/withdrawals_1_cdai_50000.json.gz differ
diff --git a/static/events/withdrawals_1_cdai_500000.json.gz b/static/events/withdrawals_1_cdai_500000.json.gz
index e69de29..16f601f 100644
Binary files a/static/events/withdrawals_1_cdai_500000.json.gz and b/static/events/withdrawals_1_cdai_500000.json.gz differ
diff --git a/static/events/withdrawals_1_cdai_5000000.json.gz b/static/events/withdrawals_1_cdai_5000000.json.gz
index e69de29..c4fd82e 100644
Binary files a/static/events/withdrawals_1_cdai_5000000.json.gz and b/static/events/withdrawals_1_cdai_5000000.json.gz differ
diff --git a/static/events/withdrawals_1_dai_100.json.gz b/static/events/withdrawals_1_dai_100.json.gz
index e69de29..e980837 100644
Binary files a/static/events/withdrawals_1_dai_100.json.gz and b/static/events/withdrawals_1_dai_100.json.gz differ
diff --git a/static/events/withdrawals_1_dai_1000.json.gz b/static/events/withdrawals_1_dai_1000.json.gz
index e69de29..541e367 100644
Binary files a/static/events/withdrawals_1_dai_1000.json.gz and b/static/events/withdrawals_1_dai_1000.json.gz differ
diff --git a/static/events/withdrawals_1_dai_10000.json.gz b/static/events/withdrawals_1_dai_10000.json.gz
index e69de29..41a57e5 100644
Binary files a/static/events/withdrawals_1_dai_10000.json.gz and b/static/events/withdrawals_1_dai_10000.json.gz differ
diff --git a/static/events/withdrawals_1_dai_100000.json.gz b/static/events/withdrawals_1_dai_100000.json.gz
index e69de29..af0cba0 100644
Binary files a/static/events/withdrawals_1_dai_100000.json.gz and b/static/events/withdrawals_1_dai_100000.json.gz differ
diff --git a/static/events/withdrawals_1_eth_0.1.json.gz b/static/events/withdrawals_1_eth_0.1.json.gz
index 3e5f1c0..f53be62 100644
Binary files a/static/events/withdrawals_1_eth_0.1.json.gz and b/static/events/withdrawals_1_eth_0.1.json.gz differ
diff --git a/static/events/withdrawals_1_eth_1.json.gz b/static/events/withdrawals_1_eth_1.json.gz
index af5842d..a6e018e 100644
Binary files a/static/events/withdrawals_1_eth_1.json.gz and b/static/events/withdrawals_1_eth_1.json.gz differ
diff --git a/static/events/withdrawals_1_eth_10.json.gz b/static/events/withdrawals_1_eth_10.json.gz
index 44c626a..7652b02 100644
Binary files a/static/events/withdrawals_1_eth_10.json.gz and b/static/events/withdrawals_1_eth_10.json.gz differ
diff --git a/static/events/withdrawals_1_eth_100.json.gz b/static/events/withdrawals_1_eth_100.json.gz
index e0d6cd6..30346d2 100644
Binary files a/static/events/withdrawals_1_eth_100.json.gz and b/static/events/withdrawals_1_eth_100.json.gz differ
diff --git a/static/events/withdrawals_1_usdc_100.json.gz b/static/events/withdrawals_1_usdc_100.json.gz
index e69de29..2d89657 100644
Binary files a/static/events/withdrawals_1_usdc_100.json.gz and b/static/events/withdrawals_1_usdc_100.json.gz differ
diff --git a/static/events/withdrawals_1_usdc_1000.json.gz b/static/events/withdrawals_1_usdc_1000.json.gz
index e69de29..5b3c29d 100644
Binary files a/static/events/withdrawals_1_usdc_1000.json.gz and b/static/events/withdrawals_1_usdc_1000.json.gz differ
diff --git a/static/events/withdrawals_1_usdt_100.json.gz b/static/events/withdrawals_1_usdt_100.json.gz
index e69de29..ab121e5 100644
Binary files a/static/events/withdrawals_1_usdt_100.json.gz and b/static/events/withdrawals_1_usdt_100.json.gz differ
diff --git a/static/events/withdrawals_1_usdt_1000.json.gz b/static/events/withdrawals_1_usdt_1000.json.gz
index e69de29..16c8999 100644
Binary files a/static/events/withdrawals_1_usdt_1000.json.gz and b/static/events/withdrawals_1_usdt_1000.json.gz differ
diff --git a/static/events/withdrawals_1_wbtc_0.1.json.gz b/static/events/withdrawals_1_wbtc_0.1.json.gz
index e69de29..9e14dd8 100644
Binary files a/static/events/withdrawals_1_wbtc_0.1.json.gz and b/static/events/withdrawals_1_wbtc_0.1.json.gz differ
diff --git a/static/events/withdrawals_1_wbtc_1.json.gz b/static/events/withdrawals_1_wbtc_1.json.gz
index e69de29..32c7188 100644
Binary files a/static/events/withdrawals_1_wbtc_1.json.gz and b/static/events/withdrawals_1_wbtc_1.json.gz differ
diff --git a/static/events/withdrawals_1_wbtc_10.json.gz b/static/events/withdrawals_1_wbtc_10.json.gz
index e69de29..bf70ee7 100644
Binary files a/static/events/withdrawals_1_wbtc_10.json.gz and b/static/events/withdrawals_1_wbtc_10.json.gz differ
diff --git a/static/events/withdrawals_42161_eth_0.1.json.gz b/static/events/withdrawals_42161_eth_0.1.json.gz
index ec8e527..b0b518a 100644
Binary files a/static/events/withdrawals_42161_eth_0.1.json.gz and b/static/events/withdrawals_42161_eth_0.1.json.gz differ
diff --git a/static/events/withdrawals_42161_eth_1.json.gz b/static/events/withdrawals_42161_eth_1.json.gz
index 35108ff..a013774 100644
Binary files a/static/events/withdrawals_42161_eth_1.json.gz and b/static/events/withdrawals_42161_eth_1.json.gz differ
diff --git a/static/events/withdrawals_42161_eth_10.json.gz b/static/events/withdrawals_42161_eth_10.json.gz
index c3fc631..a559534 100644
Binary files a/static/events/withdrawals_42161_eth_10.json.gz and b/static/events/withdrawals_42161_eth_10.json.gz differ
diff --git a/static/events/withdrawals_56_bnb_0.1.json.gz b/static/events/withdrawals_56_bnb_0.1.json.gz
index e05bf49..2fd58bb 100644
Binary files a/static/events/withdrawals_56_bnb_0.1.json.gz and b/static/events/withdrawals_56_bnb_0.1.json.gz differ
diff --git a/static/events/withdrawals_56_bnb_1.json.gz b/static/events/withdrawals_56_bnb_1.json.gz
index 8319816..11b35e7 100644
Binary files a/static/events/withdrawals_56_bnb_1.json.gz and b/static/events/withdrawals_56_bnb_1.json.gz differ
diff --git a/static/events/withdrawals_56_bnb_10.json.gz b/static/events/withdrawals_56_bnb_10.json.gz
index ba79e43..9fa8968 100644
Binary files a/static/events/withdrawals_56_bnb_10.json.gz and b/static/events/withdrawals_56_bnb_10.json.gz differ
diff --git a/static/events/withdrawals_56_bnb_100.json.gz b/static/events/withdrawals_56_bnb_100.json.gz
index f469bf7..acf1c22 100644
Binary files a/static/events/withdrawals_56_bnb_100.json.gz and b/static/events/withdrawals_56_bnb_100.json.gz differ
diff --git a/static/trees/deposits_1_eth_0.1_bloom.json.gz b/static/trees/deposits_1_eth_0.1_bloom.json.gz
index 8794dd0..0714c0f 100644
Binary files a/static/trees/deposits_1_eth_0.1_bloom.json.gz and b/static/trees/deposits_1_eth_0.1_bloom.json.gz differ
diff --git a/static/trees/deposits_1_eth_0.1_slice1.json.gz b/static/trees/deposits_1_eth_0.1_slice1.json.gz
index 87bf8dc..f0eb577 100644
Binary files a/static/trees/deposits_1_eth_0.1_slice1.json.gz and b/static/trees/deposits_1_eth_0.1_slice1.json.gz differ
diff --git a/static/trees/deposits_1_eth_0.1_slice2.json.gz b/static/trees/deposits_1_eth_0.1_slice2.json.gz
index 2520cbc..189174d 100644
Binary files a/static/trees/deposits_1_eth_0.1_slice2.json.gz and b/static/trees/deposits_1_eth_0.1_slice2.json.gz differ
diff --git a/static/trees/deposits_1_eth_0.1_slice3.json.gz b/static/trees/deposits_1_eth_0.1_slice3.json.gz
index acfcba1..6f7c44f 100644
Binary files a/static/trees/deposits_1_eth_0.1_slice3.json.gz and b/static/trees/deposits_1_eth_0.1_slice3.json.gz differ
diff --git a/static/trees/deposits_1_eth_0.1_slice4.json.gz b/static/trees/deposits_1_eth_0.1_slice4.json.gz
index 233af83..03b1a43 100644
Binary files a/static/trees/deposits_1_eth_0.1_slice4.json.gz and b/static/trees/deposits_1_eth_0.1_slice4.json.gz differ
diff --git a/static/trees/deposits_1_eth_100_bloom.json.gz b/static/trees/deposits_1_eth_100_bloom.json.gz
index ad32316..cfed015 100644
Binary files a/static/trees/deposits_1_eth_100_bloom.json.gz and b/static/trees/deposits_1_eth_100_bloom.json.gz differ
diff --git a/static/trees/deposits_1_eth_100_slice1.json.gz b/static/trees/deposits_1_eth_100_slice1.json.gz
index d184b0e..1df6822 100644
Binary files a/static/trees/deposits_1_eth_100_slice1.json.gz and b/static/trees/deposits_1_eth_100_slice1.json.gz differ
diff --git a/static/trees/deposits_1_eth_100_slice2.json.gz b/static/trees/deposits_1_eth_100_slice2.json.gz
index f864046..f1132a9 100644
Binary files a/static/trees/deposits_1_eth_100_slice2.json.gz and b/static/trees/deposits_1_eth_100_slice2.json.gz differ
diff --git a/static/trees/deposits_1_eth_100_slice3.json.gz b/static/trees/deposits_1_eth_100_slice3.json.gz
index 31e6de9..e3faf78 100644
Binary files a/static/trees/deposits_1_eth_100_slice3.json.gz and b/static/trees/deposits_1_eth_100_slice3.json.gz differ
diff --git a/static/trees/deposits_1_eth_100_slice4.json.gz b/static/trees/deposits_1_eth_100_slice4.json.gz
index 1c9f4fe..bdfee14 100644
Binary files a/static/trees/deposits_1_eth_100_slice4.json.gz and b/static/trees/deposits_1_eth_100_slice4.json.gz differ
diff --git a/static/trees/deposits_1_eth_10_bloom.json.gz b/static/trees/deposits_1_eth_10_bloom.json.gz
index 1abe1b5..6cebf00 100644
Binary files a/static/trees/deposits_1_eth_10_bloom.json.gz and b/static/trees/deposits_1_eth_10_bloom.json.gz differ
diff --git a/static/trees/deposits_1_eth_10_slice1.json.gz b/static/trees/deposits_1_eth_10_slice1.json.gz
index 9371793..11802be 100644
Binary files a/static/trees/deposits_1_eth_10_slice1.json.gz and b/static/trees/deposits_1_eth_10_slice1.json.gz differ
diff --git a/static/trees/deposits_1_eth_10_slice2.json.gz b/static/trees/deposits_1_eth_10_slice2.json.gz
index 01b9023..2faacc5 100644
Binary files a/static/trees/deposits_1_eth_10_slice2.json.gz and b/static/trees/deposits_1_eth_10_slice2.json.gz differ
diff --git a/static/trees/deposits_1_eth_10_slice3.json.gz b/static/trees/deposits_1_eth_10_slice3.json.gz
index b1ec7f6..ad2c22f 100644
Binary files a/static/trees/deposits_1_eth_10_slice3.json.gz and b/static/trees/deposits_1_eth_10_slice3.json.gz differ
diff --git a/static/trees/deposits_1_eth_10_slice4.json.gz b/static/trees/deposits_1_eth_10_slice4.json.gz
index 7a7db98..bfa38a4 100644
Binary files a/static/trees/deposits_1_eth_10_slice4.json.gz and b/static/trees/deposits_1_eth_10_slice4.json.gz differ
diff --git a/static/trees/deposits_1_eth_1_bloom.json.gz b/static/trees/deposits_1_eth_1_bloom.json.gz
index 02b1ed9..82b647d 100644
Binary files a/static/trees/deposits_1_eth_1_bloom.json.gz and b/static/trees/deposits_1_eth_1_bloom.json.gz differ
diff --git a/static/trees/deposits_1_eth_1_slice1.json.gz b/static/trees/deposits_1_eth_1_slice1.json.gz
index 247e63c..9fad765 100644
Binary files a/static/trees/deposits_1_eth_1_slice1.json.gz and b/static/trees/deposits_1_eth_1_slice1.json.gz differ
diff --git a/static/trees/deposits_1_eth_1_slice2.json.gz b/static/trees/deposits_1_eth_1_slice2.json.gz
index d549d60..e5efa8a 100644
Binary files a/static/trees/deposits_1_eth_1_slice2.json.gz and b/static/trees/deposits_1_eth_1_slice2.json.gz differ
diff --git a/static/trees/deposits_1_eth_1_slice3.json.gz b/static/trees/deposits_1_eth_1_slice3.json.gz
index 77439b9..7bb80ed 100644
Binary files a/static/trees/deposits_1_eth_1_slice3.json.gz and b/static/trees/deposits_1_eth_1_slice3.json.gz differ
diff --git a/static/trees/deposits_1_eth_1_slice4.json.gz b/static/trees/deposits_1_eth_1_slice4.json.gz
index 38680c3..a833314 100644
Binary files a/static/trees/deposits_1_eth_1_slice4.json.gz and b/static/trees/deposits_1_eth_1_slice4.json.gz differ
diff --git a/static/trees/deposits_42161_eth_0.1_bloom.json.gz b/static/trees/deposits_42161_eth_0.1_bloom.json.gz
index b827869..b1ebc05 100644
Binary files a/static/trees/deposits_42161_eth_0.1_bloom.json.gz and b/static/trees/deposits_42161_eth_0.1_bloom.json.gz differ
diff --git a/static/trees/deposits_42161_eth_0.1_slice1.json.gz b/static/trees/deposits_42161_eth_0.1_slice1.json.gz
index c96a67a..30a63a8 100644
Binary files a/static/trees/deposits_42161_eth_0.1_slice1.json.gz and b/static/trees/deposits_42161_eth_0.1_slice1.json.gz differ
diff --git a/static/trees/deposits_42161_eth_0.1_slice2.json.gz b/static/trees/deposits_42161_eth_0.1_slice2.json.gz
index fea2a4e..9f1524e 100644
Binary files a/static/trees/deposits_42161_eth_0.1_slice2.json.gz and b/static/trees/deposits_42161_eth_0.1_slice2.json.gz differ
diff --git a/static/trees/deposits_42161_eth_0.1_slice3.json.gz b/static/trees/deposits_42161_eth_0.1_slice3.json.gz
index b62dadb..fbe5deb 100644
Binary files a/static/trees/deposits_42161_eth_0.1_slice3.json.gz and b/static/trees/deposits_42161_eth_0.1_slice3.json.gz differ
diff --git a/static/trees/deposits_42161_eth_0.1_slice4.json.gz b/static/trees/deposits_42161_eth_0.1_slice4.json.gz
index 975768c..dfde1a4 100644
Binary files a/static/trees/deposits_42161_eth_0.1_slice4.json.gz and b/static/trees/deposits_42161_eth_0.1_slice4.json.gz differ
diff --git a/static/trees/deposits_42161_eth_10_bloom.json.gz b/static/trees/deposits_42161_eth_10_bloom.json.gz
index b449c61..1eed52c 100644
Binary files a/static/trees/deposits_42161_eth_10_bloom.json.gz and b/static/trees/deposits_42161_eth_10_bloom.json.gz differ
diff --git a/static/trees/deposits_42161_eth_10_slice1.json.gz b/static/trees/deposits_42161_eth_10_slice1.json.gz
index 3860bb2..d57720a 100644
Binary files a/static/trees/deposits_42161_eth_10_slice1.json.gz and b/static/trees/deposits_42161_eth_10_slice1.json.gz differ
diff --git a/static/trees/deposits_42161_eth_10_slice2.json.gz b/static/trees/deposits_42161_eth_10_slice2.json.gz
index 7cfd4ac..ce64b2a 100644
Binary files a/static/trees/deposits_42161_eth_10_slice2.json.gz and b/static/trees/deposits_42161_eth_10_slice2.json.gz differ
diff --git a/static/trees/deposits_42161_eth_10_slice3.json.gz b/static/trees/deposits_42161_eth_10_slice3.json.gz
index 119e90b..c3934e9 100644
Binary files a/static/trees/deposits_42161_eth_10_slice3.json.gz and b/static/trees/deposits_42161_eth_10_slice3.json.gz differ
diff --git a/static/trees/deposits_42161_eth_10_slice4.json.gz b/static/trees/deposits_42161_eth_10_slice4.json.gz
index 11e7c76..359ea7d 100644
Binary files a/static/trees/deposits_42161_eth_10_slice4.json.gz and b/static/trees/deposits_42161_eth_10_slice4.json.gz differ
diff --git a/static/trees/deposits_42161_eth_1_bloom.json.gz b/static/trees/deposits_42161_eth_1_bloom.json.gz
index e036a7f..af02f80 100644
Binary files a/static/trees/deposits_42161_eth_1_bloom.json.gz and b/static/trees/deposits_42161_eth_1_bloom.json.gz differ
diff --git a/static/trees/deposits_42161_eth_1_slice1.json.gz b/static/trees/deposits_42161_eth_1_slice1.json.gz
index cf9994c..0289401 100644
Binary files a/static/trees/deposits_42161_eth_1_slice1.json.gz and b/static/trees/deposits_42161_eth_1_slice1.json.gz differ
diff --git a/static/trees/deposits_42161_eth_1_slice2.json.gz b/static/trees/deposits_42161_eth_1_slice2.json.gz
index 54a9204..47d1cff 100644
Binary files a/static/trees/deposits_42161_eth_1_slice2.json.gz and b/static/trees/deposits_42161_eth_1_slice2.json.gz differ
diff --git a/static/trees/deposits_42161_eth_1_slice3.json.gz b/static/trees/deposits_42161_eth_1_slice3.json.gz
index a654f42..cff8a32 100644
Binary files a/static/trees/deposits_42161_eth_1_slice3.json.gz and b/static/trees/deposits_42161_eth_1_slice3.json.gz differ
diff --git a/static/trees/deposits_42161_eth_1_slice4.json.gz b/static/trees/deposits_42161_eth_1_slice4.json.gz
index eb86499..b46d2f8 100644
Binary files a/static/trees/deposits_42161_eth_1_slice4.json.gz and b/static/trees/deposits_42161_eth_1_slice4.json.gz differ
diff --git a/static/trees/deposits_56_bnb_0.1_bloom.json.gz b/static/trees/deposits_56_bnb_0.1_bloom.json.gz
index bcade11..7942b32 100644
Binary files a/static/trees/deposits_56_bnb_0.1_bloom.json.gz and b/static/trees/deposits_56_bnb_0.1_bloom.json.gz differ
diff --git a/static/trees/deposits_56_bnb_0.1_slice1.json.gz b/static/trees/deposits_56_bnb_0.1_slice1.json.gz
index 19fb9ac..cba2fe4 100644
Binary files a/static/trees/deposits_56_bnb_0.1_slice1.json.gz and b/static/trees/deposits_56_bnb_0.1_slice1.json.gz differ
diff --git a/static/trees/deposits_56_bnb_0.1_slice2.json.gz b/static/trees/deposits_56_bnb_0.1_slice2.json.gz
index 6c9deb3..a8bc36b 100644
Binary files a/static/trees/deposits_56_bnb_0.1_slice2.json.gz and b/static/trees/deposits_56_bnb_0.1_slice2.json.gz differ
diff --git a/static/trees/deposits_56_bnb_0.1_slice3.json.gz b/static/trees/deposits_56_bnb_0.1_slice3.json.gz
index af4a958..f0306c3 100644
Binary files a/static/trees/deposits_56_bnb_0.1_slice3.json.gz and b/static/trees/deposits_56_bnb_0.1_slice3.json.gz differ
diff --git a/static/trees/deposits_56_bnb_0.1_slice4.json.gz b/static/trees/deposits_56_bnb_0.1_slice4.json.gz
index 2ba723a..822dbab 100644
Binary files a/static/trees/deposits_56_bnb_0.1_slice4.json.gz and b/static/trees/deposits_56_bnb_0.1_slice4.json.gz differ
diff --git a/static/trees/deposits_56_bnb_100_bloom.json.gz b/static/trees/deposits_56_bnb_100_bloom.json.gz
index dbbb20b..56031bb 100644
Binary files a/static/trees/deposits_56_bnb_100_bloom.json.gz and b/static/trees/deposits_56_bnb_100_bloom.json.gz differ
diff --git a/static/trees/deposits_56_bnb_100_slice1.json.gz b/static/trees/deposits_56_bnb_100_slice1.json.gz
index e954001..0a02814 100644
Binary files a/static/trees/deposits_56_bnb_100_slice1.json.gz and b/static/trees/deposits_56_bnb_100_slice1.json.gz differ
diff --git a/static/trees/deposits_56_bnb_100_slice2.json.gz b/static/trees/deposits_56_bnb_100_slice2.json.gz
index 148f485..99d4794 100644
Binary files a/static/trees/deposits_56_bnb_100_slice2.json.gz and b/static/trees/deposits_56_bnb_100_slice2.json.gz differ
diff --git a/static/trees/deposits_56_bnb_100_slice3.json.gz b/static/trees/deposits_56_bnb_100_slice3.json.gz
index b61ae0d..9843d68 100644
Binary files a/static/trees/deposits_56_bnb_100_slice3.json.gz and b/static/trees/deposits_56_bnb_100_slice3.json.gz differ
diff --git a/static/trees/deposits_56_bnb_100_slice4.json.gz b/static/trees/deposits_56_bnb_100_slice4.json.gz
index 91d70d6..9278c92 100644
Binary files a/static/trees/deposits_56_bnb_100_slice4.json.gz and b/static/trees/deposits_56_bnb_100_slice4.json.gz differ
diff --git a/static/trees/deposits_56_bnb_10_bloom.json.gz b/static/trees/deposits_56_bnb_10_bloom.json.gz
index b6cd74c..2a8271b 100644
Binary files a/static/trees/deposits_56_bnb_10_bloom.json.gz and b/static/trees/deposits_56_bnb_10_bloom.json.gz differ
diff --git a/static/trees/deposits_56_bnb_10_slice1.json.gz b/static/trees/deposits_56_bnb_10_slice1.json.gz
index de04b71..e88ec1b 100644
Binary files a/static/trees/deposits_56_bnb_10_slice1.json.gz and b/static/trees/deposits_56_bnb_10_slice1.json.gz differ
diff --git a/static/trees/deposits_56_bnb_10_slice2.json.gz b/static/trees/deposits_56_bnb_10_slice2.json.gz
index 8bd65c2..0b79a1f 100644
Binary files a/static/trees/deposits_56_bnb_10_slice2.json.gz and b/static/trees/deposits_56_bnb_10_slice2.json.gz differ
diff --git a/static/trees/deposits_56_bnb_10_slice3.json.gz b/static/trees/deposits_56_bnb_10_slice3.json.gz
index ee67268..d5d21b9 100644
Binary files a/static/trees/deposits_56_bnb_10_slice3.json.gz and b/static/trees/deposits_56_bnb_10_slice3.json.gz differ
diff --git a/static/trees/deposits_56_bnb_10_slice4.json.gz b/static/trees/deposits_56_bnb_10_slice4.json.gz
index 175fd21..6ff29ac 100644
Binary files a/static/trees/deposits_56_bnb_10_slice4.json.gz and b/static/trees/deposits_56_bnb_10_slice4.json.gz differ
diff --git a/static/trees/deposits_56_bnb_1_bloom.json.gz b/static/trees/deposits_56_bnb_1_bloom.json.gz
index 0612b9d..7f9d000 100644
Binary files a/static/trees/deposits_56_bnb_1_bloom.json.gz and b/static/trees/deposits_56_bnb_1_bloom.json.gz differ
diff --git a/static/trees/deposits_56_bnb_1_slice1.json.gz b/static/trees/deposits_56_bnb_1_slice1.json.gz
index 19bf30b..03a6cec 100644
Binary files a/static/trees/deposits_56_bnb_1_slice1.json.gz and b/static/trees/deposits_56_bnb_1_slice1.json.gz differ
diff --git a/static/trees/deposits_56_bnb_1_slice2.json.gz b/static/trees/deposits_56_bnb_1_slice2.json.gz
index 218743a..17e8c9a 100644
Binary files a/static/trees/deposits_56_bnb_1_slice2.json.gz and b/static/trees/deposits_56_bnb_1_slice2.json.gz differ
diff --git a/static/trees/deposits_56_bnb_1_slice3.json.gz b/static/trees/deposits_56_bnb_1_slice3.json.gz
index a50a25b..d686255 100644
Binary files a/static/trees/deposits_56_bnb_1_slice3.json.gz and b/static/trees/deposits_56_bnb_1_slice3.json.gz differ
diff --git a/static/trees/deposits_56_bnb_1_slice4.json.gz b/static/trees/deposits_56_bnb_1_slice4.json.gz
index cd818f6..807389c 100644
Binary files a/static/trees/deposits_56_bnb_1_slice4.json.gz and b/static/trees/deposits_56_bnb_1_slice4.json.gz differ
diff --git a/store/governance/gov.js b/store/governance/gov.js
index 0bf4f81..3a47156 100644
--- a/store/governance/gov.js
+++ b/store/governance/gov.js
@@ -37,7 +37,7 @@ const state = () => {
EXECUTION_DELAY: 172800,
EXECUTION_EXPIRATION: 259200,
PROPOSAL_THRESHOLD: '1000000000000000000000',
- QUORUM_VOTES: '25000000000000000000000',
+ QUORUM_VOTES: '100000000000000000000000',
VOTING_PERIOD: 432000
}
}
diff --git a/yarn.lock b/yarn.lock
index 9122ed7..59ba419 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2451,6 +2451,11 @@
dependencies:
defer-to-connect "^1.0.1"
+"@tornado/fixed-merkle-tree@0.7":
+ version "0.7.3"
+ resolved "https://git.tornado.ws/api/packages/tornado-packages/npm/%40tornado%2Ffixed-merkle-tree/-/0.7.3/fixed-merkle-tree-0.7.3.tgz#6636ce9d334553c5f17e5a564fd22f2e9ec04472"
+ integrity sha512-8UWvIzz0/rMGBkzXACwmCv/5I1VJmnshAKc4C+nkTfOdmnX8Pf1bBa0GlxUIZ25ZFGiU/h2IKEHYckmHovwzEA==
+
"@tornado/gas-price-oracle@^0.5.3":
version "0.5.3"
resolved "https://git.tornado.ws/api/packages/tornado-packages/npm/%40tornado%2Fgas-price-oracle/-/0.5.3/gas-price-oracle-0.5.3.tgz#fb5423dddee2f52edbc16174c5ddce90bea5413d"
@@ -2460,10 +2465,10 @@
bignumber.js "^9.0.0"
node-cache "^5.1.2"
-"@tornado/snarkjs@0.1.20-p2":
- version "0.1.20-p2"
- resolved "https://git.tornado.ws/api/packages/tornado-packages/npm/%40tornado%2Fsnarkjs/-/0.1.20-p2/snarkjs-0.1.20-p2.tgz#e25a1d4ca8305887202d02cb38077795108f1ec3"
- integrity sha512-3E+tmJXtYj7GE8DZ13IBTgqkgplembU/qxYczIOxyxxEYBRAubccr9hFMrAjCaYBh/Rq94lDd5G4SE/l08IrNA==
+"@tornado/snarkjs@0.1.20", "@tornado/snarkjs@^0.1.20":
+ version "0.1.20"
+ resolved "https://git.tornado.ws/api/packages/tornado-packages/npm/%40tornado%2Fsnarkjs/-/0.1.20/snarkjs-0.1.20.tgz#d7610cd3c8dc10598da7dc3e40e5d7470c3aa8c7"
+ integrity sha512-mn+ePoQjqOHyDyK8AMy8SXYqNSxJWVswWVmMYvuc75/9bBtJ7SNtwrTByxmfWjrf4S3BM3IrGfHqBHEXY6gR4Q==
dependencies:
big-integer "^1.6.43"
chai "^4.2.0"
@@ -2488,14 +2493,13 @@
bignumber.js "^9.1.1"
ethers "5.7"
-"@tornado/websnark@0.0.4-p1":
- version "0.0.4-p1"
- resolved "https://git.tornado.ws/api/packages/tornado-packages/npm/%40tornado%2Fwebsnark/-/0.0.4-p1/websnark-0.0.4-p1.tgz#9a44a06a53d6931f85c8454cf31b7239c150ff46"
- integrity sha512-sWQESVWarJsjjc0/t4G2eAy/Z1eZfzDG2V51jDzJBg0tQQkAjhBXsGIn+xdCIvPwn7bMvmDGxpicCzNQhieOJg==
+"@tornado/websnark@0.0.4":
+ version "0.0.4"
+ resolved "https://git.tornado.ws/api/packages/tornado-packages/npm/%40tornado%2Fwebsnark/-/0.0.4/websnark-0.0.4.tgz#4c603259b71172225a70e3d454344fa172710970"
+ integrity sha512-dHbaS41ILPq5NyVBDW8AmUPoSKvamtkTeIhyuKKmoyOrZMAUhJ9y1B2zRcejUKfhCZkIjAgCt9bvdzdOGGswwQ==
dependencies:
- "@tornado/snarkjs" "0.1.20-p2"
+ "@tornado/snarkjs" "^0.1.20"
big-integer "1.6.42"
- wasmbuilder "0.0.3"
"@types/anymatch@*":
version "1.3.1"
@@ -7994,11 +7998,6 @@ find-up@^4.0.0:
locate-path "^5.0.0"
path-exists "^4.0.0"
-fixed-merkle-tree@^0.7.3:
- version "0.7.3"
- resolved "https://registry.yarnpkg.com/fixed-merkle-tree/-/fixed-merkle-tree-0.7.3.tgz#e8993628bc43894dfae3cb7e2a847f45c63e8678"
- integrity sha512-b50ZBpDfp/Nru120IdeS0IyqbVjOien1OSdWMDdcxS9uVHLV668xndNkEnn9t1WFOvc5aw1owl6l4N8mP5mkKg==
-
flat-cache@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@@ -16025,13 +16024,6 @@ walker@^1.0.7, walker@~1.0.5:
dependencies:
makeerror "1.0.x"
-wasmbuilder@0.0.3:
- version "0.0.3"
- resolved "https://registry.yarnpkg.com/wasmbuilder/-/wasmbuilder-0.0.3.tgz#761766a87ef1f65d07d920dc671e691e2d98ff65"
- integrity sha512-6+lhe2ong4zTG+XkqMduzXzNT1Lxiz9UpwgU4FJ+Ttx8zGeH3nOXROiyVqTRQr/l+NYw7KN5T009uAKaSOmMAQ==
- dependencies:
- big-integer "^1.6.43"
-
wasmbuilder@^0.0.12:
version "0.0.12"
resolved "https://registry.yarnpkg.com/wasmbuilder/-/wasmbuilder-0.0.12.tgz#a60cb25d6d11f314fe5ab3f4ee041ccb493cb78a"