Merge pull request #585 from gitcoinco/feature/latestMaciContract

VoteOptionIndex event handling
gitcoinco · Jun 20, 2024 · 0e35834 · 0e35834
2 parents 90ef948 + f0aa5a4
commit 0e35834
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 1 deletion.
diff --git a/src/database/changeset.ts b/src/database/changeset.ts
@@ -18,6 +18,7 @@ import {
   NewApplicationPayout,
   NewContribution,
   NewMessage,
+  NewVoteOptionIndex,
 } from "./schema.js";
 
 export type DataChange =
@@ -144,4 +145,8 @@ export type DataChange =
   | {
       type: "InsertMessage";
       message: NewMessage;
+    }
+  | {
+      type: "InsertVoteOptionIndex";
+      voteOptionIndex: NewVoteOptionIndex;
     };
diff --git a/src/database/index.ts b/src/database/index.ts
@@ -16,6 +16,7 @@ import {
   ApplicationPayout,
   ContributionTable,
   MessageTable,
+  VoteOptionIndexTable,
 } from "./schema.js";
 import { migrate } from "./migrate.js";
 import { encodeJsonWithBigInts } from "../utils/index.js";
@@ -41,6 +42,7 @@ interface Tables {
   applicationsPayouts: ApplicationPayout;
   contributions: ContributionTable;
   messages: MessageTable;
+  votingIndexOptions: VoteOptionIndexTable;
 }
 
 type KyselyDb = Kysely<Tables>;
@@ -521,6 +523,14 @@ export class Database {
         break;
       }
 
+      case "InsertVoteOptionIndex": {
+        await this.#db
+          .insertInto("votingIndexOptions")
+          .values(change.voteOptionIndex)
+          .execute();
+        break;
+      }
+
       default:
         throw new Error(`Unknown changeset type`);
     }

diff --git a/src/database/migrate.ts b/src/database/migrate.ts
@@ -339,6 +339,22 @@ export async function migrate<T>(db: Kysely<T>, schemaName: string) {
     )
     .execute();
 
+  await schema
+    .createTable("votingIndexOptions")
+    .addColumn("id", "text") // Unique identifier for each vote option index
+    .addColumn("chainId", CHAIN_ID_TYPE) // Chain ID
+    .addColumn("roundId", ADDRESS_TYPE) // Foreign key to the rounds table
+    .addColumn("optionIndex", "integer") // Option index number
+    .addColumn("recipientId", ADDRESS_TYPE) // Recipient ID
+    .addPrimaryKeyConstraint("vote_option_index_pkey", ["id"])
+    .addForeignKeyConstraint(
+      "vote_option_index_round_fkey",
+      ["chainId", "roundId"],
+      "rounds",
+      ["chainId", "id"]
+    )
+    .execute();
+
   // https://www.graphile.org/postgraphile/smart-tags/
   // https://www.graphile.org/postgraphile/computed-columns/
   await sql`

diff --git a/src/database/schema.ts b/src/database/schema.ts
@@ -285,3 +285,14 @@ export type MACIMessage = {
   msgType: string;
   data: string[];
 };
+
+export type VoteOptionIndexTable = {
+  id: string;
+  chainId: ChainId;
+  roundId: Address | string;
+  optionIndex: number;
+  recipientId: Hex;
+};
+
+export type VoteOptionIndex = Selectable<VoteOptionIndexTable>;
+export type NewVoteOptionIndex = Insertable<VoteOptionIndexTable>;
diff --git a/src/indexer/allo/v2/handleEvent.ts b/src/indexer/allo/v2/handleEvent.ts
@@ -1026,6 +1026,50 @@ export async function handleEvent(
       }
     }
 
+    case "RecipientVotingOptionAdded": {
+      const strategyAddress = parseAddress(event.address);
+      const round = await db.getRoundByStrategyAddress(
+        chainId,
+        strategyAddress
+      );
+
+      if (round === null) {
+        return [];
+      }
+      const recipientId = parseAddress(event.params.recipientId);
+      const optionIndex = Number(event.params.recipientIndex);
+      const id = ethers.utils.solidityKeccak256(
+        ["string"],
+        [`${event.blockNumber}-${round.id}-${chainId}-${recipientId}`]
+      );
+
+      switch (round.strategyName) {
+        case "allov2.MACIQF": {
+          return [
+            {
+              type: "InsertVoteOptionIndex",
+              voteOptionIndex: {
+                chainId,
+                id,
+                roundId: round.id,
+                recipientId,
+                optionIndex,
+              },
+            },
+          ];
+        }
+
+        default: {
+          logger.warn({
+            msg: `Unsupported strategy ${round.strategyName}`,
+            event,
+          });
+
+          return [];
+        }
+      }
+    }
+
     case "SignUp": {
       const maciAddress = parseAddress(event.address);
 

diff --git a/src/indexer/allo/v2/strategy.ts b/src/indexer/allo/v2/strategy.ts
@@ -8,7 +8,7 @@ export function extractStrategyFromId(_id: string): Strategy | null {
   const id = _id.toLowerCase();
   /* eslint-disable no-fallthrough */
   switch (id) {
-    case "0x02ce039501668fadbe8b9ef4030e619cf4eefbc3d70415b61ebdfd3c5d467ad2":
+    case "0x9b167da08fc4d96c2bda5fa376d9c734f55bc41f7b5de98280322597dfb097ed":
       return {
         id: id,
         name: "allov2.MACIQF",