Merge remote-tracking branch 'origin/develop' into cohort/clrfund

clrfund · Aug 3, 2023 · a61eef4 · a61eef4
2 parents e748cf5 + e8cdd41
commit a61eef4
Show file tree

Hide file tree

Showing 19 changed files with 276 additions and 143 deletions.
diff --git a/.github/workflows/finalize-round.yml b/.github/workflows/finalize-round.yml
@@ -66,7 +66,7 @@ jobs:
         echo "MACI_START_BLOCK:" $MACI_START_BLOCK
         # tally and finalize
         cd contracts
-        yarn hardhat run --network "${NETWORK}" scripts/tally.ts
+        yarn hardhat tally --round-address "${ROUND_ADDRESS}" --network "${NETWORK}"
         curl --location --request POST 'https://api.pinata.cloud/pinning/pinFileToIPFS' \
           --header "Authorization: Bearer ${{ secrets.PINATA_JWT }}" \
           --form 'file=@"tally.json"'

diff --git a/contracts/package.json b/contracts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@clrfund/contracts",
-  "version": "4.2.4",
+  "version": "4.2.5",
   "license": "GPL-3.0",
   "scripts": {
     "hardhat": "hardhat",
@@ -11,7 +11,7 @@
     "deployTestRound:local": "hardhat run --network localhost scripts/deployTestRound.ts",
     "contribute:local": "hardhat run --network localhost scripts/contribute.ts",
     "vote:local": "hardhat run --network localhost scripts/vote.ts",
-    "tally:local": "hardhat run --network localhost scripts/tally.ts",
+    "tally:local": "hardhat --network localhost tally",
     "finalize:local": "hardhat run --network localhost scripts/finalize.ts",
     "claim:local": "hardhat run --network localhost scripts/claim.ts",
     "test": "hardhat test",

diff --git a/contracts/scripts/tally.ts b/contracts/scripts/tally.ts
diff --git a/contracts/tasks/index.ts b/contracts/tasks/index.ts
@@ -13,3 +13,4 @@ import './mergeAllocations'
 import './setDurations'
 import './deploySponsor'
 import './loadUsers'
+import './tally'