chore: use non-zero start and end blocks for proof generation

- [x] Update maci-contracts task - [x] Update maci-cli task - [x] Add indexed params for poll events - [x] Change deploy config example maci public key
privacy-scaling-explorations · Apr 1, 2024 · 7f6f059 · 7f6f059
1 parent 23237c3
commit 7f6f059
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 23 deletions.
diff --git a/cli/ts/commands/genProofs.ts b/cli/ts/commands/genProofs.ts
@@ -240,10 +240,23 @@ export const genProofs = async ({
     }
   } else {
     // build an off-chain representation of the MACI contract using data in the contract storage
-    let fromBlock = startBlock ? Number(startBlock) : 0;
+    const defaultStartBlockSignup = await maciContract
+      .queryFilter(maciContract.filters.SignUp())
+      .then((events) => events[0]?.blockNumber ?? 0);
+    const defaultStartBlockPoll = await maciContract
+      .queryFilter(maciContract.filters.DeployPoll())
+      .then((events) => events[0]?.blockNumber ?? 0);
+    const defaultStartBlock = Math.min(defaultStartBlockPoll, defaultStartBlockSignup);
+    let fromBlock = startBlock ? Number(startBlock) : defaultStartBlock;
+
+    const root = await messageAqContract.getMainRoot(messageTreeDepth);
+    const defaultEndBlock = await pollContract
+      .queryFilter(pollContract.filters.MergeMessageAq(root), fromBlock)
+      .then((events) => events[events.length - 1]?.blockNumber);
+
     if (transactionHash) {
       const tx = await signer.provider!.getTransaction(transactionHash);
-      fromBlock = tx?.blockNumber ?? 0;
+      fromBlock = tx?.blockNumber ?? defaultStartBlock;
     }
 
     logYellow(quiet, info(`starting to fetch logs from block ${fromBlock}`));
@@ -254,7 +267,7 @@ export const genProofs = async ({
       pollId,
       fromBlock,
       blocksPerBatch,
-      endBlock,
+      endBlock || defaultEndBlock,
     );
   }
 

diff --git a/contracts/contracts/Poll.sol b/contracts/contracts/Poll.sol
@@ -75,10 +75,10 @@ contract Poll is Params, Utilities, SnarkCommon, Ownable, EmptyBallotRoots, IPol
 
   event PublishMessage(Message _message, PubKey _encPubKey);
   event TopupMessage(Message _message);
-  event MergeMaciStateAqSubRoots(uint256 _numSrQueueOps);
-  event MergeMaciStateAq(uint256 _stateRoot, uint256 _numSignups);
-  event MergeMessageAqSubRoots(uint256 _numSrQueueOps);
-  event MergeMessageAq(uint256 _messageRoot);
+  event MergeMaciStateAqSubRoots(uint256 indexed _numSrQueueOps);
+  event MergeMaciStateAq(uint256 indexed _stateRoot, uint256 indexed _numSignups);
+  event MergeMessageAqSubRoots(uint256 indexed _numSrQueueOps);
+  event MergeMessageAq(uint256 indexed _messageRoot);
 
   /// @notice Each MACI instance can have multiple Polls.
   /// When a Poll is deployed, its voting period starts immediately.

diff --git a/contracts/deploy-config-example.json b/contracts/deploy-config-example.json
@@ -28,7 +28,7 @@
     },
     "Poll": {
       "pollDuration": 30,
-      "coordinatorPubkey": "macipk.ea638a3366ed91f2e955110888573861f7c0fc0bb5fb8b8dca9cd7a08d7d6b93",
+      "coordinatorPubkey": "macipk.9a59264310d95cfd8eb7083aebeba221b5c26e77427f12b7c0f50bc1cc35e621",
       "subsidyEnabled": false,
       "useQuadraticVoting": true
     }

diff --git a/contracts/tasks/helpers/ProofGenerator.ts b/contracts/tasks/helpers/ProofGenerator.ts
@@ -80,7 +80,9 @@ export class ProofGenerator {
    * @returns {MaciState} maci state
    */
   static async prepareState({
-    maciContractAddress,
+    maciContract,
+    pollContract,
+    messageAq,
     pollId,
     maciPrivateKey,
     coordinatorKeypair,
@@ -101,23 +103,38 @@ export class ProofGenerator {
     }
 
     // build an off-chain representation of the MACI contract using data in the contract storage
-    let fromBlock = startBlock ? Number(startBlock) : 0;
+    const defaultStartBlockSignup = await maciContract
+      .queryFilter(maciContract.filters.SignUp())
+      .then((events) => events[0]?.blockNumber ?? 0);
+    const defaultStartBlockPoll = await maciContract
+      .queryFilter(maciContract.filters.DeployPoll())
+      .then((events) => events[0]?.blockNumber ?? 0);
+    const defaultStartBlock = Math.min(defaultStartBlockPoll, defaultStartBlockSignup);
+    let fromBlock = startBlock ? Number(startBlock) : defaultStartBlock;
+
+    const { messageTreeDepth } = await pollContract.treeDepths();
+    const root = await messageAq.getMainRoot(messageTreeDepth);
+    const defaultEndBlock = await pollContract
+      .queryFilter(pollContract.filters.MergeMessageAq(root), fromBlock)
+      .then((events) => events[events.length - 1]?.blockNumber);
 
     if (transactionHash) {
       const tx = await signer.provider!.getTransaction(transactionHash);
-      fromBlock = tx?.blockNumber ?? 0;
+      fromBlock = tx?.blockNumber ?? defaultEndBlock;
     }
 
     console.log(`starting to fetch logs from block ${fromBlock}`);
 
+    const maciContractAddress = await maciContract.getAddress();
+
     return genMaciStateFromContract(
       signer.provider!,
       maciContractAddress,
       coordinatorKeypair,
       BigInt(pollId),
       fromBlock,
       blocksPerBatch,
-      endBlock,
+      endBlock || defaultEndBlock,
     );
   }
 

diff --git a/contracts/tasks/helpers/types.ts b/contracts/tasks/helpers/types.ts
@@ -255,9 +255,19 @@ export interface ICircuitFiles {
  */
 export interface IPrepareStateParams {
   /**
-   * MACI contract address
+   * MACI contract
    */
-  maciContractAddress: string;
+  maciContract: MACI;
+
+  /**
+   * Poll contract
+   */
+  pollContract: Poll;
+
+  /**
+   * MessageAq contract
+   */
+  messageAq: AccQueue;
 
   /**
    * Poll id

diff --git a/contracts/tasks/runner/prove.ts b/contracts/tasks/runner/prove.ts
@@ -6,18 +6,18 @@ import { Keypair, PrivKey } from "maci-domainobjs";
 import fs from "fs";
 
 import type { Proof } from "../../ts/types";
-
-import {
-  type VkRegistry,
-  type Subsidy,
-  type Verifier,
-  type MACI,
-  type Poll,
-  type AccQueue,
+import type {
+  VkRegistry,
+  Subsidy,
+  Verifier,
+  MACI,
+  Poll,
+  AccQueue,
   MessageProcessor,
   Tally,
   TallyNonQv,
 } from "../../typechain-types";
+
 import { ContractStorage } from "../helpers/ContractStorage";
 import { Deployment } from "../helpers/Deployment";
 import { ProofGenerator } from "../helpers/ProofGenerator";
@@ -102,6 +102,11 @@ task("prove", "Command to generate proof and prove the result of a poll on-chain
 
       const pollAddress = await maciContract.polls(poll);
       const pollContract = await deployment.getContract<Poll>({ name: EContracts.Poll, address: pollAddress });
+      const messageAqAddress = await pollContract.extContracts().then((contracts) => contracts.messageAq);
+      const messageAq = await deployment.getContract<AccQueue>({
+        name: EContracts.AccQueue,
+        address: messageAqAddress,
+      });
 
       const [, messageAqContractAddress] = await pollContract.extContracts();
       const messageAqContract = await deployment.getContract<AccQueue>({
@@ -125,7 +130,9 @@ task("prove", "Command to generate proof and prove the result of a poll on-chain
       }
 
       const maciState = await ProofGenerator.prepareState({
-        maciContractAddress,
+        maciContract,
+        pollContract,
+        messageAq,
         maciPrivateKey,
         coordinatorKeypair,
         pollId: poll,