From 0e01d9e48a75920fff11749648b483100326397e Mon Sep 17 00:00:00 2001 From: ctrlc03 <93448202+ctrlc03@users.noreply.github.com> Date: Thu, 23 May 2024 16:21:17 +0100 Subject: [PATCH] chore(zkeys): use ts to download zkey artifacts and simplify repo --- .../scripts/download-ceremony-artifacts.sh | 15 ---- .github/scripts/download-zkeys-1-3.sh | 15 ---- .../scripts/downloadZkeys.ts | 8 +-- .github/workflows/coordinator-build.yml | 5 +- .github/workflows/nightly-ceremony.yml | 2 +- .github/workflows/reusable-e2e.yml | 2 +- cli/scripts/gen_zkey.sh | 8 --- coordinator/apps/Dockerfile | 2 +- coordinator/package.json | 1 - integrationTests/package.json | 3 +- integrationTests/scripts/download_zkeys.sh | 14 ---- package.json | 8 ++- pnpm-lock.yaml | 72 ++++++++++++------- tsconfig.json | 2 +- .../quick-start/installation.md | 16 ++--- 15 files changed, 67 insertions(+), 106 deletions(-) delete mode 100755 .github/scripts/download-ceremony-artifacts.sh delete mode 100644 .github/scripts/download-zkeys-1-3.sh rename {coordinator => .github}/scripts/downloadZkeys.ts (77%) delete mode 100755 cli/scripts/gen_zkey.sh delete mode 100755 integrationTests/scripts/download_zkeys.sh diff --git a/.github/scripts/download-ceremony-artifacts.sh b/.github/scripts/download-ceremony-artifacts.sh deleted file mode 100755 index e218ae6389..0000000000 --- a/.github/scripts/download-ceremony-artifacts.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -set -e - -cd "$(dirname "$0")" -cd .. -mkdir -p ../cli/zkeys - -URL=https://maci-develop-fra.s3.eu-central-1.amazonaws.com/v1.2.0/maci_artifacts_6-9-2-3_prod.tar.gz -DIR_NAME="maci_keys.tar.gz" -OUT_DIR=../cli/ - -echo "downloading $URL" -curl $URL -o "$OUT_DIR/$DIR_NAME" -tar -xvf "$OUT_DIR/$DIR_NAME" -C "$OUT_DIR" diff --git a/.github/scripts/download-zkeys-1-3.sh b/.github/scripts/download-zkeys-1-3.sh deleted file mode 100644 index f1aa10c7dd..0000000000 --- a/.github/scripts/download-zkeys-1-3.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -set -e - -cd "$(dirname "$0")" -cd .. -mkdir -p ../cli/zkeys - -URL=https://maci-develop-fra.s3.eu-central-1.amazonaws.com/v1.3.0/maci_artifacts_10-2-1-2_test.tar.gz -DIR_NAME="maci_keys.tar.gz" -OUT_DIR=../cli/ - -echo "downloading $URL" -curl $URL -o "$OUT_DIR/$DIR_NAME" -tar -xvf "$OUT_DIR/$DIR_NAME" -C "$OUT_DIR" diff --git a/coordinator/scripts/downloadZkeys.ts b/.github/scripts/downloadZkeys.ts similarity index 77% rename from coordinator/scripts/downloadZkeys.ts rename to .github/scripts/downloadZkeys.ts index 187a430d5e..da4f700f48 100644 --- a/coordinator/scripts/downloadZkeys.ts +++ b/.github/scripts/downloadZkeys.ts @@ -1,15 +1,13 @@ -import dotenv from "dotenv"; import * as tar from "tar"; import fs from "fs"; import https from "https"; import path from "path"; -dotenv.config({ path: [path.resolve(__dirname, "../.env"), path.resolve(__dirname, "../.env.example")] }); - -const ZKEY_PATH = path.resolve(process.env.COORDINATOR_ZKEY_PATH!); +const ZKEY_PATH = path.resolve(process.argv.slice(3)[0]); const ZKEYS_URLS = { test: "https://maci-develop-fra.s3.eu-central-1.amazonaws.com/v1.3.0/maci_artifacts_10-2-1-2_test.tar.gz", + prod: "https://maci-develop-fra.s3.eu-central-1.amazonaws.com/v1.2.0/maci_artifacts_6-9-2-3_prod.tar.gz", }; const ARCHIVE_NAME = path.resolve(ZKEY_PATH, "maci_keys.tar.gz"); @@ -34,7 +32,7 @@ export async function downloadZkeys(): Promise { .on("finish", () => { file.close(); - tar.x({ f: ARCHIVE_NAME }).then(() => fs.promises.rm(ARCHIVE_NAME)); + tar.x({ f: ARCHIVE_NAME, C: ZKEY_PATH, strip: 1 }).then(() => fs.promises.rm(ARCHIVE_NAME)); }) .on("error", () => fs.promises.unlink(ARCHIVE_NAME)); }) diff --git a/.github/workflows/coordinator-build.yml b/.github/workflows/coordinator-build.yml index 55911bb439..cb525c6e78 100644 --- a/.github/workflows/coordinator-build.yml +++ b/.github/workflows/coordinator-build.yml @@ -11,7 +11,7 @@ env: COORDINATOR_PRIVATE_KEY_PATH: "./priv.key" COORDINATOR_TALLY_ZKEY_NAME: "TallyVotes_10-1-2_test" COORDINATOR_MESSAGE_PROCESS_ZKEY_NAME: "ProcessMessages_10-2-1-2_test" - COORDINATOR_ZKEY_PATH: "./zkeys" + COORDINATOR_ZKEY_PATH: "./zkeys/" COORDINATOR_RAPIDSNARK_EXE: "~/rapidsnark/build/prover" concurrency: @@ -98,8 +98,7 @@ jobs: - name: Download zkeys if: ${{ env.CHANGED == 'false' }} run: | - pnpm download-zkeys:test - working-directory: coordinator + pnpm download-zkeys-coordinator:test - name: Generate keypair run: | diff --git a/.github/workflows/nightly-ceremony.yml b/.github/workflows/nightly-ceremony.yml index 4f201a2fc7..6a46b26f26 100644 --- a/.github/workflows/nightly-ceremony.yml +++ b/.github/workflows/nightly-ceremony.yml @@ -56,7 +56,7 @@ jobs: chmod +x ~/rapidsnark/build/prover - name: Download ceremony artifacts - run: ./.github/scripts/download-ceremony-artifacts.sh + run: pnpm download-zkeys:ceremony - name: Run e2e tests run: pnpm test:cli-ceremony diff --git a/.github/workflows/reusable-e2e.yml b/.github/workflows/reusable-e2e.yml index 34a728e48f..cf447c3ba3 100644 --- a/.github/workflows/reusable-e2e.yml +++ b/.github/workflows/reusable-e2e.yml @@ -88,7 +88,7 @@ jobs: - name: Download zkeys if: ${{ env.CHANGED == 'false' }} run: | - pnpm download:test-zkeys-1-3 + pnpm download-zkeys:test - name: ${{ matrix.command }} run: pnpm run ${{ matrix.command }} diff --git a/cli/scripts/gen_zkey.sh b/cli/scripts/gen_zkey.sh deleted file mode 100755 index 2f51e8d40e..0000000000 --- a/cli/scripts/gen_zkey.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -pnpm exec zkey-manager compile -c ../zkeys.config.yml -pnpm exec zkey-manager downloadPtau -c ../zkeys.config.yml -pnpm exec zkey-manager genZkeys -c ../zkeys.config.yml - - - diff --git a/coordinator/apps/Dockerfile b/coordinator/apps/Dockerfile index 3144d8e39a..277861546a 100644 --- a/coordinator/apps/Dockerfile +++ b/coordinator/apps/Dockerfile @@ -25,8 +25,8 @@ ARG PORT=3000 WORKDIR ./maci COPY --chown=node:node --from=builder /builder/ ./ +RUN pnpm run download-zkeys-coordinator:test WORKDIR /maci/coordinator -RUN pnpm run download-zkeys:test RUN pnpm run generate-keypair EXPOSE ${PORT} diff --git a/coordinator/package.json b/coordinator/package.json index a3378e16ff..8bcf364f66 100644 --- a/coordinator/package.json +++ b/coordinator/package.json @@ -18,7 +18,6 @@ "test": "jest", "test:coverage": "jest --coverage", "types": "tsc -p tsconfig.json --noEmit", - "download-zkeys:test": "ts-node ./scripts/downloadZkeys.ts test", "generate-keypair": "ts-node ./scripts/generateKeypair.ts" }, "dependencies": { diff --git a/integrationTests/package.json b/integrationTests/package.json index a50de7e13b..0d65d1e15d 100644 --- a/integrationTests/package.json +++ b/integrationTests/package.json @@ -14,8 +14,7 @@ "types": "tsc -p tsconfig.json --noEmit", "test": "ts-mocha --exit ./ts/__tests__/**.test.ts", "test:integration": "NODE_OPTIONS=--max-old-space-size=4096 ts-mocha --exit ./ts/__tests__/integration.test.ts", - "test:maciKeys": "ts-mocha --exit ./ts/__tests__/maci-keys.test.ts", - "download-zkeys": "./scripts/download_zkeys.sh" + "test:maciKeys": "ts-mocha --exit ./ts/__tests__/maci-keys.test.ts" }, "devDependencies": { "@types/chai": "^4.3.11", diff --git a/integrationTests/scripts/download_zkeys.sh b/integrationTests/scripts/download_zkeys.sh deleted file mode 100755 index 66a72cb836..0000000000 --- a/integrationTests/scripts/download_zkeys.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -xe - -cd "$(dirname "$0")" -cd .. - -mkdir -p ../cli/zkeys - -URL=https://maci-develop-fra.s3.eu-central-1.amazonaws.com/v1.1.2/maci_keys_10-2-1-2_dev.tar.gz -DIR_NAME="maci_keys.tar.gz" -OUT_DIR=../cli/ - -echo "downloading $URL" -curl $URL -o "$OUT_DIR/$DIR_NAME" -tar -xvf "$OUT_DIR/$DIR_NAME" -C "$OUT_DIR" diff --git a/package.json b/package.json index ce06418be4..710159287e 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,9 @@ "setup:zkeys": "NODE_OPTIONS=--max-old-space-size=4096 lerna run gen-zkeys --scope \"maci-circuits\"", "clean": "lerna exec -- rm -rf node_modules build && rm -rf node_modules", "commit": "git cz", - "download:test-zkeys-1-2": "lerna run download-zkeys --scope \"maci-integrationtests\"", - "download:test-zkeys-1-3": "bash .github/scripts/download-zkeys-1-3.sh", - "download:ceremony-zkeys": "bash .github/scripts/download-ceremony-artifacts.sh", + "download-zkeys:test": "ts-node ./.github/scripts/downloadZkeys.ts test ./cli/zkeys", + "download-zkeys:ceremony": "ts-node ./.github/scripts/downloadZkeys.ts prod ./cli/zkeys", + "download-zkeys-coordinator:test": "ts-node ./.github/scripts/downloadZkeys.ts test ./coordinator/zkeys", "prettier": "prettier -c .", "prettier:fix": "prettier -w .", "lint:ts": "eslint './**/**/*.ts' './**/**/*.tsx'", @@ -55,6 +55,8 @@ "prettier": "^3.2.5", "prettier-plugin-solidity": "^1.3.1", "solhint": "^5.0.1", + "tar": "^7.1.0", + "ts-node": "^10.9.1", "typedoc": "^0.25.13", "typedoc-plugin-markdown": "^3.17.1", "typescript": "^5.4.5" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bd1f444914..0414cc9a70 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -80,6 +80,12 @@ importers: solhint: specifier: ^5.0.1 version: 5.0.1(typescript@5.4.5) + tar: + specifier: ^7.1.0 + version: 7.1.0 + ts-node: + specifier: ^10.9.1 + version: 10.9.2(@types/node@20.12.12)(typescript@5.4.5) typedoc: specifier: ^0.25.13 version: 0.25.13(typescript@5.4.5) @@ -3682,7 +3688,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 espree: 9.6.1 globals: 13.24.0 ignore: 5.3.1 @@ -4036,7 +4042,7 @@ packages: engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': 2.0.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -4085,7 +4091,6 @@ packages: engines: {node: '>=18.0.0'} dependencies: minipass: 7.1.0 - dev: false /@istanbuljs/load-nyc-config@1.1.0: resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==} @@ -6731,7 +6736,7 @@ packages: '@typescript-eslint/types': 7.10.0 '@typescript-eslint/typescript-estree': 7.10.0(typescript@5.4.5) '@typescript-eslint/visitor-keys': 7.10.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 eslint: 8.57.0 typescript: 5.4.5 transitivePeerDependencies: @@ -6758,7 +6763,7 @@ packages: dependencies: '@typescript-eslint/typescript-estree': 7.10.0(typescript@5.4.5) '@typescript-eslint/utils': 7.10.0(eslint@8.57.0)(typescript@5.4.5) - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 eslint: 8.57.0 ts-api-utils: 1.3.0(typescript@5.4.5) typescript: 5.4.5 @@ -6782,7 +6787,7 @@ packages: dependencies: '@typescript-eslint/types': 7.10.0 '@typescript-eslint/visitor-keys': 7.10.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 minimatch: 9.0.4 @@ -7047,7 +7052,7 @@ packages: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color @@ -7055,7 +7060,7 @@ packages: resolution: {integrity: sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==} engines: {node: '>= 14'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -7498,7 +7503,7 @@ packages: /axios@1.6.8: resolution: {integrity: sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==} dependencies: - follow-redirects: 1.15.6(debug@4.3.4) + follow-redirects: 1.15.6 form-data: 4.0.0 proxy-from-env: 1.1.0 transitivePeerDependencies: @@ -8236,7 +8241,6 @@ packages: /chownr@3.0.0: resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==} engines: {node: '>=18'} - dev: false /chrome-trace-event@1.0.3: resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==} @@ -9495,6 +9499,17 @@ packages: ms: 2.1.3 dev: true + /debug@4.3.4: + resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.2 + /debug@4.3.4(supports-color@8.1.1): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -10226,7 +10241,7 @@ packages: eslint: '*' eslint-plugin-import: '*' dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 enhanced-resolve: 5.16.0 eslint: 8.57.0 eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.10.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) @@ -10451,7 +10466,7 @@ packages: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.2 @@ -11182,6 +11197,15 @@ packages: resolution: {integrity: sha512-Gz1EvfOneuFfk4yG458dJ3TLJ7gV19q3OM/vVvvHf7eT02Hm1DleB4edsia6ahbKgAYxO9gvyQ1ioWZR+a00Yw==} dev: false + /follow-redirects@1.15.6: + resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==} + engines: {node: '>=4.0'} + peerDependencies: + debug: '*' + peerDependenciesMeta: + debug: + optional: true + /follow-redirects@1.15.6(debug@4.3.4): resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==} engines: {node: '>=4.0'} @@ -12406,7 +12430,7 @@ packages: dependencies: '@tootallnate/once': 2.0.0 agent-base: 6.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -12416,7 +12440,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -12469,7 +12493,7 @@ packages: engines: {node: '>= 6'} dependencies: agent-base: 6.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color @@ -12478,7 +12502,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -14073,7 +14097,7 @@ packages: dependencies: chalk: 5.3.0 commander: 12.1.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 execa: 8.0.1 lilconfig: 3.1.1 listr2: 8.2.1 @@ -15363,7 +15387,6 @@ packages: dependencies: minipass: 7.1.0 rimraf: 5.0.5 - dev: false /mkdirp@0.5.6: resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} @@ -15380,7 +15403,6 @@ packages: resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==} engines: {node: '>=10'} hasBin: true - dev: false /mnemonist@0.38.5: resolution: {integrity: sha512-bZTFT5rrPKtPJxj8KSV0WkPyNxl72vQepqqVUAW2ARUpUSF2qXMB6jZj7hW5/k7C1rtpzqbD/IIbJwLXUjCHeg==} @@ -17323,6 +17345,7 @@ packages: resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} engines: {node: '>=10.13.0'} hasBin: true + requiresBuild: true /prettier@3.2.5: resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} @@ -18275,7 +18298,6 @@ packages: hasBin: true dependencies: glob: 10.3.12 - dev: false /ripemd160@2.0.2: resolution: {integrity: sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==} @@ -18785,7 +18807,7 @@ packages: engines: {node: '>= 10'} dependencies: agent-base: 6.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 socks: 2.8.3 transitivePeerDependencies: - supports-color @@ -18796,7 +18818,7 @@ packages: engines: {node: '>= 14'} dependencies: agent-base: 7.1.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 socks: 2.8.3 transitivePeerDependencies: - supports-color @@ -19516,7 +19538,6 @@ packages: minizlib: 3.0.1 mkdirp: 3.0.1 yallist: 5.0.0 - dev: false /temp-dir@1.0.0: resolution: {integrity: sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==} @@ -19876,7 +19897,7 @@ packages: engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} dependencies: '@tufjs/models': 1.0.4 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 make-fetch-happen: 11.1.1 transitivePeerDependencies: - supports-color @@ -19887,7 +19908,7 @@ packages: engines: {node: ^16.14.0 || >=18.0.0} dependencies: '@tufjs/models': 2.0.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 make-fetch-happen: 13.0.0 transitivePeerDependencies: - supports-color @@ -21019,7 +21040,6 @@ packages: /yallist@5.0.0: resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==} engines: {node: '>=18'} - dev: false /yaml@1.10.2: resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==} diff --git a/tsconfig.json b/tsconfig.json index 475b5385ac..c767dedaad 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -30,5 +30,5 @@ "stripInternal": true }, "exclude": ["node_modules"], - "include": ["./**/ts", "./**/typechain-types"] + "include": ["./**/ts", "./**/typechain-types", ".github/scripts/downloadZkeys.ts"] } diff --git a/website/versioned_docs/version-v2.0_alpha/quick-start/installation.md b/website/versioned_docs/version-v2.0_alpha/quick-start/installation.md index afd919c63d..b008934721 100644 --- a/website/versioned_docs/version-v2.0_alpha/quick-start/installation.md +++ b/website/versioned_docs/version-v2.0_alpha/quick-start/installation.md @@ -167,19 +167,15 @@ Note the locations of the `.zkey` files as the CLI requires them as command-line If using the latest dev updates: ```bash -pnpm download:test-zkeys-1-3 +pnpm download-zkeys:test ``` -If using **1.2.1** - -```bash -pnpm download:test-zkeys-1-2 -``` - -Note that the below will work up until **1.2.1** - **Download ceremony artifacts** +:::info +Currently, the ceremony artifacts work with MACI version up to 1.2.2. +::: + ```bash -pnpm download:ceremony-zkeys +pnpm download-zkeys:ceremony ```