fix: conflictsˆ

gitcoinco · Feb 1, 2024 · 0ede0df · 0ede0df
1 parent 1057c80
commit 0ede0df
Show file tree

Hide file tree

Showing 4 changed files with 717 additions and 866 deletions.
diff --git a/packages/common/src/allo/backends/allo-v1.ts b/packages/common/src/allo/backends/allo-v1.ts
@@ -1,6 +1,18 @@
-import { Address, Hex, encodePacked, hexToBigInt, keccak256 } from "viem";
+import {
+  Address,
+  encodeAbiParameters,
+  encodePacked,
+  getAddress,
+  Hex,
+  hexToBigInt,
+  keccak256,
+  maxUint256,
+  parseAbiParameters,
+  parseUnits,
+  zeroAddress,
+} from "viem";
 import { Allo, AlloError, AlloOperation } from "../allo";
-import { Result, error, success } from "../common";
+import { error, Result, success } from "../common";
 import { WaitUntilIndexerSynced } from "../indexer";
 import { IpfsUploader } from "../ipfs";
 import {

diff --git a/packages/common/src/allo/backends/allo-v2.ts b/packages/common/src/allo/backends/allo-v2.ts
@@ -1,6 +1,6 @@
-import { Hex } from "viem";
+import { Address, Hex } from "viem";
 import { Allo, AlloError, AlloOperation } from "../allo";
-import { Result, error, success } from "../common";
+import { error, Result, success } from "../common";
 import { WaitUntilIndexerSynced } from "../indexer";
 import { IpfsUploader } from "../ipfs";
 import {

diff --git a/packages/common/src/allo/backends/test-utils.ts b/packages/common/src/allo/backends/test-utils.ts
@@ -16,7 +16,6 @@ export const zeroTxHash = ("0x" + "0".repeat(64)) as Hex;
 
 export const alloV1: Allo = new AlloV1({
   chainId,
-  projectRegistryAddress,
   ipfsUploader,
   transactionSender,
   waitUntilIndexerSynced,
@@ -27,6 +26,7 @@ export const alloV2: Allo = new AlloV2({
   ipfsUploader,
   transactionSender,
   waitUntilIndexerSynced,
+  allo: projectRegistryAddress,
 });
 
 export const getAllo = (version: string): Allo => {