@chainsafe/lodestar 1.51.0-dev.4671dbfa39 → 1.51.0-dev.4a8c0994a0
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 +24 -11
- package/lib/cmds/beacon/handler.js.map +1 -1
- package/lib/cmds/beacon/initBeaconState.d.ts.map +1 -1
- package/lib/cmds/beacon/initBeaconState.js +1 -1
- package/lib/cmds/beacon/initBeaconState.js.map +1 -1
- package/lib/cmds/beacon/pubkeysFile.d.ts +1 -1
- package/lib/cmds/beacon/pubkeysFile.d.ts.map +1 -1
- package/lib/cmds/builder/handler.d.ts.map +1 -1
- package/lib/cmds/builder/handler.js +6 -2
- package/lib/cmds/builder/handler.js.map +1 -1
- package/lib/cmds/builder/loadKeypair.d.ts.map +1 -1
- package/lib/cmds/builder/loadKeypair.js +1 -1
- package/lib/cmds/builder/loadKeypair.js.map +1 -1
- package/lib/cmds/dev/handler.js +6 -6
- package/lib/cmds/dev/handler.js.map +1 -1
- package/lib/cmds/dev/options.d.ts +3 -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/keymanager/decryptKeystoreDefinitions.js +1 -1
- package/lib/cmds/validator/keymanager/decryptKeystoreDefinitions.js.map +1 -1
- package/lib/cmds/validator/keymanager/impl.d.ts.map +1 -1
- package/lib/cmds/validator/keymanager/impl.js +1 -1
- 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/signers/index.js +1 -1
- package/lib/cmds/validator/signers/index.js.map +1 -1
- package/lib/cmds/validator/slashingProtection/import.js +2 -2
- package/lib/cmds/validator/slashingProtection/import.js.map +1 -1
- package/lib/cmds/validator/voluntaryExit.js +1 -1
- package/lib/cmds/validator/voluntaryExit.js.map +1 -1
- package/lib/options/beaconNodeOptions/builder.d.ts +1 -0
- package/lib/options/beaconNodeOptions/builder.d.ts.map +1 -1
- package/lib/options/beaconNodeOptions/builder.js +11 -0
- package/lib/options/beaconNodeOptions/builder.js.map +1 -1
- package/lib/options/beaconNodeOptions/chain.d.ts +1 -0
- package/lib/options/beaconNodeOptions/chain.d.ts.map +1 -1
- package/lib/options/beaconNodeOptions/chain.js +8 -0
- package/lib/options/beaconNodeOptions/chain.js.map +1 -1
- package/lib/options/beaconNodeOptions/index.d.ts +3 -0
- package/lib/options/beaconNodeOptions/index.d.ts.map +1 -1
- package/lib/options/beaconNodeOptions/network.d.ts +1 -0
- package/lib/options/beaconNodeOptions/network.d.ts.map +1 -1
- package/lib/options/beaconNodeOptions/network.js +16 -0
- package/lib/options/beaconNodeOptions/network.js.map +1 -1
- package/lib/util/file.d.ts.map +1 -1
- package/lib/util/file.js +3 -2
- package/lib/util/file.js.map +1 -1
- package/lib/util/format.js +1 -1
- package/lib/util/format.js.map +1 -1
- package/package.json +16 -17
- package/src/cmds/beacon/handler.ts +32 -11
- package/src/cmds/beacon/initBeaconState.ts +1 -1
- package/src/cmds/beacon/pubkeysFile.ts +1 -1
- package/src/cmds/builder/handler.ts +6 -1
- package/src/cmds/builder/loadKeypair.ts +1 -1
- package/src/cmds/dev/handler.ts +6 -6
- package/src/cmds/validator/blsToExecutionChange.ts +1 -1
- package/src/cmds/validator/keymanager/decryptKeystoreDefinitions.ts +1 -1
- package/src/cmds/validator/keymanager/impl.ts +1 -1
- package/src/cmds/validator/keymanager/keystoreCache.ts +1 -1
- package/src/cmds/validator/signers/index.ts +1 -1
- package/src/cmds/validator/slashingProtection/import.ts +2 -2
- package/src/cmds/validator/voluntaryExit.ts +1 -1
- package/src/options/beaconNodeOptions/builder.ts +15 -0
- package/src/options/beaconNodeOptions/chain.ts +11 -0
- package/src/options/beaconNodeOptions/network.ts +25 -0
- package/src/util/file.ts +3 -2
- package/src/util/format.ts +1 -1
|
@@ -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 {
|
|
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 {
|
|
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
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
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
|
-
|
|
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
|
|
@@ -238,6 +244,21 @@ export async function beaconHandlerInit(args: BeaconArgs & GlobalArgs) {
|
|
|
238
244
|
);
|
|
239
245
|
}
|
|
240
246
|
|
|
247
|
+
// Bids received up to the deadline plus the lag buffer must still have a chance to win the block
|
|
248
|
+
// production race, otherwise the local block is selected at the race cutoff before any bid.
|
|
249
|
+
// Only enforced on an explicitly configured deadline, the default is used as is on short slots
|
|
250
|
+
const bidDeadline = args["builder.bidDeadline"];
|
|
251
|
+
if (bidDeadline !== undefined) {
|
|
252
|
+
for (const {name: fork, epoch} of config.forksAscendingEpochOrder) {
|
|
253
|
+
const raceCutoffMs = config.getSlotComponentDurationMs(fork, BLOCK_PRODUCTION_RACE_CUTOFF_GLOAS_BPS);
|
|
254
|
+
if (isForkPostGloas(fork) && epoch !== Infinity && bidDeadline + BUILDER_BID_LAG_BUFFER_MS >= raceCutoffMs) {
|
|
255
|
+
throw Error(
|
|
256
|
+
`--builder.bidDeadline of ${bidDeadline}ms must be below ${raceCutoffMs - BUILDER_BID_LAG_BUFFER_MS}ms for fork ${fork}`
|
|
257
|
+
);
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
|
|
241
262
|
return {config, options, beaconPaths, network, version, commit, privateKey, logger};
|
|
242
263
|
}
|
|
243
264
|
|
|
@@ -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
|
|
|
@@ -2,6 +2,7 @@ import fs from "node:fs";
|
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import {getClient} from "@lodestar/api";
|
|
4
4
|
import {
|
|
5
|
+
ExecutionPayloadStatus,
|
|
5
6
|
RegistryMetricCreator,
|
|
6
7
|
collectNodeJSMetrics,
|
|
7
8
|
defaultExecutionEngineHttpOpts,
|
|
@@ -107,13 +108,17 @@ export async function builderHandler(args: IBuilderCliArgs & GlobalArgs): Promis
|
|
|
107
108
|
const payloadSource = new EnginePayloadSource(toPrintableUrl(executionUrl), {
|
|
108
109
|
notifyForkchoiceUpdate: async (fork, headBlockHash, safeBlockHash, finalizedBlockHash, payloadAttributes) => {
|
|
109
110
|
try {
|
|
110
|
-
|
|
111
|
+
const {payloadStatus, payloadId} = await engine.notifyForkchoiceUpdate(
|
|
111
112
|
fork,
|
|
112
113
|
headBlockHash,
|
|
113
114
|
safeBlockHash,
|
|
114
115
|
finalizedBlockHash,
|
|
115
116
|
payloadAttributes
|
|
116
117
|
);
|
|
118
|
+
if (payloadStatus.status === ExecutionPayloadStatus.INVALID) {
|
|
119
|
+
throw Error(`Invalid prepare payload, validationError=${payloadStatus.validationError ?? ""}`);
|
|
120
|
+
}
|
|
121
|
+
return payloadId;
|
|
117
122
|
} catch (e) {
|
|
118
123
|
// Only retry while the execution client is syncing, it has not imported the parent payload yet.
|
|
119
124
|
// The engine interface does not expose the fcU status, this matches the error thrown for the SYNCING status
|
|
@@ -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";
|
package/src/cmds/dev/handler.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
|
-
import {
|
|
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
|
|
41
|
-
await
|
|
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
|
|
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
|
|
52
|
-
await
|
|
51
|
+
await rm(beaconDbDir, {recursive: true, force: true});
|
|
52
|
+
await rm(validatorsDbDir, {recursive: true, force: true});
|
|
53
53
|
});
|
|
54
54
|
}
|
|
55
55
|
|
|
@@ -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";
|
|
@@ -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 "@
|
|
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";
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import {Keystore} from "@chainsafe/bls-keystore";
|
|
2
|
-
import {SecretKey} from "@chainsafe/lodestar-z/blst";
|
|
3
2
|
import {
|
|
4
3
|
BuilderBoostFactorData,
|
|
5
4
|
BuilderConfigData,
|
|
@@ -20,6 +19,7 @@ import {
|
|
|
20
19
|
} from "@lodestar/api/keymanager";
|
|
21
20
|
import {KeymanagerApiMethods as Api} from "@lodestar/api/keymanager/server";
|
|
22
21
|
import {ApiError} from "@lodestar/api/server";
|
|
22
|
+
import {SecretKey} from "@lodestar/native/blst";
|
|
23
23
|
import {Epoch} from "@lodestar/types";
|
|
24
24
|
import {fromHex, isValidHttpUrl} from "@lodestar/utils";
|
|
25
25
|
import {Interchange, SignerType, Validator} from "@lodestar/validator";
|
|
@@ -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 "@
|
|
4
|
+
import {SecretKey} from "@lodestar/native/blst";
|
|
5
5
|
import {fromHex, toHex, toPubkeyHex} from "@lodestar/utils";
|
|
6
6
|
import {SignerLocal, SignerType} from "@lodestar/validator";
|
|
7
7
|
import {writeFile600Perm} from "../../../util/file.js";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
2
|
import {deriveEth2ValidatorKeys, deriveKeyFromMnemonic} from "@chainsafe/bls-keygen";
|
|
3
|
-
import {SecretKey} from "@
|
|
3
|
+
import {SecretKey} from "@lodestar/native/blst";
|
|
4
4
|
import {interopSecretKey} from "@lodestar/state-transition";
|
|
5
5
|
import {LogLevel, Logger, isValidHttpUrl} from "@lodestar/utils";
|
|
6
6
|
import {Signer, SignerType, externalSignerGetKeys} from "@lodestar/validator";
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import {readFile} from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import {getNodeLogger} from "@lodestar/logger/node";
|
|
4
4
|
import {CliCommand} from "@lodestar/utils";
|
|
@@ -61,7 +61,7 @@ export const importCmd: CliCommand<ImportArgs, ISlashingProtectionArgs & Account
|
|
|
61
61
|
(await metadata.getGenesisValidatorsRoot()) ?? (await getGenesisValidatorsRoot(args));
|
|
62
62
|
|
|
63
63
|
logger.verbose("Reading slashing protection data", {file});
|
|
64
|
-
const interchangeStr = await
|
|
64
|
+
const interchangeStr = await readFile(file, "utf8");
|
|
65
65
|
const interchangeJson = JSON.parse(interchangeStr) as Interchange;
|
|
66
66
|
|
|
67
67
|
await slashingProtection.importInterchange(interchangeJson, genesisValidatorsRoot, logger);
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import inquirer from "inquirer";
|
|
4
|
-
import {Signature} from "@chainsafe/lodestar-z/blst";
|
|
5
4
|
import {ApiClient, getClient} from "@lodestar/api";
|
|
6
5
|
import {BeaconConfig, createBeaconConfig} from "@lodestar/config";
|
|
6
|
+
import {Signature} from "@lodestar/native/blst";
|
|
7
7
|
import {
|
|
8
8
|
computeEpochAtSlot,
|
|
9
9
|
computeSigningRoot,
|
|
@@ -6,6 +6,7 @@ export type ExecutionBuilderArgs = {
|
|
|
6
6
|
builder: boolean;
|
|
7
7
|
"builder.url"?: string;
|
|
8
8
|
"builder.timeout"?: number;
|
|
9
|
+
"builder.bidDeadline"?: number;
|
|
9
10
|
"builder.faultInspectionWindow"?: number;
|
|
10
11
|
"builder.allowedFaults"?: number;
|
|
11
12
|
};
|
|
@@ -20,10 +21,16 @@ export function parseArgs(args: ExecutionBuilderArgs): IBeaconNodeOptions["execu
|
|
|
20
21
|
);
|
|
21
22
|
}
|
|
22
23
|
|
|
24
|
+
const bidDeadline = args["builder.bidDeadline"];
|
|
25
|
+
if (bidDeadline !== undefined && (!Number.isInteger(bidDeadline) || bidDeadline <= 0)) {
|
|
26
|
+
throw new YargsError("builder.bidDeadline must be a positive integer");
|
|
27
|
+
}
|
|
28
|
+
|
|
23
29
|
return {
|
|
24
30
|
enabled: args.builder,
|
|
25
31
|
url: args["builder.url"] ?? defaultExecutionBuilderHttpOpts.url,
|
|
26
32
|
timeout: args["builder.timeout"],
|
|
33
|
+
bidDeadline,
|
|
27
34
|
faultInspectionWindow: args["builder.faultInspectionWindow"],
|
|
28
35
|
allowedFaults: args["builder.allowedFaults"],
|
|
29
36
|
};
|
|
@@ -54,6 +61,14 @@ export const options: CliCommandOptions<ExecutionBuilderArgs> = {
|
|
|
54
61
|
group: "builder",
|
|
55
62
|
},
|
|
56
63
|
|
|
64
|
+
"builder.bidDeadline": {
|
|
65
|
+
description:
|
|
66
|
+
"Time in milliseconds builders are given to provide a bid once block production starts. Advertised to builder API endpoints via the `X-Timeout-Ms` header and applied to bids received via p2p. Post-Gloas only",
|
|
67
|
+
type: "number",
|
|
68
|
+
defaultDescription: String(defaultExecutionBuilderHttpOpts.bidDeadline),
|
|
69
|
+
group: "builder",
|
|
70
|
+
},
|
|
71
|
+
|
|
57
72
|
"builder.faultInspectionWindow": {
|
|
58
73
|
type: "number",
|
|
59
74
|
description:
|
|
@@ -23,6 +23,7 @@ export type ChainArgs = {
|
|
|
23
23
|
"chain.proposerBoostReorg"?: boolean;
|
|
24
24
|
"chain.disableImportExecutionFcU"?: boolean;
|
|
25
25
|
"chain.preaggregateSlotDistance"?: number;
|
|
26
|
+
"chain.singleAttestationIgnoreProposalDuty"?: boolean;
|
|
26
27
|
"chain.attDataCacheSlotDistance"?: number;
|
|
27
28
|
"chain.computeUnrealized"?: boolean;
|
|
28
29
|
"chain.fastConfirmation"?: boolean;
|
|
@@ -65,6 +66,7 @@ export function parseArgs(args: ChainArgs & CircuitBreakerArgs): IBeaconNodeOpti
|
|
|
65
66
|
proposerBoostReorg: args["chain.proposerBoostReorg"],
|
|
66
67
|
disableImportExecutionFcU: args["chain.disableImportExecutionFcU"],
|
|
67
68
|
preaggregateSlotDistance: args["chain.preaggregateSlotDistance"],
|
|
69
|
+
singleAttestationIgnoreProposalDuty: args["chain.singleAttestationIgnoreProposalDuty"],
|
|
68
70
|
attDataCacheSlotDistance: args["chain.attDataCacheSlotDistance"],
|
|
69
71
|
computeUnrealized: args["chain.computeUnrealized"],
|
|
70
72
|
fastConfirmation: args["chain.fastConfirmation"],
|
|
@@ -230,6 +232,15 @@ Will double processing times. Use only for debugging purposes.",
|
|
|
230
232
|
group: "chain",
|
|
231
233
|
},
|
|
232
234
|
|
|
235
|
+
"chain.singleAttestationIgnoreProposalDuty": {
|
|
236
|
+
hidden: true,
|
|
237
|
+
type: "boolean",
|
|
238
|
+
description:
|
|
239
|
+
"collect single attestations of every vote slot a block at the current slot can include regardless of block proposal duties, could be used with --subscribeAllSubnets",
|
|
240
|
+
defaultDescription: "false",
|
|
241
|
+
group: "chain",
|
|
242
|
+
},
|
|
243
|
+
|
|
233
244
|
"chain.attDataCacheSlotDistance": {
|
|
234
245
|
hidden: true,
|
|
235
246
|
type: "number",
|
|
@@ -3,6 +3,7 @@ import os from "node:os";
|
|
|
3
3
|
import {multiaddr} from "@multiformats/multiaddr";
|
|
4
4
|
import {ENR} from "@chainsafe/enr";
|
|
5
5
|
import {IBeaconNodeOptions, defaultOptions} from "@lodestar/beacon-node";
|
|
6
|
+
import {SLOTS_PER_EPOCH} from "@lodestar/params";
|
|
6
7
|
import {CliCommandOptions} from "@lodestar/utils";
|
|
7
8
|
import {YargsError} from "../../util/index.js";
|
|
8
9
|
|
|
@@ -55,6 +56,7 @@ export type NetworkArgs = {
|
|
|
55
56
|
targetPeers?: number;
|
|
56
57
|
subscribeAllSubnets?: boolean;
|
|
57
58
|
slotsToSubscribeBeforeAggregatorDuty?: number;
|
|
59
|
+
slotsToSubscribeBeforeProposalDuty?: number;
|
|
58
60
|
disablePeerScoring?: boolean;
|
|
59
61
|
quic?: boolean;
|
|
60
62
|
tcp?: boolean;
|
|
@@ -127,6 +129,19 @@ export function parseArgs(args: NetworkArgs): IBeaconNodeOptions["network"] {
|
|
|
127
129
|
throw new YargsError("Cannot disable both TCP and QUIC transports");
|
|
128
130
|
}
|
|
129
131
|
|
|
132
|
+
const slotsToSubscribeBeforeProposalDuty =
|
|
133
|
+
args.slotsToSubscribeBeforeProposalDuty ?? defaultOptions.network.slotsToSubscribeBeforeProposalDuty;
|
|
134
|
+
if (
|
|
135
|
+
!Number.isInteger(slotsToSubscribeBeforeProposalDuty) ||
|
|
136
|
+
slotsToSubscribeBeforeProposalDuty < 0 ||
|
|
137
|
+
// proposers are only known one epoch ahead (fulu proposer lookahead)
|
|
138
|
+
slotsToSubscribeBeforeProposalDuty > SLOTS_PER_EPOCH
|
|
139
|
+
) {
|
|
140
|
+
throw new YargsError(
|
|
141
|
+
`slotsToSubscribeBeforeProposalDuty must be an integer in [0, ${SLOTS_PER_EPOCH}], got ${slotsToSubscribeBeforeProposalDuty}`
|
|
142
|
+
);
|
|
143
|
+
}
|
|
144
|
+
|
|
130
145
|
// validate ip, ip6, ports
|
|
131
146
|
const muArgs = {
|
|
132
147
|
listenAddress: listenAddress ? `/ip4/${listenAddress}` : undefined,
|
|
@@ -215,6 +230,7 @@ export function parseArgs(args: NetworkArgs): IBeaconNodeOptions["network"] {
|
|
|
215
230
|
subscribeAllSubnets: args.subscribeAllSubnets,
|
|
216
231
|
slotsToSubscribeBeforeAggregatorDuty:
|
|
217
232
|
args.slotsToSubscribeBeforeAggregatorDuty ?? defaultOptions.network.slotsToSubscribeBeforeAggregatorDuty,
|
|
233
|
+
slotsToSubscribeBeforeProposalDuty,
|
|
218
234
|
disablePeerScoring: args.disablePeerScoring,
|
|
219
235
|
quic,
|
|
220
236
|
tcp,
|
|
@@ -337,6 +353,15 @@ export const options: CliCommandOptions<NetworkArgs> = {
|
|
|
337
353
|
group: "network",
|
|
338
354
|
},
|
|
339
355
|
|
|
356
|
+
slotsToSubscribeBeforeProposalDuty: {
|
|
357
|
+
hidden: true,
|
|
358
|
+
type: "number",
|
|
359
|
+
description:
|
|
360
|
+
"Number of slots before a block proposal of a connected validator to subscribe to all attestation subnets, to pack their single attestations into the block. 0 disables",
|
|
361
|
+
defaultDescription: String(defaultOptions.network.slotsToSubscribeBeforeProposalDuty),
|
|
362
|
+
group: "network",
|
|
363
|
+
},
|
|
364
|
+
|
|
340
365
|
disablePeerScoring: {
|
|
341
366
|
type: "boolean",
|
|
342
367
|
description: "Disable peer scoring, used for testing on devnets",
|
package/src/util/file.ts
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";
|
|
@@ -120,7 +121,7 @@ export async function downloadOrCopyFile(pathDest: string, urlOrPathSrc: string)
|
|
|
120
121
|
await downloadFile(pathDest, urlOrPathSrc);
|
|
121
122
|
} else {
|
|
122
123
|
mkdir(path.dirname(pathDest));
|
|
123
|
-
await
|
|
124
|
+
await copyFile(urlOrPathSrc, pathDest);
|
|
124
125
|
}
|
|
125
126
|
}
|
|
126
127
|
|
|
@@ -159,7 +160,7 @@ export async function downloadOrLoadFile(pathOrUrl: string): Promise<Uint8Array>
|
|
|
159
160
|
const arrayBuffer = await res.arrayBuffer();
|
|
160
161
|
return new Uint8Array(arrayBuffer);
|
|
161
162
|
}
|
|
162
|
-
return
|
|
163
|
+
return fsReadFile(pathOrUrl);
|
|
163
164
|
}
|
|
164
165
|
|
|
165
166
|
/**
|
package/src/util/format.ts
CHANGED