@chainsafe/lodestar 1.41.0-dev.a35cbde8b3 → 1.41.0-dev.aeab9f930d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainsafe/lodestar",
-  "version": "1.41.0-dev.a35cbde8b3",
+  "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.a35cbde8b3",
-    "@lodestar/beacon-node": "^1.41.0-dev.a35cbde8b3",
-    "@lodestar/config": "^1.41.0-dev.a35cbde8b3",
-    "@lodestar/db": "^1.41.0-dev.a35cbde8b3",
-    "@lodestar/light-client": "^1.41.0-dev.a35cbde8b3",
-    "@lodestar/logger": "^1.41.0-dev.a35cbde8b3",
-    "@lodestar/params": "^1.41.0-dev.a35cbde8b3",
-    "@lodestar/state-transition": "^1.41.0-dev.a35cbde8b3",
-    "@lodestar/types": "^1.41.0-dev.a35cbde8b3",
-    "@lodestar/utils": "^1.41.0-dev.a35cbde8b3",
-    "@lodestar/validator": "^1.41.0-dev.a35cbde8b3",
-    "@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.a35cbde8b3",
+    "@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": "090cdf258f4c067ebe6b5f0bdba221c2c23b9962"
+  "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";