From b4e23e96b438d5ea4e702e332ba542d05fc4d130 Mon Sep 17 00:00:00 2001 From: Theo Date: Wed, 13 Sep 2023 23:26:28 -0700 Subject: [PATCH] Update self-hosted tornado packages --- README.md | 2 +- package.json | 6 +++--- scripts/updateTree.js | 2 +- services/merkleTree.js | 2 +- yarn.lock | 36 ++++++++++++++---------------------- 5 files changed, 20 insertions(+), 28 deletions(-) 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/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/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/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"