@chainsafe/lodestar 1.39.0-dev.aceb5b7416 → 1.39.0-dev.b37f2bd1bd

package/lib/networks/sepolia.js

@@ -1,4 +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 = "https://raw.githubusercontent.com/eth-clients/sepolia/main/metadata/bootstrap_nodes.yaml";

package/lib/networks/sepolia.js.map

@@ -1 +1 @@
-{"version":3,"file":"sepolia.js","sourceRoot":"","sources":["../../src/networks/sepolia.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,IAAI,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAE5E,MAAM,CAAC,MAAM,cAAc,GAAG,sEAAsE,CAAC;AACrG,MAAM,CAAC,MAAM,gBAAgB,GAAG,oEAAoE,CAAC;AACrG,MAAM,CAAC,MAAM,gBAAgB,GAC3B,0FAA0F,CAAC;AAE7F,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,kOAAkO;IAClO,6OAA6O;IAC7O,6OAA6O;IAC7O,6OAA6O;IAC7O,6OAA6O;IAC7O,6OAA6O;IAC7O,gOAAgO;CACjO,CAAC"}
+{"version":3,"file":"sepolia.js","sourceRoot":"","sources":["../../src/networks/sepolia.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,IAAI,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAE5E,MAAM,CAAC,MAAM,0BAA0B,GAAG,OAAO,CAAC;AAClD,MAAM,CAAC,MAAM,cAAc,GAAG,sEAAsE,CAAC;AACrG,MAAM,CAAC,MAAM,gBAAgB,GAAG,oEAAoE,CAAC;AACrG,MAAM,CAAC,MAAM,gBAAgB,GAC3B,0FAA0F,CAAC;AAE7F,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,kOAAkO;IAClO,6OAA6O;IAC7O,6OAA6O;IAC7O,6OAA6O;IAC7O,6OAA6O;IAC7O,6OAA6O;IAC7O,gOAAgO;CACjO,CAAC"}

package/lib/options/beaconNodeOptions/eth1.d.ts

@@ -1,23 +1,14 @@
+import { IBeaconNodeOptions } from "@lodestar/beacon-node";
 import { CliCommandOptions } from "@lodestar/utils";
-/**
- * @deprecated These options are no longer used since eth1 deposit tracking was removed.
- */
+import { ExecutionEngineArgs } from "./execution.js";
 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;
 };
-/**
- * @deprecated These options are no longer used since eth1 deposit tracking was removed.
- */
+export declare function parseArgs(args: Eth1Args & Partial<ExecutionEngineArgs>): IBeaconNodeOptions["eth1"];
 export declare const options: CliCommandOptions<Eth1Args>;
 //# sourceMappingURL=eth1.d.ts.map

package/lib/options/beaconNodeOptions/eth1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"eth1.d.ts","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/eth1.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB,kBAAkB;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,kBAAkB;IAClB,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,kBAAkB;IAClB,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,kBAAkB;IAClB,oCAAoC,CAAC,EAAE,OAAO,CAAC;IAC/C,kBAAkB;IAClB,sCAAsC,CAAC,EAAE,OAAO,CAAC;IACjD,kBAAkB;IAClB,yBAAyB,CAAC,EAAE,MAAM,CAAC;CACpC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO,EAAE,iBAAiB,CAAC,QAAQ,CAsD/C,CAAC"}
+{"version":3,"file":"eth1.d.ts","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/eth1.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,kBAAkB,EAAiB,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAC,mBAAmB,EAAC,MAAM,gBAAgB,CAAC;AAEnD,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,oCAAoC,CAAC,EAAE,OAAO,CAAC;IAC/C,sCAAsC,CAAC,EAAE,OAAO,CAAC;IACjD,yBAAyB,CAAC,EAAE,MAAM,CAAC;CACpC,CAAC;AAEF,wBAAgB,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,mBAAmB,CAAC,GAAG,kBAAkB,CAAC,MAAM,CAAC,CA0BnG;AAED,eAAO,MAAM,OAAO,EAAE,iBAAiB,CAAC,QAAQ,CAmD/C,CAAC"}

package/lib/options/beaconNodeOptions/eth1.js

@@ -1,18 +1,40 @@
-/**
- * @deprecated These options are no longer used since eth1 deposit tracking was removed.
- */
+import fs from "node:fs";
+import { defaultOptions } from "@lodestar/beacon-node";
+import { extractJwtHexSecret } from "../../util/index.js";
+export function parseArgs(args) {
+    let jwtSecretHex;
+    let jwtId;
+    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"],
+    };
+}
 export const options = {
     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) => 
@@ -22,28 +44,27 @@ export const options = {
     },
     "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/lib/options/beaconNodeOptions/eth1.js.map

@@ -1 +1 @@
-{"version":3,"file":"eth1.js","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/eth1.ts"],"names":[],"mappings":"AAoBA;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAgC;IAClD,IAAI,EAAE;QACJ,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,IAAI;QAChB,WAAW,EAAE,kCAAkC;QAC/C,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,MAAM;KACd;IAED,mBAAmB,EAAE;QACnB,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,IAAI;QAChB,WAAW,EACT,0MAA0M;QAC5M,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,CAAC,IAAc,EAAY,EAAE;QACnC,0CAA0C;QAC1C,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzC,KAAK,EAAE,MAAM;KACd;IAED,iCAAiC,EAAE;QACjC,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,IAAI;QAChB,WAAW,EAAE,kEAAkE;QAC/E,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,MAAM;KACd;IAED,oCAAoC,EAAE;QACpC,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,IAAI;QAChB,WAAW,EAAE,wCAAwC;QACrD,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,MAAM;KACd;IAED,sCAAsC,EAAE;QACtC,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,IAAI;QAChB,WAAW,EACT,0LAA0L;QAC5L,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,MAAM;KACd;IAED,yBAAyB,EAAE;QACzB,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,IAAI;QAChB,WAAW,EAAE,sGAAsG;QACnH,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,MAAM;KACd;CACF,CAAC"}
+{"version":3,"file":"eth1.js","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/eth1.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAqB,cAAc,EAAC,MAAM,uBAAuB,CAAC;AAEzE,OAAO,EAAC,mBAAmB,EAAC,MAAM,qBAAqB,CAAC;AAYxD,MAAM,UAAU,SAAS,CAAC,IAA6C;IACrE,IAAI,YAAgC,CAAC;IACrC,IAAI,KAAyB,CAAC;IAE9B,IAAI,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAE7C,oFAAoF;IACpF,oFAAoF;IACpF,4EAA4E;IAC5E,sBAAsB;IACtB,IAAI,YAAY,KAAK,SAAS,IAAI,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACzD,YAAY,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACtC,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACjH,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IACrB,CAAC;IAED,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,IAAI;QAClB,YAAY;QACZ,YAAY;QACZ,KAAK;QACL,0BAA0B,EAAE,IAAI,CAAC,iCAAiC,CAAC;QACnE,6BAA6B,EAAE,IAAI,CAAC,oCAAoC,CAAC;QACzE,+BAA+B,EAAE,IAAI,CAAC,sCAAsC,CAAC;QAC7E,kBAAkB,EAAE,IAAI,CAAC,yBAAyB,CAAC;KACpD,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAgC;IAClD,IAAI,EAAE;QACJ,WAAW,EAAE,kCAAkC;QAC/C,IAAI,EAAE,SAAS;QACf,kBAAkB,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC;QACvD,KAAK,EAAE,MAAM;KACd;IAED,mBAAmB,EAAE;QACnB,WAAW,EACT,0MAA0M;QAC5M,kBAAkB,EAAE,cAAc,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC;QAC/D,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,CAAC,IAAc,EAAY,EAAE;QACnC,0CAA0C;QAC1C,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzC,KAAK,EAAE,MAAM;KACd;IAED,iCAAiC,EAAE;QACjC,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,kEAAkE;QAC/E,IAAI,EAAE,QAAQ;QACd,kBAAkB,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,0BAA0B,CAAC;QAC1E,KAAK,EAAE,MAAM;KACd;IAED,oCAAoC,EAAE;QACpC,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,wCAAwC;QACrD,IAAI,EAAE,SAAS;QACf,kBAAkB,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,6BAA6B,CAAC;QAC7E,KAAK,EAAE,MAAM;KACd;IAED,sCAAsC,EAAE;QACtC,MAAM,EAAE,IAAI;QACZ,WAAW,EACT,0LAA0L;QAC5L,IAAI,EAAE,SAAS;QACf,kBAAkB,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,+BAA+B,CAAC;QAC/E,KAAK,EAAE,MAAM;KACd;IAED,yBAAyB,EAAE;QACzB,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,sGAAsG;QACnH,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,MAAM;KACd;CACF,CAAC"}

package/lib/options/beaconNodeOptions/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,MAAM,MAAM,cAAc,GAAG,GAAG,CAAC,OAAO,GACtC,KAAK,CAAC,SAAS,GACf,IAAI,CAAC,QAAQ,GACb,SAAS,CAAC,mBAAmB,GAC7B,OAAO,CAAC,oBAAoB,GAC5B,OAAO,CAAC,WAAW,GACnB,UAAU,CAAC,cAAc,GACzB,OAAO,CAAC,WAAW,GACnB,IAAI,CAAC,QAAQ,CAAC;AAEhB,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,cAAc,GAAG,gBAAgB,CAAC,kBAAkB,CAAC,CAa9F;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAU7B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,MAAM,MAAM,cAAc,GAAG,GAAG,CAAC,OAAO,GACtC,KAAK,CAAC,SAAS,GACf,IAAI,CAAC,QAAQ,GACb,SAAS,CAAC,mBAAmB,GAC7B,OAAO,CAAC,oBAAoB,GAC5B,OAAO,CAAC,WAAW,GACnB,UAAU,CAAC,cAAc,GACzB,OAAO,CAAC,WAAW,GACnB,IAAI,CAAC,QAAQ,CAAC;AAEhB,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,cAAc,GAAG,gBAAgB,CAAC,kBAAkB,CAAC,CAc9F;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAU7B,CAAC"}

package/lib/options/beaconNodeOptions/index.js

@@ -14,6 +14,7 @@ export function parseBeaconNodeArgs(args) {
         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),

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,wBAAwB,EAAC,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAYlC,MAAM,UAAU,mBAAmB,CAAC,IAAoB;IACtD,iFAAiF;IACjF,OAAO,wBAAwB,CAAC;QAC9B,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC;QACxB,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC;QAC5B,UAAU;QACV,eAAe,EAAE,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;QAC1C,gBAAgB,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;QACzC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;QAChC,UAAU,EAAE,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC;QACtC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;QAChC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;KAC3B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,GAAG,GAAG,CAAC,OAAO;IACd,GAAG,KAAK,CAAC,OAAO;IAChB,GAAG,IAAI,CAAC,OAAO;IACf,GAAG,SAAS,CAAC,OAAO;IACpB,GAAG,OAAO,CAAC,OAAO;IAClB,GAAG,OAAO,CAAC,OAAO;IAClB,GAAG,UAAU,CAAC,OAAO;IACrB,GAAG,OAAO,CAAC,OAAO;IAClB,GAAG,IAAI,CAAC,OAAO;CAChB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,wBAAwB,EAAC,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAYlC,MAAM,UAAU,mBAAmB,CAAC,IAAoB;IACtD,iFAAiF;IACjF,OAAO,wBAAwB,CAAC;QAC9B,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC;QACxB,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC;QAC5B,UAAU;QACV,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;QAC1B,eAAe,EAAE,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC;QAC1C,gBAAgB,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;QACzC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;QAChC,UAAU,EAAE,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC;QACtC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;QAChC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;KAC3B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,GAAG,GAAG,CAAC,OAAO;IACd,GAAG,KAAK,CAAC,OAAO;IAChB,GAAG,IAAI,CAAC,OAAO;IACf,GAAG,SAAS,CAAC,OAAO;IACpB,GAAG,OAAO,CAAC,OAAO;IAClB,GAAG,OAAO,CAAC,OAAO;IAClB,GAAG,UAAU,CAAC,OAAO;IACrB,GAAG,OAAO,CAAC,OAAO;IAClB,GAAG,IAAI,CAAC,OAAO;CAChB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainsafe/lodestar",
-  "version": "1.39.0-dev.aceb5b7416",
+  "version": "1.39.0-dev.b37f2bd1bd",
   "description": "Command line interface for lodestar",
   "author": "ChainSafe Systems",
   "license": "Apache-2.0",
@@ -69,17 +69,17 @@
     "@libp2p/crypto": "^5.0.15",
     "@libp2p/interface": "^2.7.0",
     "@libp2p/peer-id": "^5.1.0",
-    "@lodestar/api": "1.39.0-dev.aceb5b7416",
-    "@lodestar/beacon-node": "1.39.0-dev.aceb5b7416",
-    "@lodestar/config": "1.39.0-dev.aceb5b7416",
-    "@lodestar/db": "1.39.0-dev.aceb5b7416",
-    "@lodestar/light-client": "1.39.0-dev.aceb5b7416",
-    "@lodestar/logger": "1.39.0-dev.aceb5b7416",
-    "@lodestar/params": "1.39.0-dev.aceb5b7416",
-    "@lodestar/state-transition": "1.39.0-dev.aceb5b7416",
-    "@lodestar/types": "1.39.0-dev.aceb5b7416",
-    "@lodestar/utils": "1.39.0-dev.aceb5b7416",
-    "@lodestar/validator": "1.39.0-dev.aceb5b7416",
+    "@lodestar/api": "1.39.0-dev.b37f2bd1bd",
+    "@lodestar/beacon-node": "1.39.0-dev.b37f2bd1bd",
+    "@lodestar/config": "1.39.0-dev.b37f2bd1bd",
+    "@lodestar/db": "1.39.0-dev.b37f2bd1bd",
+    "@lodestar/light-client": "1.39.0-dev.b37f2bd1bd",
+    "@lodestar/logger": "1.39.0-dev.b37f2bd1bd",
+    "@lodestar/params": "1.39.0-dev.b37f2bd1bd",
+    "@lodestar/state-transition": "1.39.0-dev.b37f2bd1bd",
+    "@lodestar/types": "1.39.0-dev.b37f2bd1bd",
+    "@lodestar/utils": "1.39.0-dev.b37f2bd1bd",
+    "@lodestar/validator": "1.39.0-dev.b37f2bd1bd",
     "@multiformats/multiaddr": "^12.1.3",
     "deepmerge": "^4.3.1",
     "ethers": "^6.7.0",
@@ -94,12 +94,12 @@
     "yargs": "^17.7.1"
   },
   "devDependencies": {
-    "@lodestar/test-utils": "1.39.0-dev.aceb5b7416",
+    "@lodestar/test-utils": "1.39.0-dev.b37f2bd1bd",
     "@types/debug": "^4.1.7",
     "@types/inquirer": "^9.0.3",
     "@types/proper-lockfile": "^4.1.4",
     "@types/yargs": "^17.0.24",
     "fastify": "^5.2.1"
   },
-  "gitHead": "84def35d08355dfa2f53c71abbced440b870629b"
+  "gitHead": "d2d0808597a7c8e20703a9b6ee4041a4e25ed638"
 }

package/src/cmds/beacon/handler.ts

@@ -10,7 +10,7 @@ import {ACTIVE_PRESET, PresetName} from "@lodestar/params";
 import {ErrorAborted, bytesToInt, formatBytes} from "@lodestar/utils";
 import {ProcessShutdownCallback} from "@lodestar/validator";
 import {BeaconNodeOptions, getBeaconConfigFromArgs} from "../../config/index.js";
-import {getNetworkBootnodes, isKnownNetworkName, readBootnodes} from "../../networks/index.js";
+import {getNetworkBootnodes, getNetworkData, isKnownNetworkName, readBootnodes} from "../../networks/index.js";
 import {GlobalArgs, parseBeaconNodeArgs} from "../../options/index.js";
 import {LogArgs} from "../../options/logOptions.js";
 import {
@@ -71,11 +71,13 @@ export async function beaconHandler(args: BeaconArgs & GlobalArgs): Promise<void
   // BeaconNode setup
   try {
     const {anchorState, isFinalized, wsCheckpoint} = await initBeaconState(
+      options,
       args,
       beaconPaths.dataDir,
       config,
       db,
-      logger
+      logger,
+      abortController.signal
     );
     const beaconConfig = createBeaconConfig(config, anchorState.genesisValidatorsRoot);
     const node = await BeaconNode.init({
@@ -187,6 +189,12 @@ export async function beaconHandlerInit(args: BeaconArgs & GlobalArgs) {
   // Add detailed version string for API node/version endpoint
   beaconNodeOptions.set({api: {commit, version}});
 
+  // Set known depositContractDeployBlock
+  if (isKnownNetworkName(network)) {
+    const {depositContractDeployBlock} = getNetworkData(network);
+    beaconNodeOptions.set({eth1: {depositContractDeployBlock}});
+  }
+
   const logger = initLogger(args, beaconPaths.dataDir, config);
   const {privateKey, enr} = await initPrivateKeyAndEnr(args, beaconPaths.beaconDir, logger);
 
@@ -218,7 +226,7 @@ export async function beaconHandlerInit(args: BeaconArgs & GlobalArgs) {
     // Add User-Agent header to all builder requests
     beaconNodeOptions.set({executionBuilder: {userAgent: versionStr}});
     // Set jwt version with version string
-    beaconNodeOptions.set({executionEngine: {jwtVersion: versionStr}});
+    beaconNodeOptions.set({executionEngine: {jwtVersion: versionStr}, eth1: {jwtVersion: versionStr}});
     // Set commit and version for ClientVersion
     beaconNodeOptions.set({executionEngine: {commit, version}});
   }

package/src/cmds/beacon/initBeaconState.ts

@@ -2,8 +2,10 @@ import {
   DbCPStateDatastore,
   FileCPStateDatastore,
   IBeaconDb,
+  IBeaconNodeOptions,
   checkAndPersistAnchorState,
   getStateTypeFromBytes,
+  initStateFromEth1,
 } from "@lodestar/beacon-node";
 import {BeaconConfig, ChainForkConfig, createBeaconConfig} from "@lodestar/config";
 import {
@@ -92,17 +94,20 @@ 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
+  logger: Logger,
+  signal: AbortSignal
 ): 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");
@@ -328,7 +333,9 @@ export async function initBeaconState(
     return {anchorState, isFinalized};
   }
 
-  throw Error("Failed to initialize beacon state, please provide a genesis state file or use checkpoint sync");
+  // 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};
 }
 
 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 and execution engine requests",
+      "Do not send implementation details over p2p identify protocol and in builder, execution engine and eth1 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

@@ -80,6 +80,11 @@ 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/networks/chiado.ts

@@ -1,5 +1,7 @@
 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,6 +20,7 @@ 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,5 +1,6 @@
 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,5 +1,7 @@
 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,5 +1,6 @@
 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 =

package/src/networks/index.ts

@@ -49,6 +49,7 @@ 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,5 +1,6 @@
 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";

package/src/networks/sepolia.ts

@@ -1,5 +1,6 @@
 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,40 +1,58 @@
+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;
 };
 
-/**
- * @deprecated These options are no longer used since eth1 deposit tracking was removed.
- */
+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"],
+  };
+}
+
 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[] =>
@@ -45,32 +63,31 @@ 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,6 +27,7 @@ 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),