From 02024dd234172944116cdf0c067709cdc0a8f3ac Mon Sep 17 00:00:00 2001 From: Chance Hudson Date: Thu, 25 Mar 2021 02:32:55 -0500 Subject: [PATCH 1/5] fix: downgrade hdwallet to fix bug introduced in 1.2.3 --- packages/contracts/package.json | 2 +- yarn.lock | 88 ++++++++++++++++----------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 09bd022c..3b03804c 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -44,7 +44,7 @@ }, "devDependencies": { "@truffle/artifactor": "^4.0.54", - "@truffle/hdwallet-provider": "1.2.3", + "@truffle/hdwallet-provider": "1.2.2", "chai": "^4.2.0", "circomlib": "0.5.1", "eth-gas-reporter": "^0.2.17", diff --git a/yarn.lock b/yarn.lock index a6b7c756..150bd969 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2587,10 +2587,10 @@ emittery "^0.4.1" ora "^3.4.0" -"@truffle/hdwallet-provider@1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@truffle/hdwallet-provider/-/hdwallet-provider-1.2.3.tgz#0d5991ccf6ae434880503545d6e811790a40f090" - integrity sha512-o8Mp7eJNQzy+7JmXObCZussrr933nnRWTA1x3qOn0cda6XzDUkCYyg1COvW4zbCTFyIPekHoBloGE4scbulRww== +"@truffle/hdwallet-provider@1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@truffle/hdwallet-provider/-/hdwallet-provider-1.2.2.tgz#7b42f7cb7fc1f80751c573c72ba488e59690f8ea" + integrity sha512-gpE5M9c+G7uMR9Nn2xslY0BRdl8hvlrHxBJ451g/V3WnOI5rDQMXezz6VZMn3zvWDiQTPRknx1uUDfWvMuQwqg== dependencies: "@trufflesuite/web3-provider-engine" "15.0.13-1" any-promise "^1.3.0" @@ -3390,10 +3390,10 @@ "@zkopru/account@file:packages/account": version "1.0.0-beta.2" dependencies: - "@zkopru/babyjubjub" "file:../../../.cache/yarn/v6/npm-@zkopru-account-1.0.0-beta.2-3a16c4a1-0c5d-43b8-af6d-36af8ff09570-1616653185896/node_modules/@zkopru/babyjubjub" - "@zkopru/database" "file:../../../.cache/yarn/v6/npm-@zkopru-account-1.0.0-beta.2-3a16c4a1-0c5d-43b8-af6d-36af8ff09570-1616653185896/node_modules/@zkopru/database" - "@zkopru/transaction" "file:../../../.cache/yarn/v6/npm-@zkopru-account-1.0.0-beta.2-3a16c4a1-0c5d-43b8-af6d-36af8ff09570-1616653185896/node_modules/@zkopru/transaction" - "@zkopru/utils" "file:../../../.cache/yarn/v6/npm-@zkopru-account-1.0.0-beta.2-3a16c4a1-0c5d-43b8-af6d-36af8ff09570-1616653185896/node_modules/@zkopru/utils" + "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-account-1.0.0-beta.2-c023871a-7d61-4b15-a362-cabaf90440f4-1616657408655/node_modules/@zkopru/babyjubjub" + "@zkopru/database" "file:../../.cache/yarn/v6/npm-@zkopru-account-1.0.0-beta.2-c023871a-7d61-4b15-a362-cabaf90440f4-1616657408655/node_modules/@zkopru/database" + "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-account-1.0.0-beta.2-c023871a-7d61-4b15-a362-cabaf90440f4-1616657408655/node_modules/@zkopru/transaction" + "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-account-1.0.0-beta.2-c023871a-7d61-4b15-a362-cabaf90440f4-1616657408655/node_modules/@zkopru/utils" bip39 "^3.0.2" circomlib "0.5.1" hdkey "^1.1.1" @@ -3406,7 +3406,7 @@ "@zkopru/babyjubjub@file:packages/babyjubjub": version "1.0.0-beta.2" dependencies: - "@zkopru/utils" "file:../../../.cache/yarn/v6/npm-@zkopru-babyjubjub-1.0.0-beta.2-0233fc1f-e025-48cc-b3ba-5cf65427dbd2-1616653185890/node_modules/@zkopru/utils" + "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-babyjubjub-1.0.0-beta.2-ee19c540-6028-4540-b4eb-ebf2f43b85a4-1616657408628/node_modules/@zkopru/utils" big-integer "^1.6.48" blake-hash "^1.1.0" bn.js "^5.1.1" @@ -3418,13 +3418,13 @@ "@zkopru/cli@file:packages/cli": version "1.0.0-beta.2" dependencies: - "@zkopru/account" "file:../../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-8c4c1195-58cd-41ab-8ee4-e1ed595a2872-1616653185913/node_modules/@zkopru/account" - "@zkopru/coordinator" "file:../../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-8c4c1195-58cd-41ab-8ee4-e1ed595a2872-1616653185913/node_modules/@zkopru/coordinator" - "@zkopru/core" "file:../../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-8c4c1195-58cd-41ab-8ee4-e1ed595a2872-1616653185913/node_modules/@zkopru/core" - "@zkopru/database" "file:../../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-8c4c1195-58cd-41ab-8ee4-e1ed595a2872-1616653185913/node_modules/@zkopru/database" - "@zkopru/transaction" "file:../../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-8c4c1195-58cd-41ab-8ee4-e1ed595a2872-1616653185913/node_modules/@zkopru/transaction" - "@zkopru/utils" "file:../../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-8c4c1195-58cd-41ab-8ee4-e1ed595a2872-1616653185913/node_modules/@zkopru/utils" - "@zkopru/zk-wizard" "file:../../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-8c4c1195-58cd-41ab-8ee4-e1ed595a2872-1616653185913/node_modules/@zkopru/zk-wizard" + "@zkopru/account" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-3df6725d-502c-483c-91f4-0bbb0e37071e-1616657408709/node_modules/@zkopru/account" + "@zkopru/coordinator" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-3df6725d-502c-483c-91f4-0bbb0e37071e-1616657408709/node_modules/@zkopru/coordinator" + "@zkopru/core" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-3df6725d-502c-483c-91f4-0bbb0e37071e-1616657408709/node_modules/@zkopru/core" + "@zkopru/database" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-3df6725d-502c-483c-91f4-0bbb0e37071e-1616657408709/node_modules/@zkopru/database" + "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-3df6725d-502c-483c-91f4-0bbb0e37071e-1616657408709/node_modules/@zkopru/transaction" + "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-3df6725d-502c-483c-91f4-0bbb0e37071e-1616657408709/node_modules/@zkopru/utils" + "@zkopru/zk-wizard" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-3df6725d-502c-483c-91f4-0bbb0e37071e-1616657408709/node_modules/@zkopru/zk-wizard" axios "^0.21.1" big-integer "^1.6.48" bip39 "^3.0.2" @@ -3461,13 +3461,13 @@ "@zkopru/coordinator@file:packages/coordinator": version "1.0.0-beta.2" dependencies: - "@zkopru/babyjubjub" "file:../../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-20c095da-9c2f-442f-9c8a-a0d86526664e-1616653185897/node_modules/@zkopru/babyjubjub" - "@zkopru/contracts" "file:../../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-20c095da-9c2f-442f-9c8a-a0d86526664e-1616653185897/node_modules/@zkopru/contracts" - "@zkopru/core" "file:../../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-20c095da-9c2f-442f-9c8a-a0d86526664e-1616653185897/node_modules/@zkopru/core" - "@zkopru/database" "file:../../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-20c095da-9c2f-442f-9c8a-a0d86526664e-1616653185897/node_modules/@zkopru/database" - "@zkopru/transaction" "file:../../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-20c095da-9c2f-442f-9c8a-a0d86526664e-1616653185897/node_modules/@zkopru/transaction" - "@zkopru/tree" "file:../../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-20c095da-9c2f-442f-9c8a-a0d86526664e-1616653185897/node_modules/@zkopru/tree" - "@zkopru/utils" "file:../../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-20c095da-9c2f-442f-9c8a-a0d86526664e-1616653185897/node_modules/@zkopru/utils" + "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-2a5bca6e-6ea5-499c-8739-1fb43f0b5050-1616657408642/node_modules/@zkopru/babyjubjub" + "@zkopru/contracts" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-2a5bca6e-6ea5-499c-8739-1fb43f0b5050-1616657408642/node_modules/@zkopru/contracts" + "@zkopru/core" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-2a5bca6e-6ea5-499c-8739-1fb43f0b5050-1616657408642/node_modules/@zkopru/core" + "@zkopru/database" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-2a5bca6e-6ea5-499c-8739-1fb43f0b5050-1616657408642/node_modules/@zkopru/database" + "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-2a5bca6e-6ea5-499c-8739-1fb43f0b5050-1616657408642/node_modules/@zkopru/transaction" + "@zkopru/tree" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-2a5bca6e-6ea5-499c-8739-1fb43f0b5050-1616657408642/node_modules/@zkopru/tree" + "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-2a5bca6e-6ea5-499c-8739-1fb43f0b5050-1616657408642/node_modules/@zkopru/utils" async-lock "^1.2.2" axios "^0.21.1" big-integer "^1.6.48" @@ -3495,12 +3495,12 @@ "@zkopru/core@file:packages/core": version "1.0.0-beta.2" dependencies: - "@zkopru/account" "file:../../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-f5574794-fa28-4bb5-bb5b-6b3e330e5588-1616653185900/node_modules/@zkopru/account" - "@zkopru/babyjubjub" "file:../../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-f5574794-fa28-4bb5-bb5b-6b3e330e5588-1616653185900/node_modules/@zkopru/babyjubjub" - "@zkopru/contracts" "file:../../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-f5574794-fa28-4bb5-bb5b-6b3e330e5588-1616653185900/node_modules/@zkopru/contracts" - "@zkopru/transaction" "file:../../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-f5574794-fa28-4bb5-bb5b-6b3e330e5588-1616653185900/node_modules/@zkopru/transaction" - "@zkopru/tree" "file:../../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-f5574794-fa28-4bb5-bb5b-6b3e330e5588-1616653185900/node_modules/@zkopru/tree" - "@zkopru/utils" "file:../../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-f5574794-fa28-4bb5-bb5b-6b3e330e5588-1616653185900/node_modules/@zkopru/utils" + "@zkopru/account" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-ea79740b-4e20-46df-be1b-0fa096ddcd02-1616657408662/node_modules/@zkopru/account" + "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-ea79740b-4e20-46df-be1b-0fa096ddcd02-1616657408662/node_modules/@zkopru/babyjubjub" + "@zkopru/contracts" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-ea79740b-4e20-46df-be1b-0fa096ddcd02-1616657408662/node_modules/@zkopru/contracts" + "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-ea79740b-4e20-46df-be1b-0fa096ddcd02-1616657408662/node_modules/@zkopru/transaction" + "@zkopru/tree" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-ea79740b-4e20-46df-be1b-0fa096ddcd02-1616657408662/node_modules/@zkopru/tree" + "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-ea79740b-4e20-46df-be1b-0fa096ddcd02-1616657408662/node_modules/@zkopru/utils" async-lock "^1.2.2" big-integer "^1.6.48" bn.js "^5.1.1" @@ -3518,8 +3518,8 @@ "@zkopru/database@file:packages/database": version "1.0.0-beta.2" dependencies: - "@zkopru/babyjubjub" "file:../../../.cache/yarn/v6/npm-@zkopru-database-1.0.0-beta.2-ffc79c50-e5da-4002-8b86-41266e158281-1616653185912/node_modules/@zkopru/babyjubjub" - "@zkopru/utils" "file:../../../.cache/yarn/v6/npm-@zkopru-database-1.0.0-beta.2-ffc79c50-e5da-4002-8b86-41266e158281-1616653185912/node_modules/@zkopru/utils" + "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-database-1.0.0-beta.2-d98c526c-be15-4650-b607-a8fb0f040165-1616657408704/node_modules/@zkopru/babyjubjub" + "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-database-1.0.0-beta.2-d98c526c-be15-4650-b607-a8fb0f040165-1616657408704/node_modules/@zkopru/utils" async-lock "^1.2.8" bn.js "^4.12.0" pg "^8.5.1" @@ -3531,8 +3531,8 @@ "@zkopru/transaction@file:packages/transaction": version "1.0.0-beta.2" dependencies: - "@zkopru/babyjubjub" "file:../../../.cache/yarn/v6/npm-@zkopru-transaction-1.0.0-beta.2-22c6008b-d171-4a2b-a716-e2ae0b6a70f9-1616653185894/node_modules/@zkopru/babyjubjub" - "@zkopru/utils" "file:../../../.cache/yarn/v6/npm-@zkopru-transaction-1.0.0-beta.2-22c6008b-d171-4a2b-a716-e2ae0b6a70f9-1616653185894/node_modules/@zkopru/utils" + "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-transaction-1.0.0-beta.2-6bfd82e7-14fb-4a11-937a-d5a713723287-1616657408632/node_modules/@zkopru/babyjubjub" + "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-transaction-1.0.0-beta.2-6bfd82e7-14fb-4a11-937a-d5a713723287-1616657408632/node_modules/@zkopru/utils" big-integer "^1.6.48" bs58 "^4.0.1" chacha20 "^0.1.4" @@ -3545,9 +3545,9 @@ "@zkopru/tree@file:packages/tree": version "1.0.0-beta.2" dependencies: - "@zkopru/babyjubjub" "file:../../../.cache/yarn/v6/npm-@zkopru-tree-1.0.0-beta.2-2dcb7351-9573-4030-98ab-f04306c021f0-1616653185904/node_modules/@zkopru/babyjubjub" - "@zkopru/database" "file:../../../.cache/yarn/v6/npm-@zkopru-tree-1.0.0-beta.2-2dcb7351-9573-4030-98ab-f04306c021f0-1616653185904/node_modules/@zkopru/database" - "@zkopru/transaction" "file:../../../.cache/yarn/v6/npm-@zkopru-tree-1.0.0-beta.2-2dcb7351-9573-4030-98ab-f04306c021f0-1616653185904/node_modules/@zkopru/transaction" + "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-tree-1.0.0-beta.2-f41fc1fd-1801-4431-b308-5423e6c6eb3e-1616657408684/node_modules/@zkopru/babyjubjub" + "@zkopru/database" "file:../../.cache/yarn/v6/npm-@zkopru-tree-1.0.0-beta.2-f41fc1fd-1801-4431-b308-5423e6c6eb3e-1616657408684/node_modules/@zkopru/database" + "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-tree-1.0.0-beta.2-f41fc1fd-1801-4431-b308-5423e6c6eb3e-1616657408684/node_modules/@zkopru/transaction" async-lock "^1.2.2" big-integer "^1.6.48" bn.js "^5.1.1" @@ -3578,14 +3578,14 @@ "@zkopru/zk-wizard@file:packages/zk-wizard": version "1.0.0-beta.2" dependencies: - "@zkopru/account" "file:../../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-99f894ef-c049-4c41-b5ce-7c90ab8ff0c6-1616653185902/node_modules/@zkopru/account" - "@zkopru/babyjubjub" "file:../../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-99f894ef-c049-4c41-b5ce-7c90ab8ff0c6-1616653185902/node_modules/@zkopru/babyjubjub" - "@zkopru/contracts" "file:../../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-99f894ef-c049-4c41-b5ce-7c90ab8ff0c6-1616653185902/node_modules/@zkopru/contracts" - "@zkopru/core" "file:../../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-99f894ef-c049-4c41-b5ce-7c90ab8ff0c6-1616653185902/node_modules/@zkopru/core" - "@zkopru/database" "file:../../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-99f894ef-c049-4c41-b5ce-7c90ab8ff0c6-1616653185902/node_modules/@zkopru/database" - "@zkopru/transaction" "file:../../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-99f894ef-c049-4c41-b5ce-7c90ab8ff0c6-1616653185902/node_modules/@zkopru/transaction" - "@zkopru/tree" "file:../../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-99f894ef-c049-4c41-b5ce-7c90ab8ff0c6-1616653185902/node_modules/@zkopru/tree" - "@zkopru/utils" "file:../../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-99f894ef-c049-4c41-b5ce-7c90ab8ff0c6-1616653185902/node_modules/@zkopru/utils" + "@zkopru/account" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-618d6ba5-508b-4be5-9c8a-d7d7311d6354-1616657408668/node_modules/@zkopru/account" + "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-618d6ba5-508b-4be5-9c8a-d7d7311d6354-1616657408668/node_modules/@zkopru/babyjubjub" + "@zkopru/contracts" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-618d6ba5-508b-4be5-9c8a-d7d7311d6354-1616657408668/node_modules/@zkopru/contracts" + "@zkopru/core" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-618d6ba5-508b-4be5-9c8a-d7d7311d6354-1616657408668/node_modules/@zkopru/core" + "@zkopru/database" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-618d6ba5-508b-4be5-9c8a-d7d7311d6354-1616657408668/node_modules/@zkopru/database" + "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-618d6ba5-508b-4be5-9c8a-d7d7311d6354-1616657408668/node_modules/@zkopru/transaction" + "@zkopru/tree" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-618d6ba5-508b-4be5-9c8a-d7d7311d6354-1616657408668/node_modules/@zkopru/tree" + "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-618d6ba5-508b-4be5-9c8a-d7d7311d6354-1616657408668/node_modules/@zkopru/utils" big-integer "^1.6.48" circom_runtime "0.1.13" ffjavascript "0.2.22" From b23c9e453276ef8641ff74699c8217b8884495a9 Mon Sep 17 00:00:00 2001 From: Chance Hudson Date: Thu, 25 Mar 2021 02:33:11 -0500 Subject: [PATCH 2/5] fix: replace goerli contract address --- packages/cli/src/apps/coordinator/config.ts | 2 +- .../apps/coordinator/example-config/prompts/set-websocket.ts | 2 +- packages/cli/src/apps/wallet/config.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cli/src/apps/coordinator/config.ts b/packages/cli/src/apps/coordinator/config.ts index 493f1b4d..dd59c928 100644 --- a/packages/cli/src/apps/coordinator/config.ts +++ b/packages/cli/src/apps/coordinator/config.ts @@ -1,5 +1,5 @@ export const DEFAULT = { - address: '0xCDD5C38A39fDC9C77fE3a72998d34c8Ce99d2d34', + address: '0xcf59A7424E979969FF52982933BD0E33072552c4', bootstrap: true, websocket: 'ws://goerli.zkopru.network:8546', maxBytes: 131072, diff --git a/packages/cli/src/apps/coordinator/example-config/prompts/set-websocket.ts b/packages/cli/src/apps/coordinator/example-config/prompts/set-websocket.ts index 79cba69a..9a3f822d 100644 --- a/packages/cli/src/apps/coordinator/example-config/prompts/set-websocket.ts +++ b/packages/cli/src/apps/coordinator/example-config/prompts/set-websocket.ts @@ -5,7 +5,7 @@ import { Menu, ExampleConfigContext } from '../menu' const addressesByNetworkId = { '1': undefined, - '5': '0xCDD5C38A39fDC9C77fE3a72998d34c8Ce99d2d34', + '5': '0xcf59A7424E979969FF52982933BD0E33072552c4', } export default class Wallet extends PromptApp { diff --git a/packages/cli/src/apps/wallet/config.ts b/packages/cli/src/apps/wallet/config.ts index 6f35b41b..57b75552 100644 --- a/packages/cli/src/apps/wallet/config.ts +++ b/packages/cli/src/apps/wallet/config.ts @@ -1,5 +1,5 @@ export const DEFAULT = { - address: '0xCDD5C38A39fDC9C77fE3a72998d34c8Ce99d2d34', + address: '0xcf59A7424E979969FF52982933BD0E33072552c4', networkId: 1, chainId: 1, websocket: 'ws://goerli.zkopru.network:8546', From 384586d9ff7d583176b3ba19cd943867f28e81b8 Mon Sep 17 00:00:00 2001 From: Chance Hudson Date: Thu, 25 Mar 2021 02:43:53 -0500 Subject: [PATCH 3/5] chore: use zkoprunet tagged circuit image --- .circleci/config.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f206ae52..0b43cf93 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -83,8 +83,7 @@ jobs: - run: name: Setup command: | - docker pull jchancehud/zkopru:circuits - docker tag jchancehud/zkopru:circuits zkoprunet/circuits:dev + docker pull zkoprunet/circuits:dev cd packages/circuits yarn setup yarn build-keys @@ -103,8 +102,7 @@ jobs: - run: name: Setup command: | - docker pull jchancehud/zkopru:circuits - docker tag jchancehud/zkopru:circuits zkoprunet/circuits:dev + docker pull zkoprunet/circuits:dev cd packages/dataset yarn load-keys - run: @@ -154,8 +152,7 @@ jobs: - run: name: ZK Wizard Tests command: | - docker pull jchancehud/zkopru:circuits - docker tag jchancehud/zkopru:circuits zkoprunet/circuits:dev + docker pull zkoprunet/circuits:dev cd packages/circuits yarn setup yarn build-keys From 094a65bae21bb0c97756985c9d5c4c65ec63c39b Mon Sep 17 00:00:00 2001 From: Chance Hudson Date: Thu, 25 Mar 2021 03:21:57 -0500 Subject: [PATCH 4/5] fix: linter, enable ecmaVersion 2020 --- .eslintrc.js | 7 +- package.json | 6 +- packages/babyjubjub/src/fp.ts | 1 - packages/babyjubjub/src/fr.ts | 1 - packages/babyjubjub/src/point.ts | 1 - .../test/libraries/poseidon.soltest.js | 13 +-- packages/core/src/context/layer1.ts | 1 - packages/zk-wizard/src/snark.ts | 1 - tsconfig.json | 5 +- yarn.lock | 90 +++++++++---------- 10 files changed, 61 insertions(+), 65 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index fffa537a..7b1c74e2 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -3,11 +3,12 @@ const path = require('path') const common = { env: { node: true, - es6: true, - es2017: true, - // es2020: true, + es2020: true, 'jest/globals': true, }, + parserOptions: { + ecmaVersion: 2020, + }, plugins: ['prettier', 'jest', 'markdown'], extends: ['airbnb-base', 'prettier', 'plugin:jest/all'], rules: { diff --git a/package.json b/package.json index 5656ed5b..37a8303a 100644 --- a/package.json +++ b/package.json @@ -95,8 +95,8 @@ "@types/tar": "^4.0.3", "@types/tar-fs": "^2.0.0", "@types/uuid": "^8.0.0", - "@typescript-eslint/eslint-plugin": "^2.2.0", - "@typescript-eslint/parser": "^2.2.0", + "@typescript-eslint/eslint-plugin": "^2.34.0", + "@typescript-eslint/parser": "^2.34.0", "bignumber.js": "^9.0.0", "bn.js": "^5.1.1", "circom": "0.5.42", @@ -106,7 +106,7 @@ "cross-env": "^6.0.3", "cz-conventional-changelog": "^3.0.2", "docker-compose": "^0.23.4", - "eslint": "^6.1.0", + "eslint": "^6.4.0", "eslint-config-airbnb-base": "^14.0.0", "eslint-config-prettier": "^6.0.0", "eslint-import-resolver-lerna": "^1.1.0", diff --git a/packages/babyjubjub/src/fp.ts b/packages/babyjubjub/src/fp.ts index a7e42326..859d43ca 100644 --- a/packages/babyjubjub/src/fp.ts +++ b/packages/babyjubjub/src/fp.ts @@ -1,4 +1,3 @@ -/* global BigInt */ import BN from 'bn.js' import { Bytes32, Uint256, Address } from 'soltypes' import RedBN from './types/redbn' diff --git a/packages/babyjubjub/src/fr.ts b/packages/babyjubjub/src/fr.ts index 515f0668..6e12a712 100644 --- a/packages/babyjubjub/src/fr.ts +++ b/packages/babyjubjub/src/fr.ts @@ -1,4 +1,3 @@ -/* global BigInt */ import BN from 'bn.js' import { Bytes32, Uint256, Address } from 'soltypes' import RedBN from './types/redbn' diff --git a/packages/babyjubjub/src/point.ts b/packages/babyjubjub/src/point.ts index 8d2979b2..aea0ab03 100644 --- a/packages/babyjubjub/src/point.ts +++ b/packages/babyjubjub/src/point.ts @@ -1,4 +1,3 @@ -/* global BigInt */ import { hexToBuffer, hexify } from '@zkopru/utils' import * as ffjs from 'ffjavascript' import * as circomlib from 'circomlib' diff --git a/packages/contracts/test-cases/test/libraries/poseidon.soltest.js b/packages/contracts/test-cases/test/libraries/poseidon.soltest.js index a7e3f1e5..7599acd7 100644 --- a/packages/contracts/test-cases/test/libraries/poseidon.soltest.js +++ b/packages/contracts/test-cases/test/libraries/poseidon.soltest.js @@ -4,8 +4,8 @@ /* eslint-disable jest/require-top-level-describe */ /* eslint-disable jest/consistent-test-it */ const chai = require("chai"); -const { Fp } = require("~babyjubjub"); const circomlib = require("circomlib"); +const { Fp } = require("~babyjubjub"); const { expect } = chai; const { toBN } = web3.utils; @@ -22,11 +22,12 @@ const preHashedZeroAt = i => { contract.only("Poseidon", async accounts => { let poseidon; let preHashed; + let poseidonTester; before(async () => { poseidonTester = await PoseidonTester.deployed(); preHashed = await poseidonTester.preHashed(); }); - describe("preHasehd", () => { + describe("preHashed", () => { Array(49) .fill(0) .forEach((_, i) => { @@ -39,16 +40,16 @@ contract.only("Poseidon", async accounts => { }); }); }); - describe("Poseidon2", () => { - it("should show same result", async () => { + describe("poseidon2", () => { + it("should show same result (1)", async () => { const hash = await poseidonTester.poseidon2([1, 2]); expect(hash.toString()).to.equal(jsPoseidon([1n, 2n]).toString()); }); - it("should show same result", async () => { + it("should show same result (2)", async () => { const hash = await poseidonTester.poseidon3([1, 2, 3]); expect(hash.toString()).to.equal(jsPoseidon([1n, 2n, 3n]).toString()); }); - it("should show same result", async () => { + it("should show same result (3)", async () => { const hash = await poseidonTester.poseidon4([1, 2, 3, 4]); expect(hash.toString()).to.equal(jsPoseidon([1n, 2n, 3n, 4n]).toString()); }); diff --git a/packages/core/src/context/layer1.ts b/packages/core/src/context/layer1.ts index 78e04fcf..06f3f1b5 100644 --- a/packages/core/src/context/layer1.ts +++ b/packages/core/src/context/layer1.ts @@ -1,4 +1,3 @@ -/* global BigInt */ /* eslint-disable @typescript-eslint/camelcase */ import { ZkopruContract, diff --git a/packages/zk-wizard/src/snark.ts b/packages/zk-wizard/src/snark.ts index 1788478d..aa307da9 100644 --- a/packages/zk-wizard/src/snark.ts +++ b/packages/zk-wizard/src/snark.ts @@ -1,4 +1,3 @@ -/* global BigInt */ import { join } from 'path' import { fork } from 'child_process' import * as ffjs from 'ffjavascript' diff --git a/tsconfig.json b/tsconfig.json index b0a63d2e..4507c12b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "target": "es6", + "target": "es2020", "module": "commonjs", "moduleResolution": "node", "rootDir": ".", @@ -39,9 +39,8 @@ "resolveJsonModule": true, "noImplicitAny": false, "lib": [ - "es2019", + "es2020", "DOM", - "ES6", "DOM.Iterable", "ScriptHost" ] diff --git a/yarn.lock b/yarn.lock index 150bd969..59c31675 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3280,7 +3280,7 @@ resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.2.tgz#808c9fa7e4517274ed555fa158f2de4b4f468e71" integrity sha512-HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg== -"@typescript-eslint/eslint-plugin@^2.2.0": +"@typescript-eslint/eslint-plugin@^2.34.0": version "2.34.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz#6f8ce8a46c7dea4a6f1d171d2bb8fbae6dac2be9" integrity sha512-4zY3Z88rEE99+CNvTbXSyovv2z9PNOVffTWD2W8QF5s2prBQtwN2zadqERcrHpcR7O/+KMI3fcTAmUUhK/iQcQ== @@ -3309,7 +3309,7 @@ "@typescript-eslint/typescript-estree" "1.13.0" eslint-scope "^4.0.0" -"@typescript-eslint/parser@^2.2.0": +"@typescript-eslint/parser@^2.34.0": version "2.34.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.34.0.tgz#50252630ca319685420e9a39ca05fe185a256bc8" integrity sha512-03ilO0ucSD0EPTw2X4PntSIRFtDPWjrVq7C3/Z3VQHRC7+13YB55rcJI3Jt+YgeHbjUdJPcPa7b23rXCBokuyA== @@ -3390,10 +3390,10 @@ "@zkopru/account@file:packages/account": version "1.0.0-beta.2" dependencies: - "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-account-1.0.0-beta.2-c023871a-7d61-4b15-a362-cabaf90440f4-1616657408655/node_modules/@zkopru/babyjubjub" - "@zkopru/database" "file:../../.cache/yarn/v6/npm-@zkopru-account-1.0.0-beta.2-c023871a-7d61-4b15-a362-cabaf90440f4-1616657408655/node_modules/@zkopru/database" - "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-account-1.0.0-beta.2-c023871a-7d61-4b15-a362-cabaf90440f4-1616657408655/node_modules/@zkopru/transaction" - "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-account-1.0.0-beta.2-c023871a-7d61-4b15-a362-cabaf90440f4-1616657408655/node_modules/@zkopru/utils" + "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-account-1.0.0-beta.2-f0048f13-4802-4220-a7be-2d80f0186fc9-1616659735126/node_modules/@zkopru/babyjubjub" + "@zkopru/database" "file:../../.cache/yarn/v6/npm-@zkopru-account-1.0.0-beta.2-f0048f13-4802-4220-a7be-2d80f0186fc9-1616659735126/node_modules/@zkopru/database" + "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-account-1.0.0-beta.2-f0048f13-4802-4220-a7be-2d80f0186fc9-1616659735126/node_modules/@zkopru/transaction" + "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-account-1.0.0-beta.2-f0048f13-4802-4220-a7be-2d80f0186fc9-1616659735126/node_modules/@zkopru/utils" bip39 "^3.0.2" circomlib "0.5.1" hdkey "^1.1.1" @@ -3406,7 +3406,7 @@ "@zkopru/babyjubjub@file:packages/babyjubjub": version "1.0.0-beta.2" dependencies: - "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-babyjubjub-1.0.0-beta.2-ee19c540-6028-4540-b4eb-ebf2f43b85a4-1616657408628/node_modules/@zkopru/utils" + "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-babyjubjub-1.0.0-beta.2-9b885d9d-c8c7-4340-a69b-927f55b97352-1616659735125/node_modules/@zkopru/utils" big-integer "^1.6.48" blake-hash "^1.1.0" bn.js "^5.1.1" @@ -3418,13 +3418,13 @@ "@zkopru/cli@file:packages/cli": version "1.0.0-beta.2" dependencies: - "@zkopru/account" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-3df6725d-502c-483c-91f4-0bbb0e37071e-1616657408709/node_modules/@zkopru/account" - "@zkopru/coordinator" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-3df6725d-502c-483c-91f4-0bbb0e37071e-1616657408709/node_modules/@zkopru/coordinator" - "@zkopru/core" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-3df6725d-502c-483c-91f4-0bbb0e37071e-1616657408709/node_modules/@zkopru/core" - "@zkopru/database" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-3df6725d-502c-483c-91f4-0bbb0e37071e-1616657408709/node_modules/@zkopru/database" - "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-3df6725d-502c-483c-91f4-0bbb0e37071e-1616657408709/node_modules/@zkopru/transaction" - "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-3df6725d-502c-483c-91f4-0bbb0e37071e-1616657408709/node_modules/@zkopru/utils" - "@zkopru/zk-wizard" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-3df6725d-502c-483c-91f4-0bbb0e37071e-1616657408709/node_modules/@zkopru/zk-wizard" + "@zkopru/account" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-b779bb51-e5ab-4a4c-bbfe-de58bee05b53-1616659735144/node_modules/@zkopru/account" + "@zkopru/coordinator" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-b779bb51-e5ab-4a4c-bbfe-de58bee05b53-1616659735144/node_modules/@zkopru/coordinator" + "@zkopru/core" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-b779bb51-e5ab-4a4c-bbfe-de58bee05b53-1616659735144/node_modules/@zkopru/core" + "@zkopru/database" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-b779bb51-e5ab-4a4c-bbfe-de58bee05b53-1616659735144/node_modules/@zkopru/database" + "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-b779bb51-e5ab-4a4c-bbfe-de58bee05b53-1616659735144/node_modules/@zkopru/transaction" + "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-b779bb51-e5ab-4a4c-bbfe-de58bee05b53-1616659735144/node_modules/@zkopru/utils" + "@zkopru/zk-wizard" "file:../../.cache/yarn/v6/npm-@zkopru-cli-1.0.0-beta.2-b779bb51-e5ab-4a4c-bbfe-de58bee05b53-1616659735144/node_modules/@zkopru/zk-wizard" axios "^0.21.1" big-integer "^1.6.48" bip39 "^3.0.2" @@ -3461,13 +3461,13 @@ "@zkopru/coordinator@file:packages/coordinator": version "1.0.0-beta.2" dependencies: - "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-2a5bca6e-6ea5-499c-8739-1fb43f0b5050-1616657408642/node_modules/@zkopru/babyjubjub" - "@zkopru/contracts" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-2a5bca6e-6ea5-499c-8739-1fb43f0b5050-1616657408642/node_modules/@zkopru/contracts" - "@zkopru/core" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-2a5bca6e-6ea5-499c-8739-1fb43f0b5050-1616657408642/node_modules/@zkopru/core" - "@zkopru/database" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-2a5bca6e-6ea5-499c-8739-1fb43f0b5050-1616657408642/node_modules/@zkopru/database" - "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-2a5bca6e-6ea5-499c-8739-1fb43f0b5050-1616657408642/node_modules/@zkopru/transaction" - "@zkopru/tree" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-2a5bca6e-6ea5-499c-8739-1fb43f0b5050-1616657408642/node_modules/@zkopru/tree" - "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-2a5bca6e-6ea5-499c-8739-1fb43f0b5050-1616657408642/node_modules/@zkopru/utils" + "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-a053eba8-59a0-464a-8383-80a832dc9c3c-1616659735128/node_modules/@zkopru/babyjubjub" + "@zkopru/contracts" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-a053eba8-59a0-464a-8383-80a832dc9c3c-1616659735128/node_modules/@zkopru/contracts" + "@zkopru/core" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-a053eba8-59a0-464a-8383-80a832dc9c3c-1616659735128/node_modules/@zkopru/core" + "@zkopru/database" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-a053eba8-59a0-464a-8383-80a832dc9c3c-1616659735128/node_modules/@zkopru/database" + "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-a053eba8-59a0-464a-8383-80a832dc9c3c-1616659735128/node_modules/@zkopru/transaction" + "@zkopru/tree" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-a053eba8-59a0-464a-8383-80a832dc9c3c-1616659735128/node_modules/@zkopru/tree" + "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-coordinator-1.0.0-beta.2-a053eba8-59a0-464a-8383-80a832dc9c3c-1616659735128/node_modules/@zkopru/utils" async-lock "^1.2.2" axios "^0.21.1" big-integer "^1.6.48" @@ -3495,12 +3495,12 @@ "@zkopru/core@file:packages/core": version "1.0.0-beta.2" dependencies: - "@zkopru/account" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-ea79740b-4e20-46df-be1b-0fa096ddcd02-1616657408662/node_modules/@zkopru/account" - "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-ea79740b-4e20-46df-be1b-0fa096ddcd02-1616657408662/node_modules/@zkopru/babyjubjub" - "@zkopru/contracts" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-ea79740b-4e20-46df-be1b-0fa096ddcd02-1616657408662/node_modules/@zkopru/contracts" - "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-ea79740b-4e20-46df-be1b-0fa096ddcd02-1616657408662/node_modules/@zkopru/transaction" - "@zkopru/tree" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-ea79740b-4e20-46df-be1b-0fa096ddcd02-1616657408662/node_modules/@zkopru/tree" - "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-ea79740b-4e20-46df-be1b-0fa096ddcd02-1616657408662/node_modules/@zkopru/utils" + "@zkopru/account" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-b3d1ead9-7a7e-459c-9fac-26fbc1bd1d6e-1616659735132/node_modules/@zkopru/account" + "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-b3d1ead9-7a7e-459c-9fac-26fbc1bd1d6e-1616659735132/node_modules/@zkopru/babyjubjub" + "@zkopru/contracts" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-b3d1ead9-7a7e-459c-9fac-26fbc1bd1d6e-1616659735132/node_modules/@zkopru/contracts" + "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-b3d1ead9-7a7e-459c-9fac-26fbc1bd1d6e-1616659735132/node_modules/@zkopru/transaction" + "@zkopru/tree" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-b3d1ead9-7a7e-459c-9fac-26fbc1bd1d6e-1616659735132/node_modules/@zkopru/tree" + "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-core-1.0.0-beta.2-b3d1ead9-7a7e-459c-9fac-26fbc1bd1d6e-1616659735132/node_modules/@zkopru/utils" async-lock "^1.2.2" big-integer "^1.6.48" bn.js "^5.1.1" @@ -3518,8 +3518,8 @@ "@zkopru/database@file:packages/database": version "1.0.0-beta.2" dependencies: - "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-database-1.0.0-beta.2-d98c526c-be15-4650-b607-a8fb0f040165-1616657408704/node_modules/@zkopru/babyjubjub" - "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-database-1.0.0-beta.2-d98c526c-be15-4650-b607-a8fb0f040165-1616657408704/node_modules/@zkopru/utils" + "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-database-1.0.0-beta.2-d48d1637-7c6c-41f3-bf4a-69de6813197f-1616659735142/node_modules/@zkopru/babyjubjub" + "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-database-1.0.0-beta.2-d48d1637-7c6c-41f3-bf4a-69de6813197f-1616659735142/node_modules/@zkopru/utils" async-lock "^1.2.8" bn.js "^4.12.0" pg "^8.5.1" @@ -3531,8 +3531,8 @@ "@zkopru/transaction@file:packages/transaction": version "1.0.0-beta.2" dependencies: - "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-transaction-1.0.0-beta.2-6bfd82e7-14fb-4a11-937a-d5a713723287-1616657408632/node_modules/@zkopru/babyjubjub" - "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-transaction-1.0.0-beta.2-6bfd82e7-14fb-4a11-937a-d5a713723287-1616657408632/node_modules/@zkopru/utils" + "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-transaction-1.0.0-beta.2-e60dd820-f9b5-4a69-80cc-ea1a34e11af2-1616659735119/node_modules/@zkopru/babyjubjub" + "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-transaction-1.0.0-beta.2-e60dd820-f9b5-4a69-80cc-ea1a34e11af2-1616659735119/node_modules/@zkopru/utils" big-integer "^1.6.48" bs58 "^4.0.1" chacha20 "^0.1.4" @@ -3545,9 +3545,9 @@ "@zkopru/tree@file:packages/tree": version "1.0.0-beta.2" dependencies: - "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-tree-1.0.0-beta.2-f41fc1fd-1801-4431-b308-5423e6c6eb3e-1616657408684/node_modules/@zkopru/babyjubjub" - "@zkopru/database" "file:../../.cache/yarn/v6/npm-@zkopru-tree-1.0.0-beta.2-f41fc1fd-1801-4431-b308-5423e6c6eb3e-1616657408684/node_modules/@zkopru/database" - "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-tree-1.0.0-beta.2-f41fc1fd-1801-4431-b308-5423e6c6eb3e-1616657408684/node_modules/@zkopru/transaction" + "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-tree-1.0.0-beta.2-375fc035-bbe2-4940-a3fb-232bda4f59b2-1616659735138/node_modules/@zkopru/babyjubjub" + "@zkopru/database" "file:../../.cache/yarn/v6/npm-@zkopru-tree-1.0.0-beta.2-375fc035-bbe2-4940-a3fb-232bda4f59b2-1616659735138/node_modules/@zkopru/database" + "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-tree-1.0.0-beta.2-375fc035-bbe2-4940-a3fb-232bda4f59b2-1616659735138/node_modules/@zkopru/transaction" async-lock "^1.2.2" big-integer "^1.6.48" bn.js "^5.1.1" @@ -3578,14 +3578,14 @@ "@zkopru/zk-wizard@file:packages/zk-wizard": version "1.0.0-beta.2" dependencies: - "@zkopru/account" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-618d6ba5-508b-4be5-9c8a-d7d7311d6354-1616657408668/node_modules/@zkopru/account" - "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-618d6ba5-508b-4be5-9c8a-d7d7311d6354-1616657408668/node_modules/@zkopru/babyjubjub" - "@zkopru/contracts" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-618d6ba5-508b-4be5-9c8a-d7d7311d6354-1616657408668/node_modules/@zkopru/contracts" - "@zkopru/core" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-618d6ba5-508b-4be5-9c8a-d7d7311d6354-1616657408668/node_modules/@zkopru/core" - "@zkopru/database" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-618d6ba5-508b-4be5-9c8a-d7d7311d6354-1616657408668/node_modules/@zkopru/database" - "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-618d6ba5-508b-4be5-9c8a-d7d7311d6354-1616657408668/node_modules/@zkopru/transaction" - "@zkopru/tree" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-618d6ba5-508b-4be5-9c8a-d7d7311d6354-1616657408668/node_modules/@zkopru/tree" - "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-618d6ba5-508b-4be5-9c8a-d7d7311d6354-1616657408668/node_modules/@zkopru/utils" + "@zkopru/account" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-b5bc3ec0-d383-4e64-b398-bd803f1ca6a9-1616659735134/node_modules/@zkopru/account" + "@zkopru/babyjubjub" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-b5bc3ec0-d383-4e64-b398-bd803f1ca6a9-1616659735134/node_modules/@zkopru/babyjubjub" + "@zkopru/contracts" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-b5bc3ec0-d383-4e64-b398-bd803f1ca6a9-1616659735134/node_modules/@zkopru/contracts" + "@zkopru/core" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-b5bc3ec0-d383-4e64-b398-bd803f1ca6a9-1616659735134/node_modules/@zkopru/core" + "@zkopru/database" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-b5bc3ec0-d383-4e64-b398-bd803f1ca6a9-1616659735134/node_modules/@zkopru/database" + "@zkopru/transaction" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-b5bc3ec0-d383-4e64-b398-bd803f1ca6a9-1616659735134/node_modules/@zkopru/transaction" + "@zkopru/tree" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-b5bc3ec0-d383-4e64-b398-bd803f1ca6a9-1616659735134/node_modules/@zkopru/tree" + "@zkopru/utils" "file:../../.cache/yarn/v6/npm-@zkopru-zk-wizard-1.0.0-beta.2-b5bc3ec0-d383-4e64-b398-bd803f1ca6a9-1616659735134/node_modules/@zkopru/utils" big-integer "^1.6.48" circom_runtime "0.1.13" ffjavascript "0.2.22" @@ -4774,9 +4774,9 @@ blake2b-wasm@^1.1.0: dependencies: nanoassert "^1.0.0" -"blake2b-wasm@git+https://github.com/jbaylina/blake2b-wasm.git": +"blake2b-wasm@https://github.com/jbaylina/blake2b-wasm.git": version "2.1.0" - resolved "git+https://github.com/jbaylina/blake2b-wasm.git#0d5f024b212429c7f50a7f533aa3a2406b5b42b3" + resolved "https://github.com/jbaylina/blake2b-wasm.git#0d5f024b212429c7f50a7f533aa3a2406b5b42b3" dependencies: nanoassert "^1.0.0" @@ -7581,7 +7581,7 @@ eslint-visitor-keys@^1.1.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint@^6.1.0: +eslint@^6.4.0: version "6.8.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb" integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig== From fe885d8a0679e3282ba8e8b456c806cb3bb9664f Mon Sep 17 00:00:00 2001 From: Chance Hudson Date: Thu, 25 Mar 2021 03:36:07 -0500 Subject: [PATCH 5/5] fix: revert tsconfig target --- tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index 4507c12b..1295a25c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "target": "es2020", + "target": "es6", "module": "commonjs", "moduleResolution": "node", "rootDir": ".",