Merge pull request #984 from privacy-scaling-explorations/deps/ceremo…

…ny-deployment chore(publish): fix publishing scripts to publish contracts with ceremony params
privacy-scaling-explorations · Jan 10, 2024 · e45c136 · e45c136
2 parents a307e27 + f27af1c
commit e45c136
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -30,8 +30,10 @@ jobs:
       - name: Initialize Project
         run: |
           npm install
-          npx lerna bootstrap
+          npm run bootstrap
           npm run build
+        env:
+          STATE_TREE_DEPTH: ${{ vars.STATE_TREE_DEPTH }}
 
       - name: Compile Contracts
         run: |

diff --git a/.github/workflows/nightly-ceremony.yml b/.github/workflows/nightly-ceremony.yml
@@ -33,11 +33,12 @@ jobs:
           npm install
           npm run bootstrap
           npm run build
+        env:
+          STATE_TREE_DEPTH: 6
 
-      - name: Compile contracts with ceremony params and run hardhat fork
+      - name: Run hardhat fork
         run: |
           cd contracts
-          npm run compileSol 6
           npm run hardhat &
 
       - name: Download rapidsnark (1c137)
@@ -53,4 +54,5 @@ jobs:
         run: ./.github/scripts/ceremony-param-tests-c-witness.sh
 
       - name: Stop Hardhat
+        if: always()
         run: kill $(lsof -t -i:8545)
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -68,6 +68,7 @@ jobs:
         run: npm run ${{ matrix.command }}
 
       - name: Stop Hardhat
+        if: always()
         run: kill $(lsof -t -i:8545)
 
   unit:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,8 +33,10 @@ jobs:
         run: |
           git config --global url."https://github.com/".insteadOf git://github.com/
           npm install
-          npx lerna bootstrap
+          npm run bootstrap
           npm run build
+        env:
+          STATE_TREE_DEPTH: ${{ vars.STATE_TREE_DEPTH }}
 
       - name: Publish NPM
         run: |

diff --git a/contracts/scripts/compileSol.sh b/contracts/scripts/compileSol.sh
@@ -15,7 +15,7 @@ echo 'Writing Merkle zeros contracts'
 ./scripts/writeMerkleZeroesContracts.sh 
 
 echo 'Writing empty ballot tree root contract'
-./scripts/writeEmptyBallotRoots.sh $1
+./scripts/writeEmptyBallotRoots.sh
 
 echo 'Building contracts with Hardhat'
 npx hardhat compile

diff --git a/contracts/scripts/writeEmptyBallotRoots.sh b/contracts/scripts/writeEmptyBallotRoots.sh
@@ -4,5 +4,4 @@ set -e
 cd "$(dirname "$0")"
 cd ..
 
-# take the stateTreeDepth as cli arg
-npx ts-node ts/genEmptyBallotRootsContract.ts $1 > contracts/trees/EmptyBallotRoots.sol
+npx ts-node ts/genEmptyBallotRootsContract.ts > contracts/trees/EmptyBallotRoots.sol
diff --git a/contracts/ts/genEmptyBallotRootsContract.ts b/contracts/ts/genEmptyBallotRootsContract.ts
@@ -10,7 +10,7 @@ const genEmptyBallotRootsContract = (): string => {
     .toString();
 
   // This hard-coded value should be consistent with the value of `stateTreeDepth` of MACI.sol
-  const stateTreeDepth = process.argv[2] ? Number.parseInt(process.argv[2], 10) : 10;
+  const stateTreeDepth = process.env.STATE_TREE_DEPTH ? Number.parseInt(process.env.STATE_TREE_DEPTH, 10) : 10;
 
   let r = "";
   for (let i = 1; i < 6; i += 1) {