Merge branch 'main' into bug/3291-cant-select-full-area-project-logo

Author: dalime

packages/common/package.json

@@ -19,7 +19,7 @@
     "@allo-team/allo-v2-sdk": "^1.0.78",
     "@ethersproject/abstract-signer": "^5.7.0",
     "@ethersproject/providers": "^5.7.2",
-    "@gitcoin/gitcoin-chain-data": "^1.0.27",
+    "@gitcoin/gitcoin-chain-data": "^1.0.34",
     "@gitcoinco/passport-sdk-types": "^0.2.0",
     "@openzeppelin/merkle-tree": "^1.0.2",
     "@rainbow-me/rainbowkit": "2.1.2",

packages/common/src/allo/allo.ts

@@ -245,6 +245,19 @@ export interface Allo {
     }
   >;
 
+  manageProfileMembers: (args: {
+    profileId: Hex;
+    members: Address[];
+    addOrRemove: "add" | "remove";
+  }) => AlloOperation<
+    Result<null>,
+    {
+      transaction: Result<Hex>;
+      transactionStatus: Result<TransactionReceipt>;
+      indexingStatus: Result<null>;
+    }
+  >;
+
   directAllocation: (args: {
     tokenAddress: Address;
     poolId: string;

packages/common/src/allo/backends/allo-v1.ts

@@ -1311,6 +1311,25 @@ export class AlloV1 implements Allo {
     });
   }
 
+  manageProfileMembers(args: {
+    profileId: Hex;
+    members: Address[];
+    addOrRemove: "add" | "remove";
+  }): AlloOperation<
+    Result<null>,
+    {
+      transaction: Result<Hex>;
+      transactionStatus: Result<TransactionReceipt>;
+      indexingStatus: Result<null>;
+    }
+  > {
+    return new AlloOperation(async () => {
+      const result = new AlloError(`Unsupported on v1 ${args}`);
+      return error(result);
+    });
+  }
+
+
   directAllocation(args: {
     tokenAddress: Address;
     poolId: string;

packages/common/src/allo/backends/allo-v2.ts

@@ -83,74 +83,6 @@ export function getAlloAddress(chainId: number) {
   return allo.address();
 }
 
-export function getDirectAllocationPoolId(chainId: number) {
-  switch (chainId) {
-    case 11155111:
-      return 386;
-    case 10:
-      return 58;
-    case 42161:
-      return 390;
-    case 42220:
-      return 12;
-    case 8453:
-      return 36;
-    case 43114:
-      return 15;
-    case 534352:
-    case 534353:
-      return 22;
-    case 250:
-      return 4;
-    case 1:
-      return 11;
-    case 1329:
-    case 808:
-      return 8;
-    case 42:
-      return 3;
-    case 1088:
-      return 1;
-    default:
-      return undefined;
-  }
-}
-
-export function getDirectAllocationStrategyAddress(chainId: number) {
-  switch (chainId) {
-    case 11155111:
-      return "0xd60BCfa8714949c478d88da51A7450703A32Cf35";
-    case 10:
-      return "0x56662F9c0174cD6ae14b214fC52Bd6Eb6B6eA602";
-    case 42161:
-      return "0x56662F9c0174cD6ae14b214fC52Bd6Eb6B6eA602";
-    case 42220:
-      return "0x56662F9c0174cD6ae14b214fC52Bd6Eb6B6eA602";
-    case 8453:
-      return "0x56662F9c0174cD6ae14b214fC52Bd6Eb6B6eA602";
-    case 43114:
-      return "0x86b4329E7CB8674b015477C81356420D79c71A53";
-    case 534353:
-      return "0x56662F9c0174cD6ae14b214fC52Bd6Eb6B6eA602";
-    case 534352:
-      return "0x9da0a7978b7bd826e06800427cbf1ec1200393e3";
-    case 250:
-      return "0x1E18cdce56B3754c4Dca34CB3a7439C24E8363de";
-    case 1:
-      return "0x56662F9c0174cD6ae14b214fC52Bd6Eb6B6eA602";
-    case 808:
-      return "0x1cfa7A687cd18b99D255bFc25930d3a0b05EB00F";
-    case 1329:
-      return "0x7836f59bd6dc1d87a45df8b9a74eefcdf25bc8a9";
-    case 42:
-      return "0xeB6325d9daCD1E46A20C02F46E41d4CAE45C0980";
-    case 1088:
-      return "0x56662F9c0174cD6ae14b214fC52Bd6Eb6B6eA602";
-    default:
-      return undefined;
-  }
-}
-
 export class AlloV2 implements Allo {
   private transactionSender: TransactionSender;
   private ipfsUploader: IpfsUploader;
@@ -1505,6 +1437,66 @@ export class AlloV2 implements Allo {
     });
   }
 
+  manageProfileMembers(args: {
+    profileId: Hex;
+    members: Address[];
+    addOrRemove: "add" | "remove";
+  }): AlloOperation<
+    Result<null>,
+    {
+      transaction: Result<Hex>;
+      transactionStatus: Result<TransactionReceipt>;
+      indexingStatus: Result<null>;
+    }
+  > {
+    return new AlloOperation(async ({ emit }) => {
+      const txData =
+        args.addOrRemove === "add"
+          ? this.registry.addMembers({
+              profileId: args.profileId,
+              members: args.members,
+            })
+          : this.registry.removeMembers({
+              profileId: args.profileId,
+              members: args.members,
+            });
+
+      const txResult = await sendRawTransaction(this.transactionSender, {
+        to: txData.to,
+        data: txData.data,
+        value: BigInt(txData.value),
+      });
+
+      emit("transaction", txResult);
+
+      if (txResult.type === "error") {
+        return error(txResult.error);
+      }
+
+      let receipt: TransactionReceipt;
+      try {
+        receipt = await this.transactionSender.wait(txResult.value);
+        emit("transactionStatus", success(receipt));
+      } catch (err) {
+        console.log(err);
+        const result = new AlloError(
+          `Failed to ${args.addOrRemove} profile members`
+        );
+        emit("transactionStatus", error(result));
+        return error(result);
+      }
+
+      await this.waitUntilIndexerSynced({
+        chainId: this.chainId,
+        blockNumber: receipt.blockNumber,
+      });
+
+      emit("indexingStatus", success(null));
+
+      return success(null);
+    });
+  }
+
   directAllocation(args: {
     tokenAddress: Address;
     poolId: string;
@@ -1533,7 +1525,8 @@ export class AlloV2 implements Allo {
         poolId: poolId,
       });
 
-      const strategyAddress = getDirectAllocationStrategyAddress(this.chainId);
+      const strategyAddress = getChainById(this.chainId).contracts
+        .directAllocationStrategyAddress;
 
       if (strategyAddress === undefined) {
         return error(new AlloError("Direct allocation strategy not found"));

packages/common/src/index.ts

@@ -477,25 +477,6 @@ export function isChainIdSupported(chainId: number) {
   return getChainById(chainId) !== undefined;
 }
 
-const gg20Rounds = [
-  //GG20 rounds
-  { roundId: "23", chainId: 42161 }, // Hackathon Alumni
-  { roundId: "24", chainId: 42161 }, // ENS
-  { roundId: "25", chainId: 42161 }, // dApps & Apps
-  { roundId: "26", chainId: 42161 }, // WEB3 Infrastructure
-  { roundId: "27", chainId: 42161 }, // Developer Tooling
-  { roundId: "28", chainId: 42161 }, // Hypercerts Ecosystem
-  { roundId: "29", chainId: 42161 }, // Climate Solutions
-  { roundId: "31", chainId: 42161 }, // Open Civics
-  { roundId: "36", chainId: 42161 }, // Regenerative Land Projects
-  { roundId: "39", chainId: 42161 }, // DeSci
-  { roundId: "9", chainId: 10 }, // Token Engineering Commons (TEC)
-];
-
-export function isGG20Round(roundId: string, chainId: number) {
-  return gg20Rounds.some((r) => r.roundId === roundId && r.chainId === chainId);
-}
-
 export function isLitUnavailable(chainId: number) {
   return [
     4201, // LUKSO_TESTNET,

packages/grant-explorer/src/checkoutStore.ts

@@ -180,7 +180,7 @@ export const useCheckoutStore = create<CheckoutState>()(
               client: walletClient,
             });
             nonce = await erc20Contract.read.nonces([owner]);
-            const tokenName = await erc20Contract.read.name();
+            let tokenName = await erc20Contract.read.name();
             if (getPermitType(token, chainId) === "dai") {
               sig = await signPermitDai({
                 walletClient: walletClient,
@@ -194,6 +194,13 @@ export const useCheckoutStore = create<CheckoutState>()(
                 permitVersion: token.permitVersion ?? "1",
               });
             } else {
+              // cUSD is a special case where the token symbol is used for permit instead of the name
+              if (
+                chainId === 42220 &&
+                token.address.toLowerCase() ===
+                  "0x765de816845861e75a25fca122bb6898b8b1282a".toLowerCase()
+              )
+                tokenName = "cUSD";
               sig = await signPermit2612({
                 walletClient: walletClient,
                 value: totalDonationPerChain[chainId],