@chainsafe/lodestar 1.39.0-dev.3bf4734ba9 → 1.39.0-dev.46c9c672fd

package/src/cmds/beacon/initBeaconState.ts

@@ -2,10 +2,8 @@ import {
   DbCPStateDatastore,
   FileCPStateDatastore,
   IBeaconDb,
-  IBeaconNodeOptions,
   checkAndPersistAnchorState,
   getStateTypeFromBytes,
-  initStateFromEth1,
 } from "@lodestar/beacon-node";
 import {BeaconConfig, ChainForkConfig, createBeaconConfig} from "@lodestar/config";
 import {
@@ -94,20 +92,17 @@ async function initAndVerifyWeakSubjectivityState(
  * 1. restore from weak subjectivity state (possibly downloaded from a remote beacon node)
  * 2. restore from db
  * 3. restore from genesis state (possibly downloaded via URL)
- * 4. create genesis state from eth1
  *
  * The returned anchorState could be finalized or not.
  * - if we load from checkpointState, checkpointSyncUrl, genesisStateFile or archived db, it is finalized
  * - it's not finalized if we load from unsafeCheckpointState or lastPersistedCheckpointState
  */
 export async function initBeaconState(
-  options: IBeaconNodeOptions,
   args: BeaconArgs & GlobalArgs,
   dataDir: string,
   chainForkConfig: ChainForkConfig,
   db: IBeaconDb,
-  logger: Logger,
-  signal: AbortSignal
+  logger: Logger
 ): Promise<{anchorState: BeaconStateAllForks; isFinalized: boolean; wsCheckpoint?: Checkpoint}> {
   if (args.forceCheckpointSync && !(args.checkpointState || args.checkpointSyncUrl || args.unsafeCheckpointState)) {
     throw new Error("Forced checkpoint sync without specifying a checkpointState or checkpointSyncUrl");
@@ -333,9 +328,7 @@ export async function initBeaconState(
     return {anchorState, isFinalized};
   }
 
-  // Only place we will not bother checking isWithinWeakSubjectivityPeriod as forceGenesis passed by user
-  const anchorState = await initStateFromEth1({config: chainForkConfig, db, logger, opts: options.eth1, signal});
-  return {anchorState, isFinalized: true};
+  throw Error("Failed to initialize beacon state, please provide a genesis state file or use checkpoint sync");
 }
 
 async function readWSState(

package/src/cmds/beacon/options.ts

@@ -150,7 +150,7 @@ export const beaconExtraOptions: CliCommandOptions<BeaconExtraArgs> = {
 
   private: {
     description:
-      "Do not send implementation details over p2p identify protocol and in builder, execution engine and eth1 requests",
+      "Do not send implementation details over p2p identify protocol, and in builder and execution engine requests",
     type: "boolean",
   },
 

package/src/cmds/dev/files.ts

@@ -15,7 +15,7 @@ export async function writeTestnetFiles(
   const genesisTime = Math.floor(Date.now() / 1000);
   const eth1BlockHash = Buffer.alloc(32, 0);
 
-  const {state} = nodeUtils.initDevState(config, genesisValidators, {genesisTime, eth1BlockHash});
+  const state = nodeUtils.initDevState(config, genesisValidators, {genesisTime, eth1BlockHash});
 
   // Write testnet data
   fs.mkdirSync(targetDir, {recursive: true});

package/src/cmds/dev/handler.ts

@@ -60,7 +60,7 @@ export async function devHandler(args: IDevArgs & GlobalArgs): Promise<void> {
     const genesisTime = args.genesisTime ?? Math.floor(Date.now() / 1000) + 5;
     const eth1BlockHash = fromHex(args.genesisEth1Hash ?? toHex(Buffer.alloc(32, 0x0b)));
 
-    const {state} = nodeUtils.initDevState(config, validatorCount, {genesisTime, eth1BlockHash});
+    const state = nodeUtils.initDevState(config, validatorCount, {genesisTime, eth1BlockHash});
 
     args.genesisStateFile = "genesis.ssz";
     fs.writeFileSync(args.genesisStateFile, state.serialize());

package/src/cmds/dev/options.ts

@@ -1,13 +1,14 @@
 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 {BeaconArgs, beaconOptions} from "../beacon/options.js";
 import {IValidatorCliArgs, validatorOptions} from "../validator/options.js";
 
 type IDevOwnArgs = {
   genesisEth1Hash?: string;
   genesisValidators: number;
-  startValidators?: string;
+  startValidators?: number[];
   genesisTime?: number;
   reset?: boolean;
   dumpTestnetFiles?: string;
@@ -29,8 +30,13 @@ const devOwnOptions: CliCommandOptions<IDevOwnArgs> = {
   },
 
   startValidators: {
-    description: "Start interop validators in inclusive range with notation '0..7'",
-    type: "string",
+    description: "Start interop validators in inclusive range(s) with notation '0..7'",
+    type: "array",
+    coerce: (indexes: string[]): number[] =>
+      // Parse ["11..13,15..17"] to ["11..13", "15..17"]
+      indexes
+        .flatMap((item) => item.split(","))
+        .flatMap(parseRange),
     group: "dev",
   },
 
@@ -80,11 +86,6 @@ const externalOptionsOverrides: Partial<Record<"network" | keyof typeof beaconNo
     defaultDescription: undefined,
     default: true,
   },
-  eth1: {
-    ...beaconNodeOptions.eth1,
-    defaultDescription: undefined,
-    default: false,
-  },
   rest: {
     ...beaconNodeOptions.rest,
     defaultDescription: undefined,

package/src/cmds/validator/options.ts

@@ -3,7 +3,7 @@ import {CliCommandOptions} from "@lodestar/utils";
 import {defaultOptions} from "@lodestar/validator";
 import {coerceCors, enabledAllBashFriendly} from "../../options/beaconNodeOptions/api.js";
 import {LogArgs, logOptions} from "../../options/logOptions.js";
-import {ensure0xPrefix} from "../../util/index.js";
+import {ensure0xPrefix, parseRange} from "../../util/index.js";
 import {keymanagerRestApiServerOptsDefault} from "./keymanager/server.js";
 import {defaultAccountPaths, defaultValidatorPaths} from "./paths.js";
 
@@ -70,9 +70,9 @@ export type IValidatorCliArgs = AccountValidatorArgs &
 
     distributed?: boolean;
 
-    interopIndexes?: string;
+    interopIndexes?: number[];
     fromMnemonic?: string;
-    mnemonicIndexes?: string;
+    mnemonicIndexes?: number[];
 
     metrics?: boolean;
     "metrics.port"?: number;
@@ -453,8 +453,13 @@ export const validatorOptions: CliCommandOptions<IValidatorCliArgs> = {
 
   interopIndexes: {
     hidden: true,
-    description: "Range (inclusive) of interop key indexes to validate with: 0..16",
-    type: "string",
+    description: "Range(s) (inclusive) of interop key indexes to validate with: 0..16",
+    type: "array",
+    coerce: (indexes: string[]): number[] =>
+      // Parse ["11..13,15..17"] to ["11..13", "15..17"]
+      indexes
+        .flatMap((item) => item.split(","))
+        .flatMap(parseRange),
   },
 
   fromMnemonic: {
@@ -465,7 +470,12 @@ export const validatorOptions: CliCommandOptions<IValidatorCliArgs> = {
 
   mnemonicIndexes: {
     hidden: true,
-    description: "UNSAFE. Range (inclusive) of mnemonic key indexes to validate with: 0..16",
-    type: "string",
+    description: "UNSAFE. Range(s) (inclusive) of mnemonic key indexes to validate with: 0..16",
+    type: "array",
+    coerce: (indexes: string[]): number[] =>
+      // Parse ["11..13,15..17"] to ["11..13", "15..17"]
+      indexes
+        .flatMap((item) => item.split(","))
+        .flatMap(parseRange),
   },
 };

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

@@ -5,7 +5,7 @@ import {interopSecretKey} from "@lodestar/state-transition";
 import {LogLevel, Logger, isValidHttpUrl} from "@lodestar/utils";
 import {Signer, SignerType, externalSignerGetKeys} from "@lodestar/validator";
 import {GlobalArgs, defaultNetwork} from "../../../options/index.js";
-import {YargsError, assertValidPubkeysHex, parseRange} from "../../../util/index.js";
+import {YargsError, assertValidPubkeysHex} from "../../../util/index.js";
 import {showProgress} from "../../../util/progress.js";
 import {decryptKeystoreDefinitions} from "../keymanager/decryptKeystoreDefinitions.js";
 import {PersistedKeysBackend} from "../keymanager/persistedKeys.js";
@@ -49,7 +49,7 @@ export async function getSignersFromArgs(
 
   // ONLY USE FOR TESTNETS - Derive interop keys
   if (args.interopIndexes) {
-    const indexes = parseRange(args.interopIndexes);
+    const indexes = args.interopIndexes;
     // Using a remote signer with TESTNETS
     if (args["externalSigner.pubkeys"] || args["externalSigner.fetch"]) {
       return getRemoteSigners(args);
@@ -67,7 +67,7 @@ export async function getSignersFromArgs(
     }
 
     const masterSK = deriveKeyFromMnemonic(args.fromMnemonic);
-    const indexes = parseRange(args.mnemonicIndexes);
+    const indexes = Array.from(new Set(args.mnemonicIndexes));
     return indexes.map((index) => ({
       type: SignerType.Local,
       secretKey: SecretKey.fromBytes(deriveEth2ValidatorKeys(masterSK, index).signing),

package/src/networks/chiado.ts

@@ -1,7 +1,5 @@
 export {chiadoChainConfig as chainConfig} from "@lodestar/config/networks";
 
-// eth1.providerUrls suggestion: https://rpc.chiado.gnosis.gateway.fm
-export const depositContractDeployBlock = 155435;
 export const genesisFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/main/chiado/genesis.ssz";
 export const genesisStateRoot = "0xa48419160f8f146ecaa53d12a5d6e1e6af414a328afdc56b60d5002bb472a077";
 export const bootnodesFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/main/chiado/bootnodes.yaml";

package/src/networks/dev.ts

@@ -20,7 +20,6 @@ switch (ACTIVE_PRESET) {
 
 export {chainConfig};
 
-export const depositContractDeployBlock = 0;
 export const genesisFileUrl = null;
 export const genesisStateRoot = null;
 export const bootnodesFileUrl = null;

package/src/networks/ephemery.ts

@@ -1,6 +1,5 @@
 export {ephemeryChainConfig as chainConfig} from "@lodestar/config/networks";
 
-export const depositContractDeployBlock = 0;
 export const genesisFileUrl = "https://ephemery.dev/latest/genesis.ssz";
 export const genesisStateRoot = null;
 export const bootnodesFileUrl = "https://ephemery.dev/latest/bootstrap_nodes.txt";

package/src/networks/gnosis.ts

@@ -1,7 +1,5 @@
 export {gnosisChainConfig as chainConfig} from "@lodestar/config/networks";
 
-// eth1.providerUrls suggestion: https://rpc.gnosischain.com
-export const depositContractDeployBlock = 19469077;
 export const genesisFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/main/mainnet/genesis.ssz";
 export const genesisStateRoot = "0x1511578d6de70428bf3529ab92102f21070694cb205443437fae359a7f220537";
 export const bootnodesFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/main/mainnet/bootnodes.yaml";

package/src/networks/hoodi.ts

@@ -1,6 +1,5 @@
 export {hoodiChainConfig as chainConfig} from "@lodestar/config/networks";
 
-export const depositContractDeployBlock = 0;
 export const genesisFileUrl = "https://media.githubusercontent.com/media/eth-clients/hoodi/main/metadata/genesis.ssz";
 export const genesisStateRoot = "0x2683ebc120f91f740c7bed4c866672d01e1ba51b4cc360297138465ee5df40f0";
 export const bootnodesFileUrl =
@@ -13,4 +12,5 @@ export const bootEnrs = [
   "enr:-Ku4QIC89sMC0o-irosD4_23lJJ4qCGOvdUz7SmoShWx0k6AaxCFTKviEHa-sa7-EzsiXpDp0qP0xzX6nKdXJX3X-IQBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpBd9cEGEAAJEP__________gmlkgnY0gmlwhIbRilSJc2VjcDI1NmsxoQK_m0f1DzDc9Cjrspm36zuRa7072HSiMGYWLsKiVSbP34N1ZHCCIyk",
   "enr:-Ku4QNkWjw5tNzo8DtWqKm7CnDdIq_y7xppD6c1EZSwjB8rMOkSFA1wJPLoKrq5UvA7wcxIotH6Usx3PAugEN2JMncIBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpBd9cEGEAAJEP__________gmlkgnY0gmlwhIbHuBeJc2VjcDI1NmsxoQP3FwrhFYB60djwRjAoOjttq6du94DtkQuaN99wvgqaIYN1ZHCCIyk",
   "enr:-OS4QMJGE13xEROqvKN1xnnt7U-noc51VXyM6wFMuL9LMhQDfo1p1dF_zFdS4OsnXz_vIYk-nQWnqJMWRDKvkSK6_CwDh2F0dG5ldHOIAAAAADAAAACGY2xpZW502IpMaWdodGhvdXNljDcuMC4wLWJldGEuM4RldGgykNLxmX9gAAkQAAgAAAAAAACCaWSCdjSCaXCEhse4F4RxdWljgiMqiXNlY3AyNTZrMaECef77P8k5l3PC_raLw42OAzdXfxeQ-58BJriNaqiRGJSIc3luY25ldHMAg3RjcIIjKIN1ZHCCIyg",
+  "enr:-KG4QKRSUi4IOAIK_xt5ERrwW_J47wmNCLWFh7Jo0hFE69drZsiZ5Pb5CEcM_njFTTLlIR6SCf67HTcSV1g6hCXdhWkCgmlkgnY0gmlwhLkvrBODaXA2kCoGxcAWAAAYAAAAAAAAABCJc2VjcDI1NmsxoQPU7g2jQGTz8BYbB2vLTb39S_PrcZAehwMM0b3bWsM5rIN1ZHCCIyiEdWRwNoIjKA",
 ];

package/src/networks/index.ts

@@ -49,7 +49,6 @@ const GET_STATE_LOG_INTERVAL = 30 * 1000;
 
 export function getNetworkData(network: NetworkName): {
   chainConfig: ChainConfig;
-  depositContractDeployBlock: number;
   genesisFileUrl: string | null;
   genesisStateRoot: string | null;
   bootnodesFileUrl: string | null;

package/src/networks/mainnet.ts

@@ -1,6 +1,5 @@
 export {mainnetChainConfig as chainConfig} from "@lodestar/config/networks";
 
-export const depositContractDeployBlock = 11052984;
 export const genesisFileUrl =
   "https://raw.githubusercontent.com/eth-clients/mainnet/refs/heads/main/metadata/genesis.ssz";
 export const genesisStateRoot = "0x7e76880eb67bbdc86250aa578958e9d0675e64e714337855204fb5abaaf82c2b";
@@ -30,5 +29,5 @@ export const bootEnrs = [
   "enr:-LK4QKWrXTpV9T78hNG6s8AM6IO4XH9kFT91uZtFg1GcsJ6dKovDOr1jtAAFPnS2lvNltkOGA9k29BUN7lFh_sjuc9QBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpC1MD8qAAAAAP__________gmlkgnY0gmlwhANAdd-Jc2VjcDI1NmsxoQLQa6ai7y9PMN5hpLe5HmiJSlYzMuzP7ZhwRiwHvqNXdoN0Y3CCI4yDdWRwgiOM",
   // Lodestar team's bootnodes
   "enr:-IS4QPi-onjNsT5xAIAenhCGTDl4z-4UOR25Uq-3TmG4V3kwB9ljLTb_Kp1wdjHNj-H8VVLRBSSWVZo3GUe3z6k0E-IBgmlkgnY0gmlwhKB3_qGJc2VjcDI1NmsxoQMvAfgB4cJXvvXeM6WbCG86CstbSxbQBSGx31FAwVtOTYN1ZHCCIyg",
-  "enr:-KG4QCb8NC3gEM3I0okStV5BPX7Bg6ZXTYCzzbYyEXUPGcZtHmvQtiJH4C4F2jG7azTcb9pN3JlgpfxAnRVFzJ3-LykBgmlkgnY0gmlwhFPlR9KDaXA2kP6AAAAAAAAAAlBW__4my5iJc2VjcDI1NmsxoQLdUv9Eo9sxCt0tc_CheLOWnX59yHJtkBSOL7kpxdJ6GYN1ZHCCIyiEdWRwNoIjKA",
+  "enr:-KG4QPUf8-g_jU-KrwzG42AGt0wWM1BTnQxgZXlvCEIfTQ5hSmptkmgmMbRkpOqv6kzb33SlhPHJp7x4rLWWiVq5lSECgmlkgnY0gmlwhFPlR9KDaXA2kCoGxcAJAAAVAAAAAAAAABCJc2VjcDI1NmsxoQLdUv9Eo9sxCt0tc_CheLOWnX59yHJtkBSOL7kpxdJ6GYN1ZHCCIyiEdWRwNoIjKA",
 ];

package/src/networks/sepolia.ts

@@ -1,6 +1,5 @@
 export {sepoliaChainConfig as chainConfig} from "@lodestar/config/networks";
 
-export const depositContractDeployBlock = 1273020;
 export const genesisFileUrl = "https://github.com/eth-clients/sepolia/raw/main/metadata/genesis.ssz";
 export const genesisStateRoot = "0xfb9afe32150fa39f4b346be2519a67e2a4f5efcd50a1dc192c3f6b3d013d2798";
 export const bootnodesFileUrl =

package/src/options/beaconNodeOptions/eth1.ts

@@ -1,58 +1,40 @@
-import fs from "node:fs";
-import {IBeaconNodeOptions, defaultOptions} from "@lodestar/beacon-node";
 import {CliCommandOptions} from "@lodestar/utils";
-import {extractJwtHexSecret} from "../../util/index.js";
-import {ExecutionEngineArgs} from "./execution.js";
 
+/**
+ * @deprecated These options are no longer used since eth1 deposit tracking was removed.
+ */
 export type Eth1Args = {
+  /** @deprecated */
   eth1?: boolean;
+  /** @deprecated */
   "eth1.providerUrls"?: string[];
+  /** @deprecated */
   "eth1.depositContractDeployBlock"?: number;
+  /** @deprecated */
   "eth1.disableEth1DepositDataTracker"?: boolean;
+  /** @deprecated */
   "eth1.unsafeAllowDepositDataOverwrite"?: boolean;
+  /** @deprecated */
   "eth1.forcedEth1DataVote"?: string;
 };
 
-export function parseArgs(args: Eth1Args & Partial<ExecutionEngineArgs>): IBeaconNodeOptions["eth1"] {
-  let jwtSecretHex: string | undefined;
-  let jwtId: string | undefined;
-
-  let providerUrls = args["eth1.providerUrls"];
-
-  // If no providerUrls are explicitly provided, we should pick the execution endpoint
-  // because as per Kiln spec v2.1, execution *must* host the `eth_` methods necessary
-  // for deposit and merge trackers on engine endpoints as well protected by a
-  // jwt auth mechanism.
-  if (providerUrls === undefined && args["execution.urls"]) {
-    providerUrls = args["execution.urls"];
-    jwtSecretHex = args.jwtSecret ? extractJwtHexSecret(fs.readFileSync(args.jwtSecret, "utf-8").trim()) : undefined;
-    jwtId = args.jwtId;
-  }
-
-  return {
-    enabled: args.eth1,
-    providerUrls,
-    jwtSecretHex,
-    jwtId,
-    depositContractDeployBlock: args["eth1.depositContractDeployBlock"],
-    disableEth1DepositDataTracker: args["eth1.disableEth1DepositDataTracker"],
-    unsafeAllowDepositDataOverwrite: args["eth1.unsafeAllowDepositDataOverwrite"],
-    forcedEth1DataVote: args["eth1.forcedEth1DataVote"],
-  };
-}
-
+/**
+ * @deprecated These options are no longer used since eth1 deposit tracking was removed.
+ */
 export const options: CliCommandOptions<Eth1Args> = {
   eth1: {
+    hidden: true,
+    deprecated: true,
     description: "Whether to follow the eth1 chain",
     type: "boolean",
-    defaultDescription: String(defaultOptions.eth1.enabled),
     group: "eth1",
   },
 
   "eth1.providerUrls": {
+    hidden: true,
+    deprecated: true,
     description:
       "Urls to Eth1 node with enabled rpc. If not explicitly provided and execution endpoint provided via execution.urls, it will use execution.urls. Otherwise will try connecting on the specified default(s)",
-    defaultDescription: defaultOptions.eth1.providerUrls?.join(","),
     type: "array",
     string: true,
     coerce: (urls: string[]): string[] =>
@@ -63,31 +45,32 @@ export const options: CliCommandOptions<Eth1Args> = {
 
   "eth1.depositContractDeployBlock": {
     hidden: true,
+    deprecated: true,
     description: "Block number at which the deposit contract contract was deployed",
     type: "number",
-    defaultDescription: String(defaultOptions.eth1.depositContractDeployBlock),
     group: "eth1",
   },
 
   "eth1.disableEth1DepositDataTracker": {
     hidden: true,
+    deprecated: true,
     description: "Disable Eth1DepositDataTracker modules",
     type: "boolean",
-    defaultDescription: String(defaultOptions.eth1.disableEth1DepositDataTracker),
     group: "eth1",
   },
 
   "eth1.unsafeAllowDepositDataOverwrite": {
     hidden: true,
+    deprecated: true,
     description:
       "Allow the deposit tracker to overwrite previously fetched and saved deposit event data. Warning!!! This is an unsafe operation, so enable this flag only if you know what you are doing.",
     type: "boolean",
-    defaultDescription: String(defaultOptions.eth1.unsafeAllowDepositDataOverwrite),
     group: "eth1",
   },
 
   "eth1.forcedEth1DataVote": {
     hidden: true,
+    deprecated: true,
     description: "Vote for a specific eth1_data regardless of all conditions. Hex encoded ssz serialized Eth1Data type",
     type: "string",
     group: "eth1",

package/src/options/beaconNodeOptions/index.ts

@@ -27,7 +27,6 @@ export function parseBeaconNodeArgs(args: BeaconNodeArgs): RecursivePartial<IBea
     api: api.parseArgs(args),
     chain: chain.parseArgs(args),
     // db: {},
-    eth1: eth1.parseArgs(args),
     executionEngine: execution.parseArgs(args),
     executionBuilder: builder.parseArgs(args),
     metrics: metrics.parseArgs(args),