@chainsafe/lodestar 1.10.0-dev.85ac6cb99f → 1.10.0-dev.8a57890b6c

package/lib/options/beaconNodeOptions/network.js

@@ -1,34 +1,97 @@
+import { multiaddr } from "@multiformats/multiaddr";
+import { ENR } from "@chainsafe/discv5";
 import { defaultOptions } from "@lodestar/beacon-node";
 import { YargsError } from "../../util/index.js";
 const defaultListenAddress = "0.0.0.0";
 export const defaultP2pPort = 9000;
+export const defaultP2pPort6 = 9090;
+function validateMultiaddrArg(args, key) {
+    if (args[key]) {
+        try {
+            multiaddr(args[key]);
+        }
+        catch (e) {
+            throw new YargsError(`Invalid ${key}: ${e.message}`);
+        }
+    }
+}
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+export function parseListenArgs(args) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    // If listenAddress is explicitly set, use it
+    // If listenAddress6 is not set, use defaultListenAddress
+    const listenAddress = (_a = args.listenAddress) !== null && _a !== void 0 ? _a : (args.listenAddress6 ? undefined : defaultListenAddress);
+    const port = listenAddress ? (_b = args.port) !== null && _b !== void 0 ? _b : defaultP2pPort : undefined;
+    const discoveryPort = listenAddress ? (_d = (_c = args.discoveryPort) !== null && _c !== void 0 ? _c : args.port) !== null && _d !== void 0 ? _d : defaultP2pPort : undefined;
+    // Only use listenAddress6 if it is explicitly set
+    const listenAddress6 = args.listenAddress6;
+    const port6 = listenAddress6 ? (_e = args.port6) !== null && _e !== void 0 ? _e : defaultP2pPort6 : undefined;
+    const discoveryPort6 = listenAddress6 ? (_g = (_f = args.discoveryPort6) !== null && _f !== void 0 ? _f : args.port6) !== null && _g !== void 0 ? _g : defaultP2pPort6 : undefined;
+    return { listenAddress, port, discoveryPort, listenAddress6, port6, discoveryPort6 };
+}
 export function parseArgs(args) {
-    var _a, _b, _c, _d, _e, _f;
-    const listenAddress = args.listenAddress || defaultListenAddress;
-    const udpPort = (_b = (_a = args.discoveryPort) !== null && _a !== void 0 ? _a : args.port) !== null && _b !== void 0 ? _b : defaultP2pPort;
-    const tcpPort = (_c = args.port) !== null && _c !== void 0 ? _c : defaultP2pPort;
+    var _a, _b, _c, _d;
+    const { listenAddress, port, discoveryPort, listenAddress6, port6, discoveryPort6 } = parseListenArgs(args);
+    // validate ip, ip6, ports
+    const muArgs = {
+        listenAddress: listenAddress ? `/ip4/${listenAddress}` : undefined,
+        port: listenAddress ? `/tcp/${port}` : undefined,
+        discoveryPort: listenAddress ? `/udp/${discoveryPort}` : undefined,
+        listenAddress6: listenAddress6 ? `/ip6/${listenAddress6}` : undefined,
+        port6: listenAddress6 ? `/tcp/${port6}` : undefined,
+        discoveryPort6: listenAddress6 ? `/udp/${discoveryPort6}` : undefined,
+    };
+    for (const key of [
+        "listenAddress",
+        "port",
+        "discoveryPort",
+        "listenAddress6",
+        "port6",
+        "discoveryPort6",
+    ]) {
+        validateMultiaddrArg(muArgs, key);
+    }
+    const bindMu = listenAddress ? `${muArgs.listenAddress}${muArgs.discoveryPort}` : undefined;
+    const localMu = listenAddress ? `${muArgs.listenAddress}${muArgs.port}` : undefined;
+    const bindMu6 = listenAddress6 ? `${muArgs.listenAddress6}${muArgs.discoveryPort6}` : undefined;
+    const localMu6 = listenAddress6 ? `${muArgs.listenAddress6}${muArgs.port6}` : undefined;
     const targetPeers = args["targetPeers"];
-    const maxPeers = (_d = args["network.maxPeers"]) !== null && _d !== void 0 ? _d : (targetPeers !== undefined ? Math.floor(targetPeers * 1.1) : undefined);
+    const maxPeers = (_a = args["network.maxPeers"]) !== null && _a !== void 0 ? _a : (targetPeers !== undefined ? Math.floor(targetPeers * 1.1) : undefined);
     if (targetPeers != null && maxPeers != null && targetPeers > maxPeers) {
         throw new YargsError("network.maxPeers must be greater than or equal to targetPeers");
     }
     // Set discv5 opts to null to disable only if explicitly disabled
-    const enableDiscv5 = (_e = args["discv5"]) !== null && _e !== void 0 ? _e : true;
+    const enableDiscv5 = (_b = args["discv5"]) !== null && _b !== void 0 ? _b : true;
+    // TODO: Okay to set to empty array?
+    const bootEnrs = (_c = args["bootnodes"]) !== null && _c !== void 0 ? _c : [];
+    // throw if user-provided enrs are invalid
+    for (const enrStr of bootEnrs) {
+        try {
+            ENR.decodeTxt(enrStr);
+        }
+        catch (e) {
+            throw new YargsError(`Provided ENR in bootnodes is invalid:\n    ${enrStr}`);
+        }
+    }
     return {
         discv5: enableDiscv5
             ? {
                 config: {},
-                bindAddr: `/ip4/${listenAddress}/udp/${udpPort}`,
-                // TODO: Okay to set to empty array?
-                bootEnrs: (_f = args["bootnodes"]) !== null && _f !== void 0 ? _f : [],
+                bindAddrs: {
+                    ip4: bindMu,
+                    ip6: bindMu6,
+                },
+                bootEnrs,
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-explicit-any
                 enr: undefined,
             }
             : null,
         maxPeers: maxPeers !== null && maxPeers !== void 0 ? maxPeers : defaultOptions.network.maxPeers,
         targetPeers: targetPeers !== null && targetPeers !== void 0 ? targetPeers : defaultOptions.network.targetPeers,
-        localMultiaddrs: [`/ip4/${listenAddress}/tcp/${tcpPort}`],
+        localMultiaddrs: [localMu, localMu6].filter(Boolean),
+        deterministicLongLivedAttnets: args["deterministicLongLivedAttnets"],
         subscribeAllSubnets: args["subscribeAllSubnets"],
+        slotsToSubscribeBeforeAggregatorDuty: (_d = args["slotsToSubscribeBeforeAggregatorDuty"]) !== null && _d !== void 0 ? _d : defaultOptions.network.slotsToSubscribeBeforeAggregatorDuty,
         disablePeerScoring: args["disablePeerScoring"],
         connectToDiscv5Bootnodes: args["network.connectToDiscv5Bootnodes"],
         discv5FirstQueryDelayMs: args["network.discv5FirstQueryDelayMs"],
@@ -54,12 +117,12 @@ export const options = {
     },
     listenAddress: {
         type: "string",
-        description: "The address to listen for p2p UDP and TCP connections",
+        description: "The IPv4 address to listen for p2p UDP and TCP connections",
         defaultDescription: defaultListenAddress,
         group: "network",
     },
     port: {
-        description: "The TCP/UDP port to listen on. The UDP port can be modified by the --discovery-port flag.",
+        description: "The TCP/UDP port to listen on. The UDP port can be modified by the --discoveryPort flag.",
         type: "number",
         // TODO: Derive from BeaconNode defaults
         defaultDescription: String(defaultP2pPort),
@@ -71,6 +134,24 @@ export const options = {
         defaultDescription: "`port`",
         group: "network",
     },
+    listenAddress6: {
+        type: "string",
+        description: "The IPv6 address to listen for p2p UDP and TCP connections",
+        group: "network",
+    },
+    port6: {
+        description: "The TCP/UDP port to listen on. The UDP port can be modified by the --discoveryPort6 flag.",
+        type: "number",
+        // TODO: Derive from BeaconNode defaults
+        defaultDescription: String(defaultP2pPort6),
+        group: "network",
+    },
+    discoveryPort6: {
+        description: "The UDP port that discovery will listen on. Defaults to `port6`",
+        type: "number",
+        defaultDescription: "`port6`",
+        group: "network",
+    },
     bootnodes: {
         type: "array",
         description: "Bootnodes for discv5 discovery",
@@ -87,12 +168,25 @@ export const options = {
         defaultDescription: String(defaultOptions.network.targetPeers),
         group: "network",
     },
+    deterministicLongLivedAttnets: {
+        type: "boolean",
+        description: "Use deterministic subnet selection for long-lived subnet subscriptions",
+        defaultDescription: String(defaultOptions.network.deterministicLongLivedAttnets === true),
+        group: "network",
+    },
     subscribeAllSubnets: {
         type: "boolean",
         description: "Subscribe to all subnets regardless of validator count",
         defaultDescription: String(defaultOptions.network.subscribeAllSubnets === true),
         group: "network",
     },
+    slotsToSubscribeBeforeAggregatorDuty: {
+        hidden: true,
+        type: "number",
+        description: "Number of slots before an aggregator duty to subscribe to subnets",
+        defaultDescription: String(defaultOptions.network.slotsToSubscribeBeforeAggregatorDuty),
+        group: "network",
+    },
     disablePeerScoring: {
         type: "boolean",
         description: "Disable peer scoring, used for testing on devnets",
@@ -114,7 +208,7 @@ export const options = {
     },
     "network.connectToDiscv5Bootnodes": {
         type: "boolean",
-        description: "Attempt direct connection to discv5 bootnodes from network.discv5.bootEnrs option",
+        description: "Attempt direct connection to discv5 bootnodes",
         hidden: true,
         defaultDescription: String(defaultOptions.network.connectToDiscv5Bootnodes === true),
         group: "network",
@@ -149,7 +243,7 @@ export const options = {
     },
     "network.rateTrackerTimeoutMs": {
         type: "number",
-        description: "Time window to track rate limit in milli seconds",
+        description: "Time window to track rate limit in milliseconds",
         hidden: true,
         group: "network",
         deprecated: true,

package/lib/options/beaconNodeOptions/network.js.map

@@ -1 +1 @@
-{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/network.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/network.ts"],"names":[],"mappings":"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"}

package/lib/util/format.js

@@ -69,7 +69,7 @@ export function parseBootnodesFile(bootnodesFile) {
         for (const entry of line.split(",")) {
             const sanitizedEntry = entry.replace(/['",[\]{}.]+/g, "").trim();
             if (sanitizedEntry.includes("enr:-")) {
-                const parsedEnr = `enr:-${sanitizedEntry.split("enr:-")[1]}`;
+                const parsedEnr = `enr:-${sanitizedEntry.split("enr:-")[1].split("#")[0].trim()}`;
                 enrs.push(parsedEnr);
             }
         }

package/lib/util/format.js.map

@@ -1 +1 @@
-{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/util/format.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/util/format.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainsafe/lodestar",
-  "version": "1.10.0-dev.85ac6cb99f",
+  "version": "1.10.0-dev.8a57890b6c",
   "description": "Command line interface for lodestar",
   "author": "ChainSafe Systems",
   "license": "LGPL-3.0",
@@ -24,7 +24,7 @@
     "build": "tsc -p tsconfig.build.json && yarn write-git-data",
     "build:release": "yarn clean && yarn run build",
     "build:watch": "tsc -p tsconfig.build.json --watch",
-    "build:refdocs": "ts-node --esm ./docsgen/index.ts docs/cli.md",
+    "build:refdocs": "node --loader ts-node/esm ./docsgen/index.ts docs/cli.md",
     "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",
@@ -33,10 +33,10 @@
     "pretest": "yarn run check-types",
     "test:unit": "nyc --cache-dir .nyc_output/.cache -e .ts mocha 'test/unit/**/*.test.ts'",
     "test:e2e": "mocha --timeout 30000 'test/e2e/**/*.test.ts'",
-    "test:sim:multifork": "LODESTAR_PRESET=minimal ts-node --esm test/sim/multi_fork.test.ts",
-    "test:sim:endpoints": "LODESTAR_PRESET=minimal ts-node --esm test/sim/endpoints.test.ts",
-    "test:sim:deneb": "LODESTAR_PRESET=minimal ts-node --esm test/sim/deneb.test.ts",
-    "test:sim:backup_eth_provider": "LODESTAR_PRESET=minimal ts-node --esm test/sim/backup_eth_provider.test.ts",
+    "test:sim:multifork": "LODESTAR_PRESET=minimal node --loader ts-node/esm test/sim/multi_fork.test.ts",
+    "test:sim:endpoints": "LODESTAR_PRESET=minimal node --loader ts-node/esm test/sim/endpoints.test.ts",
+    "test:sim:deneb": "LODESTAR_PRESET=minimal node --loader ts-node/esm test/sim/deneb.test.ts",
+    "test:sim:backup_eth_provider": "LODESTAR_PRESET=minimal node --loader ts-node/esm test/sim/backup_eth_provider.test.ts",
     "test": "yarn test:unit && yarn test:e2e",
     "coverage": "codecov -F lodestar",
     "check-readme": "typescript-docs-verifier"
@@ -57,21 +57,24 @@
     "@chainsafe/bls-keygen": "^0.3.0",
     "@chainsafe/bls-keystore": "^2.0.0",
     "@chainsafe/blst": "^0.2.9",
-    "@chainsafe/discv5": "^3.0.0",
+    "@chainsafe/discv5": "^5.0.0",
     "@chainsafe/ssz": "^0.10.2",
+    "@chainsafe/threads": "^1.11.1",
+    "@libp2p/crypto": "^1.0.0",
+    "@libp2p/peer-id": "^2.0.3",
     "@libp2p/peer-id-factory": "^2.0.3",
-    "@lodestar/api": "1.10.0-dev.85ac6cb99f",
-    "@lodestar/beacon-node": "1.10.0-dev.85ac6cb99f",
-    "@lodestar/config": "1.10.0-dev.85ac6cb99f",
-    "@lodestar/db": "1.10.0-dev.85ac6cb99f",
-    "@lodestar/light-client": "1.10.0-dev.85ac6cb99f",
-    "@lodestar/logger": "1.10.0-dev.85ac6cb99f",
-    "@lodestar/params": "1.10.0-dev.85ac6cb99f",
-    "@lodestar/state-transition": "1.10.0-dev.85ac6cb99f",
-    "@lodestar/types": "1.10.0-dev.85ac6cb99f",
-    "@lodestar/utils": "1.10.0-dev.85ac6cb99f",
-    "@lodestar/validator": "1.10.0-dev.85ac6cb99f",
-    "@multiformats/multiaddr": "^11.0.0",
+    "@lodestar/api": "1.10.0-dev.8a57890b6c",
+    "@lodestar/beacon-node": "1.10.0-dev.8a57890b6c",
+    "@lodestar/config": "1.10.0-dev.8a57890b6c",
+    "@lodestar/db": "1.10.0-dev.8a57890b6c",
+    "@lodestar/light-client": "1.10.0-dev.8a57890b6c",
+    "@lodestar/logger": "1.10.0-dev.8a57890b6c",
+    "@lodestar/params": "1.10.0-dev.8a57890b6c",
+    "@lodestar/state-transition": "1.10.0-dev.8a57890b6c",
+    "@lodestar/types": "1.10.0-dev.8a57890b6c",
+    "@lodestar/utils": "1.10.0-dev.8a57890b6c",
+    "@lodestar/validator": "1.10.0-dev.8a57890b6c",
+    "@multiformats/multiaddr": "^12.1.3",
     "@types/lockfile": "^1.0.2",
     "bip39": "^3.1.0",
     "deepmerge": "^4.3.1",
@@ -88,12 +91,10 @@
     "source-map-support": "^0.5.21",
     "uint8arrays": "^4.0.3",
     "uuidv4": "^6.2.13",
-    "winston": "^3.8.2",
-    "winston-daily-rotate-file": "^4.7.1",
-    "winston-transport": "^4.5.0",
     "yargs": "^17.7.1"
   },
   "devDependencies": {
+    "@lodestar/test-utils": "1.10.0-dev.8a57890b6c",
     "@types/debug": "^4.1.7",
     "@types/expand-tilde": "^2.0.0",
     "@types/got": "^9.6.12",
@@ -101,5 +102,5 @@
     "@types/lodash": "^4.14.192",
     "@types/yargs": "^17.0.24"
   },
-  "gitHead": "d954b4d18cf1a503212e3d41c11967e9dc324bb9"
+  "gitHead": "42323ea0e520fe2b7c6da604e76cc8a266d96782"
 }

package/lib/networks/zhejiang.d.ts

@@ -1,6 +0,0 @@
-export { zhejiangChainConfig as chainConfig } from "@lodestar/config/networks";
-export declare const depositContractDeployBlock = 0;
-export declare const genesisFileUrl = "https://raw.githubusercontent.com/ethpandaops/withdrawals-testnet/master/zhejiang-testnet/custom_config_data/genesis.ssz";
-export declare const bootnodesFileUrl = "https://raw.githubusercontent.com/ethpandaops/withdrawals-testnet/master/zhejiang-testnet/custom_config_data/bootstrap_nodes.txt";
-export declare const bootEnrs: never[];
-//# sourceMappingURL=zhejiang.d.ts.map

package/lib/networks/zhejiang.js

@@ -1,7 +0,0 @@
-export { zhejiangChainConfig as chainConfig } from "@lodestar/config/networks";
-export const depositContractDeployBlock = 0;
-export const genesisFileUrl = "https://raw.githubusercontent.com/ethpandaops/withdrawals-testnet/master/zhejiang-testnet/custom_config_data/genesis.ssz";
-export const bootnodesFileUrl = "https://raw.githubusercontent.com/ethpandaops/withdrawals-testnet/master/zhejiang-testnet/custom_config_data/bootstrap_nodes.txt";
-// Pick from above file
-export const bootEnrs = [];
-//# sourceMappingURL=zhejiang.js.map

package/lib/networks/zhejiang.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"zhejiang.js","sourceRoot":"","sources":["../../src/networks/zhejiang.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,IAAI,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAE7E,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,CAAC;AAC5C,MAAM,CAAC,MAAM,cAAc,GACzB,0HAA0H,CAAC;AAC7H,MAAM,CAAC,MAAM,gBAAgB,GAC3B,kIAAkI,CAAC;AAErI,uBAAuB;AACvB,MAAM,CAAC,MAAM,QAAQ,GAAG,EAAE,CAAC"}