feat: Voting machine address depends on proposal (#89)

* feat: add voting machine address handling

* chore: update @bgd-labs/aave-address-book to version 4.17.2

Author: isArlekin

package.json

@@ -46,7 +46,7 @@
     "viem": "^2"
   },
   "devDependencies": {
-    "@bgd-labs/aave-address-book": "^4.12.0",
+    "@bgd-labs/aave-address-book": "^4.17.2",
     "@bgd-labs/js-utils": "^1.4.7",
     "@bgd-labs/rpc-env": "^2.3.1",
     "@types/lodash": "^4.17.15",

src/scripts/parse-cache.ts

@@ -53,6 +53,39 @@ import { createViemClient } from './createClient';
 
 const initDirName = `ui/${coreName}`;
 
+export const PROPOSAL_ID_THRESHOLD = 272;
+
+const VOTING_MACHINE_ADDRESSES: Record<
+  number,
+  { oldAddress: Address; newAddress: Address }
+> = {
+  1: {
+    oldAddress: '0x617332a777780F546261247F621051d0b98975Eb' as Address,
+    newAddress: '0x06a1795a88b82700896583e123F46BE43877bFb6' as Address,
+  },
+  137: {
+    oldAddress: '0xc8a2ADC4261c6b669CdFf69E717E77C9cFeB420d' as Address,
+    newAddress: '0x44c8b753229006A8047A05b90379A7e92185E97C' as Address,
+  },
+  43114: {
+    oldAddress: '0x9b6f5ef589A3DD08670Dd146C11C4Fb33E04494F' as Address,
+    newAddress: '0x4D1863d22D0ED8579f8999388BCC833CB057C2d6' as Address,
+  },
+};
+
+export function getVotingMachineAddress(
+  chainId: number,
+  proposalId: number,
+): Address {
+  const addresses = VOTING_MACHINE_ADDRESSES[chainId];
+  if (!addresses) {
+    throw new Error(`No voting machine addresses found for chain ${chainId}`);
+  }
+  return proposalId > PROPOSAL_ID_THRESHOLD
+    ? addresses.newAddress
+    : addresses.oldAddress;
+}
+
 async function getVotingData(initialProposals: InitialProposal[]) {
   const votingMachineDataHelpers = {
     [appConfig.votingMachineChainIds[0]]: getContract({
@@ -87,30 +120,50 @@ async function getVotingData(initialProposals: InitialProposal[]) {
     .map((data) => data.votingChainId)
     .filter((value, index, self) => self.indexOf(value) === index);
 
-  const votingMachines: Record<number, Hex> = {};
   const data = await Promise.all(
     votingMachineChainIds.map(async (chainId) => {
       const votingMachineDataHelper = votingMachineDataHelpers[chainId];
 
-      const formattedInitialProposals = initialProposals
-        .filter((proposal) => proposal.votingChainId === chainId)
-        .map((proposal) => {
-          return {
-            id: proposal.id,
-            snapshotBlockHash: proposal.snapshotBlockHash,
-          };
-        });
-
-      votingMachines[chainId] =
-        appConfig.votingMachineConfig[chainId].contractAddress;
-
-      return (
-        (await votingMachineDataHelper.read.getProposalsData([
-          appConfig.votingMachineConfig[chainId].contractAddress,
-          formattedInitialProposals,
+      const { oldFormattedInitialProposals, newFormattedInitialProposals } =
+        initialProposals
+          .filter((proposal) => proposal.votingChainId === chainId)
+          .map(({ id, snapshotBlockHash }) => ({ id, snapshotBlockHash }))
+          .reduce(
+            (acc, proposal) => {
+              if (proposal.id <= PROPOSAL_ID_THRESHOLD) {
+                acc.oldFormattedInitialProposals.push(proposal);
+              } else {
+                acc.newFormattedInitialProposals.push(proposal);
+              }
+              return acc;
+            },
+            {
+              oldFormattedInitialProposals: [] as {
+                id: bigint;
+                snapshotBlockHash: `0x${string}`;
+              }[],
+              newFormattedInitialProposals: [] as {
+                id: bigint;
+                snapshotBlockHash: `0x${string}`;
+              }[],
+            },
+          );
+
+      const firstNewProposalId = newFormattedInitialProposals[0].id;
+      const [oldProposalsData, newProposalsData] = await Promise.all([
+        votingMachineDataHelper.read.getProposalsData([
+          getVotingMachineAddress(chainId, 0),
+          oldFormattedInitialProposals,
           zeroAddress,
-        ])) || []
-      );
+        ]),
+        votingMachineDataHelper.read.getProposalsData([
+          getVotingMachineAddress(chainId, Number(firstNewProposalId)),
+          newFormattedInitialProposals,
+          zeroAddress,
+        ]),
+      ]);
+
+      return [...oldProposalsData, ...newProposalsData];
     }),
   );
 
@@ -631,10 +684,14 @@ async function parseCache() {
       const proposalIpfsData = ipfsCache[proposal.ipfsHash];
 
       const path = `${proposal.votingChainId}/events`;
+      const votingMachineAddress = getVotingMachineAddress(
+        proposal.votingChainId,
+        proposal.id,
+      );
       const votesCache =
         readJSONCache<Awaited<ReturnType<typeof getVotingMachineEvents>>>(
           path,
-          appConfig.votingMachineConfig[proposal.votingChainId].contractAddress,
+          votingMachineAddress,
         ) || [];
 
       // format VoteEmitted events to UI data format

yarn.lock

@@ -7,10 +7,10 @@
   resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.11.0.tgz#42cc67c5baa407ac25059fcd7d405cc5ecdb0c33"
   integrity sha512-/3DDPKHqqIqxUULp8yP4zODUY1i+2xvVWsv8A79xGWdCAG+8sb0hRh0Rk2QyOJUnnbyPUAZYcpBuRe3nS2OIUg==
 
-"@bgd-labs/aave-address-book@^4.12.0":
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/@bgd-labs/aave-address-book/-/aave-address-book-4.12.0.tgz#ad45981500097376c831169c008bdfc90d36a288"
-  integrity sha512-rxko8rJ2nsZuzGudTEV2aIbMja52WizmaNe8w0TVivVz/BzNX7JKZc73OnbO0hc5g8bI6pduQAfwXs4boZbi0w==
+"@bgd-labs/aave-address-book@^4.17.2":
+  version "4.17.2"
+  resolved "https://registry.yarnpkg.com/@bgd-labs/aave-address-book/-/aave-address-book-4.17.2.tgz#976823b4c825aeda33bd9375705260aef857c88c"
+  integrity sha512-UVVCaLlLBA5VHl+qip/9qH8yZnNyIvyeRd4nHgKAluNbjeyRPzqESqToGmWSvtWOYK2kUtOrWCu0z9ncq6t6IA==
 
 "@bgd-labs/js-utils@^1.4.7":
   version "1.4.7"