fix: Fix Subgraph deployment

.env.template

@@ -0,0 +1,11 @@
+# The name of the network (e.g., mainnet, arbitrum, etc.)
+NETWORK_NAME=...
+
+# The URL of the Graph Node endpoint for self-hosted Graph Node
+GRAPHNODE_URL=...
+
+# The URL of the IPFS endpoint for self-hosted IPFS
+IPFS_URL=...
+
+# The version label for the deployment (e.g., v1.0.0)
+VERSION_LABEL=...

.gitignore

@@ -6,3 +6,4 @@ subgraph.test.yaml
 test-stack/.env
 tests/.bin
 tests/.latest.json
+.env

.mocharc.json

@@ -1,6 +1,5 @@
 {
     "extension": ["ts"],
-    "spec": "itest/**/*.ts",
     "require": ["ts-node/register"],
     "timeout": 1000000,
     "node-option": [

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## vNEXT
 
+- Add Arbitrum & Avalanche networks. (#47)
 - Migrate integration tests from Jenkins to GitHub Actions. (#44)
 - Remove unused files to streamline the repository. (#42)
 - Rewrite Jenkins CI for future migration (#36, #37)

config/env.ts

@@ -0,0 +1,17 @@
+import 'dotenv/config';
+import { z } from 'zod';
+
+const envSchema = z.object({
+    NETWORK_NAME: z.string().min(1, 'NETWORK_NAME is required').default('bellecour'),
+
+    GRAPHNODE_URL: z
+        .string()
+        .url('GRAPHNODE_URL must be a valid URL')
+        .default('http://localhost:8020'),
+
+    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'),
+});
+
+export const env = envSchema.parse(process.env);

networks.json

@@ -1,4 +1,48 @@
 {
+    "fuji": {
+        "ERC1538": {
+            "address": "0x14B465079537655E1662F012e99EBa3863c8B9E0",
+            "startBlock": 39496461
+        },
+        "Core": {
+            "address": "0x14B465079537655E1662F012e99EBa3863c8B9E0",
+            "startBlock": 39496461
+        },
+        "AppRegistry": {
+            "address": "0x4a6531ce5150ee716b2d93865D0fbB9ce5492D17",
+            "startBlock": 39496461
+        },
+        "DatasetRegistry": {
+            "address": "0x3441A0C9FE488c51fcABa2bAAA048720f4D4F72D",
+            "startBlock": 39496461
+        },
+        "WorkerpoolRegistry": {
+            "address": "0xf81970E3CB0f8711bEaA79135e686873FfbBAC4A",
+            "startBlock": 39496461
+        }
+    },
+    "arbitrum-sepolia": {
+        "ERC1538": {
+            "address": "0x14B465079537655E1662F012e99EBa3863c8B9E0",
+            "startBlock": 145249746
+        },
+        "Core": {
+            "address": "0x14B465079537655E1662F012e99EBa3863c8B9E0",
+            "startBlock": 145249746
+        },
+        "AppRegistry": {
+            "address": "0x4a6531ce5150ee716b2d93865D0fbB9ce5492D17",
+            "startBlock": 145249746
+        },
+        "DatasetRegistry": {
+            "address": "0x3441A0C9FE488c51fcABa2bAAA048720f4D4F72D",
+            "startBlock": 145249746
+        },
+        "WorkerpoolRegistry": {
+            "address": "0xf81970E3CB0f8711bEaA79135e686873FfbBAC4A",
+            "startBlock": 145249746
+        }
+    },
     "bellecour": {
         "ERC1538": {
             "address": "0x3eca1B216A7DF1C7689aEb259fFB83ADFB894E7f",

package.json

@@ -7,13 +7,13 @@
   "scripts": {
     "prepare": "husky",
     "generate:typechain": "typechain --target ethers-v6 --out-dir generated/typechain './node_modules/@iexec/poco/build/contracts/*.json' --ts-nocheck",
-    "build": "rm -rf generated && rm -rf build && npm run generate:typechain && graph codegen && graph build --network ${NETWORK_NAME:-bellecour}",
+    "build": "dotenv -e .env -- rm -rf generated && rm -rf build && npm run generate:typechain && graph codegen && graph build --network ${NETWORK_NAME:-bellecour}",
     "test": "npm run test:unit && npm run test:e2e",
-    "test:unit": "graph test",
-    "test:e2e": "NETWORK_NAME=${NETWORK_NAME:-bellecour} mocha",
+    "test:unit": "graph test unit",
+    "test:e2e": "mocha tests/e2e/**/*.ts",
     "coverage": "graph test -- -c",
-    "create": "graph create ${NETWORK_NAME:-bellecour}/poco --node ${GRAPHNODE_URL:-http://localhost:8020}",
-    "deploy": "graph deploy ${NETWORK_NAME:-bellecour}/poco --node ${GRAPHNODE_URL:-http://localhost:8020} --ipfs ${IPFS_URL:-http://localhost:5001} --version-label ${VERSION_LABEL:-bellecour/poco-v5}",
+    "create": "dotenv -e .env -- graph create ${NETWORK_NAME:-bellecour}/poco --node ${GRAPHNODE_URL:-http://localhost:8020}",
+    "deploy": "dotenv -e .env -- graph deploy ${NETWORK_NAME:-bellecour}/poco --node ${GRAPHNODE_URL:-http://localhost:8020} --ipfs ${IPFS_URL:-http://localhost:5001} --version-label ${VERSION_LABEL:-bellecour/poco-v5}",
     "all": "npm run build && npm run create && npm run deploy",
     "stop-test-stack": "cd test-stack && docker compose down --remove-orphans --volumes",
     "start-test-stack": "npm run stop-test-stack && cd test-stack && export NETWORK_NAME=${NETWORK_NAME:-bellecour} && tsx prepare-test-env.ts && docker compose build && docker compose up -d",
@@ -36,9 +36,11 @@
   "devDependencies": {
     "@apollo/client": "^3.11.8",
     "@graphprotocol/graph-cli": "^0.96.0",
-    "@graphprotocol/graph-ts": "^0.38.0",
+    "@graphprotocol/graph-ts": "0.35.1",
     "@typechain/ethers-v6": "^0.5.1",
     "@types/mocha": "^10.0.9",
+    "dotenv": "^16.5.0",
+    "dotenv-cli": "^8.0.0",
     "ethers": "^6.13.5",
     "husky": "^9.1.6",
     "lint-staged": "^15.2.10",
@@ -48,7 +50,8 @@
     "prettier-plugin-organize-imports": "^4.1.0",
     "testcontainers": "^10.13.2",
     "ts-node": "^10.9.2",
-    "tsx": "^4.19.3"
+    "tsx": "^4.19.3",
+    "zod": "^3.24.3"
   },
   "dependencies": {
     "@iexec/poco": "^5.5.0",

subgraph.yaml

@@ -40,6 +40,7 @@ dataSources:
       language: wasm/assemblyscript
       entities:
         - Category
+        - Protocol
         - Account
         - AppOrder
         - DatasetOrder

itest/integration.test.ts → tests/e2e/integration.test.ts

@@ -2,15 +2,16 @@ import { InMemoryCache } from '@apollo/client/cache';
 import { ApolloClient, gql } from '@apollo/client/core';
 import { equal } from 'assert';
 import { JsonRpcProvider, Wallet, ZeroHash } from 'ethers';
-import { AppRegistry__factory, IexecInterfaceToken__factory } from '../generated/typechain';
-import config from '../networks.json' with { type: 'json' };
+import { env } from '../../config/env';
+import { AppRegistry__factory, IexecInterfaceToken__factory } from '../../generated/typechain';
+import config from '../../networks.json' with { type: 'json' };
 
-const APIURL = `http://localhost:8000/subgraphs/name/${process.env.NETWORK_NAME}/poco`;
+const APIURL = `http://localhost:8000/subgraphs/name/${env.NETWORK_NAME}/poco`;
 const client = new ApolloClient({
     uri: APIURL,
     cache: new InMemoryCache(),
 });
-const networkName = process.env.NETWORK_NAME!;
+const networkName = env.NETWORK_NAME!;
 const iexecProxyAddress = (config as any)[networkName].ERC1538.address;
 
 describe('Integration tests', () => {