Merge pull request #348 from privacy-scaling-explorations/fix/subgrap…

…h-parsing fix(subgraph): remove call handler and use events for poll init
privacy-scaling-explorations · Sep 18, 2024 · ae1355f · ae1355f
2 parents dc5a31f + c6906b0
commit ae1355f
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 21 deletions.
diff --git a/packages/contracts/contracts/maci/Poll.sol b/packages/contracts/contracts/maci/Poll.sol
@@ -20,6 +20,7 @@ contract Poll is Ownable, BasePoll, ICommon {
 
   /// @notice events
   event SetRegistry(address indexed registry);
+  event PollInit();
 
   /// @notice custom errors
   error RegistryAlreadyInitialized();
@@ -113,6 +114,8 @@ contract Poll is Ownable, BasePoll, ICommon {
   function init() public override onlyOwner isRegistryInitialized {
     initTime = block.timestamp;
     super.init();
+
+    emit PollInit();
   }
 
   /// @inheritdoc BasePoll

diff --git a/packages/subgraph/config/network.json b/packages/subgraph/config/network.json
@@ -1,7 +1,7 @@
 {
   "network": "optimism-sepolia",
-  "maciContractAddress": "0xbE6e250bf8B5F689c65Cc79667589A9EBF6Fe8E3",
-  "registryManagerContractAddress": "0xbE6e250bf8B5F689c65Cc79667589A9EBF6Fe8E3",
-  "registryManagerContractStartBlock": 13160483,
-  "maciContractStartBlock": 13160483
+  "maciContractAddress": "0xac4d16D0541ca7255579b501A2F1D6F3a436521E",
+  "registryManagerContractAddress": "0xed5875D05DebcDdDbd902f471447dA97c6d26d7E",
+  "registryManagerContractStartBlock": 17396799,
+  "maciContractStartBlock": 17396799
 }
diff --git a/packages/subgraph/src/poll.ts b/packages/subgraph/src/poll.ts
@@ -2,10 +2,10 @@
 
 import { Poll, Vote, MACI } from "../generated/schema";
 import {
-  InitCall,
   MergeMaciState as MergeMaciStateEvent,
   MergeMessageAq as MergeMessageAqEvent,
   MergeMessageAqSubRoots as MergeMessageAqSubRootsEvent,
+  PollInit as PollInitEvent,
   PublishMessage as PublishMessageEvent,
   SetRegistry as SetRegistryEvent,
 } from "../generated/templates/Poll/Poll";
@@ -84,13 +84,13 @@ export function handleSetRegistry(event: SetRegistryEvent): void {
   poll.save();
 }
 
-export function handleInitPoll(call: InitCall): void {
-  const poll = Poll.load(call.to);
+export function handleInitPoll(event: PollInitEvent): void {
+  const poll = Poll.load(event.address);
 
   if (!poll) {
     return;
   }
 
-  poll.initTime = call.block.timestamp;
+  poll.initTime = event.block.timestamp;
   poll.save();
 }
diff --git a/packages/subgraph/templates/subgraph.template.yaml b/packages/subgraph/templates/subgraph.template.yaml
@@ -84,8 +84,7 @@ templates:
           handler: handlePublishMessage
         - event: SetRegistry(indexed address)
           handler: handleSetRegistry
-      callHandlers:
-        - function: init()
+        - event: PollInit()
           handler: handleInitPoll
       file: ./src/poll.ts
 

diff --git a/packages/subgraph/tests/poll/poll.test.ts b/packages/subgraph/tests/poll/poll.test.ts
@@ -21,7 +21,7 @@ import {
   createMergeMessageAqSubRootsEvent,
   createPublishMessageEvent,
   createSetRegistryEvent,
-  createInitPollCall,
+  createInitPollEvent,
 } from "./utils";
 
 export {
@@ -49,13 +49,13 @@ describe("Poll", () => {
   });
 
   test("should handle merge maci state properly", () => {
-    const call = createInitPollCall(DEFAULT_POLL_ADDRESS);
+    const event = createInitPollEvent(DEFAULT_POLL_ADDRESS);
 
-    handleInitPoll(call);
+    handleInitPoll(event);
 
-    const poll = Poll.load(call.to)!;
+    const poll = Poll.load(event.address)!;
 
-    assert.fieldEquals("Poll", poll.id.toHex(), "initTime", call.block.timestamp.toString());
+    assert.fieldEquals("Poll", poll.id.toHex(), "initTime", event.block.timestamp.toString());
   });
 
   test("should handle poll initialization properly", () => {

diff --git a/packages/subgraph/tests/poll/utils.ts b/packages/subgraph/tests/poll/utils.ts
@@ -1,21 +1,21 @@
 import { Address, BigInt as GraphBN, ethereum } from "@graphprotocol/graph-ts";
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { newMockEvent, newMockCall } from "matchstick-as";
+import { newMockEvent } from "matchstick-as";
 
 import {
-  InitCall,
   MergeMaciState,
   MergeMessageAq,
   MergeMessageAqSubRoots,
   PublishMessage,
   SetRegistry,
+  PollInit,
 } from "../../generated/templates/Poll/Poll";
 
-export function createInitPollCall(address: Address): InitCall {
-  const call = changetype<InitCall>(newMockCall());
-  call.to = address;
+export function createInitPollEvent(address: Address): PollInit {
+  const event = changetype<PollInit>(newMockEvent());
+  event.address = address;
 
-  return call;
+  return event;
 }
 
 export function createMergeMaciStateEvent(address: Address, stateRoot: GraphBN, numSignups: GraphBN): MergeMaciState {