Merge pull request privacy-scaling-explorations#794 from privacy-scal…

…ing-explorations/refactoring/cli

refactoring(cli && tests) - refactoring of the CLI package and integration tests

.github/workflows/circuit-build.yml

@@ -41,9 +41,9 @@ jobs:
           npm run bootstrap
           npm run build
 
-      - name: Download circom Binary v2.1.5
+      - name: Download circom Binary v2.1.6
         run: |
-          wget -qO /home/runner/work/circom https://github.com/iden3/circom/releases/download/v2.1.5/circom-linux-amd64
+          wget -qO /home/runner/work/circom https://github.com/iden3/circom/releases/download/v2.1.6/circom-linux-amd64
           chmod +x /home/runner/work/circom
           sudo mv /home/runner/work/circom /bin/circom
 

.github/workflows/nightly.yml

@@ -13,10 +13,10 @@ jobs:
         with:
           ref: dev
 
-      - name: Use Node.js 16
+      - name: Use Node.js 20
         uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Install dependencies
         run: |
@@ -38,6 +38,7 @@ jobs:
         run: |
           cd contracts
           npm run compileSol
+          npm run hardhat &
 
       - name: Download rapidsnark (1c137)
         run: |
@@ -59,16 +60,12 @@ jobs:
           npx zkey-manager compile -c ./zkeys.config.yml
           npx zkey-manager genZkeys -c ./zkeys.config.yml
 
-      - name: Start Hardhat
+      - name: e2e Tests
         run: |
-          cd contracts
-          nohup npm run hardhat > /dev/null 2>&1 &
-          while [[ "$(lsof -i :8545)" -eq '0' ]]; do sleep 1; done
-
-      - name: Bespoke Test
-        run: ./.github/scripts/run-e2e-tests.sh
+          cd cli 
+          npm run test
 
-      - name: Integration Test
+      - name: Integration Tests
         run: |
           cd integrationTests
           npm run test

.github/workflows/release.yml

@@ -23,10 +23,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Use Node.js 18
+      - name: Use Node.js 20
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           registry-url: "https://registry.npmjs.org"
 
       - name: Initialize Project

.github/workflows/reusable-e2e.yml

@@ -10,10 +10,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Use Node.js 16
+      - name: Use Node.js 20
         uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
       # Check for changes in the 'circuit' folder
       - name: Get changed files
@@ -63,10 +63,10 @@ jobs:
           wget -qO ~/rapidsnark/build/prover https://maci-devops-zkeys.s3.ap-northeast-2.amazonaws.com/rapidsnark-linux-amd64-1c137
           chmod +x ~/rapidsnark/build/prover
 
-      - name: Download circom Binary v2.0.8
+      - name: Download circom Binary v2.1.6
         run: |
           mkdir -p /home/runner/work/maci/.local/bin
-          wget -qO /home/runner/work/maci/.local/bin/circom https://github.com/iden3/circom/releases/download/v2.0.8/circom-linux-amd64
+          wget -qO /home/runner/work/maci/.local/bin/circom https://github.com/iden3/circom/releases/download/v2.1.6/circom-linux-amd64
           chmod +x /home/runner/work/maci/.local/bin/circom
 
       - name: Generate zkeys
@@ -85,7 +85,9 @@ jobs:
           npm run download-zkeys
 
       - name: Bespoke Test
-        run: ./.github/scripts/run-e2e-tests.sh
+        run: |
+          cd cli
+          npm run test
 
       - name: Integration Test
         run: |

.gitignore

@@ -145,8 +145,8 @@ typings/
 cli/output.json
 cli/processinput.json
 cli/tallyinput.json
-**/contractAddress.txt
-**/contractAddress.old
+cli/contractAddresses.json
+cli/contractAddresses.old.json
 
 # mdBook rendered files
 publish