Merge branch 'main' into main

Author: MasterHW

.env.example

@@ -79,3 +79,9 @@ REACT_APP_COINGECKO_API_KEY=
 # ---------------------------
 
 REACT_APP_STAKING_APP=https://boost.explorer.gitcoin.co/
+REACT_APP_STAKING_HUB_ENDPOINT=https://api.staking-hub.gitcoin.co
+
+# ---------------------------
+# Karma
+REACT_APP_KARMA_GAP_INDEXER_URL=https://gapapi.karmahq.xyz
+REACT_APP_KARMA_GAP_APP_URL=https://gap.karmahq.xyz

packages/builder/src/components/application/Form.tsx

@@ -111,7 +111,9 @@ export default function Form({
     const allProjectMetadata = state.grantsMetadata;
     const { chainID } = state.web3;
 
+    console.log("allProjectMetadata", allProjectMetadata);
     const projectIds = Object.keys(allProjectMetadata);
+    console.log("projectIds", projectIds);
 
     return {
       anchors: state.projects.anchor,
@@ -139,6 +141,7 @@ export default function Form({
   let selectedProjectMetadata: Metadata | undefined;
   let createLinkedProject = false;
 
+  // VERIFY LOGIC AFTER POPULATING linkedChains
   if (selectedProjectID !== undefined && selectedProjectID !== "") {
     selectedProjectMetadata =
       props.allProjectMetadata[selectedProjectID]?.metadata;
@@ -302,11 +305,15 @@ export default function Form({
 
   useEffect(() => {
     const currentOptions = props.projectIDs.map((id): ProjectOption => {
+      console.log("currentOptions: id", id);
       const chainId = props.allProjectMetadata[id]!.metadata!.chainId!;
-
+      console.log("currentOptions: chainId", chainId);
       const chain = getChainById(chainId);
+      console.log("currentOptions: chain", chain);
       const chainName = chain.prettyName;
+      console.log("currentOptions: chainName", chainName);
       const { icon } = chain;
+      console.log("currentOptions: icon", icon);
 
       return {
         id,
@@ -319,7 +326,7 @@ export default function Form({
       };
     });
     currentOptions.unshift({ id: undefined, title: "", chainInfo: undefined });
-
+    console.log("currentOptions: currentOptions", currentOptions);
     setProjectOptions(currentOptions);
   }, [props.allProjectMetadata]);
 
@@ -402,6 +409,8 @@ export default function Form({
               return null;
             }
 
+            console.log("answers", answers);
+
             if (input.type === "project") {
               return readOnly ? (
                 <TextInput

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

@@ -170,7 +170,7 @@ export class AlloV2 implements Allo {
           abi: MRC_ABI,
           functionName: "allocate",
           args: [poolIds, amounts, data],
-          value: nativeTokenAmount,
+          value: nativeTokenAmount + (directAllocation?.amount ?? BigInt(0)),
         },
         this.chainId
       );

packages/data-layer/src/data-layer.test.ts

@@ -46,7 +46,7 @@ const mockProjects: v2Project[] = [
         createdAtBlock: "5146499",
       },
     ],
-    projectType: "CANONICAL",
+    projectType: "canonical",
     linkedChains: [],
   },
 ];

packages/data-layer/src/data-layer.ts

@@ -59,7 +59,7 @@ import {
   getRoundsForManagerByAddress,
   getDirectDonationsByProjectId,
 } from "./queries";
-import { orderByMapping } from "./utils";
+import { mergeCanonicalAndLinkedProjects, orderByMapping } from "./utils";
 import {
   AttestationService,
   type MintingAttestationIdsData,
@@ -251,9 +251,9 @@ export class DataLayer {
 
     if (response.projects.length === 0) return null;
 
-    // const project = mergeCanonicalAndLinkedProjects(response.projects)[0];
+    const project = mergeCanonicalAndLinkedProjects(response.projects)[0];
 
-    return { project: response.projects[0] };
+    return { project: project };
   }
 
   async getProjectAnchorByIdAndChainId({
@@ -316,7 +316,8 @@ export class DataLayer {
       requestVariables,
     );
 
-    return response.projects;
+    const mergedProjects = mergeCanonicalAndLinkedProjects(response.projects);
+    return mergedProjects;
   }
 
   /**
@@ -815,17 +816,30 @@ export class DataLayer {
     chainIds: number[];
   }): Promise<Contribution[]> {
     const { address, chainIds } = args;
-    const response: { donations: Contribution[] } = await request(
-      this.gsIndexerEndpoint,
-      getDonationsByDonorAddress,
-      {
-        address: getAddress(address),
-        chainIds,
-      },
-    );
+    let offset = 0;
+    let hasMore = true;
+    const limit = 200;
+    let donations: Contribution[] = [];
+
+    while (hasMore) {
+      const response: { donations: Contribution[] } = await request(
+        this.gsIndexerEndpoint,
+        getDonationsByDonorAddress,
+        { address: getAddress(address), chainIds, limit, offset },
+      );
+
+      donations = [...donations, ...response.donations];
+
+      // Check if we need to fetch more
+      if (response.donations.length < limit) {
+        hasMore = false;
+      } else {
+        offset += limit;
+      }
+    }
 
     // Filter out invalid donations and map the project metadata from application metadata (solution for canonical projects in indexer v2)
-    const validDonations = response.donations.reduce<Contribution[]>(
+    const validDonations = donations.reduce<Contribution[]>(
       (validDonations, donation) => {
         if (donation.round.strategyName !== "allov2.DirectAllocationStrategy") {
           if (donation.application?.project) {

packages/data-layer/src/data.types.ts

@@ -32,7 +32,7 @@ export type ApplicationStatus =
   | "CANCELLED"
   | "IN_REVIEW";
 
-export type ProjectType = "CANONICAL" | "LINKED";
+export type ProjectType = "canonical" | "linked";
 
 export type GrantApplicationFormAnswer = {
   questionId: number;
@@ -208,7 +208,7 @@ export type v2Project = {
   nonce?: bigint;
   anchorAddress?: string;
   /**
-   * The type of the project - `CANONICAL` or `LINKED`
+   * The type of the project - `canonical` or `linked`
    */
   projectType: ProjectType;
   /**

packages/data-layer/src/queries.ts

@@ -773,8 +773,15 @@ export const getRoundForExplorer = gql`
 `;
 
 export const getDonationsByDonorAddress = gql`
-  query getDonationsByDonorAddress($address: String!, $chainIds: [Int!]!) {
+  query getDonationsByDonorAddress(
+    $address: String!
+    $chainIds: [Int!]!
+    $limit: Int = 200
+    $offset: Int = 0
+  ) {
     donations(
+      limit: $limit
+      offset: $offset
       where: { chainId: { _in: $chainIds }, donorAddress: { _eq: $address } }
     ) {
       id

packages/data-layer/src/utils.ts

@@ -12,11 +12,11 @@ export const mergeCanonicalAndLinkedProjects = (
   projects: v2Project[],
 ): v2Project[] => {
   const canonicalProjects = projects.filter(
-    (project) => project.projectType === "CANONICAL",
+    (project) => project.projectType === "canonical",
   );
 
   const linkedProjects = projects.filter(
-    (project) => project.projectType === "LINKED",
+    (project) => project.projectType === "linked",
   );
   const allProjects: Record<string, v2Project> = {};
   for (const project of canonicalProjects) {