update query

Author: thelostone-mc

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

@@ -32,16 +32,14 @@ const mockProjects: v2Project[] = [
     },
     metadataCid: "bafkreie4ra5mdxumvxhsjpvawhvtdovlgjk4v74zsgvpqrs2ehdk5srtl4",
     name: "Jax v2 test 4",
-    nodeId:
-      "WyJwcm9qZWN0cyIsIjB4OGE3OTI0OWI2MzM5NWMyNWJkMTIxYmE2ZmYyODAxOThjMzk5ZDRmYjNmOTUxZmMzYzQyMTk3YjU0YTZkYjZhNiIsMTExNTUxMTFd",
     // note: This is moved to roles also
     createdByAddress: "0x0000",
     createdAtBlock: "5146499",
     updatedAtBlock: "5146499",
     projectNumber: null,
     registryAddress: "0x4aacca72145e1df2aec137e1f3c5e3d75db8b5f3",
     tags: ["allo-v2"],
-    roles: [
+    projectRoles: [
       {
         address: "0xe849b2a694184b8739a04c915518330757cdb18b",
         role: "OWNER",
@@ -585,15 +583,14 @@ describe("v2 projects retrieval", () => {
     });
 
     expect(project?.project.id).toEqual(mockProject.id);
-    expect(project?.project.nodeId).toEqual(mockProject.nodeId);
     expect(project?.project.chainId).toEqual(mockProject.chainId);
     expect(project?.project.registryAddress).toEqual(
       mockProject.registryAddress,
     );
     // Note: projectNumber is depreciated in v2 and should be null
     expect(project?.project.projectNumber).toEqual(null);
     expect(project?.project.tags).toEqual(mockProject.tags);
-    expect(project?.project.roles).toEqual(mockProject.roles);
+    expect(project?.project.projectRoles).toEqual(mockProject.projectRoles);
     expect(project?.project.name).toEqual(mockProject.name);
     expect(project?.project.metadata.description).toEqual(
       mockProject.metadata.description,

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

@@ -263,7 +263,7 @@ export class DataLayer {
     projectId: string;
     chainId: number;
   }): Promise<Address | undefined> {
-    const response: { project?: { anchorAddress: Address } } = await request(
+    const response: {  projects: Array<{ anchorAddress: Address }>} = await request(
       this.gsIndexerEndpoint,
       getProjectAnchorByIdAndChainId,
       {
@@ -272,7 +272,7 @@ export class DataLayer {
       },
     );
 
-    return response?.project?.anchorAddress;
+    return response?.projects[0]?.anchorAddress;
   }
 
   /**

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

@@ -174,7 +174,6 @@ export type v2Project = {
    */
   metadataCid: string;
   name: string;
-  nodeId: string;
   /**
    * The project number from v1
    *
@@ -205,7 +204,7 @@ export type v2Project = {
    * The block the project was updated at
    */
   updatedAtBlock: string;
-  roles: AddressAndRole[];
+  projectRoles: AddressAndRole[];
   nonce?: bigint;
   anchorAddress?: string;
   /**
@@ -273,6 +272,7 @@ export type DirectDonationValues = {
   amount: number;
   donorAddress: string;
   amountInUsd: number;
+  projectId: string;
 };
 
 /**
@@ -301,8 +301,8 @@ export type ProjectApplicationForManager = ProjectApplication & {
     strategyName: string;
     strategyAddress: string;
   };
-  canonicalProject: {
-    roles: { address: Address }[];
+  project: {
+    projectRoles: { address: Address }[];
   };
 };
 
@@ -397,7 +397,7 @@ export type ProjectApplicationWithProject = {
 };
 
 export type V2RoundWithRoles = V2Round & {
-  roles: AddressAndRole[];
+  roundRoles: AddressAndRole[];
   createdByAddress: string;
 };
 
@@ -792,6 +792,7 @@ export type Contribution = {
     project: {
       name: string;
       metadata?: ProjectMetadata;
+      projectType: string;
     };
   };
   timestamp: string;
@@ -812,7 +813,7 @@ export type RoundApplicationPayout = {
   applications: [
     {
       id: string;
-      applicationsPayoutsByChainIdAndRoundIdAndApplicationId: Payout[];
+      applicationsPayouts: Payout[];
     },
   ];
 };

packages/data-layer/src/queries.ts

@@ -103,7 +103,6 @@ export const getProjectsById = gql`
       metadata
       metadataCid
       name
-      nodeId
       projectNumber
       registryAddress
       tags
@@ -561,7 +560,7 @@ export const getProjectsBySearchTerm = gql`
 export const getProjectsAndRolesByAddress = gql`
   query getProjectsAndRolesByAddressQuery(
     $address: String!
-    $version: String! //TODO: chainge the code in which this query is called
+    $version: String!
     $chainIds: [Int!]!
   ) {
     projects(
@@ -705,7 +704,7 @@ const getRoundForManagerFields = `
   fundedAmount
   fundedAmountInUsd
   matchingDistribution
-  roles(first: 100) {
+  roundRoles(first: 100) {
     role
     address
     createdAtBlock

packages/round-manager/src/features/api/program.ts

@@ -39,7 +39,7 @@ export async function listPrograms(
       programs.push({
         id: program.id,
         metadata: program.metadata,
-        operatorWallets: program.roles.map(
+        operatorWallets: program.projectRoles.map(
           (role: { address: string }) => role.address
         ),
         tags: program.tags,
@@ -49,7 +49,7 @@ export async function listPrograms(
           logo: stringToBlobUrl(chain.icon),
         },
         createdByAddress: program.createdByAddress,
-        roles: program.roles,
+        roles: program.projectRoles,
         qfRoundsCount: program.qfRounds?.length || 0,
         dgRoundsCount: program.dgRounds?.length || 0,
       });
@@ -84,7 +84,7 @@ export async function getProgramById(
   return {
     id: program.id,
     metadata: program.metadata,
-    operatorWallets: program.roles.map(
+    operatorWallets: program.projectRoles.map(
       (role: { address: string }) => role.address
     ),
     tags: program.tags,
@@ -93,6 +93,6 @@ export async function getProgramById(
       name: chain.prettyName,
       logo: stringToBlobUrl(chain.icon),
     },
-    roles: program.roles,
+    roles: program.projectRoles,
   };
 }

packages/round-manager/src/features/api/round.ts

@@ -83,7 +83,7 @@ export async function getRoundById(args: {
 }
 
 function indexerV2RoundToRound(round: RoundForManager): Round {
-  const operatorWallets = round.roles.map(
+  const operatorWallets = round.roundRoles.map(
     (account: { address: string }) => account.address
   );
 
@@ -129,7 +129,7 @@ function indexerV2RoundToRound(round: RoundForManager): Round {
     },
     ownedBy: round.projectId,
     operatorWallets: operatorWallets,
-    roles: round.roles,
+    roles: round.roundRoles,
     finalized: false,
     tags: round.tags,
     createdByAddress: round.createdByAddress,

packages/round-manager/src/features/api/utils.ts

@@ -248,9 +248,9 @@ export const convertApplications = (
 ) => {
   const applications: GrantApplication[] = dataLayerApplications.flatMap(
     (application) => {
-      if (application.canonicalProject === null) {
+      if (application.project === null) {
         console.error(
-          `Canonical project not found for application ${application.id}`
+          `project not found for application ${application.id}`
         );
         return [];
       }
@@ -268,7 +268,7 @@ export const convertApplications = (
           metadata: application.metadata,
           project: {
             ...application.metadata.application.project,
-            owners: application.canonicalProject.roles,
+            owners: application.project.projectRoles,
             id: application.projectId,
           },
           projectId: application.projectId,

packages/round-manager/src/features/round/usePayouts.tsx

@@ -32,9 +32,7 @@ export function usePayouts(args: {
         projectId: args.projectId,
       });
 
-      const payouts =
-        result.applications[0]
-          .applicationsPayoutsByChainIdAndRoundIdAndApplicationId;
+      const payouts = result.applications[0].applicationsPayouts;
 
       let mappedPayouts = payouts.map((payout) => {
         return {