tweak

Author: thelostone-mc

.env.example

@@ -3,7 +3,6 @@ SYNCHRONIZE=false
 LOGGING=true
 PORT=4000
 INDEXER_URL=https://grants-stack-indexer-v2.gitcoin.co/
-INDEXER_ADMIN_SECRET=your_indexer_admin_secret
 OPENAI_API_KEY=your_openai_api_key
 NODE_ENV=development
 # Performance tuning

src/env.ts

@@ -10,7 +10,6 @@ interface EnvVars {
   SYNCHRONIZE: string;
   LOGGING: string;
   INDEXER_URL: string;
-  INDEXER_ADMIN_SECRET: string;
   OPENAI_API_KEY: string;
   [key: string]: string | number | undefined;
 }
@@ -26,7 +25,6 @@ export const env: EnvVars = {
   SYNCHRONIZE: process.env.SYNCHRONIZE ?? 'false',
   LOGGING: process.env.LOGGING ?? 'false',
   INDEXER_URL: process.env.INDEXER_URL ?? '',
-  INDEXER_ADMIN_SECRET: process.env.INDEXER_ADMIN_SECRET ?? '',
   OPENAI_API_KEY: process.env.OPENAI_API_KEY ?? '',
   ...process.env,
 };

src/ext/indexer/indexer.ts

@@ -85,10 +85,7 @@ class IndexerClient {
       const response: ManagerRolesResponse = await request(
         this.indexerEndpoint,
         getRoundManager,
-        requestVariables,
-        {
-          'x-hasura-admin-secret': env.INDEXER_ADMIN_SECRET,
-        }
+        requestVariables
       );
       if (response.rounds.length === 0) {
         this.logger.warn(
@@ -149,10 +146,7 @@ class IndexerClient {
       const response: RoundApplicationsQueryResponse = await request(
         this.indexerEndpoint,
         getRoundWithApplications,
-        requestVariables,
-        {
-          'x-hasura-admin-secret': env.INDEXER_ADMIN_SECRET,
-        }
+        requestVariables
       );
 
       if (response.rounds.length === 0) {
@@ -162,7 +156,16 @@ class IndexerClient {
         return null;
       }
 
-      const round = response.rounds[0];
+      const round = {
+        chainId: response.rounds[0].chainId,
+        id: response.rounds[0].id,
+        roundMetadata: response.rounds[0].roundMetadata,
+        roundMetadataCid: response.rounds[0].roundMetadataCid,
+        applications: response.rounds[0].applications.map(application => ({
+          ...application,
+          project: application.projects[0],
+        })),
+      };
 
       // Cache the result
       this.cache.set(cacheKey, round);
@@ -199,10 +202,7 @@ class IndexerClient {
       const response: ApplicationRoundQueryResponse = await request(
         this.indexerEndpoint,
         getApplicationWithRound,
-        requestVariables,
-        {
-          'x-hasura-admin-secret': env.INDEXER_ADMIN_SECRET,
-        }
+        requestVariables
       );
 
       const application = response.applications[0];

src/ext/indexer/queries.ts

@@ -23,7 +23,7 @@ export const getRoundWithApplications = gql`
         metadataCid
         status
         projectId
-        project {
+        projects(where: { projectType: { _eq: "canonical" } }) {
           metadata
           metadataCid
         }

src/ext/indexer/types.ts

@@ -1,3 +1,4 @@
+// 1. Basic Types & Enums
 export type Address = `0x${string}`;
 
 export enum Status {
@@ -6,6 +7,7 @@ export enum Status {
   REJECTED = 'REJECTED',
 }
 
+// 2. Metadata & Supporting Interfaces
 export interface ApplicationMetadata {
   signature: string;
   application: {
@@ -52,34 +54,48 @@ export interface ProjectMetadata {
   projectTwitter?: string;
   userGithub?: string;
   projectGithub?: string;
-  // credentials: ProjectCredentials;
   owners: Array<{ address: string }>;
   createdAt: number;
   lastUpdated: number;
 }
 
-export interface Application {
+// 3. Base Interfaces (Used in Multiple Places)
+export interface BaseProject {
+  metadata: ProjectMetadata;
+  metadataCid: string;
+}
+
+export interface BaseApplication {
   id: string;
   metadata: ApplicationMetadata;
   metadataCid: string;
   status: Status;
   projectId: string;
-  project: {
-    metadata: ProjectMetadata;
-    metadataCid: string;
-  };
 }
 
-export interface RoundWithApplications {
+// 4. Extended Implementations
+export interface Application extends BaseApplication {
+  project: BaseProject;
+}
+
+export interface ApplicationQuery extends BaseApplication {
+  projects: BaseProject[];
+}
+
+export interface BaseRound<T extends BaseApplication> {
   chainId: number;
   id: string;
   roundMetadata: RoundMetadata;
   roundMetadataCid: string;
-  applications: Application[];
+  applications: T[];
 }
 
+export type RoundWithApplications = BaseRound<Application>;
+export type RoundWithApplicationsQuery = BaseRound<ApplicationQuery>;
+
+// 5. API Response Structures
 export interface RoundApplicationsQueryResponse {
-  rounds: RoundWithApplications[];
+  rounds: RoundWithApplicationsQuery[];
 }
 
 export interface ApplicationWithRound {