@chainsafe/lodestar 1.51.0-dev.88c15a0731 → 1.51.0-dev.8a64241e1b
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/README.md +9 -7
- package/lib/applyPreset.js +0 -13
- package/lib/applyPreset.js.map +1 -1
- package/lib/cmds/beacon/handler.d.ts.map +1 -1
- package/lib/cmds/beacon/handler.js +23 -13
- 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 -1
- package/lib/cmds/dev/options.d.ts.map +1 -1
- package/lib/cmds/dev/options.js +1 -3
- package/lib/cmds/dev/options.js.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/decryptKeystores/threadPool.d.ts +1 -1
- package/lib/cmds/validator/keymanager/decryptKeystores/threadPool.d.ts.map +1 -1
- package/lib/cmds/validator/keymanager/decryptKeystores/threadPool.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/keymanager/persistedKeys.d.ts +1 -1
- package/lib/cmds/validator/keymanager/persistedKeys.d.ts.map +1 -1
- package/lib/cmds/validator/keymanager/persistedKeys.js +1 -1
- package/lib/cmds/validator/keymanager/persistedKeys.js.map +1 -1
- package/lib/cmds/validator/options.d.ts.map +1 -1
- package/lib/cmds/validator/options.js +3 -9
- 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/slashingProtection/export.d.ts.map +1 -1
- package/lib/cmds/validator/slashingProtection/export.js +1 -3
- package/lib/cmds/validator/slashingProtection/export.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.d.ts.map +1 -1
- package/lib/cmds/validator/voluntaryExit.js +2 -4
- 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 -1
- package/lib/options/beaconNodeOptions/chain.d.ts.map +1 -1
- package/lib/options/beaconNodeOptions/chain.js +10 -10
- package/lib/options/beaconNodeOptions/chain.js.map +1 -1
- package/lib/options/beaconNodeOptions/index.d.ts +3 -1
- 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/options/globalOptions.d.ts +0 -2
- package/lib/options/globalOptions.d.ts.map +1 -1
- package/lib/options/globalOptions.js +0 -5
- package/lib/options/globalOptions.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 +18 -16
- package/src/applyPreset.ts +0 -15
- package/src/cmds/beacon/handler.ts +30 -15
- 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/dev/options.ts +1 -3
- package/src/cmds/validator/blsToExecutionChange.ts +1 -1
- package/src/cmds/validator/keymanager/decryptKeystoreDefinitions.ts +1 -1
- package/src/cmds/validator/keymanager/decryptKeystores/threadPool.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/keymanager/persistedKeys.ts +1 -1
- package/src/cmds/validator/options.ts +3 -9
- package/src/cmds/validator/signers/index.ts +1 -1
- package/src/cmds/validator/slashingProtection/export.ts +1 -3
- package/src/cmds/validator/slashingProtection/import.ts +2 -2
- package/src/cmds/validator/voluntaryExit.ts +2 -4
- package/src/options/beaconNodeOptions/builder.ts +15 -0
- package/src/options/beaconNodeOptions/chain.ts +13 -13
- package/src/options/beaconNodeOptions/network.ts +25 -0
- package/src/options/globalOptions.ts +0 -7
- package/src/util/file.ts +3 -2
- package/src/util/format.ts +1 -1
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
|
|
package/src/cmds/dev/options.ts
CHANGED
|
@@ -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";
|
|
@@ -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";
|
|
@@ -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));
|
|
@@ -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";
|
|
@@ -14,7 +14,7 @@ import {
|
|
|
14
14
|
import {lockFilepath} from "../../../util/lockfile.js";
|
|
15
15
|
import {IPersistedKeysBackend, LocalKeystoreDefinition} from "./interface.js";
|
|
16
16
|
|
|
17
|
-
export {
|
|
17
|
+
export {DeletionStatus, ImportStatus};
|
|
18
18
|
|
|
19
19
|
type PathArgs = {
|
|
20
20
|
keystoresDir: string;
|
|
@@ -416,9 +416,7 @@ export const validatorOptions: CliCommandOptions<IValidatorCliArgs> = {
|
|
|
416
416
|
string: true, // Ensures the pubkey string is not automatically converted to numbers
|
|
417
417
|
coerce: (pubkeys: string[]): string[] =>
|
|
418
418
|
// Parse ["0x11,0x22"] to ["0x11", "0x22"]
|
|
419
|
-
pubkeys
|
|
420
|
-
.flatMap((item) => item.split(","))
|
|
421
|
-
.map(ensure0xPrefix),
|
|
419
|
+
pubkeys.flatMap((item) => item.split(",")).map(ensure0xPrefix),
|
|
422
420
|
group: "externalSigner",
|
|
423
421
|
},
|
|
424
422
|
|
|
@@ -518,9 +516,7 @@ export const validatorOptions: CliCommandOptions<IValidatorCliArgs> = {
|
|
|
518
516
|
type: "array",
|
|
519
517
|
coerce: (indexes: string[]): number[] =>
|
|
520
518
|
// Parse ["11..13,15..17"] to ["11..13", "15..17"]
|
|
521
|
-
indexes
|
|
522
|
-
.flatMap((item) => item.split(","))
|
|
523
|
-
.flatMap(parseRange),
|
|
519
|
+
indexes.flatMap((item) => item.split(",")).flatMap(parseRange),
|
|
524
520
|
},
|
|
525
521
|
|
|
526
522
|
fromMnemonic: {
|
|
@@ -535,8 +531,6 @@ export const validatorOptions: CliCommandOptions<IValidatorCliArgs> = {
|
|
|
535
531
|
type: "array",
|
|
536
532
|
coerce: (indexes: string[]): number[] =>
|
|
537
533
|
// Parse ["11..13,15..17"] to ["11..13", "15..17"]
|
|
538
|
-
indexes
|
|
539
|
-
.flatMap((item) => item.split(","))
|
|
540
|
-
.flatMap(parseRange),
|
|
534
|
+
indexes.flatMap((item) => item.split(",")).flatMap(parseRange),
|
|
541
535
|
},
|
|
542
536
|
};
|
|
@@ -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";
|
|
@@ -42,9 +42,7 @@ export const exportCmd: CliCommand<ExportArgs, ISlashingProtectionArgs & Account
|
|
|
42
42
|
string: true, // Ensures the pubkey string is not automatically converted to numbers
|
|
43
43
|
coerce: (pubkeys: string[]): string[] =>
|
|
44
44
|
// Parse ["0x11,0x22"] to ["0x11", "0x22"]
|
|
45
|
-
pubkeys
|
|
46
|
-
.flatMap((item) => item.split(","))
|
|
47
|
-
.map(ensure0xPrefix),
|
|
45
|
+
pubkeys.flatMap((item) => item.split(",")).map(ensure0xPrefix),
|
|
48
46
|
},
|
|
49
47
|
},
|
|
50
48
|
|
|
@@ -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,
|
|
@@ -59,9 +59,7 @@ If no `pubkeys` are provided, it will exit all validators that have been importe
|
|
|
59
59
|
string: true, // Ensures the pubkey string is not automatically converted to numbers
|
|
60
60
|
coerce: (pubkeys: string[]): string[] =>
|
|
61
61
|
// Parse ["0x11,0x22"] to ["0x11", "0x22"]
|
|
62
|
-
pubkeys
|
|
63
|
-
.flatMap((item) => item.split(","))
|
|
64
|
-
.map(ensure0xPrefix),
|
|
62
|
+
pubkeys.flatMap((item) => item.split(",")).map(ensure0xPrefix),
|
|
65
63
|
},
|
|
66
64
|
|
|
67
65
|
yes: {
|
|
@@ -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,13 +23,13 @@ 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;
|
|
29
30
|
"chain.maxSkipSlots"?: number;
|
|
30
31
|
"chain.disableProposerSlashings"?: boolean;
|
|
31
32
|
emitPayloadAttributes?: boolean;
|
|
32
|
-
broadcastValidationStrictness?: string;
|
|
33
33
|
"chain.minSameMessageSignatureSetsToBatch"?: number;
|
|
34
34
|
"chain.maxShufflingCacheEpochs"?: number;
|
|
35
35
|
"chain.archiveStateEpochFrequency": number;
|
|
@@ -66,13 +66,13 @@ export function parseArgs(args: ChainArgs & CircuitBreakerArgs): IBeaconNodeOpti
|
|
|
66
66
|
proposerBoostReorg: args["chain.proposerBoostReorg"],
|
|
67
67
|
disableImportExecutionFcU: args["chain.disableImportExecutionFcU"],
|
|
68
68
|
preaggregateSlotDistance: args["chain.preaggregateSlotDistance"],
|
|
69
|
+
singleAttestationIgnoreProposalDuty: args["chain.singleAttestationIgnoreProposalDuty"],
|
|
69
70
|
attDataCacheSlotDistance: args["chain.attDataCacheSlotDistance"],
|
|
70
71
|
computeUnrealized: args["chain.computeUnrealized"],
|
|
71
72
|
fastConfirmation: args["chain.fastConfirmation"],
|
|
72
73
|
maxSkipSlots: args["chain.maxSkipSlots"],
|
|
73
74
|
disableProposerSlashings: args["chain.disableProposerSlashings"],
|
|
74
75
|
emitPayloadAttributes: args.emitPayloadAttributes,
|
|
75
|
-
broadcastValidationStrictness: args.broadcastValidationStrictness,
|
|
76
76
|
minSameMessageSignatureSetsToBatch:
|
|
77
77
|
args["chain.minSameMessageSignatureSetsToBatch"] ?? defaultOptions.chain.minSameMessageSignatureSetsToBatch,
|
|
78
78
|
maxShufflingCacheEpochs: args["chain.maxShufflingCacheEpochs"] ?? defaultOptions.chain.maxShufflingCacheEpochs,
|
|
@@ -232,6 +232,15 @@ Will double processing times. Use only for debugging purposes.",
|
|
|
232
232
|
group: "chain",
|
|
233
233
|
},
|
|
234
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
|
+
|
|
235
244
|
"chain.attDataCacheSlotDistance": {
|
|
236
245
|
hidden: true,
|
|
237
246
|
type: "number",
|
|
@@ -286,15 +295,6 @@ Will double processing times. Use only for debugging purposes.",
|
|
|
286
295
|
group: "chain",
|
|
287
296
|
},
|
|
288
297
|
|
|
289
|
-
broadcastValidationStrictness: {
|
|
290
|
-
// TODO: hide the option till validations fully implemented
|
|
291
|
-
hidden: true,
|
|
292
|
-
description:
|
|
293
|
-
"'warn' or 'error' - options to either throw error or to log warning when broadcast validation can't be performed",
|
|
294
|
-
type: "string",
|
|
295
|
-
default: "warn",
|
|
296
|
-
},
|
|
297
|
-
|
|
298
298
|
"chain.minSameMessageSignatureSetsToBatch": {
|
|
299
299
|
hidden: true,
|
|
300
300
|
description: "Minimum number of same message signature sets to batch",
|
|
@@ -361,9 +361,9 @@ Will double processing times. Use only for debugging purposes.",
|
|
|
361
361
|
|
|
362
362
|
"chain.pruneHistory": {
|
|
363
363
|
description:
|
|
364
|
-
"Continually prune finalized blocks and execution payload envelopes older than `MIN_EPOCHS_FOR_BLOCK_REQUESTS` (33024 epochs / ~5 months on mainnet) and all archived states before the finalized epoch. \
|
|
364
|
+
"Continually prune finalized blocks and execution payload envelopes older than `MIN_EPOCHS_FOR_BLOCK_REQUESTS` (33024 epochs / ~5 months on mainnet, 14299 epochs / ~2 months from gloas) and all archived states before the finalized epoch. \
|
|
365
365
|
This is useful to minimize disk usage when the node does not need to serve historical data. \
|
|
366
|
-
|
|
366
|
+
An existing large database is pruned gradually, up to 4096 slots of blocks on startup and on every finalized checkpoint.",
|
|
367
367
|
type: "boolean",
|
|
368
368
|
default: defaultOptions.chain.pruneHistory,
|
|
369
369
|
group: "chain",
|
|
@@ -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",
|
|
@@ -9,7 +9,6 @@ type GlobalSingleArgs = {
|
|
|
9
9
|
network?: NetworkName;
|
|
10
10
|
paramsFile?: string;
|
|
11
11
|
preset: string;
|
|
12
|
-
presetFile?: string;
|
|
13
12
|
rcConfig?: string;
|
|
14
13
|
supernode?: boolean;
|
|
15
14
|
semiSupernode?: boolean;
|
|
@@ -42,12 +41,6 @@ const globalSingleOptions: CliCommandOptions<GlobalSingleArgs> = {
|
|
|
42
41
|
default: ACTIVE_PRESET,
|
|
43
42
|
},
|
|
44
43
|
|
|
45
|
-
presetFile: {
|
|
46
|
-
hidden: true,
|
|
47
|
-
description: "Preset configuration file to override the active preset with custom values",
|
|
48
|
-
type: "string",
|
|
49
|
-
},
|
|
50
|
-
|
|
51
44
|
rcConfig: {
|
|
52
45
|
description: "RC file to supplement command line args, accepted formats: .yml, .yaml, .json",
|
|
53
46
|
type: "string",
|
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