Merge remote-tracking branch 'origin/main' into horizon

Author: tmigone

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
   build:
     strategy:
       matrix:
-        node-version: [18, 20, 22]
+        node-version: [20, 22]
         system:
           - os: ubuntu-22.04
     runs-on: ${{ matrix.system.os }}

docs/networks/arbitrum-sepolia.md

@@ -7,8 +7,8 @@ The Graph Network's testnet is on Arbitrum Sepolia (eip155:421614). Sepolia netw
 | Component          | Release                                                                              |
 | ------------------ | ------------------------------------------------------------------------------------ |
 | contracts          | [5.3.3](https://github.com/graphprotocol/contracts/releases/tag/v5.3.3)              |
-| indexer-agent      | [0.23.5](https://github.com/graphprotocol/indexer/releases/tag/v0.23.5)              |
-| indexer-cli        | [0.23.5](https://github.com/graphprotocol/indexer/releases/tag/v0.23.5)              |
+| indexer-agent      | [0.23.8](https://github.com/graphprotocol/indexer/releases/tag/v0.23.8)              |
+| indexer-cli        | [0.23.8](https://github.com/graphprotocol/indexer/releases/tag/v0.23.8)              |
 | indexer-service-rs | [1.0.0](https://github.com/graphprotocol/indexer-rs/releases/tag/v1.0.0)             |
 | tap-agent          | [1.0.0](https://github.com/graphprotocol/indexer-rs/releases/tag/v1.0.0)             |
 | graph-node         | [0.35.1](https://github.com/graphprotocol/graph-node/releases/tag/v0.35.1)           |

lerna.json

@@ -4,5 +4,5 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.23.5"
+  "version": "0.23.8"
 }

packages/indexer-agent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/indexer-agent",
-  "version": "0.23.5",
+  "version": "0.23.8",
   "description": "Indexer agent",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@graphprotocol/common-ts": "3.0.1",
-    "@graphprotocol/indexer-common": "^0.23.5",
+    "@graphprotocol/indexer-common": "^0.23.8",
     "@thi.ng/heaps": "^1.3.1",
     "axios": "0.26.1",
     "bs58": "5.0.0",

packages/indexer-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/indexer-cli",
-  "version": "0.23.5",
+  "version": "0.23.8",
   "description": "Indexer CLI for The Graph Network",
   "main": "./dist/cli.js",
   "files": [
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@graphprotocol/common-ts": "3.0.1",
-    "@graphprotocol/indexer-common": "^0.23.5",
+    "@graphprotocol/indexer-common": "^0.23.8",
     "@iarna/toml": "2.2.5",
     "@thi.ng/iterators": "5.1.74",
     "@urql/core": "3.1.0",

packages/indexer-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphprotocol/indexer-common",
-  "version": "0.23.5",
+  "version": "0.23.8",
   "description": "Common library for Graph Protocol indexer components",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

packages/indexer-common/src/indexer-management/types.ts

@@ -238,23 +238,16 @@ const caip2ByChainAlias: { [key: string]: string } = {
   boba: 'eip155:288',
   'boba-bnb': 'eip155:56288',
   zora: 'eip155:7777777',
-  mode: 'eip155:34443',
+  'mode-mainnet': 'eip155:34443',
 }
 
 async function buildCaip2MappingsFromRegistry() {
-  const networks = registry.networks
-
-  for (const network of networks) {
-    if (!network.aliases) {
+  for (const network of registry.networks) {
+    const alias = network.id
+    caip2ByChainAlias[alias] = network.caip2Id
+    if (!network.caip2Id.startsWith('eip155')) {
       continue
     }
-    for (const alias of network.aliases) {
-      caip2ByChainAlias[alias] = network.caip2Id
-      if (alias.endsWith('-mainnet')) {
-        const aliasWithoutSuffix = alias.replace('-mainnet', '')
-        caip2ByChainAlias[aliasWithoutSuffix] = network.caip2Id
-      }
-    }
     const chainId = parseInt(network.caip2Id.split(':')[1])
     if (
       typeof chainId === 'number' &&