Fix: scripts subgraph package

.dockerignore

@@ -6,5 +6,4 @@
 !/packages/subgraph/
 /packages/subgraph/generated/
 /packages/subgraph/build/
-/packages/subgraph/subgraph.yaml
-/packages/subgraph/.drone.yml
+/packages/subgraph/.drone.yml

packages/sdk/.drone.yml

@@ -327,7 +327,7 @@ steps:
       - test:unit
 
   - name: subgraph-deploy
-    image: node:18.19
+    image: node:20.18
     environment:
       GRAPHNODE_URL: http://graphnode:8020
       IPFS_URL: http://ipfs:5001

packages/sdk/src/lib/dataProtectorSharing/smartContract/getPocoContract.ts

@@ -1,9 +1,7 @@
 import type { IExecModule } from 'iexec';
 import type { IPoCo } from '../../../../generated/typechain/sharing/interfaces/IPoCo.js';
 
-export async function getPocoContract(
-  iexec: IExecModule
-): Promise<IPoCo> {
+export async function getPocoContract(iexec: IExecModule): Promise<IPoCo> {
   const client = await iexec.config.resolveContractsClient();
   return client.getIExecContract() as unknown as IPoCo;
 }

packages/sdk/tests/docker-compose.yml

@@ -229,6 +229,7 @@ services:
         condition: service_started
     environment:
       START_BLOCK: $BELLECOUR_FORK_BLOCK
+      NETWORK_NAME: bellecour
       GRAPHNODE_URL: http://graphnode:8020
       IPFS_URL: http://ipfs:5001
       ENV: prod

packages/sdk/tests/test-utils.ts

@@ -49,8 +49,8 @@ export const getTestConfig = (
       : 'http://127.0.0.1:8080',
     ipfsNode: process.env.DRONE ? 'http://ipfs:5001' : 'http://127.0.0.1:5001',
     subgraphUrl: process.env.DRONE
-      ? 'http://graphnode:8000/subgraphs/name/DataProtector-v2'
-      : 'http://127.0.0.1:8000/subgraphs/name/DataProtector-v2',
+      ? 'http://graphnode:8000/subgraphs/name/bellecour/DataProtector-v2'
+      : 'http://127.0.0.1:8000/subgraphs/name/bellecour/DataProtector-v2',
   };
   return [ethProvider, options];
 };

packages/subgraph/.drone.yml

@@ -8,7 +8,7 @@ trigger:
 
 steps:
   - name: build-subgraph
-    image: node:18.19
+    image: node:20.18
     environment:
       ENV: prod
     commands:

packages/subgraph/.env.template

@@ -9,3 +9,6 @@ IPFS_URL=...
 
 # The version label for the deployment (e.g., v1.0.0)
 VERSION_LABEL=...
+
+# Start block number for local testing
+START_BLOCK=...

packages/subgraph/.gitignore

@@ -10,5 +10,5 @@ coverage.json
 
 # subgraph
 generated
-subgraph.yaml
 tests/.latest.json
+subgraph.yaml

packages/subgraph/.nvmrc

@@ -0,0 +1 @@
+20.18

packages/subgraph/config/env.ts

@@ -12,6 +12,14 @@ const envSchema = z.object({
     IPFS_URL: z.string().url('IPFS_URL must be a valid URL').default('http://localhost:5001'),
 
     VERSION_LABEL: z.string().min(1, 'VERSION_LABEL is required').default('bellecour/poco-v5'),
+
+    START_BLOCK: z
+        .string()
+        .transform((val) => parseInt(val, 10))
+        .refine((val) => !isNaN(val) && val >= 0, {
+            message: 'START_BLOCK must be a valid non-negative integer',
+        })
+        .or(z.undefined()),
 });
 
 export const env = envSchema.parse(process.env);

packages/subgraph/deployer.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.19
+FROM node:20.18
 
 RUN mkdir /app
 
@@ -8,4 +8,4 @@ WORKDIR /app/packages/subgraph
 
 RUN npm ci
 
-ENTRYPOINT [ "npm", "run", "all" ]
+ENTRYPOINT [ "npm", "run", "all" ]