diff --git a/assets/styles/components/_info.scss b/assets/styles/components/_info.scss index b7a7fb9..4169cf0 100644 --- a/assets/styles/components/_info.scss +++ b/assets/styles/components/_info.scss @@ -1,3 +1,10 @@ +.warning { + color: #ff8a00; + border-color: #ff8a00; + border-width: 2px; + font-size: 1.5em; +} + .info { &-name { font-size: 0.929rem; diff --git a/components/DepositModalBox.vue b/components/DepositModalBox.vue index 613b6fc..1b15fb0 100644 --- a/components/DepositModalBox.vue +++ b/components/DepositModalBox.vue @@ -29,10 +29,8 @@ {{ $t('saveAsFile') }} {{ filename }} diff --git a/langs/en.json b/langs/en.json index a07910e..10d7ed4 100644 --- a/langs/en.json +++ b/langs/en.json @@ -37,7 +37,7 @@ "iBackedUpTheNote": "I backed up the note", "iEncryptedTheNote": "Create an on-chain backup of this note with your Account {address}", "yourNoteWontBeSaved": "Your note won't be saved in your browser. Please make sure it's backed up!", - "yourDontHaveAccount": "You can also save encrypted notes on-chain by setting up the Note Account. Create one on the {account} page.", + "yourDontHaveAccount": "FAILURE TO BACKUP NOTES WILL RESULT IN LOSS OF FUNDS", "sendDeposit": "Send Deposit", "clickToCopy": "Click to copy", "copied": "Copied!", diff --git a/langs/ru.json b/langs/ru.json index 46ae366..2ff3f9e 100644 --- a/langs/ru.json +++ b/langs/ru.json @@ -37,7 +37,7 @@ "iBackedUpTheNote": "Я сделал резервную копию", "iEncryptedTheNote": "Создать резервную копию этой Note в блокчейне с помощью Аккаунта {address}", "yourNoteWontBeSaved": "Ваша Note не будет сохранена в браузере. Убедитесь, что вы сделали резервную копию!", - "yourDontHaveAccount": "Вы также можете сохранять зашифрованные Note в блокчейне, создав аккаунт для приватных Note. Создайте его на странице {account}.", + "yourDontHaveAccount": "НЕВОЗМОЖНОСТЬ СОЗДАТЬ РЕЗЕРВНУЮ ЗАПИСКУ ПРИВЕДЕТ К ПОТЕРЕ СРЕДСТВ", "sendDeposit": "Отправить депозит", "clickToCopy": "Скопировать", "copied": "Скопировано!", diff --git a/langs/zh.json b/langs/zh.json index c13e179..541b472 100644 --- a/langs/zh.json +++ b/langs/zh.json @@ -37,7 +37,7 @@ "iBackedUpTheNote": "我已备份了凭证", "iEncryptedTheNote": "用您的账户{address}创建此凭证的链上备份", "yourNoteWontBeSaved": "你的存款凭证不会被存储在浏览器的缓存中,请确认已作好备份。", - "yourDontHaveAccount": "您还可以通过设置凭证账户将加密的凭证保存在链上。 在 {account} 页面上创建。", + "yourDontHaveAccount": "未能备份票据将导致资金损失", "sendDeposit": "发送存款", "clickToCopy": "点击复制", "copied": "已复制!", diff --git a/package.json b/package.json index c132f88..b9a6e0b 100644 --- a/package.json +++ b/package.json @@ -83,13 +83,11 @@ "eslint-plugin-vue": "^6.0.1", "esm": "^3.2.25", "jest": "^24.9.0", - "node-stream-zip": "^1.15.0", "nodemon": "^2.0.0", "prettier": "^1.19.1", "raw-loader": "^3.1.0", "sass": "^1.49.9", "sass-loader": "^8.0.0", - "vue-jest": "^3.0.5", - "zip-local": "^0.3.4" + "vue-jest": "^3.0.5" } } diff --git a/scripts/helpers/download.js b/scripts/helpers/download.js index fb05282..e19b6db 100644 --- a/scripts/helpers/download.js +++ b/scripts/helpers/download.js @@ -30,14 +30,9 @@ export async function loadCachedEvents({ name, directory, deployedBlock }) { if (module) { const events = JSON.parse(module) - const [lastEvent] = JSON.parse(module).sort( - (a, b) => (b.block || b.blockNumber) - (a.block || a.blockNumber) - ) - const lastBlock = lastEvent.block || lastEvent.blockNumber - return { events, - lastBlock + lastBlock: events[events.length - 1].blockNumber } } } catch (err) { @@ -68,8 +63,7 @@ export async function getPastEvents({ type, fromBlock, netId, events, contractAt const blockDifference = Math.ceil(blockNumberBuffer - fromBlock) // eth_logs and eth_filter are restricted > 10,000 block queries - const blockDenom = blockDifference > 10000 ? 4950 : 20 - const blockRange = blockDifference / blockDenom + const blockRange = 10000 let chunksCount = blockDifference === 0 ? 1 : Math.ceil(blockDifference / blockRange) const chunkSize = Math.ceil(blockDifference / chunksCount) diff --git a/scripts/helpers/save.js b/scripts/helpers/save.js index db0d63e..f294ed5 100644 --- a/scripts/helpers/save.js +++ b/scripts/helpers/save.js @@ -1,17 +1,37 @@ import fs from 'fs' -import zipper from 'zip-local' +import Jszip from 'jszip' + +const compressionConfig = { + type: "nodebuffer", + compression: "DEFLATE", + compressionOptions: { + level: 9 + } +} + +const fileConfig = { + binary: true, + compression: "DEFLATE" +} + +export async function save(filePath) { + const jszip = new Jszip() + const directories = filePath.split('/') + const fileName = directories[directories.length - 1] -export function save(fileName) { try { - zipper.sync - .zip(`${fileName}`) - .compress() - .save(`${fileName}.zip`) + const data = fs.readFileSync(`${filePath}`) + + await jszip.file(`${fileName}`, data, fileConfig) + await jszip.generateNodeStream({ + ...compressionConfig, + streamFiles: true + }) + .pipe(fs.createWriteStream(`${filePath}.zip`)) - fs.unlinkSync(fileName) return true } catch (err) { - console.log('on save error', fileName, err.message) + console.log('on save error', filePath, err.message) return false } } diff --git a/scripts/updateEvents.js b/scripts/updateEvents.js index 211b0d9..9eca0cd 100644 --- a/scripts/updateEvents.js +++ b/scripts/updateEvents.js @@ -64,7 +64,7 @@ async function main(type, netId) { let freshEvents = cachedEvents.events.concat(events) if (type === 'Withdrawal') { - freshEvents = uniqBy(freshEvents, 'nullifierHash').sort((a, b) => b.blockNumber - a.blockNumber) + freshEvents = uniqBy(freshEvents, 'nullifierHash').sort((a, b) => a.blockNumber - b.blockNumber) } else { freshEvents = freshEvents.filter((e, index) => Number(e.leafIndex) === index) } diff --git a/services/events.js b/services/events.js index 7ee1495..0b32ac8 100644 --- a/services/events.js +++ b/services/events.js @@ -14,7 +14,7 @@ class EventService { this.idb = window.$nuxt.$indexedDB(netId) const { nativeCurrency } = networkConfig[`netId${netId}`] - const hasCache = supportedCaches.indexOf(Number(this.netId)) !== 0 + const hasCache = supportedCaches.includes(netId.toString()) this.netId = netId this.amount = amount @@ -37,6 +37,7 @@ class EventService { if (!cachedEvents && this.hasCache) { cachedEvents = await this.getEventsFromCache(type) } + return cachedEvents } async updateEvents(type, cachedEvents) { @@ -45,6 +46,7 @@ class EventService { const savedEvents = cachedEvents || (await this.getEvents(type)) let fromBlock = deployedBlock + if (savedEvents) { fromBlock = savedEvents.lastBlock + 1 } @@ -138,22 +140,23 @@ class EventService { async getEventsFromDB(type) { try { const instanceName = this.getInstanceName(type) - const savedEvents = await this.idb.getAll({ storeName: instanceName }) if (!savedEvents || !savedEvents.length) { return undefined } - const event = await this.idb.getFromIndex({ - storeName: 'lastEvents', - indexName: 'name', - key: instanceName + // IndexedDB scrambles assortment + savedEvents.sort((a, b) => { + if (a.leafIndex && b.leafIndex) { + return a.leafIndex - b.leafIndex + } + return a.blockNumber - b.blockNumber }) return { events: savedEvents, - lastBlock: event.blockNumber + lastBlock: savedEvents[savedEvents.length - 1].blockNumber } } catch (err) { return undefined @@ -268,7 +271,7 @@ class EventService { async getBatchEventsFromRpc({ fromBlock, type }) { try { - const blockRange = 4950 + const blockRange = 10000 const { blockDifference, currentBlockNumber } = await this.getBlocksDiff({ fromBlock }) let numberParts = blockDifference === 0 ? 1 : Math.ceil(blockDifference / blockRange) @@ -311,15 +314,17 @@ class EventService { async getEventsFromRpc({ fromBlock, type }) { try { + const { blockDifference } = await this.getBlocksDiff({ fromBlock }) let events - if (Number(this.netId) === 1) { + if (blockDifference < 10000) { const rpcEvents = await this.getEventsPartFromRpc({ fromBlock, toBlock: 'latest', type }) events = rpcEvents?.events || [] } else { const rpcEvents = await this.getBatchEventsFromRpc({ fromBlock, type }) events = rpcEvents?.events || [] } + return events } catch (err) { return [] @@ -332,6 +337,7 @@ class EventService { const rpcEvents = await this.getEventsFromRpc({ fromBlock, type }) const allEvents = [].concat(rpcEvents || []) + if (allEvents.length) { return { events: allEvents, diff --git a/static/events/deposits_bnb_0.1.json.zip b/static/events/deposits_bnb_0.1.json.zip index 4179f81..5d73975 100644 Binary files a/static/events/deposits_bnb_0.1.json.zip and b/static/events/deposits_bnb_0.1.json.zip differ diff --git a/static/events/deposits_bnb_1.json.zip b/static/events/deposits_bnb_1.json.zip index 62747bb..1d97102 100644 Binary files a/static/events/deposits_bnb_1.json.zip and b/static/events/deposits_bnb_1.json.zip differ diff --git a/static/events/deposits_bnb_10.json.zip b/static/events/deposits_bnb_10.json.zip index dcf4ce5..47b34e2 100644 Binary files a/static/events/deposits_bnb_10.json.zip and b/static/events/deposits_bnb_10.json.zip differ diff --git a/static/events/deposits_bnb_100.json.zip b/static/events/deposits_bnb_100.json.zip index 50d09c2..82b15ca 100644 Binary files a/static/events/deposits_bnb_100.json.zip and b/static/events/deposits_bnb_100.json.zip differ diff --git a/static/events/deposits_eth_0.1.json.zip b/static/events/deposits_eth_0.1.json.zip index 92ecc45..1202255 100644 Binary files a/static/events/deposits_eth_0.1.json.zip and b/static/events/deposits_eth_0.1.json.zip differ diff --git a/static/events/deposits_eth_1.json.zip b/static/events/deposits_eth_1.json.zip index 57043e6..d1b00f9 100644 Binary files a/static/events/deposits_eth_1.json.zip and b/static/events/deposits_eth_1.json.zip differ diff --git a/static/events/deposits_eth_10.json.zip b/static/events/deposits_eth_10.json.zip index 8f1989d..0020d82 100644 Binary files a/static/events/deposits_eth_10.json.zip and b/static/events/deposits_eth_10.json.zip differ diff --git a/static/events/deposits_eth_100.json.zip b/static/events/deposits_eth_100.json.zip index 54f468a..345c274 100644 Binary files a/static/events/deposits_eth_100.json.zip and b/static/events/deposits_eth_100.json.zip differ diff --git a/static/events/deposits_matic_100.json.zip b/static/events/deposits_matic_100.json.zip index 11d196a..444639a 100644 Binary files a/static/events/deposits_matic_100.json.zip and b/static/events/deposits_matic_100.json.zip differ diff --git a/static/events/deposits_matic_1000.json.zip b/static/events/deposits_matic_1000.json.zip index 3287243..04795c3 100644 Binary files a/static/events/deposits_matic_1000.json.zip and b/static/events/deposits_matic_1000.json.zip differ diff --git a/static/events/deposits_matic_10000.json.zip b/static/events/deposits_matic_10000.json.zip index 010fa2e..1eb81e6 100644 Binary files a/static/events/deposits_matic_10000.json.zip and b/static/events/deposits_matic_10000.json.zip differ diff --git a/static/events/deposits_matic_100000.json.zip b/static/events/deposits_matic_100000.json.zip index 2ed42dc..42e5ee1 100644 Binary files a/static/events/deposits_matic_100000.json.zip and b/static/events/deposits_matic_100000.json.zip differ diff --git a/static/events/deposits_xdai_100.json.zip b/static/events/deposits_xdai_100.json.zip index 146b937..d3abb3e 100644 Binary files a/static/events/deposits_xdai_100.json.zip and b/static/events/deposits_xdai_100.json.zip differ diff --git a/static/events/deposits_xdai_1000.json.zip b/static/events/deposits_xdai_1000.json.zip index 2eb1d97..945d09a 100644 Binary files a/static/events/deposits_xdai_1000.json.zip and b/static/events/deposits_xdai_1000.json.zip differ diff --git a/static/events/deposits_xdai_10000.json.zip b/static/events/deposits_xdai_10000.json.zip index 978c944..b6b561f 100644 Binary files a/static/events/deposits_xdai_10000.json.zip and b/static/events/deposits_xdai_10000.json.zip differ diff --git a/static/events/deposits_xdai_100000.json.zip b/static/events/deposits_xdai_100000.json.zip index b62ecf0..e1d3b20 100644 Binary files a/static/events/deposits_xdai_100000.json.zip and b/static/events/deposits_xdai_100000.json.zip differ diff --git a/static/events/encrypted_notes_1.json.zip b/static/events/encrypted_notes_1.json.zip index 07d1488..c15f7b7 100644 Binary files a/static/events/encrypted_notes_1.json.zip and b/static/events/encrypted_notes_1.json.zip differ diff --git a/static/events/encrypted_notes_100.json.zip b/static/events/encrypted_notes_100.json.zip index 1089175..f2959ca 100644 Binary files a/static/events/encrypted_notes_100.json.zip and b/static/events/encrypted_notes_100.json.zip differ diff --git a/static/events/encrypted_notes_137.json.zip b/static/events/encrypted_notes_137.json.zip index ed5afd8..6016a45 100644 Binary files a/static/events/encrypted_notes_137.json.zip and b/static/events/encrypted_notes_137.json.zip differ diff --git a/static/events/encrypted_notes_56.json.zip b/static/events/encrypted_notes_56.json.zip index a76e5a7..b094462 100644 Binary files a/static/events/encrypted_notes_56.json.zip and b/static/events/encrypted_notes_56.json.zip differ diff --git a/static/events/withdrawals_bnb_0.1.json.zip b/static/events/withdrawals_bnb_0.1.json.zip index 4f96224..d988742 100644 Binary files a/static/events/withdrawals_bnb_0.1.json.zip and b/static/events/withdrawals_bnb_0.1.json.zip differ diff --git a/static/events/withdrawals_bnb_1.json.zip b/static/events/withdrawals_bnb_1.json.zip index d4053c6..9ca1e30 100644 Binary files a/static/events/withdrawals_bnb_1.json.zip and b/static/events/withdrawals_bnb_1.json.zip differ diff --git a/static/events/withdrawals_bnb_10.json.zip b/static/events/withdrawals_bnb_10.json.zip index f68880b..fa1518a 100644 Binary files a/static/events/withdrawals_bnb_10.json.zip and b/static/events/withdrawals_bnb_10.json.zip differ diff --git a/static/events/withdrawals_bnb_100.json.zip b/static/events/withdrawals_bnb_100.json.zip index 6c1117e..5ea069c 100644 Binary files a/static/events/withdrawals_bnb_100.json.zip and b/static/events/withdrawals_bnb_100.json.zip differ diff --git a/static/events/withdrawals_eth_0.1.json.zip b/static/events/withdrawals_eth_0.1.json.zip index 1d2d28c..8a88774 100644 Binary files a/static/events/withdrawals_eth_0.1.json.zip and b/static/events/withdrawals_eth_0.1.json.zip differ diff --git a/static/events/withdrawals_eth_1.json.zip b/static/events/withdrawals_eth_1.json.zip index 412febe..34d8498 100644 Binary files a/static/events/withdrawals_eth_1.json.zip and b/static/events/withdrawals_eth_1.json.zip differ diff --git a/static/events/withdrawals_eth_10.json.zip b/static/events/withdrawals_eth_10.json.zip index 6476ccb..cf21215 100644 Binary files a/static/events/withdrawals_eth_10.json.zip and b/static/events/withdrawals_eth_10.json.zip differ diff --git a/static/events/withdrawals_eth_100.json.zip b/static/events/withdrawals_eth_100.json.zip index 4b7d837..f70819f 100644 Binary files a/static/events/withdrawals_eth_100.json.zip and b/static/events/withdrawals_eth_100.json.zip differ diff --git a/static/events/withdrawals_matic_100.json.zip b/static/events/withdrawals_matic_100.json.zip index 6523acc..4cbdc30 100644 Binary files a/static/events/withdrawals_matic_100.json.zip and b/static/events/withdrawals_matic_100.json.zip differ diff --git a/static/events/withdrawals_matic_1000.json.zip b/static/events/withdrawals_matic_1000.json.zip index 114152b..361134d 100644 Binary files a/static/events/withdrawals_matic_1000.json.zip and b/static/events/withdrawals_matic_1000.json.zip differ diff --git a/static/events/withdrawals_matic_10000.json.zip b/static/events/withdrawals_matic_10000.json.zip index 84ee784..d3f3ba2 100644 Binary files a/static/events/withdrawals_matic_10000.json.zip and b/static/events/withdrawals_matic_10000.json.zip differ diff --git a/static/events/withdrawals_matic_100000.json.zip b/static/events/withdrawals_matic_100000.json.zip index 23c4e5d..c86c59f 100644 Binary files a/static/events/withdrawals_matic_100000.json.zip and b/static/events/withdrawals_matic_100000.json.zip differ diff --git a/static/events/withdrawals_xdai_100.json.zip b/static/events/withdrawals_xdai_100.json.zip index eb93501..ada4b3f 100644 Binary files a/static/events/withdrawals_xdai_100.json.zip and b/static/events/withdrawals_xdai_100.json.zip differ diff --git a/static/events/withdrawals_xdai_1000.json.zip b/static/events/withdrawals_xdai_1000.json.zip index f9e6715..e6220e8 100644 Binary files a/static/events/withdrawals_xdai_1000.json.zip and b/static/events/withdrawals_xdai_1000.json.zip differ diff --git a/static/events/withdrawals_xdai_10000.json.zip b/static/events/withdrawals_xdai_10000.json.zip index e8e5722..d566416 100644 Binary files a/static/events/withdrawals_xdai_10000.json.zip and b/static/events/withdrawals_xdai_10000.json.zip differ diff --git a/static/events/withdrawals_xdai_100000.json.zip b/static/events/withdrawals_xdai_100000.json.zip index 1088280..ac0b34d 100644 Binary files a/static/events/withdrawals_xdai_100000.json.zip and b/static/events/withdrawals_xdai_100000.json.zip differ diff --git a/static/tornado.json.zip b/static/tornado.json.zip index 748a238..a6265fb 100644 Binary files a/static/tornado.json.zip and b/static/tornado.json.zip differ diff --git a/static/tornadoProvingKey.bin.zip b/static/tornadoProvingKey.bin.zip index 509f3ab..2865811 100644 Binary files a/static/tornadoProvingKey.bin.zip and b/static/tornadoProvingKey.bin.zip differ diff --git a/static/trees/deposits_bnb_0.1_bloom.json.zip b/static/trees/deposits_bnb_0.1_bloom.json.zip index 0620af3..34bded7 100644 Binary files a/static/trees/deposits_bnb_0.1_bloom.json.zip and b/static/trees/deposits_bnb_0.1_bloom.json.zip differ diff --git a/static/trees/deposits_bnb_0.1_slice1.json.zip b/static/trees/deposits_bnb_0.1_slice1.json.zip index 68b76f3..32f4860 100644 Binary files a/static/trees/deposits_bnb_0.1_slice1.json.zip and b/static/trees/deposits_bnb_0.1_slice1.json.zip differ diff --git a/static/trees/deposits_bnb_0.1_slice2.json.zip b/static/trees/deposits_bnb_0.1_slice2.json.zip index b32826a..c36859a 100644 Binary files a/static/trees/deposits_bnb_0.1_slice2.json.zip and b/static/trees/deposits_bnb_0.1_slice2.json.zip differ diff --git a/static/trees/deposits_bnb_0.1_slice3.json.zip b/static/trees/deposits_bnb_0.1_slice3.json.zip index 56aff95..9e7dd52 100644 Binary files a/static/trees/deposits_bnb_0.1_slice3.json.zip and b/static/trees/deposits_bnb_0.1_slice3.json.zip differ diff --git a/static/trees/deposits_bnb_0.1_slice4.json.zip b/static/trees/deposits_bnb_0.1_slice4.json.zip index fa5d1e8..6193e14 100644 Binary files a/static/trees/deposits_bnb_0.1_slice4.json.zip and b/static/trees/deposits_bnb_0.1_slice4.json.zip differ diff --git a/static/trees/deposits_bnb_100_bloom.json.zip b/static/trees/deposits_bnb_100_bloom.json.zip index 624efac..36f19e8 100644 Binary files a/static/trees/deposits_bnb_100_bloom.json.zip and b/static/trees/deposits_bnb_100_bloom.json.zip differ diff --git a/static/trees/deposits_bnb_100_slice1.json.zip b/static/trees/deposits_bnb_100_slice1.json.zip index 39475c1..408882e 100644 Binary files a/static/trees/deposits_bnb_100_slice1.json.zip and b/static/trees/deposits_bnb_100_slice1.json.zip differ diff --git a/static/trees/deposits_bnb_100_slice2.json.zip b/static/trees/deposits_bnb_100_slice2.json.zip index a8525c0..77b1efb 100644 Binary files a/static/trees/deposits_bnb_100_slice2.json.zip and b/static/trees/deposits_bnb_100_slice2.json.zip differ diff --git a/static/trees/deposits_bnb_100_slice3.json.zip b/static/trees/deposits_bnb_100_slice3.json.zip index abea2f1..b446ae6 100644 Binary files a/static/trees/deposits_bnb_100_slice3.json.zip and b/static/trees/deposits_bnb_100_slice3.json.zip differ diff --git a/static/trees/deposits_bnb_100_slice4.json.zip b/static/trees/deposits_bnb_100_slice4.json.zip index 902d671..c9b57c9 100644 Binary files a/static/trees/deposits_bnb_100_slice4.json.zip and b/static/trees/deposits_bnb_100_slice4.json.zip differ diff --git a/static/trees/deposits_bnb_10_bloom.json.zip b/static/trees/deposits_bnb_10_bloom.json.zip index fbf7063..54ea5ca 100644 Binary files a/static/trees/deposits_bnb_10_bloom.json.zip and b/static/trees/deposits_bnb_10_bloom.json.zip differ diff --git a/static/trees/deposits_bnb_10_slice1.json.zip b/static/trees/deposits_bnb_10_slice1.json.zip index 9b11c1a..7ee1ca8 100644 Binary files a/static/trees/deposits_bnb_10_slice1.json.zip and b/static/trees/deposits_bnb_10_slice1.json.zip differ diff --git a/static/trees/deposits_bnb_10_slice2.json.zip b/static/trees/deposits_bnb_10_slice2.json.zip index 02d611c..966114a 100644 Binary files a/static/trees/deposits_bnb_10_slice2.json.zip and b/static/trees/deposits_bnb_10_slice2.json.zip differ diff --git a/static/trees/deposits_bnb_10_slice3.json.zip b/static/trees/deposits_bnb_10_slice3.json.zip index e83ed1c..a109c61 100644 Binary files a/static/trees/deposits_bnb_10_slice3.json.zip and b/static/trees/deposits_bnb_10_slice3.json.zip differ diff --git a/static/trees/deposits_bnb_10_slice4.json.zip b/static/trees/deposits_bnb_10_slice4.json.zip index 183f9ad..a05975b 100644 Binary files a/static/trees/deposits_bnb_10_slice4.json.zip and b/static/trees/deposits_bnb_10_slice4.json.zip differ diff --git a/static/trees/deposits_bnb_1_bloom.json.zip b/static/trees/deposits_bnb_1_bloom.json.zip index 2502f3f..427fbc9 100644 Binary files a/static/trees/deposits_bnb_1_bloom.json.zip and b/static/trees/deposits_bnb_1_bloom.json.zip differ diff --git a/static/trees/deposits_bnb_1_slice1.json.zip b/static/trees/deposits_bnb_1_slice1.json.zip index 33306b7..9f06f18 100644 Binary files a/static/trees/deposits_bnb_1_slice1.json.zip and b/static/trees/deposits_bnb_1_slice1.json.zip differ diff --git a/static/trees/deposits_bnb_1_slice2.json.zip b/static/trees/deposits_bnb_1_slice2.json.zip index 27b60f4..d303a9f 100644 Binary files a/static/trees/deposits_bnb_1_slice2.json.zip and b/static/trees/deposits_bnb_1_slice2.json.zip differ diff --git a/static/trees/deposits_bnb_1_slice3.json.zip b/static/trees/deposits_bnb_1_slice3.json.zip index eb1c958..9d1da1d 100644 Binary files a/static/trees/deposits_bnb_1_slice3.json.zip and b/static/trees/deposits_bnb_1_slice3.json.zip differ diff --git a/static/trees/deposits_bnb_1_slice4.json.zip b/static/trees/deposits_bnb_1_slice4.json.zip index 2d2167a..f9fd1ce 100644 Binary files a/static/trees/deposits_bnb_1_slice4.json.zip and b/static/trees/deposits_bnb_1_slice4.json.zip differ diff --git a/static/trees/deposits_eth_0.1_bloom.json.zip b/static/trees/deposits_eth_0.1_bloom.json.zip index 69247d8..6c95c71 100644 Binary files a/static/trees/deposits_eth_0.1_bloom.json.zip and b/static/trees/deposits_eth_0.1_bloom.json.zip differ diff --git a/static/trees/deposits_eth_0.1_slice1.json.zip b/static/trees/deposits_eth_0.1_slice1.json.zip index dc298ea..0200517 100644 Binary files a/static/trees/deposits_eth_0.1_slice1.json.zip and b/static/trees/deposits_eth_0.1_slice1.json.zip differ diff --git a/static/trees/deposits_eth_0.1_slice2.json.zip b/static/trees/deposits_eth_0.1_slice2.json.zip index 026a257..746d9e9 100644 Binary files a/static/trees/deposits_eth_0.1_slice2.json.zip and b/static/trees/deposits_eth_0.1_slice2.json.zip differ diff --git a/static/trees/deposits_eth_0.1_slice3.json.zip b/static/trees/deposits_eth_0.1_slice3.json.zip index a1994d9..f6d1d45 100644 Binary files a/static/trees/deposits_eth_0.1_slice3.json.zip and b/static/trees/deposits_eth_0.1_slice3.json.zip differ diff --git a/static/trees/deposits_eth_0.1_slice4.json.zip b/static/trees/deposits_eth_0.1_slice4.json.zip index 82676be..1cdd117 100644 Binary files a/static/trees/deposits_eth_0.1_slice4.json.zip and b/static/trees/deposits_eth_0.1_slice4.json.zip differ diff --git a/static/trees/deposits_eth_100_bloom.json.zip b/static/trees/deposits_eth_100_bloom.json.zip index 4f2bb88..3806a28 100644 Binary files a/static/trees/deposits_eth_100_bloom.json.zip and b/static/trees/deposits_eth_100_bloom.json.zip differ diff --git a/static/trees/deposits_eth_100_slice1.json.zip b/static/trees/deposits_eth_100_slice1.json.zip index aa7e062..42cfd5f 100644 Binary files a/static/trees/deposits_eth_100_slice1.json.zip and b/static/trees/deposits_eth_100_slice1.json.zip differ diff --git a/static/trees/deposits_eth_100_slice2.json.zip b/static/trees/deposits_eth_100_slice2.json.zip index bfa63cd..8c5ffe2 100644 Binary files a/static/trees/deposits_eth_100_slice2.json.zip and b/static/trees/deposits_eth_100_slice2.json.zip differ diff --git a/static/trees/deposits_eth_100_slice3.json.zip b/static/trees/deposits_eth_100_slice3.json.zip index 9f3d2b3..789d5ac 100644 Binary files a/static/trees/deposits_eth_100_slice3.json.zip and b/static/trees/deposits_eth_100_slice3.json.zip differ diff --git a/static/trees/deposits_eth_100_slice4.json.zip b/static/trees/deposits_eth_100_slice4.json.zip index dde5293..9dffc05 100644 Binary files a/static/trees/deposits_eth_100_slice4.json.zip and b/static/trees/deposits_eth_100_slice4.json.zip differ diff --git a/static/trees/deposits_eth_10_bloom.json.zip b/static/trees/deposits_eth_10_bloom.json.zip index 6bc3cfa..715e66a 100644 Binary files a/static/trees/deposits_eth_10_bloom.json.zip and b/static/trees/deposits_eth_10_bloom.json.zip differ diff --git a/static/trees/deposits_eth_10_slice1.json.zip b/static/trees/deposits_eth_10_slice1.json.zip index 15dc700..b175630 100644 Binary files a/static/trees/deposits_eth_10_slice1.json.zip and b/static/trees/deposits_eth_10_slice1.json.zip differ diff --git a/static/trees/deposits_eth_10_slice2.json.zip b/static/trees/deposits_eth_10_slice2.json.zip index ae7b67d..3d117c5 100644 Binary files a/static/trees/deposits_eth_10_slice2.json.zip and b/static/trees/deposits_eth_10_slice2.json.zip differ diff --git a/static/trees/deposits_eth_10_slice3.json.zip b/static/trees/deposits_eth_10_slice3.json.zip index 00eeee4..4eda5fd 100644 Binary files a/static/trees/deposits_eth_10_slice3.json.zip and b/static/trees/deposits_eth_10_slice3.json.zip differ diff --git a/static/trees/deposits_eth_10_slice4.json.zip b/static/trees/deposits_eth_10_slice4.json.zip index 75675ce..1f6bf2d 100644 Binary files a/static/trees/deposits_eth_10_slice4.json.zip and b/static/trees/deposits_eth_10_slice4.json.zip differ diff --git a/static/trees/deposits_eth_1_bloom.json.zip b/static/trees/deposits_eth_1_bloom.json.zip index eb368f8..25be566 100644 Binary files a/static/trees/deposits_eth_1_bloom.json.zip and b/static/trees/deposits_eth_1_bloom.json.zip differ diff --git a/static/trees/deposits_eth_1_slice1.json.zip b/static/trees/deposits_eth_1_slice1.json.zip index de4a5c6..3dfa940 100644 Binary files a/static/trees/deposits_eth_1_slice1.json.zip and b/static/trees/deposits_eth_1_slice1.json.zip differ diff --git a/static/trees/deposits_eth_1_slice2.json.zip b/static/trees/deposits_eth_1_slice2.json.zip index 2c3357c..3fe4c2a 100644 Binary files a/static/trees/deposits_eth_1_slice2.json.zip and b/static/trees/deposits_eth_1_slice2.json.zip differ diff --git a/static/trees/deposits_eth_1_slice3.json.zip b/static/trees/deposits_eth_1_slice3.json.zip index 161a211..237508f 100644 Binary files a/static/trees/deposits_eth_1_slice3.json.zip and b/static/trees/deposits_eth_1_slice3.json.zip differ diff --git a/static/trees/deposits_eth_1_slice4.json.zip b/static/trees/deposits_eth_1_slice4.json.zip index d678b57..4c2b3ee 100644 Binary files a/static/trees/deposits_eth_1_slice4.json.zip and b/static/trees/deposits_eth_1_slice4.json.zip differ diff --git a/static/trees/deposits_matic_100000_bloom.json.zip b/static/trees/deposits_matic_100000_bloom.json.zip index fcca1b1..0d25fba 100644 Binary files a/static/trees/deposits_matic_100000_bloom.json.zip and b/static/trees/deposits_matic_100000_bloom.json.zip differ diff --git a/static/trees/deposits_matic_100000_slice1.json.zip b/static/trees/deposits_matic_100000_slice1.json.zip index d5820db..1fea166 100644 Binary files a/static/trees/deposits_matic_100000_slice1.json.zip and b/static/trees/deposits_matic_100000_slice1.json.zip differ diff --git a/static/trees/deposits_matic_100000_slice2.json.zip b/static/trees/deposits_matic_100000_slice2.json.zip index a74115f..bdb7223 100644 Binary files a/static/trees/deposits_matic_100000_slice2.json.zip and b/static/trees/deposits_matic_100000_slice2.json.zip differ diff --git a/static/trees/deposits_matic_100000_slice3.json.zip b/static/trees/deposits_matic_100000_slice3.json.zip index 2931676..3f00453 100644 Binary files a/static/trees/deposits_matic_100000_slice3.json.zip and b/static/trees/deposits_matic_100000_slice3.json.zip differ diff --git a/static/trees/deposits_matic_100000_slice4.json.zip b/static/trees/deposits_matic_100000_slice4.json.zip index ac0de32..f4c006e 100644 Binary files a/static/trees/deposits_matic_100000_slice4.json.zip and b/static/trees/deposits_matic_100000_slice4.json.zip differ diff --git a/static/trees/deposits_matic_10000_bloom.json.zip b/static/trees/deposits_matic_10000_bloom.json.zip index 8d5fe1b..699e1ae 100644 Binary files a/static/trees/deposits_matic_10000_bloom.json.zip and b/static/trees/deposits_matic_10000_bloom.json.zip differ diff --git a/static/trees/deposits_matic_10000_slice1.json.zip b/static/trees/deposits_matic_10000_slice1.json.zip index 5a74416..543d729 100644 Binary files a/static/trees/deposits_matic_10000_slice1.json.zip and b/static/trees/deposits_matic_10000_slice1.json.zip differ diff --git a/static/trees/deposits_matic_10000_slice2.json.zip b/static/trees/deposits_matic_10000_slice2.json.zip index 0ce7f43..ed4c289 100644 Binary files a/static/trees/deposits_matic_10000_slice2.json.zip and b/static/trees/deposits_matic_10000_slice2.json.zip differ diff --git a/static/trees/deposits_matic_10000_slice3.json.zip b/static/trees/deposits_matic_10000_slice3.json.zip index b769169..2327dd3 100644 Binary files a/static/trees/deposits_matic_10000_slice3.json.zip and b/static/trees/deposits_matic_10000_slice3.json.zip differ diff --git a/static/trees/deposits_matic_10000_slice4.json.zip b/static/trees/deposits_matic_10000_slice4.json.zip index f03cc32..0716732 100644 Binary files a/static/trees/deposits_matic_10000_slice4.json.zip and b/static/trees/deposits_matic_10000_slice4.json.zip differ diff --git a/static/trees/deposits_matic_1000_bloom.json.zip b/static/trees/deposits_matic_1000_bloom.json.zip index cb5f5cb..adf8827 100644 Binary files a/static/trees/deposits_matic_1000_bloom.json.zip and b/static/trees/deposits_matic_1000_bloom.json.zip differ diff --git a/static/trees/deposits_matic_1000_slice1.json.zip b/static/trees/deposits_matic_1000_slice1.json.zip index fe70d8f..9cfdf9c 100644 Binary files a/static/trees/deposits_matic_1000_slice1.json.zip and b/static/trees/deposits_matic_1000_slice1.json.zip differ diff --git a/static/trees/deposits_matic_1000_slice2.json.zip b/static/trees/deposits_matic_1000_slice2.json.zip index d7d918d..90376ee 100644 Binary files a/static/trees/deposits_matic_1000_slice2.json.zip and b/static/trees/deposits_matic_1000_slice2.json.zip differ diff --git a/static/trees/deposits_matic_1000_slice3.json.zip b/static/trees/deposits_matic_1000_slice3.json.zip index 27ace86..dd8ae10 100644 Binary files a/static/trees/deposits_matic_1000_slice3.json.zip and b/static/trees/deposits_matic_1000_slice3.json.zip differ diff --git a/static/trees/deposits_matic_1000_slice4.json.zip b/static/trees/deposits_matic_1000_slice4.json.zip index 8980a5e..4a22e52 100644 Binary files a/static/trees/deposits_matic_1000_slice4.json.zip and b/static/trees/deposits_matic_1000_slice4.json.zip differ diff --git a/static/trees/deposits_matic_100_bloom.json.zip b/static/trees/deposits_matic_100_bloom.json.zip index b1b99ab..34e112f 100644 Binary files a/static/trees/deposits_matic_100_bloom.json.zip and b/static/trees/deposits_matic_100_bloom.json.zip differ diff --git a/static/trees/deposits_matic_100_slice1.json.zip b/static/trees/deposits_matic_100_slice1.json.zip index 23da1fc..d57b942 100644 Binary files a/static/trees/deposits_matic_100_slice1.json.zip and b/static/trees/deposits_matic_100_slice1.json.zip differ diff --git a/static/trees/deposits_matic_100_slice2.json.zip b/static/trees/deposits_matic_100_slice2.json.zip index 096eb79..712e58a 100644 Binary files a/static/trees/deposits_matic_100_slice2.json.zip and b/static/trees/deposits_matic_100_slice2.json.zip differ diff --git a/static/trees/deposits_matic_100_slice3.json.zip b/static/trees/deposits_matic_100_slice3.json.zip index f064d86..15d331f 100644 Binary files a/static/trees/deposits_matic_100_slice3.json.zip and b/static/trees/deposits_matic_100_slice3.json.zip differ diff --git a/static/trees/deposits_matic_100_slice4.json.zip b/static/trees/deposits_matic_100_slice4.json.zip index d9df978..4b49041 100644 Binary files a/static/trees/deposits_matic_100_slice4.json.zip and b/static/trees/deposits_matic_100_slice4.json.zip differ diff --git a/static/trees/deposits_xdai_100000_bloom.json.zip b/static/trees/deposits_xdai_100000_bloom.json.zip index af26423..362f9c2 100644 Binary files a/static/trees/deposits_xdai_100000_bloom.json.zip and b/static/trees/deposits_xdai_100000_bloom.json.zip differ diff --git a/static/trees/deposits_xdai_100000_slice1.json.zip b/static/trees/deposits_xdai_100000_slice1.json.zip index 1326d8d..25f37ad 100644 Binary files a/static/trees/deposits_xdai_100000_slice1.json.zip and b/static/trees/deposits_xdai_100000_slice1.json.zip differ diff --git a/static/trees/deposits_xdai_100000_slice2.json.zip b/static/trees/deposits_xdai_100000_slice2.json.zip index a14ebc5..19e3afe 100644 Binary files a/static/trees/deposits_xdai_100000_slice2.json.zip and b/static/trees/deposits_xdai_100000_slice2.json.zip differ diff --git a/static/trees/deposits_xdai_10000_bloom.json.zip b/static/trees/deposits_xdai_10000_bloom.json.zip index 2ed0cae..23aa77c 100644 Binary files a/static/trees/deposits_xdai_10000_bloom.json.zip and b/static/trees/deposits_xdai_10000_bloom.json.zip differ diff --git a/static/trees/deposits_xdai_10000_slice1.json.zip b/static/trees/deposits_xdai_10000_slice1.json.zip index ba78bec..0b9a298 100644 Binary files a/static/trees/deposits_xdai_10000_slice1.json.zip and b/static/trees/deposits_xdai_10000_slice1.json.zip differ diff --git a/static/trees/deposits_xdai_10000_slice2.json.zip b/static/trees/deposits_xdai_10000_slice2.json.zip index 2c5dc60..ca2cc26 100644 Binary files a/static/trees/deposits_xdai_10000_slice2.json.zip and b/static/trees/deposits_xdai_10000_slice2.json.zip differ diff --git a/static/trees/deposits_xdai_10000_slice3.json.zip b/static/trees/deposits_xdai_10000_slice3.json.zip index 316f075..e1d8a4a 100644 Binary files a/static/trees/deposits_xdai_10000_slice3.json.zip and b/static/trees/deposits_xdai_10000_slice3.json.zip differ diff --git a/static/trees/deposits_xdai_10000_slice4.json.zip b/static/trees/deposits_xdai_10000_slice4.json.zip index db7f911..f21b88e 100644 Binary files a/static/trees/deposits_xdai_10000_slice4.json.zip and b/static/trees/deposits_xdai_10000_slice4.json.zip differ diff --git a/static/trees/deposits_xdai_1000_bloom.json.zip b/static/trees/deposits_xdai_1000_bloom.json.zip index e934fe8..ec76cc2 100644 Binary files a/static/trees/deposits_xdai_1000_bloom.json.zip and b/static/trees/deposits_xdai_1000_bloom.json.zip differ diff --git a/static/trees/deposits_xdai_1000_slice1.json.zip b/static/trees/deposits_xdai_1000_slice1.json.zip index 03bf650..da3258e 100644 Binary files a/static/trees/deposits_xdai_1000_slice1.json.zip and b/static/trees/deposits_xdai_1000_slice1.json.zip differ diff --git a/static/trees/deposits_xdai_1000_slice2.json.zip b/static/trees/deposits_xdai_1000_slice2.json.zip index ed03768..195044d 100644 Binary files a/static/trees/deposits_xdai_1000_slice2.json.zip and b/static/trees/deposits_xdai_1000_slice2.json.zip differ diff --git a/static/trees/deposits_xdai_1000_slice3.json.zip b/static/trees/deposits_xdai_1000_slice3.json.zip index 2a1d8ec..6b18e4b 100644 Binary files a/static/trees/deposits_xdai_1000_slice3.json.zip and b/static/trees/deposits_xdai_1000_slice3.json.zip differ diff --git a/static/trees/deposits_xdai_1000_slice4.json.zip b/static/trees/deposits_xdai_1000_slice4.json.zip index 5e3abfd..0fce4b7 100644 Binary files a/static/trees/deposits_xdai_1000_slice4.json.zip and b/static/trees/deposits_xdai_1000_slice4.json.zip differ diff --git a/static/trees/deposits_xdai_100_bloom.json.zip b/static/trees/deposits_xdai_100_bloom.json.zip index 198a5ed..ae01a50 100644 Binary files a/static/trees/deposits_xdai_100_bloom.json.zip and b/static/trees/deposits_xdai_100_bloom.json.zip differ diff --git a/static/trees/deposits_xdai_100_slice1.json.zip b/static/trees/deposits_xdai_100_slice1.json.zip index a09a6c4..f3fc61f 100644 Binary files a/static/trees/deposits_xdai_100_slice1.json.zip and b/static/trees/deposits_xdai_100_slice1.json.zip differ diff --git a/static/trees/deposits_xdai_100_slice2.json.zip b/static/trees/deposits_xdai_100_slice2.json.zip index 12f5a69..e66c408 100644 Binary files a/static/trees/deposits_xdai_100_slice2.json.zip and b/static/trees/deposits_xdai_100_slice2.json.zip differ diff --git a/static/trees/deposits_xdai_100_slice3.json.zip b/static/trees/deposits_xdai_100_slice3.json.zip index a167599..8542957 100644 Binary files a/static/trees/deposits_xdai_100_slice3.json.zip and b/static/trees/deposits_xdai_100_slice3.json.zip differ diff --git a/static/trees/deposits_xdai_100_slice4.json.zip b/static/trees/deposits_xdai_100_slice4.json.zip index 34a5b1e..2a43556 100644 Binary files a/static/trees/deposits_xdai_100_slice4.json.zip and b/static/trees/deposits_xdai_100_slice4.json.zip differ diff --git a/yarn.lock b/yarn.lock index 4927b3c..be223c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8205,11 +8205,6 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6 resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02" integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q== -graceful-fs@^4.1.3: - version "4.2.8" - resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== - graceful-fs@^4.1.4: version "4.2.4" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" @@ -10093,13 +10088,6 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -jszip@^2.5.0: - version "2.6.1" - resolved "https://registry.npmjs.org/jszip/-/jszip-2.6.1.tgz#b88f3a7b2e67a2a048152982c7a3756d9c4828f0" - integrity sha1-uI86ey5noqBIFSmCx6N1bZxIKPA= - dependencies: - pako "~1.0.2" - jszip@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.5.0.tgz#b4fd1f368245346658e781fec9675802489e15f6" @@ -11367,11 +11355,6 @@ node-res@^5.0.1: on-finished "^2.3.0" vary "^1.1.2" -node-stream-zip@^1.15.0: - version "1.15.0" - resolved "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.15.0.tgz#158adb88ed8004c6c49a396b50a6a5de3bca33ea" - integrity sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw== - nodemon@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.0.tgz#1c19aa3c668fcf5dddd1121555efb90e315d8edd" @@ -13189,7 +13172,7 @@ push-dir@^0.4.1: dependencies: minimist "^1.2.0" -q@^1.1.2, q@^1.4.1: +q@^1.1.2: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= @@ -17047,13 +17030,3 @@ zen-observable@^0.8.14: version "0.8.15" resolved "https://registry.npmjs.org/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15" integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ== - -zip-local@^0.3.4: - version "0.3.4" - resolved "https://registry.npmjs.org/zip-local/-/zip-local-0.3.4.tgz#e2931907257a946479ea5bd0d0e20adfeb2b5a07" - integrity sha1-4pMZByV6lGR56lvQ0OIK3+srWgc= - dependencies: - async "^1.4.2" - graceful-fs "^4.1.3" - jszip "^2.5.0" - q "^1.4.1"