Merge branch 'master' into npai/transfer-threshold-removal

across-protocol · Sep 29, 2023 · b95a732 · b95a732
2 parents c6b4f99 + c956805
commit b95a732
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/src/common/ContractAddresses.ts b/src/common/ContractAddresses.ts
@@ -454,6 +454,24 @@ export const CONTRACT_ADDRESSES: {
         },
       ],
     },
+    VotingV2: {
+      address: "0x004395edb43EFca9885CEdad51EC9fAf93Bd34ac",
+      abi: [
+        {
+          anonymous: false,
+          inputs: [
+            { indexed: true, internalType: "address", name: "requester", type: "address" },
+            { indexed: true, internalType: "uint32", name: "roundId", type: "uint32" },
+            { indexed: true, internalType: "bytes32", name: "identifier", type: "bytes32" },
+            { indexed: false, internalType: "uint256", name: "time", type: "uint256" },
+            { indexed: false, internalType: "bytes", name: "ancillaryData", type: "bytes" },
+            { indexed: false, internalType: "bool", name: "isGovernance", type: "bool" },
+          ],
+          name: "RequestAdded",
+          type: "event",
+        },
+      ],
+    },
   },
   10: {
     daiOptimismBridge: {

diff --git a/src/utils/UmaUtils.ts b/src/utils/UmaUtils.ts
@@ -1,11 +1,14 @@
-import { Contract, ethers, getBlockForTimestamp, isEventOlder, sortEventsDescending } from ".";
-import * as uma from "@uma/contracts-node";
 import { HubPoolClient } from "../clients";
+import { CONTRACT_ADDRESSES } from "../common";
 import { ProposedRootBundle, SortableEvent } from "../interfaces";
+import { Contract, ethers, getBlockForTimestamp, isEventOlder, sortEventsDescending } from ".";
 
-export async function getDvmContract(mainnetProvider: ethers.providers.Provider): Promise<Contract> {
-  return new Contract(await uma.getVotingV2Address(1), uma.getAbi("VotingV2"), mainnetProvider);
+export async function getDvmContract(provider: ethers.providers.Provider): Promise<Contract> {
+  const { chainId } = await provider.getNetwork();
+  const { address, abi } = CONTRACT_ADDRESSES[chainId].VotingV2;
+  return new Contract(address, abi, provider);
 }
+
 export function getDisputedProposal(
   hubPoolClient: HubPoolClient,
   disputeEvent: SortableEvent