chore: update lerna version

- [x] Use root node_modules - [x] Update docs - [x] Compatibility fixes
privacy-scaling-explorations · Jan 11, 2024 · 7dcf456 · 7dcf456
1 parent 0689040
commit 7dcf456
Show file tree

Hide file tree

Showing 42 changed files with 31,920 additions and 10,465 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -13,4 +13,4 @@
 
 # Global:
 
-* @ctrlc03 @kittybest @0xmad @samajammin
+* @ctrlc03 @kittybest @0xmad @samajammin @crisgarner
diff --git a/.github/scripts/website.sh b/.github/scripts/website.sh
@@ -3,7 +3,7 @@
 set -e
 
 # install maci dependencies, bootstrap monorepo and build packages
-npm install && npm run bootstrap && npm run build
+npm install && npm run build
 
 # run typedoc
 npm run typedoc

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -33,7 +33,6 @@ jobs:
       - name: Build
         run: |
           npm install
-          npm run bootstrap
           npm run build
 
       - name: ${{ matrix.command }}

diff --git a/.github/workflows/circuit-build.yml b/.github/workflows/circuit-build.yml
@@ -38,7 +38,6 @@ jobs:
       - name: Build maci-circuits package
         run: |
           npm install
-          npm run bootstrap
           npm run build
 
       - name: Download circom Binary v2.1.6

diff --git a/.github/workflows/commitlint.yml b/.github/workflows/commitlint.yml
@@ -28,6 +28,5 @@ jobs:
       - name: Install
         run: |
           npm install
-          npm run bootstrap
 
       - run: npx commitlint --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }} --verbose
diff --git a/.github/workflows/contracts-build.yml b/.github/workflows/contracts-build.yml
@@ -28,7 +28,6 @@ jobs:
       - name: Build
         run: |
           npm install
-          npm run bootstrap
           npm run build
 
       - name: Test

diff --git a/.github/workflows/core-build.yml b/.github/workflows/core-build.yml
@@ -28,7 +28,6 @@ jobs:
       - name: Build
         run: |
           npm install
-          npm run bootstrap
           npm run build
 
       - name: Test

diff --git a/.github/workflows/crypto-build.yml b/.github/workflows/crypto-build.yml
@@ -28,7 +28,6 @@ jobs:
       - name: Build
         run: |
           npm install
-          npm run bootstrap
           npm run build
 
       - name: Test

diff --git a/.github/workflows/domainobjs-build.yml b/.github/workflows/domainobjs-build.yml
@@ -28,7 +28,6 @@ jobs:
       - name: Build
         run: |
           npm install
-          npm run bootstrap
           npm run build
 
       - name: Test

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -33,7 +33,6 @@ jobs:
       - name: Initialize Project
         run: |
           npm install
-          npm run bootstrap
           npm run build
 
       - name: Publish Project

diff --git a/.github/workflows/nightly-ceremony.yml b/.github/workflows/nightly-ceremony.yml
@@ -34,7 +34,6 @@ jobs:
       - name: Initialize Project
         run: |
           npm install
-          npm run bootstrap
           npm run build
 
       - name: Run hardhat fork

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -36,7 +36,6 @@ jobs:
       - name: Initialize Project
         run: |
           npm install
-          npm run bootstrap
           npm run build
 
       - name: Run hardhat fork
@@ -101,7 +100,6 @@ jobs:
       - name: Build
         run: |
           npm install
-          npm run bootstrap
           npm run build
 
       - name: Test

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,7 +36,6 @@ jobs:
         run: |
           git config --global url."https://github.com/".insteadOf git://github.com/
           npm install
-          npm run bootstrap
           npm run build
 
       - name: Publish NPM

diff --git a/.github/workflows/reusable-e2e.yml b/.github/workflows/reusable-e2e.yml
@@ -52,7 +52,6 @@ jobs:
       - name: Initialize Project
         run: |
           npm install
-          npm run bootstrap
           npm run build
 
       - name: Run hardhat fork

diff --git a/build.sh b/build.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-npm i && npm run bootstrap && npm run build
+npm i && npm run build
 
diff --git a/circuits/circom/ecdh.circom b/circuits/circom/ecdh.circom
@@ -1,6 +1,6 @@
 pragma circom 2.0.0;
-include "../node_modules/circomlib/circuits/bitify.circom";
-include "../node_modules/circomlib/circuits/escalarmulany.circom";
+include "../../node_modules/circomlib/circuits/bitify.circom";
+include "../../node_modules/circomlib/circuits/escalarmulany.circom";
 
 template Ecdh() {
     // Note: the private key needs to be hashed and pruned first

diff --git a/circuits/circom/float.circom b/circuits/circom/float.circom
@@ -1,7 +1,7 @@
 pragma circom 2.0.0;
-include "../node_modules/circomlib/circuits/bitify.circom";
-include "../node_modules/circomlib/circuits/comparators.circom";
-include "../node_modules/circomlib/circuits/mux1.circom";
+include "../../node_modules/circomlib/circuits/bitify.circom";
+include "../../node_modules/circomlib/circuits/comparators.circom";
+include "../../node_modules/circomlib/circuits/mux1.circom";
 
 template msb(n) {
     // require in < 2**n 

diff --git a/circuits/circom/hasherSha256.circom b/circuits/circom/hasherSha256.circom
@@ -1,6 +1,6 @@
 pragma circom 2.0.0;
-include "../node_modules/circomlib/circuits/sha256/sha256.circom"; 
-include "../node_modules/circomlib/circuits/bitify.circom"; 
+include "../../node_modules/circomlib/circuits/sha256/sha256.circom"; 
+include "../../node_modules/circomlib/circuits/bitify.circom"; 
 
 template Sha256HashLeftRight() {
     signal input left;

diff --git a/circuits/circom/messageToCommand.circom b/circuits/circom/messageToCommand.circom
@@ -1,8 +1,8 @@
 pragma circom 2.0.0;
 include "./ecdh.circom";
 include "./unpackElement.circom";
-include "../node_modules/circomlib/circuits/bitify.circom";
-include "../node_modules/circomlib/circuits/poseidon.circom";
+include "../../node_modules/circomlib/circuits/bitify.circom";
+include "../../node_modules/circomlib/circuits/poseidon.circom";
 
 // template that converts a MACI message
 // to a command (decrypts it)

diff --git a/circuits/circom/poseidon/poseidonHashT3.circom b/circuits/circom/poseidon/poseidonHashT3.circom
@@ -1,5 +1,5 @@
 pragma circom 2.0.0;
-include "../../node_modules/circomlib/circuits/poseidon.circom";
+include "../../../node_modules/circomlib/circuits/poseidon.circom";
 
 template PoseidonHashT3() {
     var nInputs = 2;

diff --git a/circuits/circom/poseidon/poseidonHashT4.circom b/circuits/circom/poseidon/poseidonHashT4.circom
@@ -1,5 +1,5 @@
 pragma circom 2.0.0;
-include "../../node_modules/circomlib/circuits/poseidon.circom";
+include "../../../node_modules/circomlib/circuits/poseidon.circom";
 
 template PoseidonHashT4() {
     var nInputs = 3;

diff --git a/circuits/circom/poseidon/poseidonHashT5.circom b/circuits/circom/poseidon/poseidonHashT5.circom
@@ -1,5 +1,5 @@
 pragma circom 2.0.0;
-include "../../node_modules/circomlib/circuits/poseidon.circom";
+include "../../../node_modules/circomlib/circuits/poseidon.circom";
 
 template PoseidonHashT5() {
     var nInputs = 4;

diff --git a/circuits/circom/poseidon/poseidonHashT6.circom b/circuits/circom/poseidon/poseidonHashT6.circom
@@ -1,5 +1,5 @@
 pragma circom 2.0.0;
-include "../../node_modules/circomlib/circuits/poseidon.circom";
+include "../../../node_modules/circomlib/circuits/poseidon.circom";
 
 template PoseidonHashT6() {
     var nInputs = 5;

diff --git a/circuits/circom/privToPubKey.circom b/circuits/circom/privToPubKey.circom
@@ -1,6 +1,6 @@
 pragma circom 2.0.0;
-include "../node_modules/circomlib/circuits/bitify.circom";
-include "../node_modules/circomlib/circuits/escalarmulfix.circom";
+include "../../node_modules/circomlib/circuits/bitify.circom";
+include "../../node_modules/circomlib/circuits/escalarmulfix.circom";
 
 // convert a private key to a public key
 // @note the basepoint is the base point of the baby jubjub curve

diff --git a/circuits/circom/processMessages.circom b/circuits/circom/processMessages.circom
@@ -5,7 +5,7 @@ include "./messageToCommand.circom";
 include "./privToPubKey.circom";
 include "./stateLeafAndBallotTransformer.circom";
 include "./trees/incrementalQuinTree.circom";
-include "../node_modules/circomlib/circuits/mux1.circom";
+include "../../node_modules/circomlib/circuits/mux1.circom";
 include "./utils.circom";
 
 // Proves the correctness of processing a batch of messages.

diff --git a/circuits/circom/stateLeafAndBallotTransformer.circom b/circuits/circom/stateLeafAndBallotTransformer.circom
@@ -1,6 +1,6 @@
 pragma circom 2.0.0;
 include "./messageValidator.circom";
-include "../node_modules/circomlib/circuits/mux1.circom";
+include "../../node_modules/circomlib/circuits/mux1.circom";
 
 // Apply a command to a state leaf and ballot.
 template StateLeafAndBallotTransformer() {

diff --git a/circuits/circom/subsidy.circom b/circuits/circom/subsidy.circom
@@ -1,5 +1,5 @@
 pragma circom 2.0.0;
-include "../node_modules/circomlib/circuits/comparators.circom";
+include "../../node_modules/circomlib/circuits/comparators.circom";
 include "./trees/incrementalQuinTree.circom";
 include "./trees/calculateTotal.circom";
 include "./trees/checkRoot.circom";

diff --git a/circuits/circom/tallyVotes.circom b/circuits/circom/tallyVotes.circom
@@ -1,5 +1,5 @@
 pragma circom 2.0.0;
-include "../node_modules/circomlib/circuits/comparators.circom";
+include "../../node_modules/circomlib/circuits/comparators.circom";
 include "./trees/incrementalQuinTree.circom";
 include "./trees/calculateTotal.circom";
 include "./trees/checkRoot.circom";

diff --git a/circuits/circom/trees/incrementalMerkleTree.circom b/circuits/circom/trees/incrementalMerkleTree.circom
@@ -3,7 +3,7 @@ pragma circom 2.0.0;
 // https://github.com/peppersec/tornado-mixer/blob/master/circuits/merkleTree.circom
 // https://github.com/semaphore-protocol/semaphore/blob/audited/circuits/circom/semaphore-base.circom
 
-include "../../node_modules/circomlib/circuits/mux1.circom";
+include "../../../node_modules/circomlib/circuits/mux1.circom";
 include "../hasherPoseidon.circom";
 
 template MerkleTreeInclusionProof(n_levels) {

diff --git a/circuits/circom/trees/incrementalQuinTree.circom b/circuits/circom/trees/incrementalQuinTree.circom
@@ -1,6 +1,6 @@
 pragma circom 2.0.0;
-include "../../node_modules/circomlib/circuits/bitify.circom";
-include "../../node_modules/circomlib/circuits/mux1.circom";
+include "../../../node_modules/circomlib/circuits/bitify.circom";
+include "../../../node_modules/circomlib/circuits/mux1.circom";
 include "../hasherPoseidon.circom";
 include "./calculateTotal.circom";
 include "./checkRoot.circom";

diff --git a/circuits/circom/unpackElement.circom b/circuits/circom/unpackElement.circom
@@ -1,5 +1,5 @@
 pragma circom 2.0.0;
-include "../node_modules/circomlib/circuits/bitify.circom";
+include "../../node_modules/circomlib/circuits/bitify.circom";
 
 // Converts a field element (253 bits) to n 50-bit output elements 
 // where n <= 5 and n > 1

diff --git a/circuits/circom/utils.circom b/circuits/circom/utils.circom
@@ -1,5 +1,5 @@
 pragma circom 2.0.0;
-include "../node_modules/circomlib/circuits/bitify.circom";
+include "../../node_modules/circomlib/circuits/bitify.circom";
 
 // the implicit assumption of LessThan is both inputs are at most n bits
 // so we need add range check for both inputs

diff --git a/circuits/circom/verifySignature.circom b/circuits/circom/verifySignature.circom
@@ -1,11 +1,11 @@
 pragma circom 2.0.0;
-include "../node_modules/circomlib/circuits/compconstant.circom";
-include "../node_modules/circomlib/circuits/comparators.circom";
-include "../node_modules/circomlib/circuits/pointbits.circom";
+include "../../node_modules/circomlib/circuits/compconstant.circom";
+include "../../node_modules/circomlib/circuits/comparators.circom";
+include "../../node_modules/circomlib/circuits/pointbits.circom";
 include "./poseidon/poseidonHashT6.circom";
-include "../node_modules/circomlib/circuits/bitify.circom";
-include "../node_modules/circomlib/circuits/escalarmulany.circom";
-include "../node_modules/circomlib/circuits/escalarmulfix.circom";
+include "../../node_modules/circomlib/circuits/bitify.circom";
+include "../../node_modules/circomlib/circuits/escalarmulany.circom";
+include "../../node_modules/circomlib/circuits/escalarmulfix.circom";
 include "./hasherPoseidon.circom";
 
 template EdDSAPoseidonVerifier_patched() {

diff --git a/cli/zkeys.config.yml b/cli/zkeys.config.yml
@@ -3,7 +3,7 @@ out: "./zkeys"
 
 # Make sure that these paths are correct
 circomPath: "../../.local/bin/circom"
-snarkjsPath: "./node_modules/snarkjs/build/cli.cjs"
+snarkjsPath: "../node_modules/snarkjs/build/cli.cjs"
 
 circuits:
   - template: "../circuits/circom/processMessages.circom"

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -44,7 +44,6 @@ RUN cd ~ \
     && cd maci \
     && git checkout ${BRANCH_NAME} \
     && npm i 
-RUN cd ~/maci && npm run bootstrap
 RUN cd ~/maci && npm run build
 RUN cd ~/maci/contracts && npm run compileSol
 

diff --git a/docker/LightDockerfile b/docker/LightDockerfile
@@ -12,7 +12,6 @@ RUN cd $V1_REPO \
     && git checkout $BRANCH_V1 \
     && git fetch && git reset --hard origin/$BRANCH_V1 \
     && npm i
-RUN cd $V1_REPO && npm run bootstrap
 RUN cd $V1_REPO && npm run build
 RUN cd $V1_REPO/contracts && npm run compileSol
 
@@ -21,7 +20,6 @@ RUN cd $V0_REPO \
     && git checkout $BRANCH_V0 \
     && git fetch && git reset --hard origin/$BRANCH_V0 \
     && npm i
-RUN cd $V0_REPO && npm run bootstrap
 RUN cd $V0_REPO && npm run build
 RUN cd $V0_REPO/circuits && ./scripts/buildBatchUpdateStateTreeSnark.sh && ./scripts/buildQuadVoteTallySnark.sh
 RUN cd $V0_REPO/contracts && npm run compileSol

diff --git a/integrationTests/hardhat.config.ts b/integrationTests/hardhat.config.ts
@@ -31,8 +31,8 @@ const config: HardhatUserConfig = {
     },
   },
   paths: {
-    sources: "./node_modules/maci-contracts/contracts",
-    artifacts: "./node_modules/maci-contracts/artifacts",
+    sources: "../node_modules/maci-contracts/contracts",
+    artifacts: "../node_modules/maci-contracts/artifacts",
   },
 };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,4 @@

		# Global:

		* @ctrlc03 @kittybest @0xmad @samajammin
		* @ctrlc03 @kittybest @0xmad @samajammin @crisgarner