@chainsafe/lodestar 1.47.0-dev.ec596194e2 → 1.47.0-dev.f0f26cd2b6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.git-data.json +1 -1
- package/lib/cmds/beacon/handler.d.ts.map +1 -1
- package/lib/cmds/beacon/handler.js +10 -4
- package/lib/cmds/beacon/handler.js.map +1 -1
- package/lib/cmds/builder/handler.d.ts.map +1 -1
- package/lib/cmds/builder/handler.js +19 -3
- package/lib/cmds/builder/handler.js.map +1 -1
- package/lib/cmds/builder/loadKeypair.d.ts +2 -1
- package/lib/cmds/builder/loadKeypair.d.ts.map +1 -1
- package/lib/cmds/builder/loadKeypair.js +3 -2
- package/lib/cmds/builder/loadKeypair.js.map +1 -1
- package/lib/cmds/builder/options.d.ts +8 -0
- package/lib/cmds/builder/options.d.ts.map +1 -1
- package/lib/cmds/builder/options.js +24 -0
- package/lib/cmds/builder/options.js.map +1 -1
- package/lib/cmds/dev/options.d.ts +4 -0
- package/lib/cmds/dev/options.d.ts.map +1 -1
- package/lib/cmds/validator/blsToExecutionChange.js +1 -1
- package/lib/cmds/validator/blsToExecutionChange.js.map +1 -1
- package/lib/cmds/validator/handler.d.ts.map +1 -1
- package/lib/cmds/validator/handler.js +15 -2
- package/lib/cmds/validator/handler.js.map +1 -1
- package/lib/cmds/validator/keymanager/decryptKeystoreDefinitions.js +1 -1
- package/lib/cmds/validator/keymanager/decryptKeystoreDefinitions.js.map +1 -1
- package/lib/cmds/validator/keymanager/impl.d.ts +13 -2
- package/lib/cmds/validator/keymanager/impl.d.ts.map +1 -1
- package/lib/cmds/validator/keymanager/impl.js +41 -4
- package/lib/cmds/validator/keymanager/impl.js.map +1 -1
- package/lib/cmds/validator/keymanager/keystoreCache.js +1 -1
- package/lib/cmds/validator/keymanager/keystoreCache.js.map +1 -1
- package/lib/cmds/validator/keymanager/persistedKeys.d.ts.map +1 -1
- package/lib/cmds/validator/keymanager/persistedKeys.js +3 -1
- package/lib/cmds/validator/keymanager/persistedKeys.js.map +1 -1
- package/lib/cmds/validator/options.d.ts +4 -0
- package/lib/cmds/validator/options.d.ts.map +1 -1
- package/lib/cmds/validator/options.js +24 -0
- package/lib/cmds/validator/options.js.map +1 -1
- package/lib/cmds/validator/signers/index.js +1 -1
- package/lib/cmds/validator/signers/index.js.map +1 -1
- package/lib/cmds/validator/voluntaryExit.js +1 -1
- package/lib/cmds/validator/voluntaryExit.js.map +1 -1
- package/lib/networks/chiado.d.ts.map +1 -1
- package/lib/networks/chiado.js +4 -10
- package/lib/networks/chiado.js.map +1 -1
- package/lib/options/beaconNodeOptions/builder.d.ts.map +1 -1
- package/lib/options/beaconNodeOptions/builder.js +2 -2
- package/lib/options/beaconNodeOptions/builder.js.map +1 -1
- package/lib/options/beaconNodeOptions/chain.d.ts.map +1 -1
- package/lib/options/beaconNodeOptions/chain.js +1 -1
- package/lib/options/beaconNodeOptions/chain.js.map +1 -1
- package/lib/util/format.js +1 -1
- package/lib/util/format.js.map +1 -1
- package/lib/util/proposerConfig.d.ts +16 -11
- package/lib/util/proposerConfig.d.ts.map +1 -1
- package/lib/util/proposerConfig.js +128 -11
- package/lib/util/proposerConfig.js.map +1 -1
- package/package.json +21 -21
- package/src/cmds/beacon/handler.ts +10 -4
- package/src/cmds/builder/handler.ts +24 -4
- package/src/cmds/builder/loadKeypair.ts +5 -1
- package/src/cmds/builder/options.ts +33 -0
- package/src/cmds/validator/blsToExecutionChange.ts +1 -1
- package/src/cmds/validator/handler.ts +29 -2
- package/src/cmds/validator/keymanager/decryptKeystoreDefinitions.ts +1 -1
- package/src/cmds/validator/keymanager/impl.ts +56 -4
- package/src/cmds/validator/keymanager/keystoreCache.ts +1 -1
- package/src/cmds/validator/keymanager/persistedKeys.ts +5 -1
- package/src/cmds/validator/options.ts +36 -0
- package/src/cmds/validator/signers/index.ts +1 -1
- package/src/cmds/validator/voluntaryExit.ts +1 -1
- package/src/networks/chiado.ts +4 -10
- package/src/options/beaconNodeOptions/builder.ts +4 -2
- package/src/options/beaconNodeOptions/chain.ts +2 -1
- package/src/util/format.ts +1 -1
- package/src/util/proposerConfig.ts +152 -13
package/.git-data.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/cmds/beacon/handler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/cmds/beacon/handler.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,eAAe,EAAqB,MAAM,kBAAkB,CAAC;AAErE,OAAO,EAAC,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAOhE,OAAO,EAAC,UAAU,EAAsB,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAC,OAAO,EAAC,MAAM,6BAA6B,CAAC;AAYpD,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAOxC;;GAEG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA4IhF;AAED,oEAAoE;AACpE,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU;;;;;;;;;;;;;;;GA6DpE;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,EAC3C,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,eAAe,EACvB,QAAQ,SAAe,GACtB,UAAU,CAUZ"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
2
|
import { getHeapStatistics } from "node:v8";
|
|
3
|
+
import { pubkeyCache } from "@chainsafe/lodestar-z/pubkeys";
|
|
3
4
|
import { hasher } from "@chainsafe/persistent-merkle-tree";
|
|
4
5
|
import { BeaconDb, BeaconNode } from "@lodestar/beacon-node";
|
|
5
6
|
import { createBeaconConfig } from "@lodestar/config";
|
|
6
7
|
import { LevelDbController } from "@lodestar/db/controller/level";
|
|
7
8
|
import { getNodeLogger } from "@lodestar/logger/node";
|
|
8
|
-
import { ACTIVE_PRESET, PresetName } from "@lodestar/params";
|
|
9
|
-
import { createBeaconStateView
|
|
9
|
+
import { ACTIVE_PRESET, MAX_PENDING_DEPOSITS_PER_EPOCH, PresetName, SLOTS_PER_EPOCH } from "@lodestar/params";
|
|
10
|
+
import { createBeaconStateView } from "@lodestar/state-transition";
|
|
10
11
|
import { ErrorAborted, bytesToInt, formatBytes } from "@lodestar/utils";
|
|
11
12
|
import { BeaconNodeOptions, getBeaconConfigFromArgs } from "../../config/index.js";
|
|
12
13
|
import { getNetworkBootnodes, isKnownNetworkName, readBootnodes } from "../../networks/index.js";
|
|
@@ -51,8 +52,13 @@ export async function beaconHandler(args) {
|
|
|
51
52
|
try {
|
|
52
53
|
const { anchorState, stateBytes: anchorStateBytes, isFinalized, wsCheckpoint, } = await initBeaconState(args, beaconPaths.dataDir, config, db, logger);
|
|
53
54
|
const beaconConfig = createBeaconConfig(config, anchorState.genesisValidatorsRoot);
|
|
54
|
-
|
|
55
|
-
|
|
55
|
+
// Reserve 3 months of worst-case registry growth (MAX_PENDING_DEPOSITS_PER_EPOCH per epoch),
|
|
56
|
+
// over a year at organic rates, to avoid routine cache reallocations. Cache growth is protected
|
|
57
|
+
// by its native lock; if this headroom is exceeded, it grows by the same fixed step.
|
|
58
|
+
const headroomEpochs = (90 * 24 * 60 * 60) / (config.SECONDS_PER_SLOT * SLOTS_PER_EPOCH);
|
|
59
|
+
const pubkeyCacheHeadroom = MAX_PENDING_DEPOSITS_PER_EPOCH * Math.ceil(headroomEpochs);
|
|
60
|
+
pubkeyCache.ensureCapacity(anchorState.validators.length + pubkeyCacheHeadroom);
|
|
61
|
+
pubkeyCache.syncPubkeys(anchorState.validators.getAllReadonlyValues());
|
|
56
62
|
const anchorStateView = args["chain.nativeStateView"]
|
|
57
63
|
? createBeaconStateView({ useNative: true, stateBytes: anchorStateBytes })
|
|
58
64
|
: createBeaconStateView({ useNative: false, anchorState, config: beaconConfig, pubkeyCache });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/cmds/beacon/handler.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,iBAAiB,EAAC,MAAM,SAAS,CAAC;AAE1C,OAAO,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAkB,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAa,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAC,aAAa,EAAE,UAAU,EAAC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/cmds/beacon/handler.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,iBAAiB,EAAC,MAAM,SAAS,CAAC;AAE1C,OAAO,EAAC,WAAW,EAAC,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAkB,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAa,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAC,aAAa,EAAE,8BAA8B,EAAE,UAAU,EAAE,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAC5G,OAAO,EAAC,qBAAqB,EAAC,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAC,YAAY,EAAE,UAAU,EAAE,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAEtE,OAAO,EAAC,iBAAiB,EAAE,uBAAuB,EAAC,MAAM,uBAAuB,CAAC;AACjF,OAAO,EAAC,mBAAmB,EAAE,kBAAkB,EAAE,aAAa,EAAC,MAAM,yBAAyB,CAAC;AAC/F,OAAO,EAAa,mBAAmB,EAAC,MAAM,wBAAwB,CAAC;AAEvE,OAAO,EACL,gBAAgB,EAChB,KAAK,EACL,kBAAkB,EAClB,eAAe,EACf,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAC,oBAAoB,EAAC,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAC,cAAc,EAAC,MAAM,YAAY,CAAC;AAE1C,MAAM,mCAAmC,GAAG,EAAE,GAAG,EAAE,CAAC;AACpD,MAAM,WAAW,GAAG,IAAI,GAAG,IAAI,CAAC;AAChC,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;AAExC;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAA6B;IAC/D,MAAM,EAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAC,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAEnH,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,2CAA2C,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,MAAM,aAAa,GAAG,iBAAiB,EAAE,CAAC,eAAe,CAAC;IAC1D,IAAI,aAAa,GAAG,QAAQ,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,CACT,yCAAyC,WAAW,CAAC,aAAa,CAAC,wCAAwC,WAAW,CAAC,QAAQ,CAAC,0FAA0F,CAC3N,CAAC;IACJ,CAAC;IAED,yBAAyB;IACzB,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3B,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC7B,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAEzB,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;IAE9C,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAC,CAAC,CAAC;IACpD,gFAAgF;IAChF,oBAAoB;IACpB,MAAM,uBAAuB,GAA4B,CAAC,GAAG,EAAE,EAAE;QAC/D,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QACpD,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC,CAAC;IAEF,IAAI,aAAa,KAAK,UAAU,CAAC,OAAO;QAAE,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;IAEzF,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC,MAAM,EAAE,MAAM,iBAAiB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,EAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAC,CAAC,CAAC,CAAC;IACrG,MAAM,CAAC,IAAI,CAAC,+BAA+B,EAAE,EAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,EAAC,CAAC,CAAC;IAEtE,mBAAmB;IACnB,IAAI,CAAC;QACH,MAAM,EACJ,WAAW,EACX,UAAU,EAAE,gBAAgB,EAC5B,WAAW,EACX,YAAY,GACb,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;QACzE,MAAM,YAAY,GAAG,kBAAkB,CAAC,MAAM,EAAE,WAAW,CAAC,qBAAqB,CAAC,CAAC;QACnF,6FAA6F;QAC7F,gGAAgG;QAChG,qFAAqF;QACrF,MAAM,cAAc,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,GAAG,eAAe,CAAC,CAAC;QACzF,MAAM,mBAAmB,GAAG,8BAA8B,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACvF,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,GAAG,mBAAmB,CAAC,CAAC;QAChF,WAAW,CAAC,WAAW,CAAC,WAAW,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC,CAAC;QACvE,MAAM,eAAe,GAAG,IAAI,CAAC,uBAAuB,CAAC;YACnD,CAAC,CAAC,qBAAqB,CAAC,EAAC,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,gBAAgB,EAAC,CAAC;YACxE,CAAC,CAAC,qBAAqB,CAAC,EAAC,SAAS,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAC,CAAC,CAAC;QAE9F,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC;YACjC,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,YAAY;YACpB,WAAW;YACX,EAAE;YACF,MAAM;YACN,uBAAuB;YACvB,UAAU;YACV,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,YAAY,EAAE,WAAW,CAAC,YAAY;YACtC,WAAW,EAAE,eAAe;YAC5B,sBAAsB,EAAE,WAAW;YACnC,YAAY;SACb,CAAC,CAAC;QAEH,qDAAqD;QACrD,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC3B,UAA0C,CAAC,EAAE,GAAG,IAAI,CAAC;QACxD,CAAC;QAED,2CAA2C;QAC3C,MAAM,EAAC,2BAA2B,EAAE,wBAAwB,EAAC,GAAG,OAAO,CAAC,KAAK,CAAC;QAC9E,MAAM,8BAA8B,GAClC,2BAA2B,IAAI,wBAAwB;YACrD,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE;gBACf,IAAI,CAAC;oBACH,MAAM,gBAAgB,GAAG,kBAAkB,CACzC,2BAA2B,EAC3B,CAAC,IAAI,CAAC,sCAAsC,IAAI,mCAAmC,CAAC,GAAG,WAAW,CACnG,CAAC;oBACF,MAAM,CAAC,IAAI,CAAC,4BAA4B,EAAE,EAAC,gBAAgB,EAAC,CAAC,CAAC;gBAChE,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAC,2BAA2B,EAAC,EAAE,CAAU,CAAC,CAAC;gBAC9F,CAAC;gBACD,oBAAoB;YACtB,CAAC,EAAE,WAAW,CAAC;YACjB,CAAC,CAAC,IAAI,CAAC;QAEX,+DAA+D;QAC/D,kBAAkB,CAAC,KAAK,IAAI,EAAE;YAC5B,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAChC,IAAI,CAAC;oBACH,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;oBAChE,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;oBACxD,gBAAgB,CAAC,OAAO,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC;gBACjD,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACX,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,EAAE,EAAE,CAAU,CAAC,CAAC;gBACvD,CAAC;YACH,CAAC;YACD,eAAe,CAAC,KAAK,EAAE,CAAC;YAExB,IAAI,8BAA8B,KAAK,IAAI,EAAE,CAAC;gBAC5C,aAAa,CAAC,8BAA8B,CAAC,CAAC;YAChD,CAAC;QACH,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAE7B,eAAe,CAAC,MAAM,CAAC,gBAAgB,CACrC,OAAO,EACP,KAAK,IAAI,EAAE;YACT,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;gBACnB,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;gBACnC,yDAAyD;gBACzD,wDAAwD;gBACxD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,4FAA4F;gBAC5F,2DAA2D;gBAC3D,MAAM,CAAC,IAAI,CAAC,2BAA2B,EAAE,EAAE,EAAE,CAAU,CAAC,CAAC;gBACzD,2CAA2C;gBAC3C,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;gBACjB,+DAA+D;gBAC/D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC,EACD,EAAC,IAAI,EAAE,IAAI,EAAC,CACb,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;QAEjB,IAAI,CAAC,YAAY,YAAY,EAAE,CAAC;YAC9B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,oEAAoE;QAC9F,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;AACH,CAAC;AAED,oEAAoE;AACpE,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAA6B;IACnE,MAAM,EAAC,MAAM,EAAE,OAAO,EAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAExD,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;IAE3E,MAAM,EAAC,OAAO,EAAE,MAAM,EAAC,GAAG,cAAc,EAAE,CAAC;IAC3C,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClD,iDAAiD;IACjD,iBAAiB,CAAC,GAAG,CAAC,EAAC,EAAE,EAAE,EAAC,IAAI,EAAE,WAAW,CAAC,KAAK,EAAC,EAAC,CAAC,CAAC;IACvD,iBAAiB,CAAC,GAAG,CAAC;QACpB,KAAK,EAAE;YACL,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;YAC/C,2BAA2B,EAAE,WAAW,CAAC,2BAA2B;YACpE,wBAAwB,EAAE,WAAW,CAAC,wBAAwB;SAC/D;KACF,CAAC,CAAC;IACH,iFAAiF;IACjF,iBAAiB,CAAC,GAAG,CAAC,EAAC,OAAO,EAAE,EAAC,QAAQ,EAAE,EAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAC,EAAC,EAAC,CAAC,CAAC;IACzE,4DAA4D;IAC5D,iBAAiB,CAAC,GAAG,CAAC,EAAC,GAAG,EAAE,EAAC,MAAM,EAAE,OAAO,EAAC,EAAC,CAAC,CAAC;IAEhD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7D,MAAM,EAAC,UAAU,EAAE,GAAG,EAAC,GAAG,MAAM,oBAAoB,CAAC,IAAI,EAAE,WAAW,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAE1F,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;QAC1B,+BAA+B;QAC/B,iBAAiB,CAAC,GAAG,CAAC,EAAC,OAAO,EAAE,EAAC,MAAM,EAAE,EAAC,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,EAAC,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAC,EAAC,EAAC,EAAC,CAAC,CAAC;QAE7G,2CAA2C;QAC3C,MAAM,SAAS,GAAG,CAAC,iBAAiB,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CAChF,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,EAC3D,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CACtE,CAAC;QACF,yCAAyC;QACzC,iBAAiB,CAAC,GAAG,CAAC,EAAC,OAAO,EAAE,EAAC,MAAM,EAAE,EAAC,QAAQ,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,EAAC,EAAC,EAAC,CAAC,CAAC;IAClF,CAAC;IAED,iBAAiB,CAAC,GAAG,CAAC,EAAC,KAAK,EAAE,EAAC,wBAAwB,EAAE,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAC,EAAC,CAAC,CAAC;IAEnH,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAClC,iBAAiB,CAAC,GAAG,CAAC,EAAC,KAAK,EAAE,EAAC,wBAAwB,EAAE,IAAI,EAAC,EAAC,CAAC,CAAC;IACnE,CAAC;IAED,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,iBAAiB,CAAC,GAAG,CAAC,EAAC,OAAO,EAAE,EAAC,OAAO,EAAE,IAAI,EAAC,EAAE,GAAG,EAAE,EAAC,OAAO,EAAE,IAAI,EAAC,EAAC,CAAC,CAAC;IAC1E,CAAC;SAAM,CAAC;QACN,MAAM,UAAU,GAAG,YAAY,OAAO,EAAE,CAAC;QACzC,8CAA8C;QAC9C,iBAAiB,CAAC,GAAG,CAAC,EAAC,OAAO,EAAE,EAAC,OAAO,EAAC,EAAC,CAAC,CAAC;QAC5C,gDAAgD;QAChD,iBAAiB,CAAC,GAAG,CAAC,EAAC,gBAAgB,EAAE,EAAC,SAAS,EAAE,UAAU,EAAC,EAAC,CAAC,CAAC;QACnE,sCAAsC;QACtC,iBAAiB,CAAC,GAAG,CAAC,EAAC,eAAe,EAAE,EAAC,UAAU,EAAE,UAAU,EAAC,EAAC,CAAC,CAAC;QACnE,2CAA2C;QAC3C,iBAAiB,CAAC,GAAG,CAAC,EAAC,eAAe,EAAE,EAAC,MAAM,EAAE,OAAO,EAAC,EAAC,CAAC,CAAC;IAC9D,CAAC;IAED,uBAAuB;IACvB,MAAM,OAAO,GAAG,iBAAiB,CAAC,eAAe,EAAE,CAAC;IAEpD,OAAO,EAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAC,CAAC;AACtF,CAAC;AAED,MAAM,UAAU,UAAU,CACxB,IAA2C,EAC3C,OAAe,EACf,MAAuB,EACvB,QAAQ,GAAG,YAAY;IAEvB,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,EAAC,kBAAkB,EAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IAClF,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,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,2BAA2B,CAClC,IAA6B,EAC7B,MAAuB,EACvB,MAAkB,EAClB,GAAgB;IAEhB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC,wBAAwB,CAAC;IACzC,CAAC;IAED,MAAM,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEvE,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,wBAAwB,GAAG,CAAC,CAAC,CAAC;QACzE,IAAI,MAAM,GAAG,gBAAgB,EAAE,CAAC;YAC9B,MAAM,CAAC,IAAI,CACT,+FAA+F,MAAM,EAAE,CACxG,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAAC;AACtD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/cmds/builder/handler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"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"}
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
2
|
import { getClient } from "@lodestar/api";
|
|
3
|
-
import {
|
|
3
|
+
import { RegistryMetricCreator, collectNodeJSMetrics, getHttpMetricsServer } from "@lodestar/beacon-node";
|
|
4
|
+
import { Builder, getMetrics } from "@lodestar/builder";
|
|
4
5
|
import { getNodeLogger } from "@lodestar/logger/node";
|
|
5
6
|
import { fromHex, toPrintableUrl } from "@lodestar/utils";
|
|
6
7
|
import { getBeaconConfigFromArgs } from "../../config/beaconParams.js";
|
|
7
8
|
import { getGlobalPaths } from "../../paths/global.js";
|
|
8
9
|
import { cleanOldLogFiles, onGracefulShutdown, parseFeeRecipient, parseLoggerArgs } from "../../util/index.js";
|
|
10
|
+
import { getVersionData } from "../../util/version.js";
|
|
9
11
|
import { loadBuilderKeypair } from "./loadKeypair.js";
|
|
12
|
+
import { builderMetricsDefaultOptions } from "./options.js";
|
|
10
13
|
const ZERO_ADDRESS = "0x" + "0".repeat(40);
|
|
11
14
|
export async function builderHandler(args) {
|
|
12
15
|
const { config, network } = getBeaconConfigFromArgs(args);
|
|
@@ -22,11 +25,13 @@ export async function builderHandler(args) {
|
|
|
22
25
|
catch (e) {
|
|
23
26
|
logger.debug("Not able to delete log files", {}, e);
|
|
24
27
|
}
|
|
28
|
+
const { version, commit } = getVersionData();
|
|
29
|
+
logger.info("Lodestar", { network, version, commit });
|
|
25
30
|
const executionFeeRecipient = parseFeeRecipient(args.executionFeeRecipient);
|
|
26
31
|
if (executionFeeRecipient === ZERO_ADDRESS) {
|
|
27
32
|
throw Error("Cannot put zero address as an executionFeeRecipient");
|
|
28
33
|
}
|
|
29
|
-
const keypair = await loadBuilderKeypair(args.keystore, args.keystorePassword, args.builderPubkey);
|
|
34
|
+
const keypair = await loadBuilderKeypair(logger, args.keystore, args.keystorePassword, args.builderPubkey);
|
|
30
35
|
const onGracefulShutdownCbs = [];
|
|
31
36
|
onGracefulShutdown(async () => {
|
|
32
37
|
for (const cb of onGracefulShutdownCbs)
|
|
@@ -34,7 +39,17 @@ export async function builderHandler(args) {
|
|
|
34
39
|
}, logger.info.bind(logger));
|
|
35
40
|
const abortController = new AbortController();
|
|
36
41
|
onGracefulShutdownCbs.push(async () => abortController.abort());
|
|
37
|
-
const
|
|
42
|
+
const register = args.metrics ? new RegistryMetricCreator() : null;
|
|
43
|
+
const metrics = register && getMetrics(register, { version, commit, network });
|
|
44
|
+
if (metrics) {
|
|
45
|
+
const closeMetrics = collectNodeJSMetrics(register);
|
|
46
|
+
onGracefulShutdownCbs.push(() => closeMetrics());
|
|
47
|
+
const port = args["metrics.port"] ?? builderMetricsDefaultOptions.port;
|
|
48
|
+
const address = args["metrics.address"] ?? builderMetricsDefaultOptions.address;
|
|
49
|
+
const metricsServer = await getHttpMetricsServer({ port, address }, { register, logger });
|
|
50
|
+
onGracefulShutdownCbs.push(() => metricsServer.close());
|
|
51
|
+
}
|
|
52
|
+
const api = getClient({ urls: [args.beaconNodeUrl], globalInit: { signal: abortController.signal, timeoutMs: args.requestTimeout } }, { config, logger, metrics: metrics?.restApiClient });
|
|
38
53
|
logger.info("Beacon node", { beaconNode: toPrintableUrl(args.beaconNodeUrl), timeoutMs: args.requestTimeout });
|
|
39
54
|
const builder = await Builder.init({
|
|
40
55
|
keypair,
|
|
@@ -43,6 +58,7 @@ export async function builderHandler(args) {
|
|
|
43
58
|
abortController,
|
|
44
59
|
api,
|
|
45
60
|
executionFeeRecipient: fromHex(executionFeeRecipient),
|
|
61
|
+
metrics,
|
|
46
62
|
});
|
|
47
63
|
onGracefulShutdownCbs.push(() => builder.close());
|
|
48
64
|
}
|
|
@@ -1 +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;
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/cmds/builder/handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { Keypair } from "@lodestar/builder";
|
|
2
|
-
|
|
2
|
+
import { Logger } from "@lodestar/utils";
|
|
3
|
+
export declare function loadBuilderKeypair(logger: Logger, keystorePath: string, passwordPath: string, expectedPubkey?: string): Promise<Keypair>;
|
|
3
4
|
//# sourceMappingURL=loadKeypair.d.ts.map
|
|
@@ -1 +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;
|
|
1
|
+
{"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
2
|
import { Keystore } from "@chainsafe/bls-keystore";
|
|
3
|
-
import { SecretKey } from "@chainsafe/blst";
|
|
3
|
+
import { SecretKey } from "@chainsafe/lodestar-z/blst";
|
|
4
4
|
import { ensure0xPrefix } from "../../util/format.js";
|
|
5
5
|
import { readPassphraseFile } from "../../util/passphrase.js";
|
|
6
|
-
export async function loadBuilderKeypair(keystorePath, passwordPath, expectedPubkey) {
|
|
6
|
+
export async function loadBuilderKeypair(logger, keystorePath, passwordPath, expectedPubkey) {
|
|
7
7
|
const password = readPassphraseFile(passwordPath);
|
|
8
8
|
const keystoreStr = fs.readFileSync(keystorePath, "utf8");
|
|
9
9
|
const keystore = Keystore.parse(keystoreStr);
|
|
@@ -17,6 +17,7 @@ export async function loadBuilderKeypair(keystorePath, passwordPath, expectedPub
|
|
|
17
17
|
if (expectedPubkey && publicKeyHex !== ensure0xPrefix(expectedPubkey.toLowerCase())) {
|
|
18
18
|
throw Error(`Pubkey mismatch: keystore ${publicKeyHex}, expected ${expectedPubkey}`);
|
|
19
19
|
}
|
|
20
|
+
logger.info("Loaded builder keystore", { pubkey: publicKeyHex });
|
|
20
21
|
return { secretKey, publicKey };
|
|
21
22
|
}
|
|
22
23
|
//# sourceMappingURL=loadKeypair.js.map
|
|
@@ -1 +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,
|
|
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,4BAA4B,CAAC;AAGrD,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"}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import { CliCommandOptions } from "@lodestar/utils";
|
|
2
2
|
import { LogArgs } from "../../options/logOptions.js";
|
|
3
|
+
export declare const builderMetricsDefaultOptions: {
|
|
4
|
+
enabled: boolean;
|
|
5
|
+
port: number;
|
|
6
|
+
address: string;
|
|
7
|
+
};
|
|
3
8
|
export type IBuilderCliArgs = LogArgs & {
|
|
4
9
|
beaconNodeUrl: string;
|
|
5
10
|
keystore: string;
|
|
@@ -7,6 +12,9 @@ export type IBuilderCliArgs = LogArgs & {
|
|
|
7
12
|
builderPubkey?: string;
|
|
8
13
|
executionFeeRecipient: string;
|
|
9
14
|
requestTimeout: number;
|
|
15
|
+
metrics?: boolean;
|
|
16
|
+
"metrics.port"?: number;
|
|
17
|
+
"metrics.address"?: string;
|
|
10
18
|
};
|
|
11
19
|
export declare const builderOptions: CliCommandOptions<IBuilderCliArgs>;
|
|
12
20
|
//# sourceMappingURL=options.d.ts.map
|
|
@@ -1 +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;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;
|
|
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,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"}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import { defaultOptions } from "@lodestar/builder";
|
|
2
2
|
import { logOptions } from "../../options/logOptions.js";
|
|
3
|
+
export const builderMetricsDefaultOptions = {
|
|
4
|
+
enabled: false,
|
|
5
|
+
port: 5065,
|
|
6
|
+
address: "127.0.0.1",
|
|
7
|
+
};
|
|
3
8
|
export const builderOptions = {
|
|
4
9
|
...logOptions,
|
|
5
10
|
beaconNodeUrl: {
|
|
@@ -31,5 +36,24 @@ export const builderOptions = {
|
|
|
31
36
|
type: "number",
|
|
32
37
|
default: defaultOptions.requestTimeout,
|
|
33
38
|
},
|
|
39
|
+
// Metrics
|
|
40
|
+
metrics: {
|
|
41
|
+
description: "Enable the Prometheus metrics HTTP server",
|
|
42
|
+
type: "boolean",
|
|
43
|
+
defaultDescription: String(builderMetricsDefaultOptions.enabled),
|
|
44
|
+
group: "metrics",
|
|
45
|
+
},
|
|
46
|
+
"metrics.port": {
|
|
47
|
+
description: "Listen TCP port for the Prometheus metrics HTTP server",
|
|
48
|
+
type: "number",
|
|
49
|
+
defaultDescription: String(builderMetricsDefaultOptions.port),
|
|
50
|
+
group: "metrics",
|
|
51
|
+
},
|
|
52
|
+
"metrics.address": {
|
|
53
|
+
description: "Listen address for the Prometheus metrics HTTP server",
|
|
54
|
+
type: "string",
|
|
55
|
+
defaultDescription: String(builderMetricsDefaultOptions.address),
|
|
56
|
+
group: "metrics",
|
|
57
|
+
},
|
|
34
58
|
};
|
|
35
59
|
//# sourceMappingURL=options.js.map
|
|
@@ -1 +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;
|
|
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;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"}
|
|
@@ -44,6 +44,10 @@ export declare const devOptions: {
|
|
|
44
44
|
builder: CliOptionDefinition<any>;
|
|
45
45
|
"builder.selection": CliOptionDefinition<string | undefined>;
|
|
46
46
|
"builder.boostFactor": CliOptionDefinition<string | undefined>;
|
|
47
|
+
"builder.minBid": CliOptionDefinition<string | undefined>;
|
|
48
|
+
"builder.urls": CliOptionDefinition<string[] | undefined>;
|
|
49
|
+
"builder.maxExecutionPayment": CliOptionDefinition<string | undefined>;
|
|
50
|
+
allowDangerousTrustedPayments: CliOptionDefinition<boolean | undefined>;
|
|
47
51
|
useProduceBlockV3: CliOptionDefinition<boolean | undefined>;
|
|
48
52
|
broadcastValidation: CliOptionDefinition<string | undefined>;
|
|
49
53
|
blindedLocal: CliOptionDefinition<boolean | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/cmds/dev/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAIvE,OAAO,EAAC,UAAU,EAAgB,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAC,iBAAiB,EAAmB,MAAM,yBAAyB,CAAC;AAE5E,KAAK,WAAW,GAAG;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AA6FF,eAAO,MAAM,UAAU
|
|
1
|
+
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../../src/cmds/dev/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAIvE,OAAO,EAAC,UAAU,EAAgB,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAC,iBAAiB,EAAmB,MAAM,yBAAyB,CAAC;AAE5E,KAAK,WAAW,GAAG;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AA6FF,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKtB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,UAAU,GAAG,iBAAiB,GAAG,WAAW,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SecretKey } from "@chainsafe/blst";
|
|
1
|
+
import { SecretKey } from "@chainsafe/lodestar-z/blst";
|
|
2
2
|
import { getClient } from "@lodestar/api";
|
|
3
3
|
import { createBeaconConfig } from "@lodestar/config";
|
|
4
4
|
import { DOMAIN_BLS_TO_EXECUTION_CHANGE, ForkName } from "@lodestar/params";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blsToExecutionChange.js","sourceRoot":"","sources":["../../../src/cmds/validator/blsToExecutionChange.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"blsToExecutionChange.js","sourceRoot":"","sources":["../../../src/cmds/validator/blsToExecutionChange.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator/handler.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator/handler.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAsBlD,OAAO,EAAC,iBAAiB,EAAoE,MAAM,cAAc,CAAC;AAKlH;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,GAAG,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA8L1F"}
|
|
@@ -7,7 +7,7 @@ import { getNodeLogger } from "@lodestar/logger/node";
|
|
|
7
7
|
import { SlashingProtection, Validator, defaultOptions, getMetrics, } from "@lodestar/validator";
|
|
8
8
|
import { getBeaconConfigFromArgs } from "../../config/index.js";
|
|
9
9
|
import { YargsError, cleanOldLogFiles, mkdir, onGracefulShutdown, parseFeeRecipient, parseLoggerArgs, parseProposerConfig, } from "../../util/index.js";
|
|
10
|
-
import { parseBuilderBoostFactor, parseBuilderSelection } from "../../util/proposerConfig.js";
|
|
10
|
+
import { parseBuilderBoostFactor, parseBuilderGweiAmount, parseBuilderMinBid, parseBuilderSelection, parseBuilderUrls, } from "../../util/proposerConfig.js";
|
|
11
11
|
import { getVersionData } from "../../util/version.js";
|
|
12
12
|
import { KeymanagerApi } from "./keymanager/impl.js";
|
|
13
13
|
import { PersistedKeysBackend } from "./keymanager/persistedKeys.js";
|
|
@@ -149,7 +149,7 @@ export async function validatorHandler(args) {
|
|
|
149
149
|
if (proposerConfigWriteDisabled) {
|
|
150
150
|
logger.warn("Proposer data updates (feeRecipient/gasLimit etc) will not be available via Keymanager API as proposerSettingsFile has been set");
|
|
151
151
|
}
|
|
152
|
-
const keymanagerApi = new KeymanagerApi(validator, persistedKeysBackend, abortController.signal, proposerConfigWriteDisabled);
|
|
152
|
+
const keymanagerApi = new KeymanagerApi(validator, persistedKeysBackend, abortController.signal, proposerConfigWriteDisabled, args.allowDangerousTrustedPayments);
|
|
153
153
|
const keymanagerServer = new KeymanagerRestApiServer({
|
|
154
154
|
address: args["keymanager.address"],
|
|
155
155
|
port: args["keymanager.port"],
|
|
@@ -174,6 +174,9 @@ function getProposerConfigFromArgs(args, { persistedKeysBackend, accountPaths, }
|
|
|
174
174
|
gasLimit: args.defaultGasLimit,
|
|
175
175
|
selection: parseBuilderSelection(args["builder.selection"] ?? (args.builder ? defaultOptions.builderAliasSelection : undefined)),
|
|
176
176
|
boostFactor: parseBuilderBoostFactor(args["builder.boostFactor"]),
|
|
177
|
+
minBid: parseBuilderMinBid(args["builder.minBid"]),
|
|
178
|
+
maxExecutionPayment: parseBuilderGweiAmount(args["builder.maxExecutionPayment"]),
|
|
179
|
+
builders: parseBuilderUrls(args["builder.urls"]),
|
|
177
180
|
},
|
|
178
181
|
};
|
|
179
182
|
let valProposerConfig;
|
|
@@ -195,6 +198,16 @@ function getProposerConfigFromArgs(args, { persistedKeysBackend, accountPaths, }
|
|
|
195
198
|
valProposerConfig = { defaultConfig };
|
|
196
199
|
}
|
|
197
200
|
}
|
|
201
|
+
// Trusted execution payments are only backed by the builder's promise to pay, require an
|
|
202
|
+
// explicit opt-in before any configuration source can set a max execution payment above 0
|
|
203
|
+
if (args.allowDangerousTrustedPayments !== true) {
|
|
204
|
+
const configs = [valProposerConfig.defaultConfig, ...Object.values(valProposerConfig.proposerConfig ?? {})];
|
|
205
|
+
const hasTrustedPayment = configs.some((config) => (config.builder?.maxExecutionPayment ?? 0n) > 0n ||
|
|
206
|
+
(config.builder?.builders ?? []).some((entry) => (entry.maxExecutionPayment ?? 0n) > 0n));
|
|
207
|
+
if (hasTrustedPayment) {
|
|
208
|
+
throw new YargsError("Configuring a builder max execution payment above 0 requires --allowDangerousTrustedPayments");
|
|
209
|
+
}
|
|
210
|
+
}
|
|
198
211
|
return valProposerConfig;
|
|
199
212
|
}
|
|
200
213
|
function parseBroadcastValidation(broadcastValidation) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/cmds/validator/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,UAAU,EAAS,MAAM,eAAe,CAAC;AACjD,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACrB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAEL,kBAAkB,EAClB,SAAS,EAET,cAAc,EACd,UAAU,GACX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,uBAAuB,EAAC,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,KAAK,EACL,kBAAkB,EAClB,iBAAiB,EACjB,eAAe,EACf,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/cmds/validator/handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { Keystore } from "@chainsafe/bls-keystore";
|
|
4
|
-
import { SecretKey } from "@chainsafe/blst";
|
|
4
|
+
import { SecretKey } from "@chainsafe/lodestar-z/blst";
|
|
5
5
|
import { SignerType } from "@lodestar/validator";
|
|
6
6
|
import { lockFilepath, unlockFilepath } from "../../../util/lockfile.js";
|
|
7
7
|
import { DecryptKeystoresThreadPool } from "./decryptKeystores/index.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decryptKeystoreDefinitions.js","sourceRoot":"","sources":["../../../../src/cmds/validator/keymanager/decryptKeystoreDefinitions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAC,SAAS,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"decryptKeystoreDefinitions.js","sourceRoot":"","sources":["../../../../src/cmds/validator/keymanager/decryptKeystoreDefinitions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BuilderBoostFactorData, FeeRecipientData, GasLimitData, GraffitiData, KeystoreStr, PubkeyHex, RemoteSignerDefinition, SlashingProtectionData } from "@lodestar/api/keymanager";
|
|
1
|
+
import { BuilderBoostFactorData, BuilderConfigData, FeeRecipientData, GasLimitData, GraffitiData, KeystoreStr, PubkeyHex, RemoteSignerDefinition, SlashingProtectionData } from "@lodestar/api/keymanager";
|
|
2
2
|
import { KeymanagerApiMethods as Api } from "@lodestar/api/keymanager/server";
|
|
3
3
|
import { Epoch } from "@lodestar/types";
|
|
4
4
|
import { Validator } from "@lodestar/validator";
|
|
@@ -8,7 +8,8 @@ export declare class KeymanagerApi implements Api {
|
|
|
8
8
|
private readonly persistedKeysBackend;
|
|
9
9
|
private readonly signal;
|
|
10
10
|
private readonly proposerConfigWriteDisabled?;
|
|
11
|
-
|
|
11
|
+
private readonly allowDangerousTrustedPayments?;
|
|
12
|
+
constructor(validator: Validator, persistedKeysBackend: IPersistedKeysBackend, signal: AbortSignal, proposerConfigWriteDisabled?: boolean | undefined, allowDangerousTrustedPayments?: boolean | undefined);
|
|
12
13
|
private checkIfProposerWriteEnabled;
|
|
13
14
|
listFeeRecipient({ pubkey }: {
|
|
14
15
|
pubkey: PubkeyHex;
|
|
@@ -54,6 +55,16 @@ export declare class KeymanagerApi implements Api {
|
|
|
54
55
|
deleteBuilderBoostFactor({ pubkey }: {
|
|
55
56
|
pubkey: PubkeyHex;
|
|
56
57
|
}): ReturnType<Api["deleteBuilderBoostFactor"]>;
|
|
58
|
+
getBuilderConfig({ pubkey }: {
|
|
59
|
+
pubkey: PubkeyHex;
|
|
60
|
+
}): ReturnType<Api["getBuilderConfig"]>;
|
|
61
|
+
setBuilderConfig({ pubkey, builderConfig, }: {
|
|
62
|
+
pubkey: PubkeyHex;
|
|
63
|
+
builderConfig: BuilderConfigData;
|
|
64
|
+
}): ReturnType<Api["setBuilderConfig"]>;
|
|
65
|
+
deleteBuilderConfig({ pubkey }: {
|
|
66
|
+
pubkey: PubkeyHex;
|
|
67
|
+
}): ReturnType<Api["deleteBuilderConfig"]>;
|
|
57
68
|
getProposerConfig({ pubkey }: {
|
|
58
69
|
pubkey: PubkeyHex;
|
|
59
70
|
}): ReturnType<Api["getProposerConfig"]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"impl.d.ts","sourceRoot":"","sources":["../../../../src/cmds/validator/keymanager/impl.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,sBAAsB,
|
|
1
|
+
{"version":3,"file":"impl.d.ts","sourceRoot":"","sources":["../../../../src/cmds/validator/keymanager/impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Keystore } from "@chainsafe/bls-keystore";
|
|
2
|
-
import { SecretKey } from "@chainsafe/blst";
|
|
2
|
+
import { SecretKey } from "@chainsafe/lodestar-z/blst";
|
|
3
3
|
import { DeleteRemoteKeyStatus, DeletionStatus, ImportRemoteKeyStatus, ImportStatus, } from "@lodestar/api/keymanager";
|
|
4
4
|
import { ApiError } from "@lodestar/api/server";
|
|
5
5
|
import { fromHex, isValidHttpUrl } from "@lodestar/utils";
|
|
@@ -12,15 +12,17 @@ export class KeymanagerApi {
|
|
|
12
12
|
persistedKeysBackend;
|
|
13
13
|
signal;
|
|
14
14
|
proposerConfigWriteDisabled;
|
|
15
|
-
|
|
15
|
+
allowDangerousTrustedPayments;
|
|
16
|
+
constructor(validator, persistedKeysBackend, signal, proposerConfigWriteDisabled, allowDangerousTrustedPayments) {
|
|
16
17
|
this.validator = validator;
|
|
17
18
|
this.persistedKeysBackend = persistedKeysBackend;
|
|
18
19
|
this.signal = signal;
|
|
19
20
|
this.proposerConfigWriteDisabled = proposerConfigWriteDisabled;
|
|
21
|
+
this.allowDangerousTrustedPayments = allowDangerousTrustedPayments;
|
|
20
22
|
}
|
|
21
23
|
checkIfProposerWriteEnabled() {
|
|
22
24
|
if (this.proposerConfigWriteDisabled === true) {
|
|
23
|
-
throw
|
|
25
|
+
throw new ApiError(403, "proposerSettingsFile option activated");
|
|
24
26
|
}
|
|
25
27
|
}
|
|
26
28
|
async listFeeRecipient({ pubkey }) {
|
|
@@ -291,6 +293,33 @@ export class KeymanagerApi {
|
|
|
291
293
|
this.persistedKeysBackend.writeProposerConfig(pubkey, this.validator.validatorStore.getProposerConfig(pubkey));
|
|
292
294
|
return { status: 204 };
|
|
293
295
|
}
|
|
296
|
+
async getBuilderConfig({ pubkey }) {
|
|
297
|
+
this.assertValidKnownPubkey(pubkey);
|
|
298
|
+
return { data: this.validator.validatorStore.getBuilderConfig(pubkey) };
|
|
299
|
+
}
|
|
300
|
+
async setBuilderConfig({ pubkey, builderConfig, }) {
|
|
301
|
+
this.checkIfProposerWriteEnabled();
|
|
302
|
+
this.assertValidKnownPubkey(pubkey);
|
|
303
|
+
if (this.allowDangerousTrustedPayments !== true &&
|
|
304
|
+
builderConfig.builders?.some((entry) => (entry.maxExecutionPayment ?? 0n) > 0n)) {
|
|
305
|
+
throw new ApiError(400, "Configuring a builder max execution payment above 0 requires --allowDangerousTrustedPayments");
|
|
306
|
+
}
|
|
307
|
+
try {
|
|
308
|
+
this.validator.validatorStore.setBuilderConfig(pubkey, builderConfig);
|
|
309
|
+
}
|
|
310
|
+
catch (e) {
|
|
311
|
+
throw new ApiError(400, e.message);
|
|
312
|
+
}
|
|
313
|
+
this.persistedKeysBackend.writeProposerConfig(pubkey, this.validator.validatorStore.getProposerConfig(pubkey));
|
|
314
|
+
return { status: 202 };
|
|
315
|
+
}
|
|
316
|
+
async deleteBuilderConfig({ pubkey }) {
|
|
317
|
+
this.checkIfProposerWriteEnabled();
|
|
318
|
+
this.assertValidKnownPubkey(pubkey);
|
|
319
|
+
this.validator.validatorStore.deleteBuilderConfig(pubkey);
|
|
320
|
+
this.persistedKeysBackend.writeProposerConfig(pubkey, this.validator.validatorStore.getProposerConfig(pubkey));
|
|
321
|
+
return { status: 204 };
|
|
322
|
+
}
|
|
294
323
|
async getProposerConfig({ pubkey }) {
|
|
295
324
|
this.assertValidKnownPubkey(pubkey);
|
|
296
325
|
const config = this.validator.validatorStore.getProposerConfig(pubkey);
|
|
@@ -300,7 +329,15 @@ export class KeymanagerApi {
|
|
|
300
329
|
? {
|
|
301
330
|
...config.builder,
|
|
302
331
|
// Default JSON serialization can't handle BigInt
|
|
303
|
-
boostFactor: config.builder.boostFactor
|
|
332
|
+
boostFactor: config.builder.boostFactor?.toString(),
|
|
333
|
+
minBid: config.builder.minBid?.toString(),
|
|
334
|
+
maxExecutionPayment: config.builder.maxExecutionPayment?.toString(),
|
|
335
|
+
builders: config.builder.builders?.map((entry) => ({
|
|
336
|
+
...entry,
|
|
337
|
+
maxExecutionPayment: entry.maxExecutionPayment?.toString(),
|
|
338
|
+
minBid: entry.minBid?.toString(),
|
|
339
|
+
builderBoostFactor: entry.builderBoostFactor?.toString(),
|
|
340
|
+
})),
|
|
304
341
|
}
|
|
305
342
|
: undefined,
|
|
306
343
|
};
|