From 4065d89909332018880b1e601438a8c14b42dc39 Mon Sep 17 00:00:00 2001 From: T-Hax <> Date: Wed, 3 May 2023 21:42:42 +0000 Subject: [PATCH] Introduce @tornado scoped dependencies Signed-off-by: T-Hax <> --- .yarnrc.yml | 5 - @tornado/sdk-chain/.yarnrc.yml | 33 ------- @tornado/sdk-core/.yarnrc.yml | 33 ------- @tornado/sdk-core/package.json | 2 +- @tornado/sdk-crypto/.yarnrc.yml | 33 ------- @tornado/sdk-crypto/package.json | 8 +- @tornado/sdk-data/.yarnrc.yml | 33 ------- @tornado/sdk-utils/.yarnrc.yml | 33 ------- @tornado/sdk-utils/package.json | 2 +- @tornado/sdk-web/.yarnrc.yml | 33 ------- @tornado/sdk-web/package.json | 2 +- @tornado/sdk/.yarnrc.yml | 33 ------- test/core.test.ts | 6 +- yarn.lock | 151 ++++++++++++++++--------------- 14 files changed, 86 insertions(+), 321 deletions(-) delete mode 100644 @tornado/sdk-chain/.yarnrc.yml delete mode 100644 @tornado/sdk-core/.yarnrc.yml delete mode 100644 @tornado/sdk-crypto/.yarnrc.yml delete mode 100644 @tornado/sdk-data/.yarnrc.yml delete mode 100644 @tornado/sdk-utils/.yarnrc.yml delete mode 100644 @tornado/sdk-web/.yarnrc.yml delete mode 100644 @tornado/sdk/.yarnrc.yml diff --git a/.yarnrc.yml b/.yarnrc.yml index 7a48104..381239e 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1,8 +1,6 @@ enableTelemetry: false npmScopes: - thax: - npmRegistryServer: "https://development.tornadocash.community/api/packages/T-Hax/npm/" tornado: npmRegistryServer: "https://development.tornadocash.community/api/packages/T-Hax/npm/" @@ -13,9 +11,6 @@ packageExtensions: "@resolver-engine/imports-fs@*": dependencies: "@resolver-engine/core": "*" - "@thax/circomlib@*": - dependencies: - web3-utils: "*" plugins: - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs diff --git a/@tornado/sdk-chain/.yarnrc.yml b/@tornado/sdk-chain/.yarnrc.yml deleted file mode 100644 index 6045dd0..0000000 --- a/@tornado/sdk-chain/.yarnrc.yml +++ /dev/null @@ -1,33 +0,0 @@ -# So basically, we want to selectively download packages from the Gitea repository but still allow the -# main repositories, so we are going to have to scope OUR packages properly. This means, unless the tornadocash -# Gitea organization defines a default scope, that we'll have to add every user scope. Including my own below. -# Note that all scopes are after @ prefix. So my prefix is @thax -npmScopes: - thax: - npmPublishRegistry: "https://development.tornadocash.community/api/packages/T-Hax/npm/" - npmRegistryServer: "https://development.tornadocash.community/api/packages/T-Hax/npm/" - # The below can be EXPORTED via some env file which actually exports the variables though - # Check the env.example, you will notice it's not a regular env - # So split your env files up, since this is only for manual actions - # npmAuthToken: ${GITEA_AUTH_TOKEN} - -# If the following isn't set you won't have a node_modules folder -# You might be used to a node_modules folder instead of a pnp or other folder type -# If you want to use the new linkers uncomment or change the following -# nodeLinker: "node-modules" - -# So the tornadocash org, the person who maintains it, might setup something (in future) like, -# tornadocash: -# npmPublishRegistry: "https://development.tornadocash.community/api/packages/tornadocash/npm/" -# npmRegistryServer: "https://development.tornadocash.community/api/packages/tornadocash/npm/" - -# We disable telemetry for obvious reasons. -enableTelemetry: false - -packageExtensions: - "@resolver-engine/imports-fs@*": - dependencies: - "@resolver-engine/core": "*" - "@thax/circomlib@*": - dependencies: - "web3-utils": "*" diff --git a/@tornado/sdk-core/.yarnrc.yml b/@tornado/sdk-core/.yarnrc.yml deleted file mode 100644 index 6045dd0..0000000 --- a/@tornado/sdk-core/.yarnrc.yml +++ /dev/null @@ -1,33 +0,0 @@ -# So basically, we want to selectively download packages from the Gitea repository but still allow the -# main repositories, so we are going to have to scope OUR packages properly. This means, unless the tornadocash -# Gitea organization defines a default scope, that we'll have to add every user scope. Including my own below. -# Note that all scopes are after @ prefix. So my prefix is @thax -npmScopes: - thax: - npmPublishRegistry: "https://development.tornadocash.community/api/packages/T-Hax/npm/" - npmRegistryServer: "https://development.tornadocash.community/api/packages/T-Hax/npm/" - # The below can be EXPORTED via some env file which actually exports the variables though - # Check the env.example, you will notice it's not a regular env - # So split your env files up, since this is only for manual actions - # npmAuthToken: ${GITEA_AUTH_TOKEN} - -# If the following isn't set you won't have a node_modules folder -# You might be used to a node_modules folder instead of a pnp or other folder type -# If you want to use the new linkers uncomment or change the following -# nodeLinker: "node-modules" - -# So the tornadocash org, the person who maintains it, might setup something (in future) like, -# tornadocash: -# npmPublishRegistry: "https://development.tornadocash.community/api/packages/tornadocash/npm/" -# npmRegistryServer: "https://development.tornadocash.community/api/packages/tornadocash/npm/" - -# We disable telemetry for obvious reasons. -enableTelemetry: false - -packageExtensions: - "@resolver-engine/imports-fs@*": - dependencies: - "@resolver-engine/core": "*" - "@thax/circomlib@*": - dependencies: - "web3-utils": "*" diff --git a/@tornado/sdk-core/package.json b/@tornado/sdk-core/package.json index 0f3186e..7f6d95e 100644 --- a/@tornado/sdk-core/package.json +++ b/@tornado/sdk-core/package.json @@ -25,7 +25,7 @@ "@tornado/sdk-utils": "workspace:*", "ethers": "^5", "pouchdb-collate": "^8.0.1", - "snarkjs": "npm:@thax/snarkjs@^0.1.20-p2" + "snarkjs": "npm:@tornado/snarkjs@^0.1.20-p2" }, "devDependencies": { "@typechain/ethers-v5": "^10.2.0", diff --git a/@tornado/sdk-crypto/.yarnrc.yml b/@tornado/sdk-crypto/.yarnrc.yml deleted file mode 100644 index 6045dd0..0000000 --- a/@tornado/sdk-crypto/.yarnrc.yml +++ /dev/null @@ -1,33 +0,0 @@ -# So basically, we want to selectively download packages from the Gitea repository but still allow the -# main repositories, so we are going to have to scope OUR packages properly. This means, unless the tornadocash -# Gitea organization defines a default scope, that we'll have to add every user scope. Including my own below. -# Note that all scopes are after @ prefix. So my prefix is @thax -npmScopes: - thax: - npmPublishRegistry: "https://development.tornadocash.community/api/packages/T-Hax/npm/" - npmRegistryServer: "https://development.tornadocash.community/api/packages/T-Hax/npm/" - # The below can be EXPORTED via some env file which actually exports the variables though - # Check the env.example, you will notice it's not a regular env - # So split your env files up, since this is only for manual actions - # npmAuthToken: ${GITEA_AUTH_TOKEN} - -# If the following isn't set you won't have a node_modules folder -# You might be used to a node_modules folder instead of a pnp or other folder type -# If you want to use the new linkers uncomment or change the following -# nodeLinker: "node-modules" - -# So the tornadocash org, the person who maintains it, might setup something (in future) like, -# tornadocash: -# npmPublishRegistry: "https://development.tornadocash.community/api/packages/tornadocash/npm/" -# npmRegistryServer: "https://development.tornadocash.community/api/packages/tornadocash/npm/" - -# We disable telemetry for obvious reasons. -enableTelemetry: false - -packageExtensions: - "@resolver-engine/imports-fs@*": - dependencies: - "@resolver-engine/core": "*" - "@thax/circomlib@*": - dependencies: - "web3-utils": "*" diff --git a/@tornado/sdk-crypto/package.json b/@tornado/sdk-crypto/package.json index 4456bdf..7017dac 100644 --- a/@tornado/sdk-crypto/package.json +++ b/@tornado/sdk-crypto/package.json @@ -20,11 +20,11 @@ "@tornado/sdk-data": "workspace:*", "@tornado/sdk-utils": "workspace:*", "chalk": "^5.2.0", - "circomlib": "npm:@thax/circomlib@^0.0.20-p1", + "circomlib": "npm:@tornado/circomlib@^0.0.20-p2", "ethers": "^5", - "fixed-merkle-tree": "npm:@thax/fixed-merkle-tree@^0.6.1-p1", - "snarkjs": "npm:@thax/snarkjs@^0.1.20-p2", - "websnark": "npm:@thax/websnark@^0.0.4-p1" + "fixed-merkle-tree": "npm:@tornado/fixed-merkle-tree@^0.6.1-p2", + "snarkjs": "npm:@tornado/snarkjs@^0.1.20-p2", + "websnark": "npm:@tornado/websnark@^0.0.4-p1" }, "devDependencies": { "@types/big-integer": "^0.0.31", diff --git a/@tornado/sdk-data/.yarnrc.yml b/@tornado/sdk-data/.yarnrc.yml deleted file mode 100644 index 6045dd0..0000000 --- a/@tornado/sdk-data/.yarnrc.yml +++ /dev/null @@ -1,33 +0,0 @@ -# So basically, we want to selectively download packages from the Gitea repository but still allow the -# main repositories, so we are going to have to scope OUR packages properly. This means, unless the tornadocash -# Gitea organization defines a default scope, that we'll have to add every user scope. Including my own below. -# Note that all scopes are after @ prefix. So my prefix is @thax -npmScopes: - thax: - npmPublishRegistry: "https://development.tornadocash.community/api/packages/T-Hax/npm/" - npmRegistryServer: "https://development.tornadocash.community/api/packages/T-Hax/npm/" - # The below can be EXPORTED via some env file which actually exports the variables though - # Check the env.example, you will notice it's not a regular env - # So split your env files up, since this is only for manual actions - # npmAuthToken: ${GITEA_AUTH_TOKEN} - -# If the following isn't set you won't have a node_modules folder -# You might be used to a node_modules folder instead of a pnp or other folder type -# If you want to use the new linkers uncomment or change the following -# nodeLinker: "node-modules" - -# So the tornadocash org, the person who maintains it, might setup something (in future) like, -# tornadocash: -# npmPublishRegistry: "https://development.tornadocash.community/api/packages/tornadocash/npm/" -# npmRegistryServer: "https://development.tornadocash.community/api/packages/tornadocash/npm/" - -# We disable telemetry for obvious reasons. -enableTelemetry: false - -packageExtensions: - "@resolver-engine/imports-fs@*": - dependencies: - "@resolver-engine/core": "*" - "@thax/circomlib@*": - dependencies: - "web3-utils": "*" diff --git a/@tornado/sdk-utils/.yarnrc.yml b/@tornado/sdk-utils/.yarnrc.yml deleted file mode 100644 index 27c4586..0000000 --- a/@tornado/sdk-utils/.yarnrc.yml +++ /dev/null @@ -1,33 +0,0 @@ -# So basically, we want to selectively download packages from the Gitea repository but still allow the -# main repositories, so we are going to have to scope OUR packages properly. This means, unless the tornadocash -# Gitea organization defines a default scope, that we'll have to add every user scope. Including my own below. -# Note that all scopes are after @ prefix. So my prefix is @thax -npmScopes: - tornado: - npmRegistryServer: "https://development.tornadocash.community/api/packages/T-Hax/npm/" - # The below can be EXPORTED via some env file which actually exports the variables though - # Check the env.example, you will notice it's not a regular env - # So split your env files up, since this is only for manual actions - # npmAuthToken: ${GITEA_AUTH_TOKEN} - - -# If the following isn't set you won't have a node_modules folder -# You might be used to a node_modules folder instead of a pnp or other folder type -# If you want to use the new linkers uncomment or change the following -# nodeLinker: "node-modules" - -# So the tornadocash org, the person who maintains it, might setup something (in future) like, -# tornadocash: -# npmPublishRegistry: "https://development.tornadocash.community/api/packages/tornadocash/npm/" -# npmRegistryServer: "https://development.tornadocash.community/api/packages/tornadocash/npm/" - -# We disable telemetry for obvious reasons. -enableTelemetry: false - -packageExtensions: - "@resolver-engine/imports-fs@*": - dependencies: - "@resolver-engine/core": "*" - "@thax/circomlib@*": - dependencies: - "web3-utils": "*" diff --git a/@tornado/sdk-utils/package.json b/@tornado/sdk-utils/package.json index d96ead4..d9e6cc2 100644 --- a/@tornado/sdk-utils/package.json +++ b/@tornado/sdk-utils/package.json @@ -20,7 +20,7 @@ "main": "./build/index.js", "dependencies": { "ethers": "^5", - "snarkjs": "npm:@thax/snarkjs@^0.1.20-p2" + "snarkjs": "npm:@tornado/snarkjs@^0.1.20-p2" }, "devDependencies": { "@types/big-integer": "^0.0.31", diff --git a/@tornado/sdk-web/.yarnrc.yml b/@tornado/sdk-web/.yarnrc.yml deleted file mode 100644 index 6045dd0..0000000 --- a/@tornado/sdk-web/.yarnrc.yml +++ /dev/null @@ -1,33 +0,0 @@ -# So basically, we want to selectively download packages from the Gitea repository but still allow the -# main repositories, so we are going to have to scope OUR packages properly. This means, unless the tornadocash -# Gitea organization defines a default scope, that we'll have to add every user scope. Including my own below. -# Note that all scopes are after @ prefix. So my prefix is @thax -npmScopes: - thax: - npmPublishRegistry: "https://development.tornadocash.community/api/packages/T-Hax/npm/" - npmRegistryServer: "https://development.tornadocash.community/api/packages/T-Hax/npm/" - # The below can be EXPORTED via some env file which actually exports the variables though - # Check the env.example, you will notice it's not a regular env - # So split your env files up, since this is only for manual actions - # npmAuthToken: ${GITEA_AUTH_TOKEN} - -# If the following isn't set you won't have a node_modules folder -# You might be used to a node_modules folder instead of a pnp or other folder type -# If you want to use the new linkers uncomment or change the following -# nodeLinker: "node-modules" - -# So the tornadocash org, the person who maintains it, might setup something (in future) like, -# tornadocash: -# npmPublishRegistry: "https://development.tornadocash.community/api/packages/tornadocash/npm/" -# npmRegistryServer: "https://development.tornadocash.community/api/packages/tornadocash/npm/" - -# We disable telemetry for obvious reasons. -enableTelemetry: false - -packageExtensions: - "@resolver-engine/imports-fs@*": - dependencies: - "@resolver-engine/core": "*" - "@thax/circomlib@*": - dependencies: - "web3-utils": "*" diff --git a/@tornado/sdk-web/package.json b/@tornado/sdk-web/package.json index b4c9853..788f946 100644 --- a/@tornado/sdk-web/package.json +++ b/@tornado/sdk-web/package.json @@ -22,7 +22,7 @@ "axios": "^1.3.5", "ethers": "^5", "socks-proxy-agent": "^7.0.0", - "web3-providers-http": "npm:@thax/web3-providers-http@^1.6.5-p1" + "web3-providers-http": "npm:@tornado/web3-providers-http@^1.6.5-p1" }, "devDependencies": { "@types/big-integer": "^0.0.31", diff --git a/@tornado/sdk/.yarnrc.yml b/@tornado/sdk/.yarnrc.yml deleted file mode 100644 index 6045dd0..0000000 --- a/@tornado/sdk/.yarnrc.yml +++ /dev/null @@ -1,33 +0,0 @@ -# So basically, we want to selectively download packages from the Gitea repository but still allow the -# main repositories, so we are going to have to scope OUR packages properly. This means, unless the tornadocash -# Gitea organization defines a default scope, that we'll have to add every user scope. Including my own below. -# Note that all scopes are after @ prefix. So my prefix is @thax -npmScopes: - thax: - npmPublishRegistry: "https://development.tornadocash.community/api/packages/T-Hax/npm/" - npmRegistryServer: "https://development.tornadocash.community/api/packages/T-Hax/npm/" - # The below can be EXPORTED via some env file which actually exports the variables though - # Check the env.example, you will notice it's not a regular env - # So split your env files up, since this is only for manual actions - # npmAuthToken: ${GITEA_AUTH_TOKEN} - -# If the following isn't set you won't have a node_modules folder -# You might be used to a node_modules folder instead of a pnp or other folder type -# If you want to use the new linkers uncomment or change the following -# nodeLinker: "node-modules" - -# So the tornadocash org, the person who maintains it, might setup something (in future) like, -# tornadocash: -# npmPublishRegistry: "https://development.tornadocash.community/api/packages/tornadocash/npm/" -# npmRegistryServer: "https://development.tornadocash.community/api/packages/tornadocash/npm/" - -# We disable telemetry for obvious reasons. -enableTelemetry: false - -packageExtensions: - "@resolver-engine/imports-fs@*": - dependencies: - "@resolver-engine/core": "*" - "@thax/circomlib@*": - dependencies: - "web3-utils": "*" diff --git a/test/core.test.ts b/test/core.test.ts index 589d01d..dbe838c 100644 --- a/test/core.test.ts +++ b/test/core.test.ts @@ -127,7 +127,7 @@ describe('Core', () => { if (debug) core.off('debug', logListener) }) - it.only('Should sync all instances.', async function () { + it('Should sync all instances.', async function () { for (let i = 0; i < instances.length; i++) { console.log('\n ♻️ Syncing ' + denominations[i] + '\n') @@ -371,7 +371,7 @@ describe('Core', () => { ).to.changeTokenBalance(dai, needsMoney, daiDelta) }).timeout(0) - it('buildDepositTransactions: multiple eth deposits', async () => { + it.only('buildDepositTransactions: multiple eth deposits', async () => { const instances = await core.getInstances( [0.1, 1, 10, 100].map((el) => { return { token: 'eth', denomination: el } @@ -390,7 +390,7 @@ describe('Core', () => { console.log('WAITING => ', i) } - expect(await needsMoney.getBalance()).to.be.lte(BigNumber.from(888.8)) + expect(await needsMoney.getBalance()).to.be.lte(parseUnits('888.8')) }).timeout(0) it('buildDepositTransactions: multiple token deposits', async () => { diff --git a/yarn.lock b/yarn.lock index 51064fb..0f02480 100644 --- a/yarn.lock +++ b/yarn.lock @@ -975,6 +975,20 @@ __metadata: languageName: node linkType: hard +"@tornado/circomlib@npm:0.0.20-p2, circomlib@npm:@tornado/circomlib@^0.0.20-p2": + version: 0.0.20-p2 + resolution: "@tornado/circomlib@npm:0.0.20-p2::__archiveUrl=https%3A%2F%2Fdevelopment.tornadocash.community%2Fapi%2Fpackages%2FT-Hax%2Fnpm%2F%2540tornado%252Fcircomlib%2F-%2F0.0.20-p2%2Fcircomlib-0.0.20-p2.tgz" + dependencies: + "@tornado/snarkjs": 0.1.20-p2 + blake-hash: ^1.1.0 + blake2b: ^2.1.3 + typedarray-to-buffer: ^3.1.5 + web3: ^1.9.0 + web3-utils: ^1.9.0 + checksum: 22375406bf9a42ff3181cb358e6104465af5f8cf4863377e24e03aa7ab2e6ab0034c6dda0a0784386e16bed662e0e6b9b83c9de9856463389f4b30d03214ce26 + languageName: node + linkType: hard + "@tornado/sdk-chain@workspace:*, @tornado/sdk-chain@workspace:@tornado/sdk-chain": version: 0.0.0-use.local resolution: "@tornado/sdk-chain@workspace:@tornado/sdk-chain" @@ -1056,7 +1070,7 @@ __metadata: pouchdb-collate: ^8.0.1 prettier: ^2.3.0 rimraf: ^4.4.0 - snarkjs: "npm:@thax/snarkjs@^0.1.20-p2" + snarkjs: "npm:@tornado/snarkjs@^0.1.20-p2" source-map-support: ^0.5.19 ts-essentials: ^9.3.1 ts-node: ^10.9.1 @@ -1085,26 +1099,26 @@ __metadata: "@typescript-eslint/parser": ^5.54.1 chai: ^4.3.4 chalk: ^5.2.0 - circomlib: "npm:@thax/circomlib@^0.0.20-p1" + circomlib: "npm:@tornado/circomlib@^0.0.20-p2" conventional-changelog-cli: ^2.1.1 dotenv: ^16.0.3 eslint: ^8.35.0 eslint-plugin-prettier: ^4.2.1 ethereum-waffle: ^4.0.10 ethers: ^5 - fixed-merkle-tree: "npm:@thax/fixed-merkle-tree@^0.6.1-p1" + fixed-merkle-tree: "npm:@tornado/fixed-merkle-tree@^0.6.1-p2" fs-extra: ^11.1.0 mocha: ^10.2.0 prettier: ^2.3.0 rimraf: ^4.4.0 - snarkjs: "npm:@thax/snarkjs@^0.1.20-p2" + snarkjs: "npm:@tornado/snarkjs@^0.1.20-p2" source-map-support: ^0.5.19 ts-essentials: ^9.3.1 ts-node: ^10.9.1 tsc-alias: ^1.2.11 tsconfig-paths: ^4.1.2 typescript: ^5.0.4 - websnark: "npm:@thax/websnark@^0.0.4-p1" + websnark: "npm:@tornado/websnark@^0.0.4-p1" dependenciesMeta: tsconfig-paths@4.2.0: unplugged: true @@ -1216,7 +1230,7 @@ __metadata: mocha: ^10.2.0 prettier: ^2.3.0 rimraf: ^4.4.0 - snarkjs: "npm:@thax/snarkjs@^0.1.20-p2" + snarkjs: "npm:@tornado/snarkjs@^0.1.20-p2" source-map-support: ^0.5.19 ts-essentials: ^9.3.1 ts-node: ^10.9.1 @@ -1264,7 +1278,7 @@ __metadata: tsc-alias: ^1.2.11 tsconfig-paths: ^4.1.2 typescript: ^5.0.4 - web3-providers-http: "npm:@thax/web3-providers-http@^1.6.5-p1" + web3-providers-http: "npm:@tornado/web3-providers-http@^1.6.5-p1" dependenciesMeta: tsconfig-paths@4.2.0: unplugged: true @@ -1298,6 +1312,31 @@ __metadata: languageName: unknown linkType: soft +"@tornado/snarkjs@npm:0.1.20-p2, snarkjs@npm:@tornado/snarkjs@^0.1.20-p2": + version: 0.1.20-p2 + resolution: "@tornado/snarkjs@npm:0.1.20-p2::__archiveUrl=https%3A%2F%2Fdevelopment.tornadocash.community%2Fapi%2Fpackages%2FT-Hax%2Fnpm%2F%2540tornado%252Fsnarkjs%2F-%2F0.1.20-p2%2Fsnarkjs-0.1.20-p2.tgz" + dependencies: + big-integer: ^1.6.43 + chai: ^4.2.0 + escape-string-regexp: ^1.0.5 + eslint: ^5.16.0 + keccak: ^2.0.0 + yargs: ^12.0.5 + bin: + cli: cli.js + checksum: 8b4796e7549cc0845d4b6f1cea8fb93beb113d53a3851c05b99c50876e86634d44e4cb0e7b00ed3938b7576b706fef11b020f3650eba2fbdc6bf05c1e708c05c + languageName: node + linkType: hard + +"@tornado/xhr2-cookies@npm:1.1.0-p0": + version: 1.1.0-p0 + resolution: "@tornado/xhr2-cookies@npm:1.1.0-p0::__archiveUrl=https%3A%2F%2Fdevelopment.tornadocash.community%2Fapi%2Fpackages%2FT-Hax%2Fnpm%2F%2540tornado%252Fxhr2-cookies%2F-%2F1.1.0-p0%2Fxhr2-cookies-1.1.0-p0.tgz" + dependencies: + cookiejar: ^2.1.1 + checksum: 07d027055819f65d17e3d1592198575d00d7c95a40b9ac680a796358346ca485486aaeb407c342f8d53407a8777d434545cb1a0fb1d37d27cddc33026bef7663 + languageName: node + linkType: hard + "@trufflesuite/bigint-buffer@npm:1.1.10": version: 1.1.10 resolution: "@trufflesuite/bigint-buffer@npm:1.1.10" @@ -3014,19 +3053,6 @@ __metadata: languageName: node linkType: hard -"circomlib@npm:@thax/circomlib@^0.0.20-p0, circomlib@npm:@thax/circomlib@^0.0.20-p1": - version: 0.0.20-p1 - resolution: "@thax/circomlib@npm:0.0.20-p1::__archiveUrl=https%3A%2F%2Fdevelopment.tornadocash.community%2Fapi%2Fpackages%2FT-Hax%2Fnpm%2F%2540thax%252Fcircomlib%2F-%2F0.0.20-p1%2Fcircomlib-0.0.20-p1.tgz" - dependencies: - blake-hash: ^1.1.0 - blake2b: ^2.1.3 - snarkjs: "npm:@thax/snarkjs@^0.1.20-p2" - typedarray-to-buffer: ^3.1.5 - web3: ^1.0.0-beta.55 - checksum: 68bba1c458fa135579b6c21627e983f5495c3054d12b0c0c079c85dbe9170f78e9bd17433fe4a10597835b4cfb218c8a46af8b5cee2cbc58af3bb6e8702400b2 - languageName: node - linkType: hard - "class-is@npm:^1.1.0": version: 1.1.0 resolution: "class-is@npm:1.1.0" @@ -4894,13 +4920,13 @@ __metadata: languageName: node linkType: hard -"fixed-merkle-tree@npm:@thax/fixed-merkle-tree@^0.6.1-p1": - version: 0.6.1-p1 - resolution: "@thax/fixed-merkle-tree@npm:0.6.1-p1::__archiveUrl=https%3A%2F%2Fdevelopment.tornadocash.community%2Fapi%2Fpackages%2FT-Hax%2Fnpm%2F%2540thax%252Ffixed-merkle-tree%2F-%2F0.6.1-p1%2Ffixed-merkle-tree-0.6.1-p1.tgz" +"fixed-merkle-tree@npm:@tornado/fixed-merkle-tree@^0.6.1-p2": + version: 0.6.1-p2 + resolution: "@tornado/fixed-merkle-tree@npm:0.6.1-p2::__archiveUrl=https%3A%2F%2Fdevelopment.tornadocash.community%2Fapi%2Fpackages%2FT-Hax%2Fnpm%2F%2540tornado%252Ffixed-merkle-tree%2F-%2F0.6.1-p2%2Ffixed-merkle-tree-0.6.1-p2.tgz" dependencies: - circomlib: "npm:@thax/circomlib@^0.0.20-p0" - snarkjs: "npm:@thax/snarkjs@^0.1.20-p2" - checksum: 2925022ddd931555707b98ca29644d07d610cb5876b3f7602703fb8e565fb9b6d898ed15f3dcf916e38a55e94ace8890a50b63cc550681e1d6ee25f3796e7b69 + "@tornado/circomlib": 0.0.20-p2 + "@tornado/snarkjs": 0.1.20-p2 + checksum: a06258207333ad3f1e085ba9e4b3f3ae2d2e6d4682930a820bd3542cb545afaee369e1ffd1d75ccb507f34185acb24b5d04da2e66e8cc546dc3c6ff163f84045 languageName: node linkType: hard @@ -9441,22 +9467,6 @@ __metadata: languageName: node linkType: hard -"snarkjs@npm:@thax/snarkjs@^0.1.20-p2": - version: 0.1.20-p2 - resolution: "@thax/snarkjs@npm:0.1.20-p2::__archiveUrl=https%3A%2F%2Fdevelopment.tornadocash.community%2Fapi%2Fpackages%2FT-Hax%2Fnpm%2F%2540thax%252Fsnarkjs%2F-%2F0.1.20-p2%2Fsnarkjs-0.1.20-p2.tgz" - dependencies: - big-integer: ^1.6.43 - chai: ^4.2.0 - escape-string-regexp: ^1.0.5 - eslint: ^5.16.0 - keccak: ^2.0.0 - yargs: ^12.0.5 - bin: - cli: cli.js - checksum: da2e44648cadd42cf26d632039d29ef16b090647d165f3d56f0edf654ff4f7b0dd6a36b2b5e87fda24599d32e77492b3174e56b081026589dfd1940b45087ddc - languageName: node - linkType: hard - "socks-proxy-agent@npm:^7.0.0": version: 7.0.0 resolution: "socks-proxy-agent@npm:7.0.0" @@ -10920,13 +10930,13 @@ __metadata: languageName: node linkType: hard -"web3-providers-http@npm:@thax/web3-providers-http@^1.6.5-p1": +"web3-providers-http@npm:@tornado/web3-providers-http@^1.6.5-p1": version: 1.6.5-p1 - resolution: "@thax/web3-providers-http@npm:1.6.5-p1::__archiveUrl=https%3A%2F%2Fdevelopment.tornadocash.community%2Fapi%2Fpackages%2FT-Hax%2Fnpm%2F%2540thax%252Fweb3-providers-http%2F-%2F1.6.5-p1%2Fweb3-providers-http-1.6.5-p1.tgz" + resolution: "@tornado/web3-providers-http@npm:1.6.5-p1::__archiveUrl=https%3A%2F%2Fdevelopment.tornadocash.community%2Fapi%2Fpackages%2FT-Hax%2Fnpm%2F%2540tornado%252Fweb3-providers-http%2F-%2F1.6.5-p1%2Fweb3-providers-http-1.6.5-p1.tgz" dependencies: + "@tornado/xhr2-cookies": 1.1.0-p0 web3-core-helpers: 1.6.1 - xhr2-cookies: "npm:@thax/xhr2-cookies@^1.1.0-p0" - checksum: 04a16722591f9c4b72e7324048c1902cb1b4b495c5b2c47f08da235e21fc92fd06ca984288ad91eaa8fe87a914a44f81696990c1491fac89e5d831b86a4e5f6b + checksum: ba73cb210a6cb97b0918ace8a1dff0ba84ec33df4a81f32f619f5ced5c13c2c6e57fabe9c9ab8ae9244ed84b3a7a6a606acca47a399fdfe40361707cb80ab919 languageName: node linkType: hard @@ -10963,21 +10973,6 @@ __metadata: languageName: node linkType: hard -"web3-utils@npm:*, web3-utils@npm:1.9.0": - version: 1.9.0 - resolution: "web3-utils@npm:1.9.0" - dependencies: - bn.js: ^5.2.1 - ethereum-bloom-filters: ^1.0.6 - ethereumjs-util: ^7.1.0 - ethjs-unit: 0.1.6 - number-to-bn: 1.7.0 - randombytes: ^2.1.0 - utf8: 3.0.0 - checksum: 3c794a7fcef9387b96e8fcd847fbf286862f0540ab6656063cdb69830ddd7141d955f5e52c049e3d5f28373311934d19f75199f42604741400af72e2348a26f6 - languageName: node - linkType: hard - "web3-utils@npm:1.6.1": version: 1.6.1 resolution: "web3-utils@npm:1.6.1" @@ -10993,7 +10988,22 @@ __metadata: languageName: node linkType: hard -"web3@npm:^1.0.0-beta.55": +"web3-utils@npm:1.9.0, web3-utils@npm:^1.9.0": + version: 1.9.0 + resolution: "web3-utils@npm:1.9.0" + dependencies: + bn.js: ^5.2.1 + ethereum-bloom-filters: ^1.0.6 + ethereumjs-util: ^7.1.0 + ethjs-unit: 0.1.6 + number-to-bn: 1.7.0 + randombytes: ^2.1.0 + utf8: 3.0.0 + checksum: 3c794a7fcef9387b96e8fcd847fbf286862f0540ab6656063cdb69830ddd7141d955f5e52c049e3d5f28373311934d19f75199f42604741400af72e2348a26f6 + languageName: node + linkType: hard + +"web3@npm:^1.9.0": version: 1.9.0 resolution: "web3@npm:1.9.0" dependencies: @@ -11015,14 +11025,14 @@ __metadata: languageName: node linkType: hard -"websnark@npm:@thax/websnark@^0.0.4-p1": +"websnark@npm:@tornado/websnark@^0.0.4-p1": version: 0.0.4-p1 - resolution: "@thax/websnark@npm:0.0.4-p1::__archiveUrl=https%3A%2F%2Fdevelopment.tornadocash.community%2Fapi%2Fpackages%2FT-Hax%2Fnpm%2F%2540thax%252Fwebsnark%2F-%2F0.0.4-p1%2Fwebsnark-0.0.4-p1.tgz" + resolution: "@tornado/websnark@npm:0.0.4-p1::__archiveUrl=https%3A%2F%2Fdevelopment.tornadocash.community%2Fapi%2Fpackages%2FT-Hax%2Fnpm%2F%2540tornado%252Fwebsnark%2F-%2F0.0.4-p1%2Fwebsnark-0.0.4-p1.tgz" dependencies: + "@tornado/snarkjs": 0.1.20-p2 big-integer: 1.6.42 - snarkjs: "npm:@thax/snarkjs@^0.1.20-p2" wasmbuilder: 0.0.3 - checksum: 47b4fd8be8f237222c6736ab0f1b2cbf4648800f1740c71048329c9efce79771cc5bd6abc61a6f7dabd9355f87993388d4a2a224ab42fe1fd24b3cafc8b4a5e2 + checksum: 5c2cac4f02b38ad66e67deae10e323ab5562141beef29870c57f61435ab5f813d47f851578a87bcb18397ad1003f17b79d4c7080b899e593956d4aaa15d3bcf5 languageName: node linkType: hard @@ -11255,15 +11265,6 @@ __metadata: languageName: node linkType: hard -"xhr2-cookies@npm:@thax/xhr2-cookies@^1.1.0-p0": - version: 1.1.0-p0 - resolution: "@thax/xhr2-cookies@npm:1.1.0-p0::__archiveUrl=https%3A%2F%2Fdevelopment.tornadocash.community%2Fapi%2Fpackages%2FT-Hax%2Fnpm%2F%2540thax%252Fxhr2-cookies%2F-%2F1.1.0-p0%2Fxhr2-cookies-1.1.0-p0.tgz" - dependencies: - cookiejar: ^2.1.1 - checksum: 550ea0c945feaccf537818866a7997276826949cc87bd01b812d616873c7e8566c8337438ff915bfe7bcf80e08ee94ec1109c72a2842170260c14250a619f952 - languageName: node - linkType: hard - "xhr@npm:^2.0.4, xhr@npm:^2.3.3": version: 2.6.0 resolution: "xhr@npm:2.6.0"