@chainsafe/lodestar 1.51.0-dev.5e25b73306 → 1.51.0-dev.6375077e13

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.
Files changed (116) hide show
  1. package/.git-data.json +1 -1
  2. package/README.md +9 -7
  3. package/lib/applyPreset.js +0 -13
  4. package/lib/applyPreset.js.map +1 -1
  5. package/lib/cmds/beacon/handler.d.ts.map +1 -1
  6. package/lib/cmds/beacon/handler.js +23 -13
  7. package/lib/cmds/beacon/handler.js.map +1 -1
  8. package/lib/cmds/beacon/initBeaconState.d.ts.map +1 -1
  9. package/lib/cmds/beacon/initBeaconState.js +1 -1
  10. package/lib/cmds/beacon/initBeaconState.js.map +1 -1
  11. package/lib/cmds/beacon/pubkeysFile.d.ts +1 -1
  12. package/lib/cmds/beacon/pubkeysFile.d.ts.map +1 -1
  13. package/lib/cmds/builder/handler.d.ts.map +1 -1
  14. package/lib/cmds/builder/handler.js +52 -3
  15. package/lib/cmds/builder/handler.js.map +1 -1
  16. package/lib/cmds/builder/loadKeypair.d.ts.map +1 -1
  17. package/lib/cmds/builder/loadKeypair.js +1 -1
  18. package/lib/cmds/builder/loadKeypair.js.map +1 -1
  19. package/lib/cmds/builder/options.d.ts +13 -0
  20. package/lib/cmds/builder/options.d.ts.map +1 -1
  21. package/lib/cmds/builder/options.js +83 -1
  22. package/lib/cmds/builder/options.js.map +1 -1
  23. package/lib/cmds/dev/handler.js +6 -6
  24. package/lib/cmds/dev/handler.js.map +1 -1
  25. package/lib/cmds/dev/options.d.ts +4 -1
  26. package/lib/cmds/dev/options.d.ts.map +1 -1
  27. package/lib/cmds/dev/options.js +1 -3
  28. package/lib/cmds/dev/options.js.map +1 -1
  29. package/lib/cmds/validator/blsToExecutionChange.js +1 -1
  30. package/lib/cmds/validator/blsToExecutionChange.js.map +1 -1
  31. package/lib/cmds/validator/handler.d.ts.map +1 -1
  32. package/lib/cmds/validator/handler.js +12 -2
  33. package/lib/cmds/validator/handler.js.map +1 -1
  34. package/lib/cmds/validator/keymanager/decryptKeystoreDefinitions.js +1 -1
  35. package/lib/cmds/validator/keymanager/decryptKeystoreDefinitions.js.map +1 -1
  36. package/lib/cmds/validator/keymanager/decryptKeystores/threadPool.d.ts +1 -1
  37. package/lib/cmds/validator/keymanager/decryptKeystores/threadPool.d.ts.map +1 -1
  38. package/lib/cmds/validator/keymanager/decryptKeystores/threadPool.js.map +1 -1
  39. package/lib/cmds/validator/keymanager/impl.d.ts.map +1 -1
  40. package/lib/cmds/validator/keymanager/impl.js +1 -1
  41. package/lib/cmds/validator/keymanager/impl.js.map +1 -1
  42. package/lib/cmds/validator/keymanager/keystoreCache.js +1 -1
  43. package/lib/cmds/validator/keymanager/keystoreCache.js.map +1 -1
  44. package/lib/cmds/validator/keymanager/persistedKeys.d.ts +1 -1
  45. package/lib/cmds/validator/keymanager/persistedKeys.d.ts.map +1 -1
  46. package/lib/cmds/validator/keymanager/persistedKeys.js +1 -1
  47. package/lib/cmds/validator/keymanager/persistedKeys.js.map +1 -1
  48. package/lib/cmds/validator/options.d.ts.map +1 -1
  49. package/lib/cmds/validator/options.js +3 -9
  50. package/lib/cmds/validator/options.js.map +1 -1
  51. package/lib/cmds/validator/signers/index.js +1 -1
  52. package/lib/cmds/validator/signers/index.js.map +1 -1
  53. package/lib/cmds/validator/slashingProtection/export.d.ts.map +1 -1
  54. package/lib/cmds/validator/slashingProtection/export.js +1 -3
  55. package/lib/cmds/validator/slashingProtection/export.js.map +1 -1
  56. package/lib/cmds/validator/slashingProtection/import.js +2 -2
  57. package/lib/cmds/validator/slashingProtection/import.js.map +1 -1
  58. package/lib/cmds/validator/voluntaryExit.d.ts.map +1 -1
  59. package/lib/cmds/validator/voluntaryExit.js +2 -4
  60. package/lib/cmds/validator/voluntaryExit.js.map +1 -1
  61. package/lib/options/beaconNodeOptions/api.d.ts +1 -0
  62. package/lib/options/beaconNodeOptions/api.d.ts.map +1 -1
  63. package/lib/options/beaconNodeOptions/api.js +8 -0
  64. package/lib/options/beaconNodeOptions/api.js.map +1 -1
  65. package/lib/options/beaconNodeOptions/builder.d.ts +1 -0
  66. package/lib/options/beaconNodeOptions/builder.d.ts.map +1 -1
  67. package/lib/options/beaconNodeOptions/builder.js +11 -0
  68. package/lib/options/beaconNodeOptions/builder.js.map +1 -1
  69. package/lib/options/beaconNodeOptions/chain.d.ts +1 -1
  70. package/lib/options/beaconNodeOptions/chain.d.ts.map +1 -1
  71. package/lib/options/beaconNodeOptions/chain.js +10 -10
  72. package/lib/options/beaconNodeOptions/chain.js.map +1 -1
  73. package/lib/options/beaconNodeOptions/index.d.ts +4 -1
  74. package/lib/options/beaconNodeOptions/index.d.ts.map +1 -1
  75. package/lib/options/beaconNodeOptions/network.d.ts +1 -0
  76. package/lib/options/beaconNodeOptions/network.d.ts.map +1 -1
  77. package/lib/options/beaconNodeOptions/network.js +16 -0
  78. package/lib/options/beaconNodeOptions/network.js.map +1 -1
  79. package/lib/options/globalOptions.d.ts +0 -2
  80. package/lib/options/globalOptions.d.ts.map +1 -1
  81. package/lib/options/globalOptions.js +0 -5
  82. package/lib/options/globalOptions.js.map +1 -1
  83. package/lib/util/file.d.ts.map +1 -1
  84. package/lib/util/file.js +3 -2
  85. package/lib/util/file.js.map +1 -1
  86. package/lib/util/format.js +1 -1
  87. package/lib/util/format.js.map +1 -1
  88. package/package.json +22 -20
  89. package/src/applyPreset.ts +0 -15
  90. package/src/cmds/beacon/handler.ts +30 -15
  91. package/src/cmds/beacon/initBeaconState.ts +1 -1
  92. package/src/cmds/beacon/pubkeysFile.ts +1 -1
  93. package/src/cmds/builder/handler.ts +73 -3
  94. package/src/cmds/builder/loadKeypair.ts +1 -1
  95. package/src/cmds/builder/options.ts +118 -1
  96. package/src/cmds/dev/handler.ts +6 -6
  97. package/src/cmds/dev/options.ts +1 -3
  98. package/src/cmds/validator/blsToExecutionChange.ts +1 -1
  99. package/src/cmds/validator/handler.ts +10 -1
  100. package/src/cmds/validator/keymanager/decryptKeystoreDefinitions.ts +1 -1
  101. package/src/cmds/validator/keymanager/decryptKeystores/threadPool.ts +1 -1
  102. package/src/cmds/validator/keymanager/impl.ts +1 -1
  103. package/src/cmds/validator/keymanager/keystoreCache.ts +1 -1
  104. package/src/cmds/validator/keymanager/persistedKeys.ts +1 -1
  105. package/src/cmds/validator/options.ts +3 -9
  106. package/src/cmds/validator/signers/index.ts +1 -1
  107. package/src/cmds/validator/slashingProtection/export.ts +1 -3
  108. package/src/cmds/validator/slashingProtection/import.ts +2 -2
  109. package/src/cmds/validator/voluntaryExit.ts +2 -4
  110. package/src/options/beaconNodeOptions/api.ts +11 -0
  111. package/src/options/beaconNodeOptions/builder.ts +15 -0
  112. package/src/options/beaconNodeOptions/chain.ts +13 -13
  113. package/src/options/beaconNodeOptions/network.ts +25 -0
  114. package/src/options/globalOptions.ts +0 -7
  115. package/src/util/file.ts +3 -2
  116. package/src/util/format.ts +1 -1
package/lib/util/file.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import fs from "node:fs";
2
+ import { copyFile, readFile as fsReadFile } from "node:fs/promises";
2
3
  import path from "node:path";
3
4
  import { Readable } from "node:stream";
4
5
  import stream from "node:stream/promises";
@@ -112,7 +113,7 @@ export async function downloadOrCopyFile(pathDest, urlOrPathSrc) {
112
113
  }
113
114
  else {
114
115
  mkdir(path.dirname(pathDest));
115
- await fs.promises.copyFile(urlOrPathSrc, pathDest);
116
+ await copyFile(urlOrPathSrc, pathDest);
116
117
  }
117
118
  }
118
119
  /**
@@ -147,7 +148,7 @@ export async function downloadOrLoadFile(pathOrUrl) {
147
148
  const arrayBuffer = await res.arrayBuffer();
148
149
  return new Uint8Array(arrayBuffer);
149
150
  }
150
- return fs.promises.readFile(pathOrUrl);
151
+ return fsReadFile(pathOrUrl);
151
152
  }
152
153
  /**
153
154
  * Returns boolean for whether the string is a URL.
@@ -1 +1 @@
1
- {"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { PublicKey } from "@chainsafe/lodestar-z/blst";
1
+ import { PublicKey } from "@lodestar/native/blst";
2
2
  import { fromHex } from "@lodestar/utils";
3
3
  /**
4
4
  * 0x prefix a string if not prefixed already
@@ -1 +1 @@
1
- {"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/util/format.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/util/format.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@chainsafe/lodestar",
3
- "version": "1.51.0-dev.5e25b73306",
3
+ "version": "1.51.0-dev.6375077e13",
4
4
  "description": "Command line interface for lodestar",
5
5
  "author": "ChainSafe Systems",
6
6
  "license": "Apache-2.0",
@@ -9,6 +9,9 @@
9
9
  },
10
10
  "homepage": "https://github.com/ChainSafe/lodestar#readme",
11
11
  "type": "module",
12
+ "engines": {
13
+ "node": "^24.22.1 || ^26.13.0"
14
+ },
12
15
  "exports": {
13
16
  ".": {
14
17
  "typescript": "./src/index.ts",
@@ -61,24 +64,24 @@
61
64
  "@chainsafe/bls-keystore": "^3.1.0",
62
65
  "@chainsafe/discv5": "^12.0.2",
63
66
  "@chainsafe/enr": "^6.0.2",
64
- "@chainsafe/lodestar-z": "catalog:",
65
67
  "@chainsafe/persistent-merkle-tree": "^1.3.1",
66
- "@chainsafe/ssz": "^1.8.1",
68
+ "@chainsafe/ssz": "^1.9.0",
67
69
  "@chainsafe/threads": "^1.11.3",
68
- "@libp2p/crypto": "^5.1.23",
69
- "@libp2p/interface": "^3.3.0",
70
- "@libp2p/peer-id": "^6.0.15",
71
- "@lodestar/api": "^1.51.0-dev.5e25b73306",
72
- "@lodestar/beacon-node": "^1.51.0-dev.5e25b73306",
73
- "@lodestar/builder": "^1.51.0-dev.5e25b73306",
74
- "@lodestar/config": "^1.51.0-dev.5e25b73306",
75
- "@lodestar/db": "^1.51.0-dev.5e25b73306",
76
- "@lodestar/logger": "^1.51.0-dev.5e25b73306",
77
- "@lodestar/params": "^1.51.0-dev.5e25b73306",
78
- "@lodestar/state-transition": "^1.51.0-dev.5e25b73306",
79
- "@lodestar/types": "^1.51.0-dev.5e25b73306",
80
- "@lodestar/utils": "^1.51.0-dev.5e25b73306",
81
- "@lodestar/validator": "^1.51.0-dev.5e25b73306",
70
+ "@libp2p/crypto": "^5.1.25",
71
+ "@libp2p/interface": "^3.4.0",
72
+ "@libp2p/peer-id": "^6.0.17",
73
+ "@lodestar/api": "^1.51.0-dev.6375077e13",
74
+ "@lodestar/beacon-node": "^1.51.0-dev.6375077e13",
75
+ "@lodestar/builder": "^1.51.0-dev.6375077e13",
76
+ "@lodestar/config": "^1.51.0-dev.6375077e13",
77
+ "@lodestar/db": "^1.51.0-dev.6375077e13",
78
+ "@lodestar/logger": "^1.51.0-dev.6375077e13",
79
+ "@lodestar/native": "^1.51.0-dev.6375077e13",
80
+ "@lodestar/params": "^1.51.0-dev.6375077e13",
81
+ "@lodestar/state-transition": "^1.51.0-dev.6375077e13",
82
+ "@lodestar/types": "^1.51.0-dev.6375077e13",
83
+ "@lodestar/utils": "^1.51.0-dev.6375077e13",
84
+ "@lodestar/validator": "^1.51.0-dev.6375077e13",
82
85
  "@multiformats/multiaddr": "^13.0.1",
83
86
  "deepmerge": "^4.3.1",
84
87
  "ethers": "^6.7.0",
@@ -86,7 +89,6 @@
86
89
  "inquirer": "^9.1.5",
87
90
  "js-yaml": "^4.1.0",
88
91
  "proper-lockfile": "^4.1.2",
89
- "rimraf": "^4.4.1",
90
92
  "source-map-support": "^0.5.21",
91
93
  "uint8arrays": "^5.0.1",
92
94
  "yargs": "^17.7.1"
@@ -94,7 +96,7 @@
94
96
  "devDependencies": {
95
97
  "@chainsafe/as-sha256": "^1.2.5",
96
98
  "@ethereumjs/rlp": "^4.0.1",
97
- "@lodestar/test-utils": "^1.51.0-dev.5e25b73306",
99
+ "@lodestar/test-utils": "^1.51.0-dev.6375077e13",
98
100
  "@types/debug": "^4.1.7",
99
101
  "@types/inquirer": "^9.0.3",
100
102
  "@types/js-yaml": "^4.0.5",
@@ -108,5 +110,5 @@
108
110
  "web3": "^4.0.3",
109
111
  "web3-eth-accounts": "^4.0.3"
110
112
  },
111
- "gitHead": "567ed0a2eed4216219e3d492432ed565c7a4383a"
113
+ "gitHead": "888395f4c0589e58af268d67444602eed4f2c266"
112
114
  }
@@ -20,13 +20,8 @@ setHasher(hashtreeHasher);
20
20
  // Running this file allows us to keep a static export strategy while NOT requiring users to
21
21
  // set LODESTAR_PRESET manually every time.
22
22
 
23
- // IMPORTANT: only import Lodestar code here which does not import any other Lodestar libraries
24
- import {PresetName, presetFromJson, setActivePreset} from "@lodestar/params/setPreset";
25
- import {readFile} from "./util/file.js";
26
-
27
23
  const network = valueOfArg("network");
28
24
  const preset = valueOfArg("preset");
29
- const presetFile = valueOfArg("presetFile");
30
25
 
31
26
  // Apply preset flag if present
32
27
  if (preset) {
@@ -42,8 +37,6 @@ else if (process.env.LODESTAR_PRESET) {
42
37
  else if (network) {
43
38
  if (network === "dev") {
44
39
  process.env.LODESTAR_PRESET = "minimal";
45
- // the kzg library has hardcoded the mainnet value, do not use presets
46
- setActivePreset(PresetName.minimal, {FIELD_ELEMENTS_PER_BLOB: 4096});
47
40
  } else if (network === "gnosis" || network === "chiado") {
48
41
  process.env.LODESTAR_PRESET = "gnosis";
49
42
  }
@@ -53,14 +46,6 @@ else if (network) {
53
46
  else if (process.argv[2] === "dev") {
54
47
  process.env.LODESTAR_PRESET = "minimal";
55
48
  process.env.LODESTAR_NETWORK = "dev";
56
- // the kzg library has hardcoded the mainnet value, do not use presets
57
- setActivePreset(PresetName.minimal, {FIELD_ELEMENTS_PER_BLOB: 4096});
58
- }
59
-
60
- if (presetFile) {
61
- // Override the active preset with custom values from file
62
- // Do not modify the preset to use as a base by passing null
63
- setActivePreset(null, presetFromJson(readFile(presetFile) ?? {}));
64
49
  }
65
50
 
66
51
  /**
@@ -1,13 +1,18 @@
1
1
  import path from "node:path";
2
2
  import {getHeapStatistics} from "node:v8";
3
3
  import {SignableENR} from "@chainsafe/enr";
4
- import {pubkeyCache} from "@chainsafe/lodestar-z/pubkeys";
5
4
  import {hasher} from "@chainsafe/persistent-merkle-tree";
6
- import {BeaconDb, BeaconNode} from "@lodestar/beacon-node";
5
+ import {
6
+ BLOCK_PRODUCTION_RACE_CUTOFF_GLOAS_BPS,
7
+ BUILDER_BID_LAG_BUFFER_MS,
8
+ BeaconDb,
9
+ BeaconNode,
10
+ } from "@lodestar/beacon-node";
7
11
  import {ChainForkConfig} from "@lodestar/config";
8
12
  import {LevelDbController} from "@lodestar/db/controller/level";
9
13
  import {LoggerNode, getNodeLogger} from "@lodestar/logger/node";
10
- import {ACTIVE_PRESET, PresetName} from "@lodestar/params";
14
+ import {pubkeyCache} from "@lodestar/native/pubkeys";
15
+ import {ACTIVE_PRESET, PresetName, isForkPostGloas} from "@lodestar/params";
11
16
  import {ErrorAborted, bytesToInt, formatBytes} from "@lodestar/utils";
12
17
  import {ProcessShutdownCallback} from "@lodestar/validator";
13
18
  import {BeaconNodeOptions, getBeaconConfigFromArgs} from "../../config/index.js";
@@ -61,6 +66,7 @@ export async function beaconHandler(args: BeaconArgs & GlobalArgs): Promise<void
61
66
  // Callback for beacon to request forced exit, for e.g. in case of irrecoverable
62
67
  // forkchoice errors
63
68
  const processShutdownCallback: ProcessShutdownCallback = (err) => {
69
+ process.exitCode = 1;
64
70
  logger.error("Process shutdown requested", {}, err);
65
71
  process.kill(process.pid, "SIGINT");
66
72
  };
@@ -142,21 +148,21 @@ export async function beaconHandler(args: BeaconArgs & GlobalArgs): Promise<void
142
148
  abortController.signal.addEventListener(
143
149
  "abort",
144
150
  async () => {
145
- let exitCode = 0;
146
151
  try {
147
152
  await node.close();
148
153
  logger.debug("Beacon node closed");
149
154
  } catch (e) {
150
155
  // If we start from unfinalized state, we don't have checkpoint state so there is this error
151
156
  // "No state in cache for finalized checkpoint state epoch"
152
- logger.warn("Error closing beacon node", {}, e as Error);
153
- // Make sure db is always closed gracefully
154
- await db.close();
155
- exitCode = 1;
157
+ // The logger prints only the message and stack of an AggregateError, not its causes
158
+ for (const error of e instanceof AggregateError ? e.errors : [e]) {
159
+ logger.warn("Error closing beacon node", {}, error as Error);
160
+ }
161
+ process.exitCode = 1;
156
162
  }
157
163
  savePubkeysFile(pubkeyCache, beaconPaths.pubkeysFile, logger);
158
164
  // Explicitly exit process due to potential active handles
159
- process.exit(exitCode);
165
+ process.exit(process.exitCode ?? 0);
160
166
  },
161
167
  {once: true}
162
168
  );
@@ -219,8 +225,8 @@ export async function beaconHandlerInit(args: BeaconArgs & GlobalArgs) {
219
225
  beaconNodeOptions.set({network: {private: true}, api: {private: true}});
220
226
  } else {
221
227
  const versionStr = `Lodestar/${version}`;
222
- // Add version string for libp2p agent version
223
- beaconNodeOptions.set({network: {version}});
228
+ const advertiseVersion = network !== "mainnet";
229
+ beaconNodeOptions.set({network: {version, advertiseVersion}});
224
230
  // Add User-Agent header to all builder requests
225
231
  beaconNodeOptions.set({executionBuilder: {userAgent: versionStr}});
226
232
  // Set jwt version with version string
@@ -232,10 +238,19 @@ export async function beaconHandlerInit(args: BeaconArgs & GlobalArgs) {
232
238
  // Render final options
233
239
  const options = beaconNodeOptions.getWithDefaults();
234
240
 
235
- if (options.chain.nativeStateTransition && config.GLOAS_FORK_EPOCH !== Infinity) {
236
- throw Error(
237
- `--chain.nativeStateTransition does not support Gloas, which is scheduled at epoch ${config.GLOAS_FORK_EPOCH}`
238
- );
241
+ // Bids received up to the deadline plus the lag buffer must still have a chance to win the block
242
+ // production race, otherwise the local block is selected at the race cutoff before any bid.
243
+ // Only enforced on an explicitly configured deadline, the default is used as is on short slots
244
+ const bidDeadline = args["builder.bidDeadline"];
245
+ if (bidDeadline !== undefined) {
246
+ for (const {name: fork, epoch} of config.forksAscendingEpochOrder) {
247
+ const raceCutoffMs = config.getSlotComponentDurationMs(fork, BLOCK_PRODUCTION_RACE_CUTOFF_GLOAS_BPS);
248
+ if (isForkPostGloas(fork) && epoch !== Infinity && bidDeadline + BUILDER_BID_LAG_BUFFER_MS >= raceCutoffMs) {
249
+ throw Error(
250
+ `--builder.bidDeadline of ${bidDeadline}ms must be below ${raceCutoffMs - BUILDER_BID_LAG_BUFFER_MS}ms for fork ${fork}`
251
+ );
252
+ }
253
+ }
239
254
  }
240
255
 
241
256
  return {config, options, beaconPaths, network, version, commit, privateKey, logger};
@@ -1,6 +1,6 @@
1
- import {pubkeyCache} from "@chainsafe/lodestar-z/pubkeys";
2
1
  import {IBeaconDb} from "@lodestar/beacon-node";
3
2
  import {BeaconConfig, ChainForkConfig} from "@lodestar/config";
3
+ import {pubkeyCache} from "@lodestar/native/pubkeys";
4
4
  import {MAX_PENDING_DEPOSITS_PER_EPOCH, SLOTS_PER_EPOCH} from "@lodestar/params";
5
5
  import {
6
6
  IBeaconStateView,
@@ -1,5 +1,5 @@
1
- import {type PubkeyCache} from "@chainsafe/lodestar-z/pubkeys";
2
1
  import {ChainForkConfig} from "@lodestar/config";
2
+ import {type PubkeyCache} from "@lodestar/native/pubkeys";
3
3
  import {getValidatorPubkeyFromStateBytes} from "@lodestar/state-transition";
4
4
  import {Logger, byteArrayEquals} from "@lodestar/utils";
5
5
 
@@ -1,13 +1,27 @@
1
+ import fs from "node:fs";
1
2
  import path from "node:path";
2
3
  import {getClient} from "@lodestar/api";
3
- import {RegistryMetricCreator, collectNodeJSMetrics, getHttpMetricsServer} from "@lodestar/beacon-node";
4
- import {Builder, getMetrics} from "@lodestar/builder";
4
+ import {
5
+ ExecutionPayloadStatus,
6
+ RegistryMetricCreator,
7
+ collectNodeJSMetrics,
8
+ defaultExecutionEngineHttpOpts,
9
+ getHttpMetricsServer,
10
+ initializeExecutionEngine,
11
+ } from "@lodestar/beacon-node";
12
+ import {Builder, EnginePayloadResult, EnginePayloadSource, getMetrics} from "@lodestar/builder";
5
13
  import {getNodeLogger} from "@lodestar/logger/node";
6
14
  import {fromHex, toPrintableUrl} from "@lodestar/utils";
7
15
  import {getBeaconConfigFromArgs} from "../../config/beaconParams.js";
8
16
  import {GlobalArgs} from "../../options/index.js";
9
17
  import {getGlobalPaths} from "../../paths/global.js";
10
- import {cleanOldLogFiles, onGracefulShutdown, parseFeeRecipient, parseLoggerArgs} from "../../util/index.js";
18
+ import {
19
+ cleanOldLogFiles,
20
+ extractJwtHexSecret,
21
+ onGracefulShutdown,
22
+ parseFeeRecipient,
23
+ parseLoggerArgs,
24
+ } from "../../util/index.js";
11
25
  import {getVersionData} from "../../util/version.js";
12
26
  import {loadBuilderKeypair} from "./loadKeypair.js";
13
27
  import {IBuilderCliArgs, builderMetricsDefaultOptions} from "./options.js";
@@ -71,6 +85,51 @@ export async function builderHandler(args: IBuilderCliArgs & GlobalArgs): Promis
71
85
 
72
86
  logger.info("Beacon node", {beaconNode: toPrintableUrl(args.beaconNodeUrl), timeoutMs: args.requestTimeout});
73
87
 
88
+ // Payload ids are local to the execution client that issued them, fallback urls can't be used
89
+ if (args["execution.urls"].length !== 1) {
90
+ throw Error("Exactly one execution client url is required");
91
+ }
92
+ const executionUrl = args["execution.urls"][0];
93
+ const engine = initializeExecutionEngine(
94
+ {
95
+ mode: "http",
96
+ urls: [executionUrl],
97
+ timeout: args["execution.timeout"] ?? defaultExecutionEngineHttpOpts.timeout,
98
+ retries: args["execution.retries"],
99
+ retryDelay: args["execution.retryDelay"],
100
+ jwtSecretHex: args["execution.jwtSecret"]
101
+ ? extractJwtHexSecret(fs.readFileSync(args["execution.jwtSecret"], "utf-8").trim())
102
+ : undefined,
103
+ version,
104
+ commit,
105
+ },
106
+ {signal: abortController.signal, logger}
107
+ );
108
+ const payloadSource = new EnginePayloadSource(toPrintableUrl(executionUrl), {
109
+ notifyForkchoiceUpdate: async (fork, headBlockHash, safeBlockHash, finalizedBlockHash, payloadAttributes) => {
110
+ try {
111
+ const {payloadStatus, payloadId} = await engine.notifyForkchoiceUpdate(
112
+ fork,
113
+ headBlockHash,
114
+ safeBlockHash,
115
+ finalizedBlockHash,
116
+ payloadAttributes
117
+ );
118
+ if (payloadStatus.status === ExecutionPayloadStatus.INVALID) {
119
+ throw Error(`Invalid prepare payload, validationError=${payloadStatus.validationError ?? ""}`);
120
+ }
121
+ return payloadId;
122
+ } catch (e) {
123
+ // Only retry while the execution client is syncing, it has not imported the parent payload yet.
124
+ // The engine interface does not expose the fcU status, this matches the error thrown for the SYNCING status
125
+ // in ExecutionEngineHttp.notifyForkchoiceUpdate until a typed error is added to the beacon node
126
+ if (e instanceof Error && e.message === "Execution Layer Syncing") return null;
127
+ throw e;
128
+ }
129
+ },
130
+ getPayload: async (fork, payloadId) => (await engine.getPayload(fork, payloadId)) as EnginePayloadResult,
131
+ });
132
+
74
133
  const builder = await Builder.init({
75
134
  keypair,
76
135
  logger,
@@ -79,6 +138,17 @@ export async function builderHandler(args: IBuilderCliArgs & GlobalArgs): Promis
79
138
  api,
80
139
  executionFeeRecipient: fromHex(executionFeeRecipient),
81
140
  metrics,
141
+ payloadSource,
142
+ bidding: {
143
+ shareBps: args["bidding.shareBps"],
144
+ fixedCostGwei: args["bidding.fixedCostGwei"],
145
+ minValueGwei: args["bidding.minValueGwei"],
146
+ maxValueGwei: args["bidding.maxValueGwei"],
147
+ deadlineBps: args["bidding.deadlineBps"],
148
+ getPayloadTimeout: args["bidding.getPayloadTimeout"],
149
+ minOperatingBalanceGwei: args["bidding.minOperatingBalanceGwei"],
150
+ },
151
+ reveal: {cutoffBps: args["reveal.cutoffBps"]},
82
152
  });
83
153
 
84
154
  onGracefulShutdownCbs.push(() => builder.close());
@@ -1,7 +1,7 @@
1
1
  import fs from "node:fs";
2
2
  import {Keystore} from "@chainsafe/bls-keystore";
3
- import {SecretKey} from "@chainsafe/lodestar-z/blst";
4
3
  import {Keypair} from "@lodestar/builder";
4
+ import {SecretKey} from "@lodestar/native/blst";
5
5
  import {Logger} from "@lodestar/utils";
6
6
  import {ensure0xPrefix} from "../../util/format.js";
7
7
  import {readPassphraseFile} from "../../util/passphrase.js";
@@ -1,3 +1,4 @@
1
+ import {defaultExecutionEngineHttpOpts} from "@lodestar/beacon-node";
1
2
  import {defaultOptions} from "@lodestar/builder";
2
3
  import {CliCommandOptions} from "@lodestar/utils";
3
4
  import {LogArgs, logOptions} from "../../options/logOptions.js";
@@ -16,6 +17,21 @@ export type IBuilderCliArgs = LogArgs & {
16
17
  executionFeeRecipient: string;
17
18
  requestTimeout: number;
18
19
 
20
+ "execution.urls": string[];
21
+ "execution.timeout"?: number;
22
+ "execution.retries": number;
23
+ "execution.retryDelay": number;
24
+ "execution.jwtSecret"?: string;
25
+
26
+ "bidding.shareBps": number;
27
+ "bidding.fixedCostGwei": number;
28
+ "bidding.minValueGwei": number;
29
+ "bidding.maxValueGwei"?: number;
30
+ "bidding.deadlineBps": number;
31
+ "bidding.getPayloadTimeout": number;
32
+ "bidding.minOperatingBalanceGwei": number;
33
+ "reveal.cutoffBps"?: number;
34
+
19
35
  metrics?: boolean;
20
36
  "metrics.port"?: number;
21
37
  "metrics.address"?: string;
@@ -25,7 +41,8 @@ export const builderOptions: CliCommandOptions<IBuilderCliArgs> = {
25
41
  ...logOptions,
26
42
 
27
43
  beaconNodeUrl: {
28
- description: "Url to a trusted beacon node",
44
+ description:
45
+ "URL of the beacon node. It must run with `--emitPayloadAttributes` to emit payload attributes for every slot",
29
46
  type: "string",
30
47
  default: defaultOptions.beaconNodeUrl,
31
48
  },
@@ -59,6 +76,106 @@ export const builderOptions: CliCommandOptions<IBuilderCliArgs> = {
59
76
  default: defaultOptions.requestTimeout,
60
77
  },
61
78
 
79
+ // Execution
80
+
81
+ "execution.urls": {
82
+ description:
83
+ "Url to the execution client engine API that builds the payloads. The execution client must be kept in sync by a beacon node",
84
+ default: defaultExecutionEngineHttpOpts.urls.join(","),
85
+ type: "array",
86
+ string: true,
87
+ coerce: (urls: string[]): string[] =>
88
+ // Parse ["url1,url2"] to ["url1", "url2"]
89
+ urls.flatMap((item) => item.split(",")),
90
+ group: "execution",
91
+ },
92
+
93
+ "execution.timeout": {
94
+ description: "Timeout in milliseconds for execution engine API HTTP client",
95
+ type: "number",
96
+ defaultDescription: String(defaultExecutionEngineHttpOpts.timeout),
97
+ group: "execution",
98
+ },
99
+
100
+ "execution.retries": {
101
+ description: "Number of retries when calling execution engine API",
102
+ type: "number",
103
+ default: defaultExecutionEngineHttpOpts.retries,
104
+ group: "execution",
105
+ },
106
+
107
+ "execution.retryDelay": {
108
+ description: "Delay time in milliseconds between retries when retrying calls to the execution engine API",
109
+ type: "number",
110
+ default: defaultExecutionEngineHttpOpts.retryDelay,
111
+ group: "execution",
112
+ },
113
+
114
+ "execution.jwtSecret": {
115
+ description:
116
+ "File path to a shared hex-encoded jwt secret which will be used to generate and bundle HS256 encoded jwt tokens for authentication with the EL client's rpc server hosting engine apis. Secret to be exactly same as the one used by the corresponding EL client.",
117
+ type: "string",
118
+ group: "execution",
119
+ },
120
+
121
+ // Bidding
122
+
123
+ "bidding.shareBps": {
124
+ description: "Share of the payload value offered to the proposer, in basis points",
125
+ type: "number",
126
+ default: defaultOptions.bidding.shareBps,
127
+ group: "bidding",
128
+ },
129
+
130
+ "bidding.fixedCostGwei": {
131
+ description: "Fixed amount in gwei deducted from the proposer share of every bid",
132
+ type: "number",
133
+ default: defaultOptions.bidding.fixedCostGwei,
134
+ group: "bidding",
135
+ },
136
+
137
+ "bidding.minValueGwei": {
138
+ description: "Never bid below this value in gwei",
139
+ type: "number",
140
+ default: defaultOptions.bidding.minValueGwei,
141
+ group: "bidding",
142
+ },
143
+
144
+ "bidding.maxValueGwei": {
145
+ description: "Never bid above this value in gwei",
146
+ type: "number",
147
+ group: "bidding",
148
+ },
149
+
150
+ "bidding.deadlineBps": {
151
+ description:
152
+ "Point within the slot before the proposal slot at which the payload is retrieved and the bid is published, in basis points",
153
+ type: "number",
154
+ default: defaultOptions.bidding.deadlineBps,
155
+ group: "bidding",
156
+ },
157
+
158
+ "bidding.getPayloadTimeout": {
159
+ description: "Timeout in milliseconds for retrieving the payload from the execution client at the bid deadline",
160
+ type: "number",
161
+ default: defaultOptions.bidding.getPayloadTimeout,
162
+ group: "bidding",
163
+ },
164
+
165
+ "bidding.minOperatingBalanceGwei": {
166
+ description: "Do not bid while the builder balance is below this value in gwei",
167
+ type: "number",
168
+ default: defaultOptions.bidding.minOperatingBalanceGwei,
169
+ group: "bidding",
170
+ },
171
+
172
+ "reveal.cutoffBps": {
173
+ description:
174
+ "Do not reveal the payload if the block committing to our bid arrives after this point within its slot, in basis points. Defaults to PAYLOAD_ATTESTATION_DUE_BPS of the network",
175
+ type: "number",
176
+ group: "reveal",
177
+ },
178
+
62
179
  // Metrics
63
180
 
64
181
  metrics: {
@@ -1,5 +1,5 @@
1
1
  import fs from "node:fs";
2
- import {rimraf} from "rimraf";
2
+ import {rm} from "node:fs/promises";
3
3
  import {nodeUtils} from "@lodestar/beacon-node";
4
4
  import {fromHex, toHex} from "@lodestar/utils";
5
5
  import {getBeaconConfigFromArgs} from "../../config/beaconParams.js";
@@ -37,10 +37,10 @@ export async function devHandler(args: IDevArgs & GlobalArgs): Promise<void> {
37
37
  // Remove slashing protection db. Otherwise the validators won't be able to propose nor attest
38
38
  // until the clock reach a higher slot than the previous run of the dev command
39
39
  if (args.genesisTime === undefined) {
40
- await rimraf(beaconDbDir);
41
- await rimraf(validatorsDbDir);
40
+ await rm(beaconDbDir, {recursive: true, force: true});
41
+ await rm(validatorsDbDir, {recursive: true, force: true});
42
42
  // Validators deposited in the previous run do not exist on the new chain
43
- await rimraf(pubkeysFile);
43
+ await rm(pubkeysFile, {recursive: true, force: true});
44
44
  }
45
45
 
46
46
  mkdir(beaconDbDir);
@@ -48,8 +48,8 @@ export async function devHandler(args: IDevArgs & GlobalArgs): Promise<void> {
48
48
 
49
49
  if (args.reset) {
50
50
  onGracefulShutdown(async () => {
51
- await rimraf(beaconDbDir);
52
- await rimraf(validatorsDbDir);
51
+ await rm(beaconDbDir, {recursive: true, force: true});
52
+ await rm(validatorsDbDir, {recursive: true, force: true});
53
53
  });
54
54
  }
55
55
 
@@ -34,9 +34,7 @@ const devOwnOptions: CliCommandOptions<IDevOwnArgs> = {
34
34
  type: "array",
35
35
  coerce: (indexes: string[]): number[] =>
36
36
  // Parse ["11..13,15..17"] to ["11..13", "15..17"]
37
- indexes
38
- .flatMap((item) => item.split(","))
39
- .flatMap(parseRange),
37
+ indexes.flatMap((item) => item.split(",")).flatMap(parseRange),
40
38
  group: "dev",
41
39
  },
42
40
 
@@ -1,6 +1,6 @@
1
- import {SecretKey} from "@chainsafe/lodestar-z/blst";
2
1
  import {getClient} from "@lodestar/api";
3
2
  import {createBeaconConfig} from "@lodestar/config";
3
+ import {SecretKey} from "@lodestar/native/blst";
4
4
  import {DOMAIN_BLS_TO_EXECUTION_CHANGE, ForkName} from "@lodestar/params";
5
5
  import {computeSigningRoot} from "@lodestar/state-transition";
6
6
  import {capella, ssz} from "@lodestar/types";
@@ -77,7 +77,16 @@ export async function validatorHandler(args: IValidatorCliArgs & GlobalArgs): Pr
77
77
 
78
78
  const onGracefulShutdownCbs: (() => Promise<void> | void)[] = [];
79
79
  onGracefulShutdown(async () => {
80
- for (const cb of onGracefulShutdownCbs) await cb();
80
+ let exitCode = 0;
81
+ try {
82
+ for (const cb of onGracefulShutdownCbs) await cb();
83
+ logger.debug("Validator client closed");
84
+ } catch (e) {
85
+ logger.warn("Error closing validator client", {}, e as Error);
86
+ exitCode = 1;
87
+ }
88
+ // Explicitly exit process due to potential active handles (e.g. EventSource / in-flight HTTP via DVT middleware)
89
+ process.exit(exitCode);
81
90
  }, logger.info.bind(logger));
82
91
 
83
92
  // Callback for validator to request forced exit, in case of doppelganger detection
@@ -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/lodestar-z/blst";
4
+ import {SecretKey} from "@lodestar/native/blst";
5
5
  import {LogLevel, Logger} from "@lodestar/utils";
6
6
  import {SignerLocal, SignerType} from "@lodestar/validator";
7
7
  import {lockFilepath, unlockFilepath} from "../../../util/lockfile.js";
@@ -45,7 +45,7 @@ export class DecryptKeystoresThreadPool {
45
45
  */
46
46
  queue(
47
47
  args: DecryptKeystoreArgs,
48
- onDecrypted: (secretKeyBytes: Uint8Array) => void,
48
+ onDecrypted: (secretKeyBytes: Uint8Array) => void | Promise<void>,
49
49
  onError: (e: Error) => void
50
50
  ): void {
51
51
  const task = this.pool.queue((thread) => thread.decryptKeystore(args));