@chainsafe/lodestar 1.41.0-dev.9fa839a030 → 1.41.0-dev.aeab9f930d

package/lib/util/pruneOldFilesInDir.js.map

@@ -1 +1 @@
-{"version":3,"file":"pruneOldFilesInDir.js","sourceRoot":"","sources":["../../src/util/pruneOldFilesInDir.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,UAAU,kBAAkB,CAAC,OAAe,EAAE,QAAgB;IAClE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,CAAC,CAAC,mBAAmB;IAC/B,CAAC;IAED,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,KAAK,MAAM,SAAS,IAAI,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;QAChD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAEhD,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACpC,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACvB,gBAAgB,IAAI,kBAAkB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC9D,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,GAAG,QAAQ,EAAE,CAAC;YACjE,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YACzB,gBAAgB,IAAI,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IAED,iDAAiD;IACjD,IAAI,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACxB,CAAC;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}
+{"version":3,"file":"pruneOldFilesInDir.js","sourceRoot":"","sources":["../../src/util/pruneOldFilesInDir.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,UAAU,kBAAkB,CAAC,OAAe,EAAE,QAAgB,EAAU;IAC5E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,CAAC,CAAC,mBAAmB;IAC/B,CAAC;IAED,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,KAAK,MAAM,SAAS,IAAI,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;QAChD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAEhD,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACpC,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACvB,gBAAgB,IAAI,kBAAkB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC9D,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,GAAG,QAAQ,EAAE,CAAC;YACjE,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YACzB,gBAAgB,IAAI,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IAED,iDAAiD;IACjD,IAAI,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACxB,CAAC;IACD,OAAO,gBAAgB,CAAC;AAAA,CACzB"}

package/lib/util/sleep.js.map

@@ -1 +1 @@
-{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../../src/util/sleep.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,KAAK,CAAC,EAAU;IAC9B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC"}
+{"version":3,"file":"sleep.js","sourceRoot":"","sources":["../../src/util/sleep.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,KAAK,CAAC,EAAU,EAAiB;IAC/C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAAA,CAC1D"}

package/lib/util/stripOffNewlines.js.map

@@ -1 +1 @@
-{"version":3,"file":"stripOffNewlines.js","sourceRoot":"","sources":["../../src/util/stripOffNewlines.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,CAAS;IACxC,OAAO,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"stripOffNewlines.js","sourceRoot":"","sources":["../../src/util/stripOffNewlines.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,CAAS,EAAU;IAClD,OAAO,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;AAAA,CACnC"}

package/lib/util/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/util/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,6EAA6E;AAC7E,MAAM,UAAU,UAAU,CAAiC,CAAI;IAC7D,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACxB,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/util/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,6EAA6E;AAC7E,MAAM,UAAU,UAAU,CAAiC,CAAI,EAAe;IAC5E,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAAA,CACvB"}

package/lib/util/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/util/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AACnC,OAAO,EAAC,iBAAiB,EAAC,MAAM,oBAAoB,CAAC;AAErD,gEAAgE;AAChE,oHAAoH;AACpH,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAO/D,MAAM,aAAa,GAAG,+BAA+B,CAAC;AAEtD;;;;;;GAMG;AACH,MAAM,UAAU,cAAc;IAI5B,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,8EAA8E;IAC9E,MAAM,YAAY,GAAG,kBAAkB,EAAE,IAAI,wBAAwB,EAAE,CAAC;IACxE,IAAI,YAAY,EAAE,CAAC;QACjB,KAAK,CAAC,IAAI,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,EAAC,MAAM,EAAE,MAAM,EAAC,GAAG,iBAAiB,EAAE,CAAC;IAE7C,yDAAyD;IACzD,IAAI,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9D,wEAAwE;IACxE,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACvC,wEAAwE;QACxE,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACzD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,OAAO;QACL,kCAAkC;QAClC,OAAO,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;QACvD,MAAM;KACP,CAAC;AACJ,CAAC;AAED,+CAA+C;AAC/C,SAAS,wBAAwB;IAC/B,MAAM,QAAQ,GAAG,UAAU,CAAC,YAAY,EAAE,EAAC,GAAG,EAAE,SAAS,EAAC,CAAC,CAAC;IAC5D,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAEhC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAgB,CAAC;IAC/E,OAAO,SAAS,CAAC,OAAO,CAAC;AAC3B,CAAC;AAED,iDAAiD;AACjD,SAAS,kBAAkB;IACzB,MAAM,QAAQ,GAAG,UAAU,CAAC,cAAc,EAAE,EAAC,GAAG,EAAE,SAAS,EAAC,CAAC,CAAC;IAC9D,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAEhC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAgB,CAAC;IACjF,OAAO,WAAW,CAAC,OAAO,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/util/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,SAAS,CAAC;AACnC,OAAO,EAAC,iBAAiB,EAAC,MAAM,oBAAoB,CAAC;AAErD,gEAAgE;AAChE,oHAAoH;AACpH,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAO/D,MAAM,aAAa,GAAG,+BAA+B,CAAC;AAEtD;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,GAG5B;IACA,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,8EAA8E;IAC9E,MAAM,YAAY,GAAG,kBAAkB,EAAE,IAAI,wBAAwB,EAAE,CAAC;IACxE,IAAI,YAAY,EAAE,CAAC;QACjB,KAAK,CAAC,IAAI,CAAC,IAAI,YAAY,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,MAAM,EAAC,MAAM,EAAE,MAAM,EAAC,GAAG,iBAAiB,EAAE,CAAC;IAE7C,yDAAyD;IACzD,IAAI,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9D,wEAAwE;IACxE,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACvC,wEAAwE;QACxE,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACzD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,OAAO;QACL,kCAAkC;QAClC,OAAO,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;QACvD,MAAM;KACP,CAAC;AAAA,CACH;AAED,+CAA+C;AAC/C,SAAS,wBAAwB,GAAuB;IACtD,MAAM,QAAQ,GAAG,UAAU,CAAC,YAAY,EAAE,EAAC,GAAG,EAAE,SAAS,EAAC,CAAC,CAAC;IAC5D,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAEhC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAgB,CAAC;IAC/E,OAAO,SAAS,CAAC,OAAO,CAAC;AAAA,CAC1B;AAED,iDAAiD;AACjD,SAAS,kBAAkB,GAAuB;IAChD,MAAM,QAAQ,GAAG,UAAU,CAAC,cAAc,EAAE,EAAC,GAAG,EAAE,SAAS,EAAC,CAAC,CAAC;IAC9D,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAEhC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAgB,CAAC;IACjF,OAAO,WAAW,CAAC,OAAO,CAAC;AAAA,CAC5B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainsafe/lodestar",
-  "version": "1.41.0-dev.9fa839a030",
+  "version": "1.41.0-dev.aeab9f930d",
   "description": "Command line interface for lodestar",
   "author": "ChainSafe Systems",
   "license": "Apache-2.0",
@@ -28,12 +28,12 @@
   },
   "scripts": {
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
-    "build": "tsc -p tsconfig.build.json && pnpm write-git-data",
+    "build": "tsgo -p tsconfig.build.json && pnpm write-git-data",
     "build:release": "pnpm clean && pnpm run build",
-    "build:watch": "tsc -p tsconfig.build.json --watch",
+    "build:watch": "tsgo -p tsconfig.build.json --watch",
     "write-git-data": "node lib/util/gitData/writeGitData.js",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\" lodestar --help",
-    "check-types": "tsc",
+    "check-types": "tsgo",
     "docs:build": "node --loader ts-node/esm ./docsgen/index.ts",
     "lint": "biome check src/ test/",
     "lint:fix": "pnpm run lint --write",
@@ -60,27 +60,27 @@
     "@chainsafe/bls-keygen": "^0.4.0",
     "@chainsafe/bls-keystore": "^3.1.0",
     "@chainsafe/blst": "^2.2.0",
-    "@chainsafe/discv5": "^11.0.4",
-    "@chainsafe/enr": "^5.0.1",
+    "@chainsafe/discv5": "^12.0.0",
+    "@chainsafe/enr": "^6.0.0",
     "@chainsafe/persistent-merkle-tree": "^1.2.1",
     "@chainsafe/pubkey-index-map": "^3.0.0",
     "@chainsafe/ssz": "^1.2.2",
     "@chainsafe/threads": "^1.11.3",
-    "@libp2p/crypto": "^5.0.15",
-    "@libp2p/interface": "^2.7.0",
-    "@libp2p/peer-id": "^5.1.0",
-    "@lodestar/api": "^1.41.0-dev.9fa839a030",
-    "@lodestar/beacon-node": "^1.41.0-dev.9fa839a030",
-    "@lodestar/config": "^1.41.0-dev.9fa839a030",
-    "@lodestar/db": "^1.41.0-dev.9fa839a030",
-    "@lodestar/light-client": "^1.41.0-dev.9fa839a030",
-    "@lodestar/logger": "^1.41.0-dev.9fa839a030",
-    "@lodestar/params": "^1.41.0-dev.9fa839a030",
-    "@lodestar/state-transition": "^1.41.0-dev.9fa839a030",
-    "@lodestar/types": "^1.41.0-dev.9fa839a030",
-    "@lodestar/utils": "^1.41.0-dev.9fa839a030",
-    "@lodestar/validator": "^1.41.0-dev.9fa839a030",
-    "@multiformats/multiaddr": "^12.1.3",
+    "@libp2p/crypto": "^5.1.13",
+    "@libp2p/interface": "^3.1.0",
+    "@libp2p/peer-id": "^6.0.4",
+    "@lodestar/api": "^1.41.0-dev.aeab9f930d",
+    "@lodestar/beacon-node": "^1.41.0-dev.aeab9f930d",
+    "@lodestar/config": "^1.41.0-dev.aeab9f930d",
+    "@lodestar/db": "^1.41.0-dev.aeab9f930d",
+    "@lodestar/light-client": "^1.41.0-dev.aeab9f930d",
+    "@lodestar/logger": "^1.41.0-dev.aeab9f930d",
+    "@lodestar/params": "^1.41.0-dev.aeab9f930d",
+    "@lodestar/state-transition": "^1.41.0-dev.aeab9f930d",
+    "@lodestar/types": "^1.41.0-dev.aeab9f930d",
+    "@lodestar/utils": "^1.41.0-dev.aeab9f930d",
+    "@lodestar/validator": "^1.41.0-dev.aeab9f930d",
+    "@multiformats/multiaddr": "^13.0.1",
     "deepmerge": "^4.3.1",
     "ethers": "^6.7.0",
     "find-up": "^6.3.0",
@@ -96,7 +96,7 @@
   "devDependencies": {
     "@chainsafe/as-sha256": "^1.2.0",
     "@ethereumjs/rlp": "^4.0.1",
-    "@lodestar/test-utils": "^1.41.0-dev.9fa839a030",
+    "@lodestar/test-utils": "^1.41.0-dev.aeab9f930d",
     "@types/debug": "^4.1.7",
     "@types/inquirer": "^9.0.3",
     "@types/js-yaml": "^4.0.5",
@@ -104,10 +104,10 @@
     "@types/tmp": "^0.2.3",
     "@types/yargs": "^17.0.24",
     "ethereum-cryptography": "^2.2.1",
-    "fastify": "^5.7.4",
+    "fastify": "^5.8.1",
     "tmp": "^0.2.4",
     "web3": "^4.0.3",
     "web3-eth-accounts": "^4.0.3"
   },
-  "gitHead": "1ba8fa66f8fc0890153a0ecc8cd5b3be617ce410"
+  "gitHead": "89f360d7bf466b84570b2b831517069776a24643"
 }

package/src/cmds/beacon/handler.ts

@@ -2,13 +2,12 @@ import path from "node:path";
 import {getHeapStatistics} from "node:v8";
 import {SignableENR} from "@chainsafe/enr";
 import {hasher} from "@chainsafe/persistent-merkle-tree";
-import {PubkeyIndexMap} from "@chainsafe/pubkey-index-map";
 import {BeaconDb, BeaconNode} from "@lodestar/beacon-node";
 import {ChainForkConfig, createBeaconConfig} from "@lodestar/config";
 import {LevelDbController} from "@lodestar/db/controller/level";
 import {LoggerNode, getNodeLogger} from "@lodestar/logger/node";
 import {ACTIVE_PRESET, PresetName} from "@lodestar/params";
-import {Index2PubkeyCache, createCachedBeaconState, syncPubkeys} from "@lodestar/state-transition";
+import {createCachedBeaconState, createPubkeyCache, syncPubkeys} from "@lodestar/state-transition";
 import {ErrorAborted, bytesToInt, formatBytes} from "@lodestar/utils";
 import {ProcessShutdownCallback} from "@lodestar/validator";
 import {BeaconNodeOptions, getBeaconConfigFromArgs} from "../../config/index.js";
@@ -80,15 +79,13 @@ export async function beaconHandler(args: BeaconArgs & GlobalArgs): Promise<void
       logger
     );
     const beaconConfig = createBeaconConfig(config, anchorState.genesisValidatorsRoot);
-    const pubkey2index = new PubkeyIndexMap();
-    const index2pubkey: Index2PubkeyCache = [];
-    syncPubkeys(anchorState.validators.getAllReadonlyValues(), pubkey2index, index2pubkey);
+    const pubkeyCache = createPubkeyCache();
+    syncPubkeys(pubkeyCache, anchorState.validators.getAllReadonlyValues());
     const cachedState = createCachedBeaconState(
       anchorState,
       {
         config: beaconConfig,
-        pubkey2index,
-        index2pubkey,
+        pubkeyCache,
       },
       {skipSyncPubkeys: true}
     );
@@ -96,8 +93,7 @@ export async function beaconHandler(args: BeaconArgs & GlobalArgs): Promise<void
     const node = await BeaconNode.init({
       opts: options,
       config: beaconConfig,
-      pubkey2index,
-      index2pubkey,
+      pubkeyCache,
       db,
       logger,
       processShutdownCallback,

package/src/cmds/beacon/initPeerIdAndEnr.ts

@@ -18,27 +18,19 @@ import {BeaconArgs} from "./options.js";
 export function isLocalMultiAddr(multiaddr: Multiaddr | undefined): boolean {
   if (!multiaddr) return false;
 
-  const protoNames = multiaddr.protoNames();
-  if (protoNames.length !== 2 && protoNames[1] !== "udp") {
+  const components = multiaddr.getComponents();
+  if (components.length !== 2 && components[1].name !== "udp") {
     throw new Error("Invalid udp multiaddr");
   }
 
   const interfaces = os.networkInterfaces();
-  const tuples = multiaddr.tuples();
-  const family = tuples[0][0];
-  const isIPv4: boolean = family === 4;
-  const ip = tuples[0][1];
+  const family = components[0].name === "ip4" ? 4 : 6;
+  const ipStr = components[0].value;
 
-  if (!ip) {
+  if (!ipStr) {
     return false;
   }
 
-  const ipStr = isIPv4
-    ? Array.from(ip).join(".")
-    : Array.from(Uint16Array.from(ip))
-        .map((n) => n.toString(16))
-        .join(":");
-
   for (const networkInterfaces of Object.values(interfaces)) {
     for (const networkInterface of networkInterfaces || []) {
       // since node version 18, the netowrkinterface family returns 4 | 6 instead of ipv4 | ipv6,

package/src/cmds/bootnode/handler.ts

@@ -2,7 +2,7 @@ import path from "node:path";
 import {PrivateKey} from "@libp2p/interface";
 import {Multiaddr, multiaddr} from "@multiformats/multiaddr";
 import {Discv5, Discv5EventEmitter} from "@chainsafe/discv5";
-import {ENR, ENRData, SignableENR} from "@chainsafe/enr";
+import {ENR, SignableENR} from "@chainsafe/enr";
 import {
   HttpMetricsServer,
   IBeaconNodeOptions,
@@ -87,7 +87,7 @@ export async function bootnodeHandler(args: BootnodeArgs & GlobalArgs): Promise<
       void discv5.findRandomNode();
     }
 
-    discv5.on("multiaddrUpdated", (addr: ENRData) => {
+    discv5.on("multiaddrUpdated", (addr: Multiaddr) => {
       logger.info("Advertised socket address updated", {addr: addr.toString()});
     });
 

package/src/cmds/dev/options.ts

@@ -1,7 +1,7 @@
 import {CliCommandOptions, CliOptionDefinition} from "@lodestar/utils";
 import {NetworkName} from "../../networks/index.js";
 import {beaconNodeOptions, globalOptions} from "../../options/index.js";
-import {parseRange} from "../../util/format.ts";
+import {parseRange} from "../../util/format.js";
 import {BeaconArgs, beaconOptions} from "../beacon/options.js";
 import {IValidatorCliArgs, validatorOptions} from "../validator/options.js";
 

package/src/cmds/validator/handler.ts

@@ -179,7 +179,7 @@ export async function validatorHandler(args: IValidatorCliArgs & GlobalArgs): Pr
       broadcastValidation: parseBroadcastValidation(args.broadcastValidation),
       blindedLocal: args.blindedLocal,
       externalSigner: {
-        url: args["externalSigner.url"],
+        urls: args["externalSigner.urls"],
         fetch: args["externalSigner.fetch"],
         fetchInterval: args["externalSigner.fetchInterval"],
       },

package/src/cmds/validator/options.ts

@@ -63,7 +63,7 @@ export type IValidatorCliArgs = AccountValidatorArgs &
 
     "clock.skipSlots"?: boolean;
 
-    "externalSigner.url"?: string;
+    "externalSigner.urls"?: string[];
     "externalSigner.pubkeys"?: string[];
     "externalSigner.fetch"?: boolean;
     "externalSigner.fetchInterval"?: number;
@@ -341,14 +341,23 @@ export const validatorOptions: CliCommandOptions<IValidatorCliArgs> = {
 
   // External signer
 
-  "externalSigner.url": {
-    description: "URL to connect to an external signing server",
-    type: "string",
+  "externalSigner.urls": {
+    alias: "externalSigner.url",
+    description: "URL(s) to connect to external signing server(s)",
+    type: "array",
+    string: true,
+    // Support backward compatibility: allow string in config files, convert to array
+    coerce: (urls: string | string[]): string[] => {
+      if (typeof urls === "string") {
+        return [urls];
+      }
+      return urls;
+    },
     group: "externalSigner",
   },
 
   "externalSigner.pubkeys": {
-    implies: ["externalSigner.url"],
+    implies: ["externalSigner.urls"],
     description:
       "List of validator public keys used by an external signer. May also provide a single string of comma-separated public keys",
     type: "array",
@@ -362,10 +371,10 @@ export const validatorOptions: CliCommandOptions<IValidatorCliArgs> = {
   },
 
   "externalSigner.fetch": {
-    implies: ["externalSigner.url"],
+    implies: ["externalSigner.urls"],
     conflicts: ["externalSigner.pubkeys"],
     description:
-      "Fetch the list of public keys to validate from an external signer. Cannot be used in combination with `--externalSigner.pubkeys`",
+      "Fetch the list of public keys to validate from external signer(s). Cannot be used in combination with `--externalSigner.pubkeys`",
     type: "boolean",
     group: "externalSigner",
   },
@@ -373,7 +382,7 @@ export const validatorOptions: CliCommandOptions<IValidatorCliArgs> = {
   "externalSigner.fetchInterval": {
     implies: ["externalSigner.fetch"],
     description:
-      "Interval in milliseconds between fetching the list of public keys from external signer, once per epoch by default",
+      "Interval in milliseconds between fetching the list of public keys from external signer(s), once per epoch by default",
     type: "number",
     group: "externalSigner",
   },

package/src/cmds/validator/signers/index.ts

@@ -20,8 +20,8 @@ const KEYSTORE_IMPORT_PROGRESS_MS = 10000;
  * --interopIndexes
  * --fromMnemonic, then requires --mnemonicIndexes
  * --importKeystores, then requires --importKeystoresPassword
- * --externalSigner.fetch, then requires --externalSigner.url
- * --externalSigner.pubkeys, then requires --externalSigner.url
+ * --externalSigner.fetch, then requires --externalSigner.urls
+ * --externalSigner.pubkeys, then requires --externalSigner.urls
  * else load from persisted
  * - both remote keys and local keystores
  *
@@ -52,7 +52,7 @@ export async function getSignersFromArgs(
     const indexes = args.interopIndexes;
     // Using a remote signer with TESTNETS
     if (args["externalSigner.pubkeys"] || args["externalSigner.fetch"]) {
-      return getRemoteSigners(args);
+      return getRemoteSigners(args, logger);
     }
     return indexes.map((index) => ({type: SignerType.Local, secretKey: interopSecretKey(index)}));
   }
@@ -105,7 +105,7 @@ export async function getSignersFromArgs(
 
   // Remote keys are declared manually or will be fetched from external signer
   if (args["externalSigner.pubkeys"] || args["externalSigner.fetch"]) {
-    return getRemoteSigners(args);
+    return getRemoteSigners(args, logger);
   }
 
   // Read keys from local account manager
@@ -153,24 +153,91 @@ export function getSignerPubkeyHex(signer: Signer): string {
   }
 }
 
-async function getRemoteSigners(args: IValidatorCliArgs & GlobalArgs): Promise<Signer[]> {
-  const externalSignerUrl = args["externalSigner.url"];
-  if (!externalSignerUrl) {
+async function getRemoteSigners(
+  args: IValidatorCliArgs & GlobalArgs,
+  logger: Pick<Logger, LogLevel.info | LogLevel.warn | LogLevel.debug>
+): Promise<Signer[]> {
+  const externalSignerUrls = args["externalSigner.urls"] ?? [];
+
+  if (externalSignerUrls.length === 0) {
     throw new YargsError(
-      `Must set externalSigner.url with ${
+      `Must set externalSigner.urls with ${
         args["externalSigner.pubkeys"] ? "externalSigner.pubkeys" : "externalSigner.fetch"
       }`
     );
   }
-  if (!isValidHttpUrl(externalSignerUrl)) {
-    throw new YargsError(`Invalid external signer URL: ${externalSignerUrl}`);
+
+  for (const url of externalSignerUrls) {
+    if (!isValidHttpUrl(url)) {
+      throw new YargsError(`Invalid external signer URL: ${url}`);
+    }
   }
+
   if (args["externalSigner.pubkeys"] && args["externalSigner.pubkeys"].length === 0) {
     throw new YargsError("externalSigner.pubkeys is set to an empty list");
   }
 
-  const pubkeys = args["externalSigner.pubkeys"] ?? (await externalSignerGetKeys(externalSignerUrl));
-  assertValidPubkeysHex(pubkeys);
+  const signers: Signer[] = [];
+
+  if (args["externalSigner.pubkeys"]) {
+    // If pubkeys are explicitly provided with multiple URLs, warn user about limitation
+    if (externalSignerUrls.length > 1) {
+      throw new YargsError(
+        "Cannot use --externalSigner.pubkeys with multiple --externalSigner.urls. " +
+          "When using --externalSigner.pubkeys, only a single URL is allowed. " +
+          "To use multiple signers, use --externalSigner.fetch instead to fetch pubkeys from each signer."
+      );
+    }
+    // If pubkeys are explicitly provided, assign them to the first (and only) URL
+    // This maintains backward compatibility
+    const pubkeys = args["externalSigner.pubkeys"];
+    assertValidPubkeysHex(pubkeys);
+    for (const pubkey of pubkeys) {
+      signers.push({type: SignerType.Remote, pubkey, url: externalSignerUrls[0]});
+    }
+  } else {
+    // Fetch pubkeys from all external signer URLs, fail startup if any signer is unavailable
+    const results: {url: string; pubkeys: string[]}[] = [];
+    const failures: {url: string; error: string}[] = [];
+    await Promise.all(
+      externalSignerUrls.map(async (url) => {
+        try {
+          const pubkeys = await externalSignerGetKeys(url);
+          results.push({url, pubkeys});
+        } catch (e) {
+          const errorMsg = e instanceof Error ? e.message : String(e);
+          failures.push({url, error: errorMsg});
+        }
+      })
+    );
+    if (failures.length > 0) {
+      const errorMessages = failures.map((f) => `  ${f.url}: ${f.error}`).join("\n");
+      throw new YargsError(
+        `Failed to fetch pubkeys from external signer(s):\n${errorMessages}\n` +
+          "Please verify the signer URLs are correct and reachable."
+      );
+    }
+
+    const seenPubkeys = new Map<string, string>();
+    for (const {url, pubkeys} of results) {
+      if (pubkeys.length > 0) {
+        assertValidPubkeysHex(pubkeys);
+        for (const pubkey of pubkeys) {
+          const firstUrl = seenPubkeys.get(pubkey);
+          if (firstUrl !== undefined) {
+            logger.warn("Duplicate pubkey found on multiple signers, using first occurrence only", {
+              pubkey,
+              firstUrl,
+              duplicateUrl: url,
+            });
+            continue;
+          }
+          seenPubkeys.set(pubkey, url);
+          signers.push({type: SignerType.Remote, pubkey, url});
+        }
+      }
+    }
+  }
 
-  return pubkeys.map((pubkey) => ({type: SignerType.Remote, pubkey, url: externalSignerUrl}));
+  return signers;
 }

package/src/cmds/validator/signers/logSigners.ts

@@ -69,7 +69,7 @@ export function warnOrExitNoSigners(args: IValidatorCliArgs, logger: Pick<Logger
       "No local keystores or remote keys found with current args, expecting to be added via keymanager or fetched from external signer later"
     );
   } else {
-    if (args["externalSigner.url"]) {
+    if (args["externalSigner.urls"]) {
       throw new YargsError(
         "No remote keys found with current args, start with --externalSigner.fetch to automatically fetch from external signer"
       );

package/src/cmds/validator/voluntaryExit.ts

@@ -37,7 +37,7 @@ If no `pubkeys` are provided, it will exit all validators that have been importe
     },
     {
       command:
-        "validator voluntary-exit --network hoodi --externalSigner.url http://signer:9000 --externalSigner.fetch --pubkeys 0xF00",
+        "validator voluntary-exit --network hoodi --externalSigner.urls http://signer:9000 --externalSigner.fetch --pubkeys 0xF00",
       description:
         "Perform a voluntary exit for the validator who has a public key 0xF00 and its secret key is on an external signer",
     },