@chainsafe/lodestar 1.47.0-dev.a27526c22a → 1.47.0-dev.bd3a76e069

package/.git-data.json

@@ -1,4 +1,4 @@
 {
   "branch": "unstable",
-  "commit": "a27526c22ada07519608a628d4a272d3b92cf616"
+  "commit": "bd3a76e069e3b0660addf88b686e414eafee6036"
 }

package/lib/cmds/builder/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/cmds/builder/handler.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAIlD,OAAO,EAAC,eAAe,EAAC,MAAM,cAAc,CAAC;AAE7C,wBAAsB,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAkCtF"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/cmds/builder/handler.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAKlD,OAAO,EAAC,eAAe,EAA+B,MAAM,cAAc,CAAC;AAI3E,wBAAsB,cAAc,CAAC,IAAI,EAAE,eAAe,GAAG,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAoEtF"}

package/lib/cmds/builder/handler.js

@@ -1,13 +1,21 @@
 import path from "node:path";
 import { getClient } from "@lodestar/api";
-import { Builder } from "@lodestar/builder";
+import { RegistryMetricCreator, collectNodeJSMetrics, getHttpMetricsServer } from "@lodestar/beacon-node";
+import { Builder, getMetrics } from "@lodestar/builder";
 import { getNodeLogger } from "@lodestar/logger/node";
+import { fromHex, toPrintableUrl } from "@lodestar/utils";
 import { getBeaconConfigFromArgs } from "../../config/beaconParams.js";
 import { getGlobalPaths } from "../../paths/global.js";
-import { cleanOldLogFiles, onGracefulShutdown, parseLoggerArgs } from "../../util/index.js";
+import { cleanOldLogFiles, onGracefulShutdown, parseFeeRecipient, parseLoggerArgs } from "../../util/index.js";
+import { getVersionData } from "../../util/version.js";
 import { loadBuilderKeypair } from "./loadKeypair.js";
+import { builderMetricsDefaultOptions } from "./options.js";
+const ZERO_ADDRESS = "0x" + "0".repeat(40);
 export async function builderHandler(args) {
     const { config, network } = getBeaconConfigFromArgs(args);
+    if (config.GLOAS_FORK_EPOCH === Infinity) {
+        throw Error(`Gloas must be scheduled via GLOAS_FORK_EPOCH for network=${network}`);
+    }
     const globalPaths = getGlobalPaths(args, network);
     const defaultLogFilepath = path.join(globalPaths.dataDir, "builder.log");
     const logger = getNodeLogger(parseLoggerArgs(args, { defaultLogFilepath }, config));
@@ -17,7 +25,13 @@ export async function builderHandler(args) {
     catch (e) {
         logger.debug("Not able to delete log files", {}, e);
     }
-    const keypair = await loadBuilderKeypair(args.keystore, args.keystorePassword, args.builderPubkey);
+    const { version, commit } = getVersionData();
+    logger.info("Lodestar", { network, version, commit });
+    const executionFeeRecipient = parseFeeRecipient(args.executionFeeRecipient);
+    if (executionFeeRecipient === ZERO_ADDRESS) {
+        throw Error("Cannot put zero address as an executionFeeRecipient");
+    }
+    const keypair = await loadBuilderKeypair(logger, args.keystore, args.keystorePassword, args.builderPubkey);
     const onGracefulShutdownCbs = [];
     onGracefulShutdown(async () => {
         for (const cb of onGracefulShutdownCbs)
@@ -25,13 +39,26 @@ export async function builderHandler(args) {
     }, logger.info.bind(logger));
     const abortController = new AbortController();
     onGracefulShutdownCbs.push(async () => abortController.abort());
-    const api = getClient({ urls: [args.beaconNodeUrl], globalInit: { signal: abortController.signal } }, { config, logger });
+    const register = args.metrics ? new RegistryMetricCreator() : null;
+    const metrics = register && getMetrics(register, { version, commit, network });
+    if (metrics) {
+        const closeMetrics = collectNodeJSMetrics(register);
+        onGracefulShutdownCbs.push(() => closeMetrics());
+        const port = args["metrics.port"] ?? builderMetricsDefaultOptions.port;
+        const address = args["metrics.address"] ?? builderMetricsDefaultOptions.address;
+        const metricsServer = await getHttpMetricsServer({ port, address }, { register, logger });
+        onGracefulShutdownCbs.push(() => metricsServer.close());
+    }
+    const api = getClient({ urls: [args.beaconNodeUrl], globalInit: { signal: abortController.signal, timeoutMs: args.requestTimeout } }, { config, logger, metrics: metrics?.restApiClient });
+    logger.info("Beacon node", { beaconNode: toPrintableUrl(args.beaconNodeUrl), timeoutMs: args.requestTimeout });
     const builder = await Builder.init({
         keypair,
         logger,
         config,
         abortController,
         api,
+        executionFeeRecipient: fromHex(executionFeeRecipient),
+        metrics,
     });
     onGracefulShutdownCbs.push(() => builder.close());
 }

package/lib/cmds/builder/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/cmds/builder/handler.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,SAAS,EAAC,MAAM,eAAe,CAAC;AACxC,OAAO,EAAC,OAAO,EAAC,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AAErE,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAC,gBAAgB,EAAE,kBAAkB,EAAE,eAAe,EAAC,MAAM,qBAAqB,CAAC;AAC1F,OAAO,EAAC,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AAGpD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAkC;IACrE,MAAM,EAAC,MAAM,EAAE,OAAO,EAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAExD,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACzE,MAAM,MAAM,GAAG,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,EAAC,kBAAkB,EAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IAElF,IAAI,CAAC;QACH,gBAAgB,CAAC,IAAI,EAAE,EAAC,kBAAkB,EAAC,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,EAAE,EAAE,CAAU,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAEnG,MAAM,qBAAqB,GAAmC,EAAE,CAAC;IACjE,kBAAkB,CAAC,KAAK,IAAI,EAAE;QAC5B,KAAK,MAAM,EAAE,IAAI,qBAAqB;YAAE,MAAM,EAAE,EAAE,CAAC;IACrD,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAE7B,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;IAC9C,qBAAqB,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,CAAC;IAEhE,MAAM,GAAG,GAAG,SAAS,CAAC,EAAC,IAAI,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,UAAU,EAAE,EAAC,MAAM,EAAE,eAAe,CAAC,MAAM,EAAC,EAAC,EAAE,EAAC,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC;IAEpH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;QACjC,OAAO;QACP,MAAM;QACN,MAAM;QACN,eAAe;QACf,GAAG;KACJ,CAAC,CAAC;IAEH,qBAAqB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;AACpD,CAAC"}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/cmds/builder/handler.ts"],"names":[],"mappings":"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"}

package/lib/cmds/builder/loadKeypair.d.ts

@@ -1,3 +1,4 @@
 import { Keypair } from "@lodestar/builder";
-export declare function loadBuilderKeypair(keystorePath: string, passwordPath: string, expectedPubkey?: string): Promise<Keypair>;
+import { Logger } from "@lodestar/utils";
+export declare function loadBuilderKeypair(logger: Logger, keystorePath: string, passwordPath: string, expectedPubkey?: string): Promise<Keypair>;
 //# sourceMappingURL=loadKeypair.d.ts.map

package/lib/cmds/builder/loadKeypair.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loadKeypair.d.ts","sourceRoot":"","sources":["../../../src/cmds/builder/loadKeypair.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,OAAO,EAAC,MAAM,mBAAmB,CAAC;AAI1C,wBAAsB,kBAAkB,CACtC,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,OAAO,CAAC,CAoBlB"}
+{"version":3,"file":"loadKeypair.d.ts","sourceRoot":"","sources":["../../../src/cmds/builder/loadKeypair.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,OAAO,EAAC,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAIvC,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,OAAO,CAAC,CAsBlB"}

package/lib/cmds/builder/loadKeypair.js

@@ -3,7 +3,7 @@ import { Keystore } from "@chainsafe/bls-keystore";
 import { SecretKey } from "@chainsafe/blst";
 import { ensure0xPrefix } from "../../util/format.js";
 import { readPassphraseFile } from "../../util/passphrase.js";
-export async function loadBuilderKeypair(keystorePath, passwordPath, expectedPubkey) {
+export async function loadBuilderKeypair(logger, keystorePath, passwordPath, expectedPubkey) {
     const password = readPassphraseFile(passwordPath);
     const keystoreStr = fs.readFileSync(keystorePath, "utf8");
     const keystore = Keystore.parse(keystoreStr);
@@ -17,6 +17,7 @@ export async function loadBuilderKeypair(keystorePath, passwordPath, expectedPub
     if (expectedPubkey && publicKeyHex !== ensure0xPrefix(expectedPubkey.toLowerCase())) {
         throw Error(`Pubkey mismatch: keystore ${publicKeyHex}, expected ${expectedPubkey}`);
     }
+    logger.info("Loaded builder keystore", { pubkey: publicKeyHex });
     return { secretKey, publicKey };
 }
 //# sourceMappingURL=loadKeypair.js.map

package/lib/cmds/builder/loadKeypair.js.map

@@ -1 +1 @@
-{"version":3,"file":"loadKeypair.js","sourceRoot":"","sources":["../../../src/cmds/builder/loadKeypair.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAE5D,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,YAAoB,EACpB,YAAoB,EACpB,cAAuB;IAEvB,MAAM,QAAQ,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAClD,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAE7C,IAAI,CAAC,CAAC,MAAM,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QAC/C,MAAM,KAAK,CAAC,iCAAiC,YAAY,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAEtD,MAAM,SAAS,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;IAC1C,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;IAEvC,IAAI,cAAc,IAAI,YAAY,KAAK,cAAc,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;QACpF,MAAM,KAAK,CAAC,6BAA6B,YAAY,cAAc,cAAc,EAAE,CAAC,CAAC;IACvF,CAAC;IAED,OAAO,EAAC,SAAS,EAAE,SAAS,EAAC,CAAC;AAChC,CAAC"}
+{"version":3,"file":"loadKeypair.js","sourceRoot":"","sources":["../../../src/cmds/builder/loadKeypair.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAG1C,OAAO,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAE5D,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,MAAc,EACd,YAAoB,EACpB,YAAoB,EACpB,cAAuB;IAEvB,MAAM,QAAQ,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAClD,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAE7C,IAAI,CAAC,CAAC,MAAM,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QAC/C,MAAM,KAAK,CAAC,iCAAiC,YAAY,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAEtD,MAAM,SAAS,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;IAC1C,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;IAEvC,IAAI,cAAc,IAAI,YAAY,KAAK,cAAc,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;QACpF,MAAM,KAAK,CAAC,6BAA6B,YAAY,cAAc,cAAc,EAAE,CAAC,CAAC;IACvF,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,EAAC,MAAM,EAAE,YAAY,EAAC,CAAC,CAAC;IAE/D,OAAO,EAAC,SAAS,EAAE,SAAS,EAAC,CAAC;AAChC,CAAC"}

package/lib/cmds/builder/options.d.ts

@@ -1,10 +1,20 @@
 import { CliCommandOptions } from "@lodestar/utils";
 import { LogArgs } from "../../options/logOptions.js";
+export declare const builderMetricsDefaultOptions: {
+    enabled: boolean;
+    port: number;
+    address: string;
+};
 export type IBuilderCliArgs = LogArgs & {
     beaconNodeUrl: string;
     keystore: string;
     keystorePassword: string;
     builderPubkey?: string;
+    executionFeeRecipient: string;
+    requestTimeout: number;
+    metrics?: boolean;
+    "metrics.port"?: number;
+    "metrics.address"?: string;
 };
 export declare const builderOptions: CliCommandOptions<IBuilderCliArgs>;
 //# sourceMappingURL=options.d.ts.map

package/lib/cmds/builder/options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/cmds/builder/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,OAAO,EAAa,MAAM,6BAA6B,CAAC;AAEhE,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG;IACtC,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,iBAAiB,CAAC,eAAe,CAyB7D,CAAC"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/cmds/builder/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,OAAO,EAAa,MAAM,6BAA6B,CAAC;AAEhE,eAAO,MAAM,4BAA4B;IACvC,OAAO;IACP,IAAI;IACJ,OAAO;CACR,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG;IACtC,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IAEvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,iBAAiB,CAAC,eAAe,CA4D7D,CAAC"}

package/lib/cmds/builder/options.js

@@ -1,5 +1,10 @@
 import { defaultOptions } from "@lodestar/builder";
 import { logOptions } from "../../options/logOptions.js";
+export const builderMetricsDefaultOptions = {
+    enabled: false,
+    port: 5065,
+    address: "127.0.0.1",
+};
 export const builderOptions = {
     ...logOptions,
     beaconNodeUrl: {
@@ -21,5 +26,34 @@ export const builderOptions = {
         description: "Builder's expected public key based on the keystore from 'keystore' option",
         type: "string",
     },
+    executionFeeRecipient: {
+        description: "Execution address for receiving the payload rewards",
+        type: "string",
+        demandOption: true,
+    },
+    requestTimeout: {
+        description: "Timeout in milliseconds for HTTP requests to the beacon node",
+        type: "number",
+        default: defaultOptions.requestTimeout,
+    },
+    // Metrics
+    metrics: {
+        description: "Enable the Prometheus metrics HTTP server",
+        type: "boolean",
+        defaultDescription: String(builderMetricsDefaultOptions.enabled),
+        group: "metrics",
+    },
+    "metrics.port": {
+        description: "Listen TCP port for the Prometheus metrics HTTP server",
+        type: "number",
+        defaultDescription: String(builderMetricsDefaultOptions.port),
+        group: "metrics",
+    },
+    "metrics.address": {
+        description: "Listen address for the Prometheus metrics HTTP server",
+        type: "string",
+        defaultDescription: String(builderMetricsDefaultOptions.address),
+        group: "metrics",
+    },
 };
 //# sourceMappingURL=options.js.map

package/lib/cmds/builder/options.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/cmds/builder/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAU,UAAU,EAAC,MAAM,6BAA6B,CAAC;AAShE,MAAM,CAAC,MAAM,cAAc,GAAuC;IAChE,GAAG,UAAU;IAEb,aAAa,EAAE;QACb,WAAW,EAAE,8BAA8B;QAC3C,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,cAAc,CAAC,aAAa;KACtC;IAED,QAAQ,EAAE;QACR,WAAW,EAAE,yBAAyB;QACtC,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,IAAI;KACnB;IAED,gBAAgB,EAAE;QAChB,WAAW,EAAE,6EAA6E;QAC1F,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,IAAI;KACnB;IAED,aAAa,EAAE;QACb,WAAW,EAAE,4EAA4E;QACzF,IAAI,EAAE,QAAQ;KACf;CACF,CAAC"}
+{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/cmds/builder/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAU,UAAU,EAAC,MAAM,6BAA6B,CAAC;AAEhE,MAAM,CAAC,MAAM,4BAA4B,GAAG;IAC1C,OAAO,EAAE,KAAK;IACd,IAAI,EAAE,IAAI;IACV,OAAO,EAAE,WAAW;CACrB,CAAC;AAeF,MAAM,CAAC,MAAM,cAAc,GAAuC;IAChE,GAAG,UAAU;IAEb,aAAa,EAAE;QACb,WAAW,EAAE,8BAA8B;QAC3C,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,cAAc,CAAC,aAAa;KACtC;IAED,QAAQ,EAAE;QACR,WAAW,EAAE,yBAAyB;QACtC,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,IAAI;KACnB;IAED,gBAAgB,EAAE;QAChB,WAAW,EAAE,6EAA6E;QAC1F,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,IAAI;KACnB;IAED,aAAa,EAAE;QACb,WAAW,EAAE,4EAA4E;QACzF,IAAI,EAAE,QAAQ;KACf;IAED,qBAAqB,EAAE;QACrB,WAAW,EAAE,qDAAqD;QAClE,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,IAAI;KACnB;IAED,cAAc,EAAE;QACd,WAAW,EAAE,8DAA8D;QAC3E,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,cAAc,CAAC,cAAc;KACvC;IAED,UAAU;IAEV,OAAO,EAAE;QACP,WAAW,EAAE,2CAA2C;QACxD,IAAI,EAAE,SAAS;QACf,kBAAkB,EAAE,MAAM,CAAC,4BAA4B,CAAC,OAAO,CAAC;QAChE,KAAK,EAAE,SAAS;KACjB;IAED,cAAc,EAAE;QACd,WAAW,EAAE,wDAAwD;QACrE,IAAI,EAAE,QAAQ;QACd,kBAAkB,EAAE,MAAM,CAAC,4BAA4B,CAAC,IAAI,CAAC;QAC7D,KAAK,EAAE,SAAS;KACjB;IAED,iBAAiB,EAAE;QACjB,WAAW,EAAE,uDAAuD;QACpE,IAAI,EAAE,QAAQ;QACd,kBAAkB,EAAE,MAAM,CAAC,4BAA4B,CAAC,OAAO,CAAC;QAChE,KAAK,EAAE,SAAS;KACjB;CACF,CAAC"}

package/lib/options/beaconNodeOptions/builder.js

@@ -34,12 +34,12 @@ export const options = {
     },
     "builder.faultInspectionWindow": {
         type: "number",
-        description: "Window to inspect missed slots (pre-gloas) or unrevealed payloads (post-gloas) for enabling/disabling builder circuit breaker",
+        description: "Window used to inspect missed slots (pre-gloas) or calculate the canonical EMPTY block rate (post-gloas) for enabling/disabling the builder circuit breaker",
         group: "builder",
     },
     "builder.allowedFaults": {
         type: "number",
-        description: "Number of missed slots (pre-gloas) or unrevealed payloads (post-gloas) allowed in the `faultInspectionWindow` for builder circuit",
+        description: "Number of missed slots allowed within `faultInspectionWindow` before ignoring the external builder (pre-gloas). Post-gloas, sets the tolerated rate of canonical EMPTY blocks, defined as `allowedFaults` out of `faultInspectionWindow` and applied to canonical blocks in the window",
         group: "builder",
     },
 };

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

@@ -1 +1 @@
-{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,+BAA+B,EAAC,MAAM,uBAAuB,CAAC;AAE1F,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAa/C,MAAM,UAAU,SAAS,CAAC,IAA0B;IAClD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACjF,MAAM,IAAI,UAAU,CAClB,gIAAgI,CACjI,CAAC;IACJ,CAAC;IAED,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,+BAA+B,CAAC,GAAG;QAC/D,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC;QAChC,qBAAqB,EAAE,IAAI,CAAC,+BAA+B,CAAC;QAC5D,aAAa,EAAE,IAAI,CAAC,uBAAuB,CAAC;KAC7C,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAA4C;IAC9D,OAAO,EAAE;QACP,WAAW,EAAE,yBAAyB;QACtC,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,+BAA+B,CAAC,OAAO;QAChD,KAAK,EAAE,SAAS;KACjB;IAED,aAAa,EAAE;QACb,KAAK,EAAE,CAAC,cAAc,CAAC;QACvB,WAAW,EAAE,6BAA6B;QAC1C,kBAAkB,EAAE,+BAA+B,CAAC,GAAG;QACvD,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,SAAS;KACjB;IAED,iBAAiB,EAAE;QACjB,WAAW,EAAE,qDAAqD;QAClE,IAAI,EAAE,QAAQ;QACd,kBAAkB,EAAE,MAAM,CAAC,+BAA+B,CAAC,OAAO,CAAC;QACnE,KAAK,EAAE,SAAS;KACjB;IAED,+BAA+B,EAAE;QAC/B,IAAI,EAAE,QAAQ;QACd,WAAW,EACT,+HAA+H;QACjI,KAAK,EAAE,SAAS;KACjB;IAED,uBAAuB,EAAE;QACvB,IAAI,EAAE,QAAQ;QACd,WAAW,EACT,mIAAmI;QACrI,KAAK,EAAE,SAAS;KACjB;CACF,CAAC"}
+{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,+BAA+B,EAAC,MAAM,uBAAuB,CAAC;AAE1F,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAa/C,MAAM,UAAU,SAAS,CAAC,IAA0B;IAClD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACjF,MAAM,IAAI,UAAU,CAClB,gIAAgI,CACjI,CAAC;IACJ,CAAC;IAED,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,+BAA+B,CAAC,GAAG;QAC/D,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC;QAChC,qBAAqB,EAAE,IAAI,CAAC,+BAA+B,CAAC;QAC5D,aAAa,EAAE,IAAI,CAAC,uBAAuB,CAAC;KAC7C,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAA4C;IAC9D,OAAO,EAAE;QACP,WAAW,EAAE,yBAAyB;QACtC,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,+BAA+B,CAAC,OAAO;QAChD,KAAK,EAAE,SAAS;KACjB;IAED,aAAa,EAAE;QACb,KAAK,EAAE,CAAC,cAAc,CAAC;QACvB,WAAW,EAAE,6BAA6B;QAC1C,kBAAkB,EAAE,+BAA+B,CAAC,GAAG;QACvD,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,SAAS;KACjB;IAED,iBAAiB,EAAE;QACjB,WAAW,EAAE,qDAAqD;QAClE,IAAI,EAAE,QAAQ;QACd,kBAAkB,EAAE,MAAM,CAAC,+BAA+B,CAAC,OAAO,CAAC;QACnE,KAAK,EAAE,SAAS;KACjB;IAED,+BAA+B,EAAE;QAC/B,IAAI,EAAE,QAAQ;QACd,WAAW,EACT,6JAA6J;QAC/J,KAAK,EAAE,SAAS;KACjB;IAED,uBAAuB,EAAE;QACvB,IAAI,EAAE,QAAQ;QACd,WAAW,EACT,wRAAwR;QAC1R,KAAK,EAAE,SAAS;KACjB;CACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainsafe/lodestar",
-  "version": "1.47.0-dev.a27526c22a",
+  "version": "1.47.0-dev.bd3a76e069",
   "description": "Command line interface for lodestar",
   "author": "ChainSafe Systems",
   "license": "Apache-2.0",
@@ -68,17 +68,17 @@
     "@libp2p/crypto": "^5.1.13",
     "@libp2p/interface": "^3.1.0",
     "@libp2p/peer-id": "^6.0.4",
-    "@lodestar/api": "^1.47.0-dev.a27526c22a",
-    "@lodestar/beacon-node": "^1.47.0-dev.a27526c22a",
-    "@lodestar/builder": "^1.47.0-dev.a27526c22a",
-    "@lodestar/config": "^1.47.0-dev.a27526c22a",
-    "@lodestar/db": "^1.47.0-dev.a27526c22a",
-    "@lodestar/logger": "^1.47.0-dev.a27526c22a",
-    "@lodestar/params": "^1.47.0-dev.a27526c22a",
-    "@lodestar/state-transition": "^1.47.0-dev.a27526c22a",
-    "@lodestar/types": "^1.47.0-dev.a27526c22a",
-    "@lodestar/utils": "^1.47.0-dev.a27526c22a",
-    "@lodestar/validator": "^1.47.0-dev.a27526c22a",
+    "@lodestar/api": "^1.47.0-dev.bd3a76e069",
+    "@lodestar/beacon-node": "^1.47.0-dev.bd3a76e069",
+    "@lodestar/builder": "^1.47.0-dev.bd3a76e069",
+    "@lodestar/config": "^1.47.0-dev.bd3a76e069",
+    "@lodestar/db": "^1.47.0-dev.bd3a76e069",
+    "@lodestar/logger": "^1.47.0-dev.bd3a76e069",
+    "@lodestar/params": "^1.47.0-dev.bd3a76e069",
+    "@lodestar/state-transition": "^1.47.0-dev.bd3a76e069",
+    "@lodestar/types": "^1.47.0-dev.bd3a76e069",
+    "@lodestar/utils": "^1.47.0-dev.bd3a76e069",
+    "@lodestar/validator": "^1.47.0-dev.bd3a76e069",
     "@multiformats/multiaddr": "^13.0.1",
     "deepmerge": "^4.3.1",
     "ethers": "^6.7.0",
@@ -94,7 +94,7 @@
   "devDependencies": {
     "@chainsafe/as-sha256": "^1.2.4",
     "@ethereumjs/rlp": "^4.0.1",
-    "@lodestar/test-utils": "^1.47.0-dev.a27526c22a",
+    "@lodestar/test-utils": "^1.47.0-dev.bd3a76e069",
     "@types/debug": "^4.1.7",
     "@types/inquirer": "^9.0.3",
     "@types/js-yaml": "^4.0.5",
@@ -108,5 +108,5 @@
     "web3": "^4.0.3",
     "web3-eth-accounts": "^4.0.3"
   },
-  "gitHead": "7259641662f67e0bf75e2ba89fdd6c5295264f42"
+  "gitHead": "99312f78bbcb5df572ba8d6c0fcba5ef05c914cc"
 }

package/src/cmds/builder/handler.ts

@@ -1,17 +1,26 @@
 import path from "node:path";
 import {getClient} from "@lodestar/api";
-import {Builder} from "@lodestar/builder";
+import {RegistryMetricCreator, collectNodeJSMetrics, getHttpMetricsServer} from "@lodestar/beacon-node";
+import {Builder, getMetrics} from "@lodestar/builder";
 import {getNodeLogger} from "@lodestar/logger/node";
+import {fromHex, toPrintableUrl} from "@lodestar/utils";
 import {getBeaconConfigFromArgs} from "../../config/beaconParams.js";
 import {GlobalArgs} from "../../options/index.js";
 import {getGlobalPaths} from "../../paths/global.js";
-import {cleanOldLogFiles, onGracefulShutdown, parseLoggerArgs} from "../../util/index.js";
+import {cleanOldLogFiles, onGracefulShutdown, parseFeeRecipient, parseLoggerArgs} from "../../util/index.js";
+import {getVersionData} from "../../util/version.js";
 import {loadBuilderKeypair} from "./loadKeypair.js";
-import {IBuilderCliArgs} from "./options.js";
+import {IBuilderCliArgs, builderMetricsDefaultOptions} from "./options.js";
+
+const ZERO_ADDRESS = "0x" + "0".repeat(40);
 
 export async function builderHandler(args: IBuilderCliArgs & GlobalArgs): Promise<void> {
   const {config, network} = getBeaconConfigFromArgs(args);
 
+  if (config.GLOAS_FORK_EPOCH === Infinity) {
+    throw Error(`Gloas must be scheduled via GLOAS_FORK_EPOCH for network=${network}`);
+  }
+
   const globalPaths = getGlobalPaths(args, network);
   const defaultLogFilepath = path.join(globalPaths.dataDir, "builder.log");
   const logger = getNodeLogger(parseLoggerArgs(args, {defaultLogFilepath}, config));
@@ -22,7 +31,16 @@ export async function builderHandler(args: IBuilderCliArgs & GlobalArgs): Promis
     logger.debug("Not able to delete log files", {}, e as Error);
   }
 
-  const keypair = await loadBuilderKeypair(args.keystore, args.keystorePassword, args.builderPubkey);
+  const {version, commit} = getVersionData();
+  logger.info("Lodestar", {network, version, commit});
+
+  const executionFeeRecipient = parseFeeRecipient(args.executionFeeRecipient);
+
+  if (executionFeeRecipient === ZERO_ADDRESS) {
+    throw Error("Cannot put zero address as an executionFeeRecipient");
+  }
+
+  const keypair = await loadBuilderKeypair(logger, args.keystore, args.keystorePassword, args.builderPubkey);
 
   const onGracefulShutdownCbs: (() => Promise<void> | void)[] = [];
   onGracefulShutdown(async () => {
@@ -32,7 +50,26 @@ export async function builderHandler(args: IBuilderCliArgs & GlobalArgs): Promis
   const abortController = new AbortController();
   onGracefulShutdownCbs.push(async () => abortController.abort());
 
-  const api = getClient({urls: [args.beaconNodeUrl], globalInit: {signal: abortController.signal}}, {config, logger});
+  const register = args.metrics ? new RegistryMetricCreator() : null;
+  const metrics = register && getMetrics(register, {version, commit, network});
+
+  if (metrics) {
+    const closeMetrics = collectNodeJSMetrics(register);
+    onGracefulShutdownCbs.push(() => closeMetrics());
+
+    const port = args["metrics.port"] ?? builderMetricsDefaultOptions.port;
+    const address = args["metrics.address"] ?? builderMetricsDefaultOptions.address;
+    const metricsServer = await getHttpMetricsServer({port, address}, {register, logger});
+
+    onGracefulShutdownCbs.push(() => metricsServer.close());
+  }
+
+  const api = getClient(
+    {urls: [args.beaconNodeUrl], globalInit: {signal: abortController.signal, timeoutMs: args.requestTimeout}},
+    {config, logger, metrics: metrics?.restApiClient}
+  );
+
+  logger.info("Beacon node", {beaconNode: toPrintableUrl(args.beaconNodeUrl), timeoutMs: args.requestTimeout});
 
   const builder = await Builder.init({
     keypair,
@@ -40,6 +77,8 @@ export async function builderHandler(args: IBuilderCliArgs & GlobalArgs): Promis
     config,
     abortController,
     api,
+    executionFeeRecipient: fromHex(executionFeeRecipient),
+    metrics,
   });
 
   onGracefulShutdownCbs.push(() => builder.close());

package/src/cmds/builder/loadKeypair.ts

@@ -2,10 +2,12 @@ import fs from "node:fs";
 import {Keystore} from "@chainsafe/bls-keystore";
 import {SecretKey} from "@chainsafe/blst";
 import {Keypair} from "@lodestar/builder";
+import {Logger} from "@lodestar/utils";
 import {ensure0xPrefix} from "../../util/format.js";
 import {readPassphraseFile} from "../../util/passphrase.js";
 
 export async function loadBuilderKeypair(
+  logger: Logger,
   keystorePath: string,
   passwordPath: string,
   expectedPubkey?: string
@@ -28,5 +30,7 @@ export async function loadBuilderKeypair(
     throw Error(`Pubkey mismatch: keystore ${publicKeyHex}, expected ${expectedPubkey}`);
   }
 
+  logger.info("Loaded builder keystore", {pubkey: publicKeyHex});
+
   return {secretKey, publicKey};
 }

package/src/cmds/builder/options.ts

@@ -2,11 +2,23 @@ import {defaultOptions} from "@lodestar/builder";
 import {CliCommandOptions} from "@lodestar/utils";
 import {LogArgs, logOptions} from "../../options/logOptions.js";
 
+export const builderMetricsDefaultOptions = {
+  enabled: false,
+  port: 5065,
+  address: "127.0.0.1",
+};
+
 export type IBuilderCliArgs = LogArgs & {
   beaconNodeUrl: string;
   keystore: string;
   keystorePassword: string;
   builderPubkey?: string;
+  executionFeeRecipient: string;
+  requestTimeout: number;
+
+  metrics?: boolean;
+  "metrics.port"?: number;
+  "metrics.address"?: string;
 };
 
 export const builderOptions: CliCommandOptions<IBuilderCliArgs> = {
@@ -34,4 +46,39 @@ export const builderOptions: CliCommandOptions<IBuilderCliArgs> = {
     description: "Builder's expected public key based on the keystore from 'keystore' option",
     type: "string",
   },
+
+  executionFeeRecipient: {
+    description: "Execution address for receiving the payload rewards",
+    type: "string",
+    demandOption: true,
+  },
+
+  requestTimeout: {
+    description: "Timeout in milliseconds for HTTP requests to the beacon node",
+    type: "number",
+    default: defaultOptions.requestTimeout,
+  },
+
+  // Metrics
+
+  metrics: {
+    description: "Enable the Prometheus metrics HTTP server",
+    type: "boolean",
+    defaultDescription: String(builderMetricsDefaultOptions.enabled),
+    group: "metrics",
+  },
+
+  "metrics.port": {
+    description: "Listen TCP port for the Prometheus metrics HTTP server",
+    type: "number",
+    defaultDescription: String(builderMetricsDefaultOptions.port),
+    group: "metrics",
+  },
+
+  "metrics.address": {
+    description: "Listen address for the Prometheus metrics HTTP server",
+    type: "string",
+    defaultDescription: String(builderMetricsDefaultOptions.address),
+    group: "metrics",
+  },
 };

package/src/options/beaconNodeOptions/builder.ts

@@ -55,14 +55,14 @@ export const options: CliCommandOptions<ExecutionBuilderArgs> = {
   "builder.faultInspectionWindow": {
     type: "number",
     description:
-      "Window to inspect missed slots (pre-gloas) or unrevealed payloads (post-gloas) for enabling/disabling builder circuit breaker",
+      "Window used to inspect missed slots (pre-gloas) or calculate the canonical EMPTY block rate (post-gloas) for enabling/disabling the builder circuit breaker",
     group: "builder",
   },
 
   "builder.allowedFaults": {
     type: "number",
     description:
-      "Number of missed slots (pre-gloas) or unrevealed payloads (post-gloas) allowed in the `faultInspectionWindow` for builder circuit",
+      "Number of missed slots allowed within `faultInspectionWindow` before ignoring the external builder (pre-gloas). Post-gloas, sets the tolerated rate of canonical EMPTY blocks, defined as `allowedFaults` out of `faultInspectionWindow` and applied to canonical blocks in the window",
     group: "builder",
   },
 };