@chainsafe/lodestar 1.47.0-dev.ec596194e2 → 1.47.0-dev.f0f26cd2b6

package/lib/util/proposerConfig.js

@@ -1,7 +1,12 @@
 import fs from "node:fs";
 import path from "node:path";
+import { builderConfigDataFromJson } from "@lodestar/api/keymanager";
+import { MAX_BUILDER_AUTH_DATA_SIZE, MAX_BUILDER_ENTRIES, MAX_BUILDER_URL_SIZE } from "@lodestar/params";
+import { fromHex, isValidAsciiHttpUrl, toHex } from "@lodestar/utils";
 import { parseFeeRecipient } from "./feeRecipient.js";
 import { readFile } from "./file.js";
+const UINT64_MAX = 2n ** 64n - 1n;
+const BUILDER_AUTH_DATA_PATTERN = new RegExp(`^0x(?:[a-fA-F0-9]{2}){1,${MAX_BUILDER_AUTH_DATA_SIZE}}$`);
 export function parseProposerConfig(configFilePath, defaultArgsConfig) {
     const configFile = readFile(configFilePath, ["yml", "yaml"]);
     const defaultConfigParsed = parseProposerConfigSection(configFile.default_config || {}, defaultArgsConfig);
@@ -21,7 +26,7 @@ function stringtoBool(input) {
 }
 function parseProposerConfigSection(proposerFileSection, overrideConfig) {
     const { graffiti, strict_fee_recipient_check, fee_recipient, builder } = proposerFileSection;
-    const { gas_limit, selection: builderSelection, boost_factor } = builder || {};
+    const { gas_limit, selection: builderSelection, boost_factor, min_bid, max_execution_payment, builders, } = builder || {};
     if (graffiti !== undefined && typeof graffiti !== "string") {
         throw Error("graffiti is not 'string");
     }
@@ -43,24 +48,50 @@ function parseProposerConfigSection(proposerFileSection, overrideConfig) {
     if (boost_factor !== undefined && typeof boost_factor !== "string") {
         throw Error("boost_factor is not 'string");
     }
+    if (min_bid !== undefined && typeof min_bid !== "string") {
+        throw Error("min_bid is not 'string");
+    }
+    if (max_execution_payment !== undefined && typeof max_execution_payment !== "string") {
+        throw Error("max_execution_payment is not 'string");
+    }
+    const parsedBuilder = overrideConfig?.builder || builder
+        ? {
+            gasLimit: overrideConfig?.builder?.gasLimit ?? (gas_limit !== undefined ? Number(gas_limit) : undefined),
+            selection: overrideConfig?.builder?.selection ?? parseBuilderSelection(builderSelection),
+            boostFactor: overrideConfig?.builder?.boostFactor ?? parseBuilderBoostFactor(boost_factor),
+            minBid: overrideConfig?.builder?.minBid ?? parseBuilderMinBid(min_bid),
+            maxExecutionPayment: overrideConfig?.builder?.maxExecutionPayment ?? parseBuilderGweiAmount(max_execution_payment),
+            builders: overrideConfig?.builder?.builders ?? parseBuilderEntries(builders),
+        }
+        : undefined;
+    if (overrideConfig?.builder?.builders !== undefined && builders !== undefined) {
+        throw Error("Cannot configure both --builder.urls and builders in the proposer settings file");
+    }
     return {
         graffiti: overrideConfig?.graffiti ?? graffiti,
         strictFeeRecipientCheck: overrideConfig?.strictFeeRecipientCheck ??
             (strict_fee_recipient_check ? stringtoBool(strict_fee_recipient_check) : undefined),
         feeRecipient: overrideConfig?.feeRecipient ?? (fee_recipient ? parseFeeRecipient(fee_recipient) : undefined),
-        builder: overrideConfig?.builder || builder
-            ? {
-                gasLimit: overrideConfig?.builder?.gasLimit ?? (gas_limit !== undefined ? Number(gas_limit) : undefined),
-                selection: overrideConfig?.builder?.selection ?? parseBuilderSelection(builderSelection),
-                boostFactor: overrideConfig?.builder?.boostFactor ?? parseBuilderBoostFactor(boost_factor),
-            }
-            : undefined,
+        builder: parsedBuilder,
     };
 }
 export function readProposerConfigDir(filepath, filename) {
     const proposerConfigStr = fs.readFileSync(path.join(filepath, filename), "utf8");
-    const proposerConfigJSON = JSON.parse(proposerConfigStr);
-    return proposerConfigJSON;
+    // Persisted via `writeProposerConfig` with BigInt values serialized as strings
+    const persisted = JSON.parse(proposerConfigStr);
+    if (persisted.builder) {
+        const { boostFactor, minBid, maxExecutionPayment, builders } = persisted.builder;
+        persisted.builder.boostFactor = boostFactor !== undefined ? BigInt(boostFactor) : undefined;
+        persisted.builder.minBid = minBid !== undefined ? BigInt(minBid) : undefined;
+        persisted.builder.maxExecutionPayment = maxExecutionPayment !== undefined ? BigInt(maxExecutionPayment) : undefined;
+        persisted.builder.builders = builders?.map((entry) => ({
+            ...entry,
+            maxExecutionPayment: entry.maxExecutionPayment !== undefined ? BigInt(entry.maxExecutionPayment) : undefined,
+            minBid: entry.minBid !== undefined ? BigInt(entry.minBid) : undefined,
+            builderBoostFactor: entry.builderBoostFactor !== undefined ? BigInt(entry.builderBoostFactor) : undefined,
+        }));
+    }
+    return persisted;
 }
 export function parseBuilderSelection(builderSelection) {
     if (builderSelection) {
@@ -89,6 +120,92 @@ export function parseBuilderBoostFactor(boostFactor) {
     if (!/^\d+$/.test(boostFactor)) {
         throw Error("Invalid input for builder boost factor, must be a valid number without decimals");
     }
-    return BigInt(boostFactor);
+    const parsed = BigInt(boostFactor);
+    if (parsed > UINT64_MAX) {
+        throw Error("Invalid input for builder boost factor, must not exceed 2**64 - 1");
+    }
+    return parsed;
+}
+export function parseBuilderMinBid(minBid) {
+    if (minBid === undefined)
+        return;
+    if (!/^\d+$/.test(minBid.toString())) {
+        throw Error("Invalid input for builder min bid, must be a valid number without decimals");
+    }
+    const parsed = BigInt(minBid);
+    if (parsed > UINT64_MAX) {
+        throw Error("Invalid input for builder min bid, must not exceed 2**64 - 1");
+    }
+    return parsed;
+}
+export function parseBuilderGweiAmount(amount) {
+    if (amount === undefined)
+        return;
+    if (!/^\d+$/.test(amount.toString())) {
+        throw Error("Invalid input for builder Gwei amount, must be a valid number without decimals");
+    }
+    const parsed = BigInt(amount);
+    if (parsed > UINT64_MAX) {
+        throw Error("Invalid input for builder Gwei amount, must not exceed 2**64 - 1");
+    }
+    return parsed;
+}
+/**
+ * Parse per-builder entries from the proposer settings file, same shape and validation as the
+ * keymanager builders api. No two entries may share both their url and their auth data, an
+ * omitted auth data is compared as the value derived from the entry url.
+ */
+export function parseBuilderEntries(builders) {
+    if (builders === undefined)
+        return undefined;
+    const { builders: entries } = builderConfigDataFromJson({ builders });
+    const seenEntries = new Set();
+    for (const entry of entries ?? []) {
+        if (!isValidAsciiHttpUrl(entry.url)) {
+            throw Error(`Invalid builder url: ${entry.url}`);
+        }
+        const authData = entry.authData !== undefined ? toHex(fromHex(entry.authData)) : toHex(Buffer.from(entry.url));
+        const entryKey = `${entry.url}|${authData}`;
+        if (seenEntries.has(entryKey)) {
+            throw Error(`Duplicate builder entry url=${entry.url}`);
+        }
+        seenEntries.add(entryKey);
+    }
+    return entries;
+}
+/**
+ * Parse builder urls into builder entries. Auth data agreed with a builder out of band may be
+ * appended as a hex fragment (`https://builder.example.com#0x0123`), it is stripped from the url
+ * and never sent on the wire. Without a fragment the auth data derives from the url.
+ */
+export function parseBuilderUrls(urls) {
+    if (urls === undefined)
+        return undefined;
+    const entries = [];
+    const seenEntries = new Set();
+    for (const value of urls) {
+        const fragmentIndex = value.indexOf("#");
+        const url = fragmentIndex === -1 ? value : value.slice(0, fragmentIndex);
+        const authData = fragmentIndex === -1 ? undefined : value.slice(fragmentIndex + 1);
+        if (!isValidAsciiHttpUrl(url)) {
+            throw Error(`Invalid builder url: ${url}`);
+        }
+        if (Buffer.byteLength(url, "utf8") > MAX_BUILDER_URL_SIZE) {
+            throw Error(`Invalid builder url, must not exceed ${MAX_BUILDER_URL_SIZE} bytes: ${url}`);
+        }
+        if (authData !== undefined && !BUILDER_AUTH_DATA_PATTERN.test(authData)) {
+            throw Error(`Invalid builder url auth data, must be a 0x-prefixed hex string of 1 to ${MAX_BUILDER_AUTH_DATA_SIZE} bytes: ${url}`);
+        }
+        const entryKey = `${url}|${authData !== undefined ? toHex(fromHex(authData)) : toHex(Buffer.from(url))}`;
+        if (seenEntries.has(entryKey)) {
+            throw Error(`Duplicate builder url: ${url}`);
+        }
+        seenEntries.add(entryKey);
+        entries.push({ url, authData });
+    }
+    if (entries.length > MAX_BUILDER_ENTRIES) {
+        throw Error(`Number of builder urls must not exceed ${MAX_BUILDER_ENTRIES}, got ${entries.length}`);
+    }
+    return entries;
 }
 //# sourceMappingURL=proposerConfig.js.map

package/lib/util/proposerConfig.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainsafe/lodestar",
-  "version": "1.47.0-dev.ec596194e2",
+  "version": "1.47.0-dev.f0f26cd2b6",
   "description": "Command line interface for lodestar",
   "author": "ChainSafe Systems",
   "license": "Apache-2.0",
@@ -59,26 +59,26 @@
   "dependencies": {
     "@chainsafe/bls-keygen": "^0.4.0",
     "@chainsafe/bls-keystore": "^3.1.0",
-    "@chainsafe/blst": "^2.2.0",
     "@chainsafe/discv5": "^12.0.2",
     "@chainsafe/enr": "^6.0.2",
-    "@chainsafe/persistent-merkle-tree": "^1.3.0",
-    "@chainsafe/ssz": "^1.6.2",
+    "@chainsafe/lodestar-z": "catalog:",
+    "@chainsafe/persistent-merkle-tree": "^1.3.1",
+    "@chainsafe/ssz": "^1.6.3",
     "@chainsafe/threads": "^1.11.3",
-    "@libp2p/crypto": "^5.1.13",
-    "@libp2p/interface": "^3.1.0",
-    "@libp2p/peer-id": "^6.0.4",
-    "@lodestar/api": "^1.47.0-dev.ec596194e2",
-    "@lodestar/beacon-node": "^1.47.0-dev.ec596194e2",
-    "@lodestar/builder": "^1.47.0-dev.ec596194e2",
-    "@lodestar/config": "^1.47.0-dev.ec596194e2",
-    "@lodestar/db": "^1.47.0-dev.ec596194e2",
-    "@lodestar/logger": "^1.47.0-dev.ec596194e2",
-    "@lodestar/params": "^1.47.0-dev.ec596194e2",
-    "@lodestar/state-transition": "^1.47.0-dev.ec596194e2",
-    "@lodestar/types": "^1.47.0-dev.ec596194e2",
-    "@lodestar/utils": "^1.47.0-dev.ec596194e2",
-    "@lodestar/validator": "^1.47.0-dev.ec596194e2",
+    "@libp2p/crypto": "^5.1.23",
+    "@libp2p/interface": "^3.3.0",
+    "@libp2p/peer-id": "^6.0.15",
+    "@lodestar/api": "^1.47.0-dev.f0f26cd2b6",
+    "@lodestar/beacon-node": "^1.47.0-dev.f0f26cd2b6",
+    "@lodestar/builder": "^1.47.0-dev.f0f26cd2b6",
+    "@lodestar/config": "^1.47.0-dev.f0f26cd2b6",
+    "@lodestar/db": "^1.47.0-dev.f0f26cd2b6",
+    "@lodestar/logger": "^1.47.0-dev.f0f26cd2b6",
+    "@lodestar/params": "^1.47.0-dev.f0f26cd2b6",
+    "@lodestar/state-transition": "^1.47.0-dev.f0f26cd2b6",
+    "@lodestar/types": "^1.47.0-dev.f0f26cd2b6",
+    "@lodestar/utils": "^1.47.0-dev.f0f26cd2b6",
+    "@lodestar/validator": "^1.47.0-dev.f0f26cd2b6",
     "@multiformats/multiaddr": "^13.0.1",
     "deepmerge": "^4.3.1",
     "ethers": "^6.7.0",
@@ -92,9 +92,9 @@
     "yargs": "^17.7.1"
   },
   "devDependencies": {
-    "@chainsafe/as-sha256": "^1.2.4",
+    "@chainsafe/as-sha256": "^1.2.5",
     "@ethereumjs/rlp": "^4.0.1",
-    "@lodestar/test-utils": "^1.47.0-dev.ec596194e2",
+    "@lodestar/test-utils": "^1.47.0-dev.f0f26cd2b6",
     "@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": "dba08d7a33a32e7e0a39fc6d3f61707e64f5e565"
+  "gitHead": "f2cb518d19fecb98b13ff35caa3c0c421e02ad39"
 }

package/src/cmds/beacon/handler.ts

@@ -1,13 +1,14 @@
 import path from "node:path";
 import {getHeapStatistics} from "node:v8";
 import {SignableENR} from "@chainsafe/enr";
+import {pubkeyCache} from "@chainsafe/lodestar-z/pubkeys";
 import {hasher} from "@chainsafe/persistent-merkle-tree";
 import {BeaconDb, BeaconNode} from "@lodestar/beacon-node";
 import {ChainForkConfig, createBeaconConfig} from "@lodestar/config";
 import {LevelDbController} from "@lodestar/db/controller/level";
 import {LoggerNode, getNodeLogger} from "@lodestar/logger/node";
-import {ACTIVE_PRESET, PresetName} from "@lodestar/params";
-import {createBeaconStateView, createPubkeyCache, syncPubkeys} from "@lodestar/state-transition";
+import {ACTIVE_PRESET, MAX_PENDING_DEPOSITS_PER_EPOCH, PresetName, SLOTS_PER_EPOCH} from "@lodestar/params";
+import {createBeaconStateView} from "@lodestar/state-transition";
 import {ErrorAborted, bytesToInt, formatBytes} from "@lodestar/utils";
 import {ProcessShutdownCallback} from "@lodestar/validator";
 import {BeaconNodeOptions, getBeaconConfigFromArgs} from "../../config/index.js";
@@ -78,8 +79,13 @@ export async function beaconHandler(args: BeaconArgs & GlobalArgs): Promise<void
       wsCheckpoint,
     } = await initBeaconState(args, beaconPaths.dataDir, config, db, logger);
     const beaconConfig = createBeaconConfig(config, anchorState.genesisValidatorsRoot);
-    const pubkeyCache = createPubkeyCache();
-    syncPubkeys(pubkeyCache, anchorState.validators.getAllReadonlyValues());
+    // Reserve 3 months of worst-case registry growth (MAX_PENDING_DEPOSITS_PER_EPOCH per epoch),
+    // over a year at organic rates, to avoid routine cache reallocations. Cache growth is protected
+    // by its native lock; if this headroom is exceeded, it grows by the same fixed step.
+    const headroomEpochs = (90 * 24 * 60 * 60) / (config.SECONDS_PER_SLOT * SLOTS_PER_EPOCH);
+    const pubkeyCacheHeadroom = MAX_PENDING_DEPOSITS_PER_EPOCH * Math.ceil(headroomEpochs);
+    pubkeyCache.ensureCapacity(anchorState.validators.length + pubkeyCacheHeadroom);
+    pubkeyCache.syncPubkeys(anchorState.validators.getAllReadonlyValues());
     const anchorStateView = args["chain.nativeStateView"]
       ? createBeaconStateView({useNative: true, stateBytes: anchorStateBytes})
       : createBeaconStateView({useNative: false, anchorState, config: beaconConfig, pubkeyCache});

package/src/cmds/builder/handler.ts

@@ -1,14 +1,16 @@
 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, 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);
 
@@ -29,13 +31,16 @@ export async function builderHandler(args: IBuilderCliArgs & GlobalArgs): Promis
     logger.debug("Not able to delete log files", {}, e as Error);
   }
 
+  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(args.keystore, args.keystorePassword, args.builderPubkey);
+  const keypair = await loadBuilderKeypair(logger, args.keystore, args.keystorePassword, args.builderPubkey);
 
   const onGracefulShutdownCbs: (() => Promise<void> | void)[] = [];
   onGracefulShutdown(async () => {
@@ -45,9 +50,23 @@ export async function builderHandler(args: IBuilderCliArgs & GlobalArgs): Promis
   const abortController = new AbortController();
   onGracefulShutdownCbs.push(async () => abortController.abort());
 
+  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}
+    {config, logger, metrics: metrics?.restApiClient}
   );
 
   logger.info("Beacon node", {beaconNode: toPrintableUrl(args.beaconNodeUrl), timeoutMs: args.requestTimeout});
@@ -59,6 +78,7 @@ export async function builderHandler(args: IBuilderCliArgs & GlobalArgs): Promis
     abortController,
     api,
     executionFeeRecipient: fromHex(executionFeeRecipient),
+    metrics,
   });
 
   onGracefulShutdownCbs.push(() => builder.close());

package/src/cmds/builder/loadKeypair.ts

@@ -1,11 +1,13 @@
 import fs from "node:fs";
 import {Keystore} from "@chainsafe/bls-keystore";
-import {SecretKey} from "@chainsafe/blst";
+import {SecretKey} from "@chainsafe/lodestar-z/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,6 +2,12 @@ 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;
@@ -9,6 +15,10 @@ export type IBuilderCliArgs = LogArgs & {
   builderPubkey?: string;
   executionFeeRecipient: string;
   requestTimeout: number;
+
+  metrics?: boolean;
+  "metrics.port"?: number;
+  "metrics.address"?: string;
 };
 
 export const builderOptions: CliCommandOptions<IBuilderCliArgs> = {
@@ -48,4 +58,27 @@ export const builderOptions: CliCommandOptions<IBuilderCliArgs> = {
     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/cmds/validator/blsToExecutionChange.ts

@@ -1,4 +1,4 @@
-import {SecretKey} from "@chainsafe/blst";
+import {SecretKey} from "@chainsafe/lodestar-z/blst";
 import {getClient} from "@lodestar/api";
 import {createBeaconConfig} from "@lodestar/config";
 import {DOMAIN_BLS_TO_EXECUTION_CHANGE, ForkName} from "@lodestar/params";

package/src/cmds/validator/handler.ts

@@ -28,7 +28,13 @@ import {
   parseLoggerArgs,
   parseProposerConfig,
 } from "../../util/index.js";
-import {parseBuilderBoostFactor, parseBuilderSelection} from "../../util/proposerConfig.js";
+import {
+  parseBuilderBoostFactor,
+  parseBuilderGweiAmount,
+  parseBuilderMinBid,
+  parseBuilderSelection,
+  parseBuilderUrls,
+} from "../../util/proposerConfig.js";
 import {getVersionData} from "../../util/version.js";
 import {KeymanagerApi} from "./keymanager/impl.js";
 import {IPersistedKeysBackend} from "./keymanager/interface.js";
@@ -212,7 +218,8 @@ export async function validatorHandler(args: IValidatorCliArgs & GlobalArgs): Pr
       validator,
       persistedKeysBackend,
       abortController.signal,
-      proposerConfigWriteDisabled
+      proposerConfigWriteDisabled,
+      args.allowDangerousTrustedPayments
     );
     const keymanagerServer = new KeymanagerRestApiServer(
       {
@@ -250,6 +257,9 @@ function getProposerConfigFromArgs(
         args["builder.selection"] ?? (args.builder ? defaultOptions.builderAliasSelection : undefined)
       ),
       boostFactor: parseBuilderBoostFactor(args["builder.boostFactor"]),
+      minBid: parseBuilderMinBid(args["builder.minBid"]),
+      maxExecutionPayment: parseBuilderGweiAmount(args["builder.maxExecutionPayment"]),
+      builders: parseBuilderUrls(args["builder.urls"]),
     },
   };
 
@@ -273,6 +283,23 @@ function getProposerConfigFromArgs(
       valProposerConfig = {defaultConfig} as ValidatorProposerConfig;
     }
   }
+
+  // Trusted execution payments are only backed by the builder's promise to pay, require an
+  // explicit opt-in before any configuration source can set a max execution payment above 0
+  if (args.allowDangerousTrustedPayments !== true) {
+    const configs = [valProposerConfig.defaultConfig, ...Object.values(valProposerConfig.proposerConfig ?? {})];
+    const hasTrustedPayment = configs.some(
+      (config) =>
+        (config.builder?.maxExecutionPayment ?? 0n) > 0n ||
+        (config.builder?.builders ?? []).some((entry) => (entry.maxExecutionPayment ?? 0n) > 0n)
+    );
+    if (hasTrustedPayment) {
+      throw new YargsError(
+        "Configuring a builder max execution payment above 0 requires --allowDangerousTrustedPayments"
+      );
+    }
+  }
+
   return valProposerConfig;
 }
 

package/src/cmds/validator/keymanager/decryptKeystoreDefinitions.ts

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import {Keystore} from "@chainsafe/bls-keystore";
-import {SecretKey} from "@chainsafe/blst";
+import {SecretKey} from "@chainsafe/lodestar-z/blst";
 import {LogLevel, Logger} from "@lodestar/utils";
 import {SignerLocal, SignerType} from "@lodestar/validator";
 import {lockFilepath, unlockFilepath} from "../../../util/lockfile.js";

package/src/cmds/validator/keymanager/impl.ts

@@ -1,7 +1,8 @@
 import {Keystore} from "@chainsafe/bls-keystore";
-import {SecretKey} from "@chainsafe/blst";
+import {SecretKey} from "@chainsafe/lodestar-z/blst";
 import {
   BuilderBoostFactorData,
+  BuilderConfigData,
   DeleteRemoteKeyStatus,
   DeletionStatus,
   FeeRecipientData,
@@ -32,12 +33,13 @@ export class KeymanagerApi implements Api {
     private readonly validator: Validator,
     private readonly persistedKeysBackend: IPersistedKeysBackend,
     private readonly signal: AbortSignal,
-    private readonly proposerConfigWriteDisabled?: boolean
+    private readonly proposerConfigWriteDisabled?: boolean,
+    private readonly allowDangerousTrustedPayments?: boolean
   ) {}
 
   private checkIfProposerWriteEnabled(): void {
     if (this.proposerConfigWriteDisabled === true) {
-      throw Error("proposerSettingsFile option activated");
+      throw new ApiError(403, "proposerSettingsFile option activated");
     }
   }
 
@@ -379,6 +381,48 @@ export class KeymanagerApi implements Api {
     return {status: 204};
   }
 
+  async getBuilderConfig({pubkey}: {pubkey: PubkeyHex}): ReturnType<Api["getBuilderConfig"]> {
+    this.assertValidKnownPubkey(pubkey);
+    return {data: this.validator.validatorStore.getBuilderConfig(pubkey)};
+  }
+
+  async setBuilderConfig({
+    pubkey,
+    builderConfig,
+  }: {
+    pubkey: PubkeyHex;
+    builderConfig: BuilderConfigData;
+  }): ReturnType<Api["setBuilderConfig"]> {
+    this.checkIfProposerWriteEnabled();
+    this.assertValidKnownPubkey(pubkey);
+
+    if (
+      this.allowDangerousTrustedPayments !== true &&
+      builderConfig.builders?.some((entry) => (entry.maxExecutionPayment ?? 0n) > 0n)
+    ) {
+      throw new ApiError(
+        400,
+        "Configuring a builder max execution payment above 0 requires --allowDangerousTrustedPayments"
+      );
+    }
+
+    try {
+      this.validator.validatorStore.setBuilderConfig(pubkey, builderConfig);
+    } catch (e) {
+      throw new ApiError(400, (e as Error).message);
+    }
+    this.persistedKeysBackend.writeProposerConfig(pubkey, this.validator.validatorStore.getProposerConfig(pubkey));
+    return {status: 202};
+  }
+
+  async deleteBuilderConfig({pubkey}: {pubkey: PubkeyHex}): ReturnType<Api["deleteBuilderConfig"]> {
+    this.checkIfProposerWriteEnabled();
+    this.assertValidKnownPubkey(pubkey);
+    this.validator.validatorStore.deleteBuilderConfig(pubkey);
+    this.persistedKeysBackend.writeProposerConfig(pubkey, this.validator.validatorStore.getProposerConfig(pubkey));
+    return {status: 204};
+  }
+
   async getProposerConfig({pubkey}: {pubkey: PubkeyHex}): ReturnType<Api["getProposerConfig"]> {
     this.assertValidKnownPubkey(pubkey);
 
@@ -390,7 +434,15 @@ export class KeymanagerApi implements Api {
         ? {
             ...config.builder,
             // Default JSON serialization can't handle BigInt
-            boostFactor: config.builder.boostFactor ? config.builder.boostFactor.toString() : undefined,
+            boostFactor: config.builder.boostFactor?.toString(),
+            minBid: config.builder.minBid?.toString(),
+            maxExecutionPayment: config.builder.maxExecutionPayment?.toString(),
+            builders: config.builder.builders?.map((entry) => ({
+              ...entry,
+              maxExecutionPayment: entry.maxExecutionPayment?.toString(),
+              minBid: entry.minBid?.toString(),
+              builderBoostFactor: entry.builderBoostFactor?.toString(),
+            })),
           }
         : undefined,
     };

package/src/cmds/validator/keymanager/keystoreCache.ts

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import {Keystore} from "@chainsafe/bls-keystore";
-import {SecretKey} from "@chainsafe/blst";
+import {SecretKey} from "@chainsafe/lodestar-z/blst";
 import {fromHex, toHex, toPubkeyHex} from "@lodestar/utils";
 import {SignerLocal, SignerType} from "@lodestar/validator";
 import {writeFile600Perm} from "../../../util/file.js";

package/src/cmds/validator/keymanager/persistedKeys.ts

@@ -53,7 +53,11 @@ export class PersistedKeysBackend implements IPersistedKeysBackend {
     if (proposerConfig !== null) {
       // if proposerConfig is not empty write or update the json to file
       const {proposerDirPath} = this.getValidatorPaths(pubkeyHex);
-      writeFile600Perm(proposerDirPath, JSON.stringify(proposerConfig));
+      writeFile600Perm(
+        proposerDirPath,
+        // Default JSON serialization can't handle BigInt
+        JSON.stringify(proposerConfig, (_key, value) => (typeof value === "bigint" ? value.toString() : value))
+      );
     } else {
       this.deleteProposerConfig(pubkeyHex);
     }