feat: add deploySubsidy arg

privacy-scaling-explorations · Jan 11, 2024 · e510d81 · e510d81
1 parent 4b903ec
commit e510d81
Show file tree

Hide file tree

Showing 41 changed files with 8,355 additions and 28,812 deletions.
diff --git a/.github/scripts/ceremony-param-tests-c-witness.sh b/.github/scripts/ceremony-param-tests-c-witness.sh
@@ -18,7 +18,7 @@ HARDHAT_CONFIG=./build/hardhat.config.js node build/ts/index.js setVerifyingKeys
 HARDHAT_CONFIG=./build/hardhat.config.js node build/ts/index.js create -s 6 -q true
 HARDHAT_CONFIG=./build/hardhat.config.js node build/ts/index.js deployPoll \
     -pk macipk.ea638a3366ed91f2e955110888573861f7c0fc0bb5fb8b8dca9cd7a08d7d6b93 \
-    --duration 30 \
+    --duration 300 \
     --max-messages 390625 \
     --max-vote-options 125 \
     --int-state-tree-depth 2 \
@@ -47,7 +47,7 @@ HARDHAT_CONFIG=./build/hardhat.config.js node build/ts/index.js publish \
     --nonce 2 \
     --poll-id 0 \
     -q true
-HARDHAT_CONFIG=./build/hardhat.config.js node build/ts/index.js timeTravel -s 100 -q true
+HARDHAT_CONFIG=./build/hardhat.config.js node build/ts/index.js timeTravel -s 300 -q true
 HARDHAT_CONFIG=./build/hardhat.config.js node build/ts/index.js mergeSignups --poll-id 0 -q true
 HARDHAT_CONFIG=./build/hardhat.config.js node build/ts/index.js mergeMessages --poll-id 0 -q true
 HARDHAT_CONFIG=./build/hardhat.config.js node build/ts/index.js genProofs \

diff --git a/.github/workflows/contracts-build.yml b/.github/workflows/contracts-build.yml
@@ -31,10 +31,6 @@ jobs:
           npm run bootstrap
           npm run build
 
-      - name: Compile Solidity
-        run: npm run compileSol
-        working-directory: contracts
-
       - name: Test
         run: npm run test
         working-directory: contracts
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -5,6 +5,9 @@ on:
     branches: [master, dev]
   pull_request:
 
+env:
+  STATE_TREE_DEPTH: ${{ vars.STATE_TREE_DEPTH }}
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
@@ -30,18 +33,13 @@ jobs:
       - name: Initialize Project
         run: |
           npm install
-          npx lerna bootstrap
+          npm run bootstrap
           npm run build
 
-      - name: Compile Contracts
-        run: |
-          cd contracts
-          npm run compileSol
-
       - name: Publish Project
         run: |
           # Prevent `git commit error` when running `lerna version`
-          # It will not pushed to GitHub. It is ephemeral
+          # It creates an ephemeral commit that will not be pushed to GitHub
           git config --global user.email "you@example.com"
           git config --global user.name "Your Name"
 

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Use Node.js 20
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           registry-url: "https://registry.npmjs.org"

diff --git a/.github/workflows/nightly-ceremony.yml b/.github/workflows/nightly-ceremony.yml
@@ -4,6 +4,9 @@ on:
   schedule:
     - cron: 0 0 * * *
 
+env:
+  STATE_TREE_DEPTH: ${{ vars.STATE_TREE_DEPTH }}
+
 jobs:
   test-with-ceremony-keys:
     runs-on: ubuntu-22.04
@@ -34,10 +37,9 @@ jobs:
           npm run bootstrap
           npm run build
 
-      - 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 +55,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
@@ -4,6 +4,9 @@ on:
   push:
     tags: ["*"]
 
+env:
+  STATE_TREE_DEPTH: ${{ vars.STATE_TREE_DEPTH }}
+
 jobs:
   draft-release:
     runs-on: ubuntu-22.04
@@ -33,7 +36,7 @@ jobs:
         run: |
           git config --global url."https://github.com/".insteadOf git://github.com/
           npm install
-          npx lerna bootstrap
+          npm run bootstrap
           npm run build
 
       - name: Publish NPM

diff --git a/circuits/package-lock.json b/circuits/package-lock.json
diff --git a/circuits/package.json b/circuits/package.json
@@ -34,11 +34,11 @@
   "devDependencies": {
     "@types/chai": "^4.3.11",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^18.11.9",
+    "@types/node": "^20.10.8",
     "chai": "^4.3.10",
     "circom_tester": "^0.0.20",
     "mocha": "^10.2.0",
     "ts-mocha": "^10.0.0",
-    "typescript": "^5.3.2"
+    "typescript": "^5.3.3"
   }
 }
diff --git a/circuits/ts/__tests__/utils/constants.ts b/circuits/ts/__tests__/utils/constants.ts
@@ -1 +1,2 @@
 export const STATE_TREE_DEPTH = 10;
+export const STATE_TREE_ARITY = 5;
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export const STATE_TREE_DEPTH = 10;
		export const STATE_TREE_ARITY = 5;