update MACI to 0.0.0-ci.09b7fe7 and use temporary zk params for testing

.github/scripts/download-6-8-2-3.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
 set -e
 
-BASE_URL="https://maci-zkeys.s3.amazonaws.com/v1.1.0/6-8-2-3"
+# TODO: replace this with params from public ceremony
+BASE_URL="https://maci-zkeys.s3.amazonaws.com/v1.1.2/6-8-2-3"
 PKGS="maci-zkeys-6-8-2-3.tar.gz"
 
-mkdir -p params
-cd params
-
-
 for p in $PKGS
 do
   url="$BASE_URL/$p"
@@ -19,6 +16,3 @@ do
     tar -zxvf $p
   fi
 done
-
-mv zkeys/* .
-rm -rf zkeys

common/package.json

@@ -22,9 +22,9 @@
   },
   "dependencies": {
     "@openzeppelin/merkle-tree": "^1.0.5",
-    "ethers": "^6.9.2",
-    "maci-crypto": "0.0.0-ci.da1e442",
-    "maci-domainobjs": "0.0.0-ci.da1e442"
+    "ethers": "^6.11.1",
+    "maci-crypto": "0.0.0-ci.09b7fe7",
+    "maci-domainobjs": "0.0.0-ci.09b7fe7"
   },
   "repository": {
     "type": "git",

common/src/utils.ts

@@ -1,4 +1,3 @@
-import { id } from 'ethers'
 import {
   genTreeCommitment as genTallyResultCommitment,
   genRandomSalt,

contracts/e2e/index.ts

@@ -1,8 +1,7 @@
 import { ethers, config } from 'hardhat'
-import { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers'
 import { time, mine } from '@nomicfoundation/hardhat-network-helpers'
 import { expect } from 'chai'
-import { BaseContract, Contract, toNumber } from 'ethers'
+import { BaseContract, Contract, toNumber, Signer } from 'ethers'
 import {
   Keypair,
   createMessage,
@@ -32,14 +31,17 @@ import {
   addTallyResultsBatch,
   getRecipientClaimData,
   getGenProofArgs,
+  TallyData,
 } from '../utils/maci'
 import { DEFAULT_CIRCUIT } from '../utils/circuits'
 import { MaciParameters } from '../utils/maciParameters'
-import { readFileSync, existsSync, mkdirSync } from 'fs'
+import { existsSync, mkdirSync } from 'fs'
 import path from 'path'
 import { FundingRound } from '../typechain-types'
+import { JSONFile } from '../utils/JSONFile'
 
 type VoteData = { recipientIndex: number; voiceCredits: bigint }
+type ClaimData = { [index: number]: bigint }
 
 const ZERO = BigInt(0)
 // funding round duration
@@ -115,14 +117,14 @@ describe('End-to-end Tests', function () {
 
   let maciTransactionHash: string
 
-  let deployer: HardhatEthersSigner
-  let coordinator: HardhatEthersSigner
-  let poolContributor1: HardhatEthersSigner
-  let poolContributor2: HardhatEthersSigner
-  let recipient1: HardhatEthersSigner
-  let recipient2: HardhatEthersSigner
-  let recipient3: HardhatEthersSigner
-  let contributors: HardhatEthersSigner[]
+  let deployer: Signer
+  let coordinator: Signer
+  let poolContributor1: Signer
+  let poolContributor2: Signer
+  let recipient1: Signer
+  let recipient2: Signer
+  let recipient3: Signer
+  let contributors: Signer[]
 
   let poseidonLibraries: { [key: string]: string }
   let userRegistry: Contract
@@ -207,8 +209,9 @@ describe('End-to-end Tests', function () {
     // Configure factory
     await clrfund.setToken(token.target)
     coordinatorKeypair = new Keypair()
+    const coordinatorAddress = await coordinator.getAddress()
     await clrfund.setCoordinator(
-      coordinator.address,
+      coordinatorAddress,
       coordinatorKeypair.pubKey.asContractParam()
     )
 
@@ -331,14 +334,17 @@ describe('End-to-end Tests', function () {
     return { tallyAddress, messageProcessorAddress }
   }
 
-  async function finalizeRound(testResetTally = false): Promise<any> {
+  async function finalizeRound(
+    testResetTally = false
+  ): Promise<{ tally: TallyData; claims: ClaimData }> {
     debugLog('Finalizing round')
     // Process messages and tally votes
     const maciAddress = await maci.getAddress()
     await mergeMaciSubtrees({
       maciAddress,
       pollId,
       numQueueOps: DEFAULT_SR_QUEUE_OPS,
+      signer: coordinator,
     })
     debugLog('Merged MACI trees')
 
@@ -359,6 +365,7 @@ describe('End-to-end Tests', function () {
       outputDir,
       blocksPerBatch: DEFAULT_GET_LOG_BATCH_SIZE,
       maciTxHash: maciTransactionHash,
+      signer: coordinator,
       quiet,
     })
 
@@ -378,6 +385,7 @@ describe('End-to-end Tests', function () {
       maciAddress,
       messageProcessorAddress,
       tallyAddress,
+      signer: coordinator,
       quiet,
     })
 
@@ -397,12 +405,13 @@ describe('End-to-end Tests', function () {
         maciAddress,
         messageProcessorAddress,
         tallyAddress,
+        signer: coordinator,
         quiet,
       })
     }
     console.log('finished proveOnChain')
 
-    const tally = JSON.parse(readFileSync(genProofArgs.tallyFile).toString())
+    const tally = JSONFile.read(genProofArgs.tallyFile) as TallyData
     const tallyHash = await getIpfsHash(tally)
     await (fundingRound.connect(coordinator) as Contract).publishTallyHash(
       tallyHash
@@ -422,13 +431,13 @@ describe('End-to-end Tests', function () {
 
     const newResultCommitment = genTallyResultCommitment(
       tally.results.tally.map((x: string) => BigInt(x)),
-      tally.results.salt,
+      BigInt(tally.results.salt),
       recipientTreeDepth
     )
 
     const perVOSpentVoiceCreditsCommitment = genTallyResultCommitment(
       tally.perVOSpentVoiceCredits.tally.map((x: string) => BigInt(x)),
-      tally.perVOSpentVoiceCredits.salt,
+      BigInt(tally.perVOSpentVoiceCredits.salt),
       recipientTreeDepth
     )
 
@@ -442,7 +451,7 @@ describe('End-to-end Tests', function () {
     )
 
     // Claim funds
-    const claims: { [index: number]: bigint } = {}
+    const claims: ClaimData = {}
     for (const recipientIndex of [1, 2]) {
       const recipient = recipientIndex === 1 ? recipient1 : recipient2
 
@@ -460,7 +469,7 @@ describe('End-to-end Tests', function () {
         'FundsClaimed',
         '_amount'
       )
-      claims[recipientIndex] = claimedAmount
+      claims[recipientIndex] = BigInt(claimedAmount)
     }
     return { tally, claims }
   }
@@ -532,8 +541,8 @@ describe('End-to-end Tests', function () {
       )
     )
     console.log('expected claim', claims[1], expectedClaims[0])
-    expect(BigInt(claims[1])).to.equal(expectedClaims[0])
-    expect(BigInt(claims[2])).to.equal(expectedClaims[1])
+    expect(claims[1]).to.equal(expectedClaims[0])
+    expect(claims[2]).to.equal(expectedClaims[1])
   })
 
   it('should allocate funds correctly if not all voice credits are spent', async () => {
@@ -656,8 +665,8 @@ describe('End-to-end Tests', function () {
       [voiceCredits1, contribution2.voiceCredits],
     ]
     const expectedTally = tallyVotes(submittedVoiceCredits)
-    expect(tally.results.tally[1]).to.equal(expectedTally[0])
-    expect(tally.results.tally[2]).to.equal(expectedTally[1])
+    expect(BigInt(tally.results.tally[1])).to.equal(expectedTally[0])
+    expect(BigInt(tally.results.tally[2])).to.equal(expectedTally[1])
     const expectedClaims = await calculateClaims(
       fundingRound,
       submittedVoiceCredits
@@ -734,7 +743,7 @@ describe('End-to-end Tests', function () {
     ]
     const expectedTally = tallyVotes(submittedVoiceCredits)
     expect(tally.results.tally[1]).to.equal('0')
-    expect(tally.results.tally[2]).to.equal(expectedTally[0])
+    expect(BigInt(tally.results.tally[2])).to.equal(expectedTally[0])
     const expectedClaims = await calculateClaims(
       fundingRound,
       submittedVoiceCredits
@@ -821,8 +830,8 @@ describe('End-to-end Tests', function () {
     ]
     const expectedTally = tallyVotes(submittedVoiceCredits)
 
-    expect(tally.results.tally[1]).to.equal(expectedTally[0])
-    expect(tally.results.tally[2]).to.equal(expectedTally[1])
+    expect(BigInt(tally.results.tally[1])).to.equal(expectedTally[0])
+    expect(BigInt(tally.results.tally[2])).to.equal(expectedTally[1])
     expect(tally.results.tally[3]).to.equal('0')
 
     const expectedClaims = await calculateClaims(
@@ -1010,7 +1019,7 @@ describe('End-to-end Tests', function () {
       )
     )
     console.log('expected claim', claims[1], expectedClaims[0])
-    expect(BigInt(claims[1])).to.equal(expectedClaims[0])
-    expect(BigInt(claims[2])).to.equal(expectedClaims[1])
+    expect(claims[1]).to.equal(expectedClaims[0])
+    expect(claims[2]).to.equal(expectedClaims[1])
   })
 })

contracts/package.json

@@ -17,7 +17,7 @@
   "dependencies": {
     "@openzeppelin/contracts": "4.9.0",
     "dotenv": "^8.2.0",
-    "maci-contracts": "0.0.0-ci.da1e442",
+    "maci-contracts": "0.0.0-ci.09b7fe7",
     "solidity-rlp": "2.0.8"
   },
   "devDependencies": {
@@ -33,14 +33,14 @@
     "@typechain/ethers-v6": "^0.5.1",
     "@typechain/hardhat": "^9.1.0",
     "@types/mocha": "^10.0.6",
-    "ethers": "^6.10.0",
+    "ethers": "^6.11.1",
     "hardhat": "^2.19.4",
     "hardhat-contract-sizer": "^2.10.0",
     "hardhat-gas-reporter": "^1.0.8",
     "ipfs-only-hash": "^2.0.1",
-    "maci-circuits": "0.0.0-ci.da1e442",
-    "maci-cli": "0.0.0-ci.da1e442",
-    "maci-domainobjs": "0.0.0-ci.da1e442",
+    "maci-circuits": "0.0.0-ci.09b7fe7",
+    "maci-cli": "0.0.0-ci.09b7fe7",
+    "maci-domainobjs": "0.0.0-ci.09b7fe7",
     "mocha": "^10.2.0",
     "solidity-coverage": "^0.8.1",
     "ts-node": "^10.9.2",

contracts/tasks/clrTally.ts

@@ -257,6 +257,7 @@ task('clr-tally', 'Tally votes')
         maciAddress,
         pollId,
         numQueueOps,
+        signer: coordinator,
         quiet,
       })
 
@@ -272,6 +273,7 @@ task('clr-tally', 'Tally votes')
             ethereumProvider: providerUrl,
             transactionHash: maciTxHash,
             blockPerBatch: blocksPerBatch,
+            signer: coordinator,
             sleep,
           })
         }
@@ -287,6 +289,7 @@ task('clr-tally', 'Tally votes')
           blocksPerBatch: getNumber(blocksPerBatch),
           maciTxHash,
           maciStateFile: outputPath,
+          signer: coordinator,
           quiet,
         })
         await genProofs(genProofArgs)
@@ -305,6 +308,7 @@ task('clr-tally', 'Tally votes')
         maciAddress,
         messageProcessorAddress,
         tallyAddress,
+        signer: coordinator,
         quiet,
       })
 

contracts/utils/circuits.ts

@@ -38,10 +38,10 @@ export type CircuitInfo = {
 
 export const CIRCUITS: { [name: string]: CircuitInfo } = {
   micro: {
-    processMessagesZkey: 'processmessages_6-8-2-3_final.zkey',
-    processWitness: 'processMessages_6-8-2-3_test',
-    processWasm: 'processmessages_6-8-2-3.wasm',
-    processDatFile: 'processMessages_6-8-2-3_test.dat',
+    processMessagesZkey: 'ProcessMessages_6-8-2-3_test.0.zkey',
+    processWitness: 'ProcessMessages_6-8-2-3_test',
+    processWasm: 'ProcessMessages_6-8-2-3_test.wasm',
+    processDatFile: 'ProcessMessages_6-8-2-3_test.dat',
     tallyVotesZkey: 'tallyvotes_6-2-3_final.zkey',
     tallyWitness: 'tallyVotes_6-2-3_test',
     tallyWasm: 'tallyvotes_6-2-3.wasm',

contracts/utils/maci.ts

@@ -10,6 +10,7 @@ import {
   LEAVES_PER_NODE,
   genTallyResultCommitment,
   Keypair,
+  Tally as TallyData,
 } from '@clrfund/common'
 import * as os from 'os'
 import {
@@ -20,7 +21,6 @@ import {
   GenProofsArgs,
   genLocalState,
   verify,
-  TallyData,
 } from 'maci-cli'
 
 import { getTalyFilePath, isPathExist } from './misc'
@@ -183,6 +183,8 @@ type getGenProofArgsInput = {
   endBlock?: number
   // MACI state file
   maciStateFile?: string
+  // transaction signer
+  signer: Signer
   // flag to turn on verbose logging in MACI cli
   quiet?: boolean
 }
@@ -204,6 +206,7 @@ export function getGenProofArgs(args: getGenProofArgsInput): GenProofsArgs {
     startBlock,
     endBlock,
     maciStateFile,
+    signer,
     quiet,
   } = args
 
@@ -237,6 +240,7 @@ export function getGenProofArgs(args: getGenProofArgsInput): GenProofsArgs {
       startBlock,
       endBlock,
       stateFile: maciStateFile,
+      signer,
       quiet,
     }
   } else {
@@ -267,6 +271,7 @@ export function getGenProofArgs(args: getGenProofArgsInput): GenProofsArgs {
       startBlock,
       endBlock,
       stateFile: maciStateFile,
+      signer,
       quiet,
     }
   }
@@ -289,7 +294,7 @@ export async function mergeMaciSubtrees({
 }: {
   maciAddress: string
   pollId: bigint
-  signer?: Signer
+  signer: Signer
   numQueueOps?: string
   quiet?: boolean
 }) {

contracts/utils/types.ts

@@ -115,12 +115,3 @@ export type RoundFileContent = {
   projects: Project[]
   tally: any
 }
-
-export type Tally = {
-  results: {
-    tally: string[]
-  }
-  totalVoiceCreditsPerVoteOption: {
-    tally: string[]
-  }
-}

vue-app/package.json

@@ -34,7 +34,7 @@
     "@walletconnect/modal": "^2.6.0",
     "crypto-js": "^4.1.1",
     "ethereum-blockies-base64": "^1.0.2",
-    "ethers": "^6.9.2",
+    "ethers": "^6.11.1",
     "floating-vue": "^2.0.0-beta.20",
     "google-spreadsheet": "^3.3.0",
     "graphql": "^16.6.0",