remove tally script

clrfund · Apr 4, 2024 · 3df43e0 · 3df43e0
1 parent e7df7a8
commit 3df43e0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 361 deletions.
diff --git a/.github/workflows/finalize-round.yml b/.github/workflows/finalize-round.yml
@@ -79,14 +79,22 @@ jobs:
         export BLOCKS_PER_BATCH=${{ github.event.inputs.blocks_per_batch }}
         export RAPID_SNARK="$GITHUB_WORKSPACE/rapidsnark/package/bin/prover"
         export CIRCUIT_DIRECTORY=$GITHUB_WORKSPACE/params
+        export PROOF_OUTPUT_DIR=./proof_output
         # tally and finalize
         cd monorepo/contracts
-        mkdir -p proof_output
-        yarn hardhat tally --clrfund "${CLRFUND_ADDRESS}" --network "${NETWORK}" \
-          --rapidsnark ${RAPID_SNARK} \
-          --circuit-directory ${CIRCUIT_DIRECTORY} \
+        mkdir -p ${PROOF_OUTPUT_DIR}
+        yarn gen-proofs --clrfund "${CLRFUND_ADDRESS}" \
           --blocks-per-batch ${BLOCKS_PER_BATCH} \
-          --maci-tx-hash "${MACI_TX_HASH}" --output-dir "./proof_output"
+          --rapidsnark ${RAPID_SNARK} \
+          --maci-tx-hash "${MACI_TX_HASH}" \
+          --proof-dir ${PROOF_OUTPUT_DIR} \
+          --network "${NETWORK}"
+        yarn hardhat prove-on-chain --clrfund "${CLRFUND_ADDRESS}" \
+          --proof-dir ${PROOF_OUTPUT_DIR} \
+          --network "${NETWORK}"
+        yarn hardhat publish-tally-results --clrfund "${CLRFUND_ADDRESS}" \
+          --proof-dir ${PROOF_OUTPUT_DIR} \
+          --network "${NETWORK}"
         curl --location --request POST 'https://api.pinata.cloud/pinning/pinFileToIPFS' \
           --header "Authorization: Bearer ${{ secrets.PINATA_JWT }}" \
           --form 'file=@"./proof_output/tally.json"'

diff --git a/contracts/.env.example b/contracts/.env.example
@@ -6,7 +6,7 @@ JSONRPC_HTTP_URL=https://eth-goerli.alchemyapi.io/v2/ADD_API_KEY
 WALLET_MNEMONIC=
 WALLET_PRIVATE_KEY=
 
-# The coordinator MACI private key, required by the tally script
+# The coordinator MACI private key, required by the gen-proofs script
 COORDINATOR_MACISK=
 
 # API key used to verify contracts on arbitrum chain (including testnet)

diff --git a/contracts/tasks/index.ts b/contracts/tasks/index.ts
@@ -10,7 +10,6 @@ import './runners/setMaciParameters'
 import './runners/setToken'
 import './runners/setUserRegistry'
 import './runners/setStorageRoot'
-import './runners/tally'
 import './runners/finalize'
 import './runners/claim'
 import './runners/cancel'

diff --git a/contracts/tasks/runners/tally.ts b/contracts/tasks/runners/tally.ts