@chainsafe/lodestar 1.23.0-dev.d44c409eaa → 1.23.0-dev.de0d6ab89b
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/applyPreset.js +0 -4
- package/lib/applyPreset.js.map +1 -1
- package/lib/cmds/beacon/handler.d.ts +1 -1
- package/lib/cmds/beacon/handler.js +13 -12
- package/lib/cmds/beacon/handler.js.map +1 -1
- package/lib/cmds/beacon/initBeaconState.js +15 -19
- package/lib/cmds/beacon/initBeaconState.js.map +1 -1
- package/lib/cmds/beacon/initPeerIdAndEnr.d.ts +3 -3
- package/lib/cmds/beacon/initPeerIdAndEnr.js +28 -29
- package/lib/cmds/beacon/initPeerIdAndEnr.js.map +1 -1
- package/lib/cmds/bootnode/handler.d.ts +1 -1
- package/lib/cmds/bootnode/handler.js +7 -8
- package/lib/cmds/bootnode/handler.js.map +1 -1
- package/lib/cmds/bootnode/options.js +1 -1
- package/lib/cmds/bootnode/options.js.map +1 -1
- package/lib/cmds/dev/options.d.ts +10 -10
- package/lib/cmds/dev/options.js +2 -2
- package/lib/cmds/dev/options.js.map +1 -1
- package/lib/cmds/validator/handler.js +4 -4
- 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/decryptKeystores/poolSize.js +1 -1
- package/lib/cmds/validator/keymanager/decryptKeystores/poolSize.js.map +1 -1
- package/lib/cmds/validator/keymanager/impl.js +1 -3
- package/lib/cmds/validator/keymanager/impl.js.map +1 -1
- package/lib/cmds/validator/keymanager/server.js +1 -2
- package/lib/cmds/validator/keymanager/server.js.map +1 -1
- package/lib/cmds/validator/options.js +2 -3
- package/lib/cmds/validator/options.js.map +1 -1
- package/lib/cmds/validator/signers/importExternalKeystores.js +8 -10
- package/lib/cmds/validator/signers/importExternalKeystores.js.map +1 -1
- package/lib/cmds/validator/signers/index.js +28 -32
- package/lib/cmds/validator/signers/index.js.map +1 -1
- package/lib/cmds/validator/signers/logSigners.js +3 -3
- package/lib/cmds/validator/signers/logSigners.js.map +1 -1
- package/lib/cmds/validator/slashingProtection/export.js +1 -2
- package/lib/cmds/validator/slashingProtection/export.js.map +1 -1
- package/lib/cmds/validator/voluntaryExit.js +3 -9
- package/lib/cmds/validator/voluntaryExit.js.map +1 -1
- package/lib/config/peerId.d.ts +7 -7
- package/lib/config/peerId.js +22 -27
- package/lib/config/peerId.js.map +1 -1
- package/lib/index.js +0 -2
- package/lib/index.js.map +1 -1
- package/lib/networks/dev.d.ts +2 -1
- package/lib/networks/dev.js.map +1 -1
- package/lib/networks/index.js +2 -3
- package/lib/networks/index.js.map +1 -1
- package/lib/options/beaconNodeOptions/api.js +2 -2
- package/lib/options/beaconNodeOptions/api.js.map +1 -1
- package/lib/options/beaconNodeOptions/builder.js +1 -1
- package/lib/options/beaconNodeOptions/builder.js.map +1 -1
- package/lib/options/beaconNodeOptions/chain.js +4 -4
- package/lib/options/beaconNodeOptions/chain.js.map +1 -1
- package/lib/options/beaconNodeOptions/eth1.js +4 -6
- package/lib/options/beaconNodeOptions/eth1.js.map +1 -1
- package/lib/options/beaconNodeOptions/execution.js +3 -5
- package/lib/options/beaconNodeOptions/execution.js.map +1 -1
- package/lib/options/beaconNodeOptions/metrics.js +1 -1
- package/lib/options/beaconNodeOptions/metrics.js.map +1 -1
- package/lib/options/beaconNodeOptions/network.js +15 -16
- package/lib/options/beaconNodeOptions/network.js.map +1 -1
- package/lib/options/logOptions.js +1 -1
- package/lib/options/logOptions.js.map +1 -1
- package/lib/options/paramsOptions.js +5 -5
- package/lib/options/paramsOptions.js.map +1 -1
- package/lib/util/file.js +2 -7
- package/lib/util/file.js.map +1 -1
- package/lib/util/format.js +2 -2
- package/lib/util/format.js.map +1 -1
- package/lib/util/fs.js +2 -4
- package/lib/util/fs.js.map +1 -1
- package/lib/util/gitData/gitDataPath.js +0 -1
- package/lib/util/gitData/gitDataPath.js.map +1 -1
- package/lib/util/gitData/index.js +6 -6
- package/lib/util/gitData/index.js.map +1 -1
- package/lib/util/jwt.js +1 -1
- package/lib/util/jwt.js.map +1 -1
- package/lib/util/logger.js +4 -2
- package/lib/util/logger.js.map +1 -1
- package/lib/util/object.js +1 -2
- package/lib/util/object.js.map +1 -1
- package/lib/util/process.js +1 -3
- package/lib/util/process.js.map +1 -1
- package/lib/util/proposerConfig.js +0 -1
- package/lib/util/proposerConfig.js.map +1 -1
- package/lib/util/types.js +1 -1
- package/lib/util/types.js.map +1 -1
- package/lib/util/version.js +0 -1
- package/lib/util/version.js.map +1 -1
- package/package.json +21 -21
package/.git-data.json
CHANGED
package/lib/applyPreset.js
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
// MUST import this file first before anything and not import any Lodestar code.
|
|
2
|
-
// eslint-disable-next-line no-restricted-imports
|
|
3
2
|
import { hasher } from "@chainsafe/persistent-merkle-tree/lib/hasher/as-sha256.js";
|
|
4
|
-
// eslint-disable-next-line no-restricted-imports
|
|
5
3
|
import { setHasher } from "@chainsafe/persistent-merkle-tree/lib/hasher/index.js";
|
|
6
4
|
// without setting this first, persistent-merkle-tree will use noble instead
|
|
7
5
|
setHasher(hasher);
|
|
@@ -37,7 +35,6 @@ else if (network) {
|
|
|
37
35
|
if (network === "dev") {
|
|
38
36
|
process.env.LODESTAR_PRESET = "minimal";
|
|
39
37
|
// "c-kzg" has hardcoded the mainnet value, do not use presets
|
|
40
|
-
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
41
38
|
setActivePreset(PresetName.minimal, { FIELD_ELEMENTS_PER_BLOB: 4096 });
|
|
42
39
|
}
|
|
43
40
|
else if (network === "gnosis" || network === "chiado") {
|
|
@@ -49,7 +46,6 @@ else if (process.argv[2] === "dev") {
|
|
|
49
46
|
process.env.LODESTAR_PRESET = "minimal";
|
|
50
47
|
process.env.LODESTAR_NETWORK = "dev";
|
|
51
48
|
// "c-kzg" has hardcoded the mainnet value, do not use presets
|
|
52
|
-
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
53
49
|
setActivePreset(PresetName.minimal, { FIELD_ELEMENTS_PER_BLOB: 4096 });
|
|
54
50
|
}
|
|
55
51
|
if (presetFile) {
|
package/lib/applyPreset.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyPreset.js","sourceRoot":"","sources":["../src/applyPreset.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAEhF,
|
|
1
|
+
{"version":3,"file":"applyPreset.js","sourceRoot":"","sources":["../src/applyPreset.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ export declare function beaconHandlerInit(args: BeaconArgs & GlobalArgs): Promis
|
|
|
20
20
|
network: string;
|
|
21
21
|
version: string;
|
|
22
22
|
commit: string;
|
|
23
|
-
|
|
23
|
+
privateKey: import("@libp2p/interface").PrivateKey;
|
|
24
24
|
logger: LoggerNode;
|
|
25
25
|
}>;
|
|
26
26
|
export declare function initLogger(args: LogArgs & Pick<GlobalArgs, "dataDir">, dataDir: string, config: ChainForkConfig, fileName?: string): LoggerNode;
|
|
@@ -13,7 +13,7 @@ import { onGracefulShutdown, mkdir, writeFile600Perm, cleanOldLogFiles, parseLog
|
|
|
13
13
|
import { getVersionData } from "../../util/version.js";
|
|
14
14
|
import { getBeaconPaths } from "./paths.js";
|
|
15
15
|
import { initBeaconState } from "./initBeaconState.js";
|
|
16
|
-
import {
|
|
16
|
+
import { initPrivateKeyAndEnr } from "./initPeerIdAndEnr.js";
|
|
17
17
|
const DEFAULT_RETENTION_SSZ_OBJECTS_HOURS = 15 * 24;
|
|
18
18
|
const HOURS_TO_MS = 3600 * 1000;
|
|
19
19
|
const EIGHT_GB = 8 * 1024 * 1024 * 1024;
|
|
@@ -21,7 +21,7 @@ const EIGHT_GB = 8 * 1024 * 1024 * 1024;
|
|
|
21
21
|
* Runs a beacon node.
|
|
22
22
|
*/
|
|
23
23
|
export async function beaconHandler(args) {
|
|
24
|
-
const { config, options, beaconPaths, network, version, commit,
|
|
24
|
+
const { config, options, beaconPaths, network, version, commit, privateKey, logger } = await beaconHandlerInit(args);
|
|
25
25
|
const heapSizeLimit = getHeapStatistics().heap_size_limit;
|
|
26
26
|
if (heapSizeLimit < EIGHT_GB) {
|
|
27
27
|
logger.warn(`Node.js heap size limit is too low, consider increasing it to at least ${EIGHT_GB}. See https://chainsafe.github.io/lodestar/faqs/#running-a-beacon-node for more details.`);
|
|
@@ -52,7 +52,7 @@ export async function beaconHandler(args) {
|
|
|
52
52
|
db,
|
|
53
53
|
logger,
|
|
54
54
|
processShutdownCallback,
|
|
55
|
-
|
|
55
|
+
privateKey,
|
|
56
56
|
peerStoreDir: beaconPaths.peerStoreDir,
|
|
57
57
|
anchorState,
|
|
58
58
|
wsCheckpoint,
|
|
@@ -120,7 +120,6 @@ export async function beaconHandler(args) {
|
|
|
120
120
|
}
|
|
121
121
|
}
|
|
122
122
|
/** Separate function to simplify unit testing of options merging */
|
|
123
|
-
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
|
|
124
123
|
export async function beaconHandlerInit(args) {
|
|
125
124
|
const { config, network } = getBeaconConfigFromArgs(args);
|
|
126
125
|
const beaconNodeOptions = new BeaconNodeOptions(parseBeaconNodeArgs(args));
|
|
@@ -134,19 +133,21 @@ export async function beaconHandlerInit(args) {
|
|
|
134
133
|
beaconNodeOptions.set({ metrics: { validatorMonitorLogs: args.validatorMonitorLogs } });
|
|
135
134
|
// Add detailed version string for API node/version endpoint
|
|
136
135
|
beaconNodeOptions.set({ api: { commit, version } });
|
|
137
|
-
// Combine bootnodes from different sources
|
|
138
|
-
const bootnodes = (beaconNodeOptions.get().network?.discv5?.bootEnrs ?? []).concat(args.bootnodesFile ? readBootnodes(args.bootnodesFile) : [], isKnownNetworkName(network) ? await getNetworkBootnodes(network) : []);
|
|
139
|
-
// Deduplicate and set combined bootnodes
|
|
140
|
-
beaconNodeOptions.set({ network: { discv5: { bootEnrs: [...new Set(bootnodes)] } } });
|
|
141
136
|
// Set known depositContractDeployBlock
|
|
142
137
|
if (isKnownNetworkName(network)) {
|
|
143
138
|
const { depositContractDeployBlock } = getNetworkData(network);
|
|
144
139
|
beaconNodeOptions.set({ eth1: { depositContractDeployBlock } });
|
|
145
140
|
}
|
|
146
141
|
const logger = initLogger(args, beaconPaths.dataDir, config);
|
|
147
|
-
const {
|
|
148
|
-
|
|
149
|
-
|
|
142
|
+
const { privateKey, enr } = await initPrivateKeyAndEnr(args, beaconPaths.beaconDir, logger);
|
|
143
|
+
if (args.discv5 !== false) {
|
|
144
|
+
// Inject ENR to beacon options
|
|
145
|
+
beaconNodeOptions.set({ network: { discv5: { enr: enr.encodeTxt(), config: { enrUpdate: !enr.ip && !enr.ip6 } } } });
|
|
146
|
+
// Combine bootnodes from different sources
|
|
147
|
+
const bootnodes = (beaconNodeOptions.get().network?.discv5?.bootEnrs ?? []).concat(args.bootnodesFile ? readBootnodes(args.bootnodesFile) : [], isKnownNetworkName(network) ? await getNetworkBootnodes(network) : []);
|
|
148
|
+
// Deduplicate and set combined bootnodes
|
|
149
|
+
beaconNodeOptions.set({ network: { discv5: { bootEnrs: [...new Set(bootnodes)] } } });
|
|
150
|
+
}
|
|
150
151
|
if (args.disableLightClientServer) {
|
|
151
152
|
beaconNodeOptions.set({ chain: { disableLightClientServer: true } });
|
|
152
153
|
}
|
|
@@ -167,7 +168,7 @@ export async function beaconHandlerInit(args) {
|
|
|
167
168
|
}
|
|
168
169
|
// Render final options
|
|
169
170
|
const options = beaconNodeOptions.getWithDefaults();
|
|
170
|
-
return { config, options, beaconPaths, network, version, commit,
|
|
171
|
+
return { config, options, beaconPaths, network, version, commit, privateKey, logger };
|
|
171
172
|
}
|
|
172
173
|
export function initLogger(args, dataDir, config, fileName = "beacon.log") {
|
|
173
174
|
const defaultLogFilepath = path.join(dataDir, fileName);
|
|
@@ -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;AAC1C,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAkB,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAC,aAAa,EAAE,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAa,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAEhE,OAAO,EAAa,mBAAmB,EAAC,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAC,iBAAiB,EAAE,uBAAuB,EAAC,MAAM,uBAAuB,CAAC;AACjF,OAAO,EAAC,mBAAmB,EAAE,cAAc,EAAE,kBAAkB,EAAE,aAAa,EAAC,MAAM,yBAAyB,CAAC;AAC/G,OAAO,EACL,kBAAkB,EAClB,KAAK,EACL,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AAGrD,OAAO,EAAC,cAAc,EAAC,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/cmds/beacon/handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -103,32 +103,28 @@ export async function initBeaconState(options, args, chainForkConfig, db, logger
|
|
|
103
103
|
ignoreWeakSubjectivityCheck: args.ignoreWeakSubjectivityCheck,
|
|
104
104
|
}, chainForkConfig, db, logger);
|
|
105
105
|
}
|
|
106
|
-
|
|
106
|
+
if (args.checkpointSyncUrl) {
|
|
107
107
|
return fetchWSStateFromBeaconApi(lastDbStateWithBytes, lastDbValidatorsBytes, {
|
|
108
108
|
checkpointSyncUrl: args.checkpointSyncUrl,
|
|
109
109
|
wssCheckpoint: args.wssCheckpoint,
|
|
110
110
|
ignoreWeakSubjectivityCheck: args.ignoreWeakSubjectivityCheck,
|
|
111
111
|
}, chainForkConfig, db, logger);
|
|
112
112
|
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
return { anchorState };
|
|
125
|
-
}
|
|
126
|
-
else {
|
|
127
|
-
// Only place we will not bother checking isWithinWeakSubjectivityPeriod as forceGenesis passed by user
|
|
128
|
-
const anchorState = await initStateFromEth1({ config: chainForkConfig, db, logger, opts: options.eth1, signal });
|
|
129
|
-
return { anchorState };
|
|
130
|
-
}
|
|
113
|
+
const genesisStateFile = args.genesisStateFile || getGenesisFileUrl(args.network || defaultNetwork);
|
|
114
|
+
if (genesisStateFile && !args.forceGenesis) {
|
|
115
|
+
const stateBytes = await downloadOrLoadFile(genesisStateFile);
|
|
116
|
+
const anchorState = getStateTypeFromBytes(chainForkConfig, stateBytes).deserializeToViewDU(stateBytes);
|
|
117
|
+
const config = createBeaconConfig(chainForkConfig, anchorState.genesisValidatorsRoot);
|
|
118
|
+
const wssCheck = isWithinWeakSubjectivityPeriod(config, anchorState, getCheckpointFromState(anchorState));
|
|
119
|
+
await checkAndPersistAnchorState(config, db, logger, anchorState, stateBytes, {
|
|
120
|
+
isWithinWeakSubjectivityPeriod: wssCheck,
|
|
121
|
+
isCheckpointState: true,
|
|
122
|
+
});
|
|
123
|
+
return { anchorState };
|
|
131
124
|
}
|
|
125
|
+
// Only place we will not bother checking isWithinWeakSubjectivityPeriod as forceGenesis passed by user
|
|
126
|
+
const anchorState = await initStateFromEth1({ config: chainForkConfig, db, logger, opts: options.eth1, signal });
|
|
127
|
+
return { anchorState };
|
|
132
128
|
}
|
|
133
129
|
async function readWSState(lastDbStateBytes, lastDbValidatorsBytes, wssOpts, chainForkConfig, db, logger) {
|
|
134
130
|
// weak subjectivity sync from a provided state file:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initBeaconState.js","sourceRoot":"","sources":["../../../src/cmds/beacon/initBeaconState.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"initBeaconState.js","sourceRoot":"","sources":["../../../src/cmds/beacon/initBeaconState.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { PrivateKey } from "@libp2p/interface";
|
|
2
2
|
import { Multiaddr } from "@multiformats/multiaddr";
|
|
3
3
|
import { SignableENR } from "@chainsafe/enr";
|
|
4
4
|
import { Logger } from "@lodestar/utils";
|
|
@@ -14,8 +14,8 @@ export declare function overwriteEnrWithCliArgs(enr: SignableENR, args: BeaconAr
|
|
|
14
14
|
/**
|
|
15
15
|
* Create new PeerId and ENR by default, unless persistNetworkIdentity is provided
|
|
16
16
|
*/
|
|
17
|
-
export declare function
|
|
18
|
-
|
|
17
|
+
export declare function initPrivateKeyAndEnr(args: BeaconArgs, beaconDir: string, logger: Logger, bootnode?: boolean): Promise<{
|
|
18
|
+
privateKey: PrivateKey;
|
|
19
19
|
enr: SignableENR;
|
|
20
20
|
}>;
|
|
21
21
|
//# sourceMappingURL=initPeerIdAndEnr.d.ts.map
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import os from "node:os";
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import { exportToJSON,
|
|
4
|
+
import { SignableENR } from "@chainsafe/enr";
|
|
5
|
+
import { generateKeyPair } from "@libp2p/crypto/keys";
|
|
6
|
+
import { exportToJSON, readPrivateKey } from "../../config/index.js";
|
|
7
7
|
import { writeFile600Perm } from "../../util/file.js";
|
|
8
8
|
import { parseListenArgs } from "../../options/beaconNodeOptions/network.js";
|
|
9
9
|
/**
|
|
@@ -101,61 +101,60 @@ export function overwriteEnrWithCliArgs(enr, args, logger, opts) {
|
|
|
101
101
|
enr.seq = preSeq + BigInt(1);
|
|
102
102
|
}
|
|
103
103
|
// invalidate cached signature
|
|
104
|
+
// biome-ignore lint/complexity/useLiteralKeys: `_signature` is a private attribute
|
|
104
105
|
delete enr["_signature"];
|
|
105
106
|
}
|
|
106
107
|
}
|
|
107
108
|
/**
|
|
108
109
|
* Create new PeerId and ENR by default, unless persistNetworkIdentity is provided
|
|
109
110
|
*/
|
|
110
|
-
export async function
|
|
111
|
+
export async function initPrivateKeyAndEnr(args, beaconDir, logger, bootnode) {
|
|
111
112
|
const { persistNetworkIdentity } = args;
|
|
112
|
-
const
|
|
113
|
-
const
|
|
114
|
-
const enr = SignableENR.
|
|
115
|
-
return {
|
|
113
|
+
const newPrivateKeyAndENR = async () => {
|
|
114
|
+
const privateKey = await generateKeyPair("secp256k1");
|
|
115
|
+
const enr = SignableENR.createFromPrivateKey(privateKey);
|
|
116
|
+
return { privateKey, enr };
|
|
116
117
|
};
|
|
117
|
-
const
|
|
118
|
-
let
|
|
118
|
+
const readPersistedPrivateKeyAndENR = async (peerIdFile, enrFile) => {
|
|
119
|
+
let privateKey;
|
|
119
120
|
let enr;
|
|
120
121
|
// attempt to read stored peer id
|
|
121
122
|
try {
|
|
122
|
-
|
|
123
|
+
privateKey = readPrivateKey(peerIdFile);
|
|
123
124
|
}
|
|
124
|
-
catch (
|
|
125
|
+
catch (_e) {
|
|
125
126
|
logger.warn("Unable to read peerIdFile, creating a new peer id");
|
|
126
|
-
return { ...(await
|
|
127
|
+
return { ...(await newPrivateKeyAndENR()), newEnr: true };
|
|
127
128
|
}
|
|
128
129
|
// attempt to read stored enr
|
|
129
130
|
try {
|
|
130
|
-
enr = SignableENR.decodeTxt(fs.readFileSync(enrFile, "utf-8"),
|
|
131
|
+
enr = SignableENR.decodeTxt(fs.readFileSync(enrFile, "utf-8"), privateKey.raw);
|
|
131
132
|
}
|
|
132
|
-
catch (
|
|
133
|
+
catch (_e) {
|
|
133
134
|
logger.warn("Unable to decode stored local ENR, creating a new ENR");
|
|
134
|
-
enr = SignableENR.
|
|
135
|
-
return {
|
|
135
|
+
enr = SignableENR.createFromPrivateKey(privateKey);
|
|
136
|
+
return { privateKey, enr, newEnr: true };
|
|
136
137
|
}
|
|
137
138
|
// check stored peer id against stored enr
|
|
138
|
-
if (!
|
|
139
|
+
if (!privateKey.equals(enr.peerId)) {
|
|
139
140
|
logger.warn("Stored local ENR doesn't match peerIdFile, creating a new ENR");
|
|
140
|
-
enr = SignableENR.
|
|
141
|
-
return {
|
|
141
|
+
enr = SignableENR.createFromPrivateKey(privateKey);
|
|
142
|
+
return { privateKey, enr, newEnr: true };
|
|
142
143
|
}
|
|
143
|
-
return {
|
|
144
|
+
return { privateKey, enr, newEnr: false };
|
|
144
145
|
};
|
|
145
146
|
if (persistNetworkIdentity) {
|
|
146
147
|
const enrFile = path.join(beaconDir, "enr");
|
|
147
148
|
const peerIdFile = path.join(beaconDir, "peer-id.json");
|
|
148
|
-
const {
|
|
149
|
+
const { privateKey, enr, newEnr } = await readPersistedPrivateKeyAndENR(peerIdFile, enrFile);
|
|
149
150
|
overwriteEnrWithCliArgs(enr, args, logger, { newEnr, bootnode });
|
|
150
151
|
// Re-persist peer-id and enr
|
|
151
|
-
writeFile600Perm(peerIdFile, exportToJSON(
|
|
152
|
+
writeFile600Perm(peerIdFile, exportToJSON(privateKey));
|
|
152
153
|
writeFile600Perm(enrFile, enr.encodeTxt());
|
|
153
|
-
return {
|
|
154
|
-
}
|
|
155
|
-
else {
|
|
156
|
-
const { peerId, enr } = await newPeerIdAndENR();
|
|
157
|
-
overwriteEnrWithCliArgs(enr, args, logger, { newEnr: true, bootnode });
|
|
158
|
-
return { peerId, enr };
|
|
154
|
+
return { privateKey, enr };
|
|
159
155
|
}
|
|
156
|
+
const { privateKey, enr } = await newPrivateKeyAndENR();
|
|
157
|
+
overwriteEnrWithCliArgs(enr, args, logger, { newEnr: true, bootnode });
|
|
158
|
+
return { privateKey, enr };
|
|
160
159
|
}
|
|
161
160
|
//# sourceMappingURL=initPeerIdAndEnr.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initPeerIdAndEnr.js","sourceRoot":"","sources":["../../../src/cmds/beacon/initPeerIdAndEnr.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"initPeerIdAndEnr.js","sourceRoot":"","sources":["../../../src/cmds/beacon/initPeerIdAndEnr.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export declare function bootnodeHandlerInit(args: BootnodeArgs & GlobalArgs): Pr
|
|
|
12
12
|
network: string;
|
|
13
13
|
version: string;
|
|
14
14
|
commit: string;
|
|
15
|
-
|
|
15
|
+
privateKey: import("@libp2p/interface").PrivateKey;
|
|
16
16
|
enr: import("@chainsafe/enr").SignableENR;
|
|
17
17
|
logger: import("@lodestar/logger/lib/node.js").LoggerNode;
|
|
18
18
|
}>;
|
|
@@ -8,7 +8,7 @@ import { getBeaconConfigFromArgs } from "../../config/index.js";
|
|
|
8
8
|
import { getNetworkBootnodes, isKnownNetworkName, readBootnodes } from "../../networks/index.js";
|
|
9
9
|
import { onGracefulShutdown, mkdir, writeFile600Perm } from "../../util/index.js";
|
|
10
10
|
import { getVersionData } from "../../util/version.js";
|
|
11
|
-
import {
|
|
11
|
+
import { initPrivateKeyAndEnr } from "../beacon/initPeerIdAndEnr.js";
|
|
12
12
|
import { parseArgs as parseMetricsArgs } from "../../options/beaconNodeOptions/metrics.js";
|
|
13
13
|
import { parseArgs as parseNetworkArgs } from "../../options/beaconNodeOptions/network.js";
|
|
14
14
|
import { getBeaconPaths } from "../beacon/paths.js";
|
|
@@ -17,7 +17,7 @@ import { initLogger } from "../beacon/handler.js";
|
|
|
17
17
|
* Runs a bootnode.
|
|
18
18
|
*/
|
|
19
19
|
export async function bootnodeHandler(args) {
|
|
20
|
-
const { discv5Args, metricsArgs, bootnodeDir, network, version, commit,
|
|
20
|
+
const { discv5Args, metricsArgs, bootnodeDir, network, version, commit, privateKey, enr, logger } = await bootnodeHandlerInit(args);
|
|
21
21
|
const abortController = new AbortController();
|
|
22
22
|
const bindAddrs = discv5Args.bindAddrs;
|
|
23
23
|
logger.info("Lodestar Bootnode", { network, version, commit });
|
|
@@ -26,7 +26,7 @@ export async function bootnodeHandler(args) {
|
|
|
26
26
|
ip4: enr.getLocationMultiaddr("udp4")?.toString(),
|
|
27
27
|
ip6: enr.getLocationMultiaddr("udp6")?.toString(),
|
|
28
28
|
});
|
|
29
|
-
logger.info("Identity", { peerId: peerId.toString(), nodeId: enr.nodeId });
|
|
29
|
+
logger.info("Identity", { peerId: enr.peerId.toString(), nodeId: enr.nodeId });
|
|
30
30
|
logger.info("ENR", { enr: enr.encodeTxt() });
|
|
31
31
|
// bootnode setup
|
|
32
32
|
try {
|
|
@@ -43,7 +43,7 @@ export async function bootnodeHandler(args) {
|
|
|
43
43
|
}
|
|
44
44
|
const discv5 = Discv5.create({
|
|
45
45
|
enr,
|
|
46
|
-
|
|
46
|
+
privateKey,
|
|
47
47
|
bindAddrs: {
|
|
48
48
|
ip4: (bindAddrs.ip4 ? multiaddr(bindAddrs.ip4) : undefined),
|
|
49
49
|
ip6: bindAddrs.ip6 ? multiaddr(bindAddrs.ip6) : undefined,
|
|
@@ -57,7 +57,7 @@ export async function bootnodeHandler(args) {
|
|
|
57
57
|
logger.info("Adding bootnode", {
|
|
58
58
|
ip4: bootEnr.getLocationMultiaddr("udp4")?.toString(),
|
|
59
59
|
ip6: bootEnr.getLocationMultiaddr("udp6")?.toString(),
|
|
60
|
-
peerId:
|
|
60
|
+
peerId: bootEnr.peerId.toString(),
|
|
61
61
|
nodeId: enr.nodeId,
|
|
62
62
|
});
|
|
63
63
|
discv5.addEnr(bootEnr);
|
|
@@ -140,7 +140,6 @@ export async function bootnodeHandler(args) {
|
|
|
140
140
|
}
|
|
141
141
|
}
|
|
142
142
|
/** Separate function to simplify unit testing of options merging */
|
|
143
|
-
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
|
|
144
143
|
export async function bootnodeHandlerInit(args) {
|
|
145
144
|
const { config, network } = getBeaconConfigFromArgs(args);
|
|
146
145
|
const { version, commit } = getVersionData();
|
|
@@ -159,7 +158,7 @@ export async function bootnodeHandlerInit(args) {
|
|
|
159
158
|
// Fetch extra bootnodes
|
|
160
159
|
discv5Args.bootEnrs = (discv5Args.bootEnrs ?? []).concat(args.bootnodesFile ? readBootnodes(args.bootnodesFile) : [], isKnownNetworkName(network) ? await getNetworkBootnodes(network) : []);
|
|
161
160
|
const logger = initLogger(args, beaconPaths.dataDir, config, "bootnode.log");
|
|
162
|
-
const {
|
|
163
|
-
return { discv5Args, metricsArgs, bootnodeDir, network, version, commit,
|
|
161
|
+
const { privateKey, enr } = await initPrivateKeyAndEnr(args, bootnodeDir, logger, true);
|
|
162
|
+
return { discv5Args, metricsArgs, bootnodeDir, network, version, commit, privateKey, enr, logger };
|
|
164
163
|
}
|
|
165
164
|
//# sourceMappingURL=handler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/cmds/bootnode/handler.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAY,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAC,GAAG,EAAC,MAAM,gBAAgB,CAAC;AACnC,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAoB,qBAAqB,EAAE,oBAAoB,EAAC,MAAM,uBAAuB,CAAC;AAGrG,OAAO,EAAC,uBAAuB,EAAC,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAC,mBAAmB,EAAE,kBAAkB,EAAE,aAAa,EAAC,MAAM,yBAAyB,CAAC;AAC/F,OAAO,EAAC,kBAAkB,EAAE,KAAK,EAAE,gBAAgB,EAAC,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/cmds/bootnode/handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,7 @@ export const bootnodeExtraOptions = {
|
|
|
34
34
|
// Each bootnode entry could be comma separated, just deserialize it into a single array
|
|
35
35
|
// as comma separated entries are generally most friendly in ansible kind of setups, i.e.
|
|
36
36
|
// [ "en1", "en2,en3" ] => [ 'en1', 'en2', 'en3' ]
|
|
37
|
-
coerce: (args) => args.
|
|
37
|
+
coerce: (args) => args.flatMap((item) => item.split(",")),
|
|
38
38
|
group: "network",
|
|
39
39
|
},
|
|
40
40
|
bootnodesFile: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/cmds/bootnode/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,UAAU,EAAC,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAc,OAAO,IAAI,cAAc,EAAC,MAAM,4CAA4C,CAAC;AAClG,OAAO,EAAC,oBAAoB,EAAE,cAAc,EAAE,eAAe,EAAC,MAAM,4CAA4C,CAAC;AAiBjH,MAAM,CAAC,MAAM,oBAAoB,GAAyC;IACxE,aAAa,EAAE;QACb,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,mDAAmD;QAChE,kBAAkB,EAAE,oBAAoB;QACxC,KAAK,EAAE,SAAS;KACjB;IAED,IAAI,EAAE;QACJ,KAAK,EAAE,eAAe;QACtB,WAAW,EAAE,2BAA2B;QACxC,IAAI,EAAE,QAAQ;QACd,kBAAkB,EAAE,MAAM,CAAC,cAAc,CAAC;QAC1C,KAAK,EAAE,SAAS;KACjB;IAED,cAAc,EAAE;QACd,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,mDAAmD;QAChE,KAAK,EAAE,SAAS;KACjB;IAED,KAAK,EAAE;QACL,KAAK,EAAE,gBAAgB;QACvB,WAAW,EAAE,2BAA2B;QACxC,IAAI,EAAE,QAAQ;QACd,kBAAkB,EAAE,MAAM,CAAC,eAAe,CAAC;QAC3C,KAAK,EAAE,SAAS;KACjB;IAED,SAAS,EAAE;QACT,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,2CAA2C;QACxD,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QACtC,wFAAwF;QACxF,yFAAyF;QACzF,kDAAkD;QAClD,MAAM,EAAE,CAAC,IAAc,EAAE,EAAE,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/cmds/bootnode/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,UAAU,EAAC,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAc,OAAO,IAAI,cAAc,EAAC,MAAM,4CAA4C,CAAC;AAClG,OAAO,EAAC,oBAAoB,EAAE,cAAc,EAAE,eAAe,EAAC,MAAM,4CAA4C,CAAC;AAiBjH,MAAM,CAAC,MAAM,oBAAoB,GAAyC;IACxE,aAAa,EAAE;QACb,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,mDAAmD;QAChE,kBAAkB,EAAE,oBAAoB;QACxC,KAAK,EAAE,SAAS;KACjB;IAED,IAAI,EAAE;QACJ,KAAK,EAAE,eAAe;QACtB,WAAW,EAAE,2BAA2B;QACxC,IAAI,EAAE,QAAQ;QACd,kBAAkB,EAAE,MAAM,CAAC,cAAc,CAAC;QAC1C,KAAK,EAAE,SAAS;KACjB;IAED,cAAc,EAAE;QACd,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,mDAAmD;QAChE,KAAK,EAAE,SAAS;KACjB;IAED,KAAK,EAAE;QACL,KAAK,EAAE,gBAAgB;QACvB,WAAW,EAAE,2BAA2B;QACxC,IAAI,EAAE,QAAQ;QACd,kBAAkB,EAAE,MAAM,CAAC,eAAe,CAAC;QAC3C,KAAK,EAAE,SAAS;KACjB;IAED,SAAS,EAAE;QACT,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,2CAA2C;QACxD,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QACtC,wFAAwF;QACxF,yFAAyF;QACzF,kDAAkD;QAClD,MAAM,EAAE,CAAC,IAAc,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnE,KAAK,EAAE,SAAS;KACjB;IAED,aAAa,EAAE;QACb,WAAW,EAAE,qDAAqD;QAClE,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,SAAS;KACjB;IAED,sBAAsB,EAAE;QACtB,WAAW,EAAE,mDAAmD;QAChE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,SAAS;KACjB;IAED,QAAQ,EAAE;QACR,WAAW,EAAE,uBAAuB;QACpC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,KAAK;KACb;IACD,SAAS,EAAE;QACT,WAAW,EAAE,wBAAwB;QACrC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,KAAK;KACb;IACD,SAAS,EAAE;QACT,WAAW,EAAE,yBAAyB;QACtC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,KAAK;KACb;IACD,UAAU,EAAE;QACV,WAAW,EAAE,wCAAwC;QACrD,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,KAAK;KACb;IACD,GAAG,EAAE;QACH,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,gDAAgD;QAC7D,KAAK,EAAE,KAAK;KACb;CACF,CAAC;AAIF,MAAM,CAAC,MAAM,eAAe,GAAuC;IACjE,GAAG,oBAAoB;IACvB,GAAG,UAAU;IACb,GAAG,cAAc;CAClB,CAAC"}
|
|
@@ -37,7 +37,6 @@ export declare const devOptions: {
|
|
|
37
37
|
"builder.timeout"?: CliOptionDefinition<any> | undefined;
|
|
38
38
|
"builder.faultInspectionWindow"?: CliOptionDefinition<any> | undefined;
|
|
39
39
|
"builder.allowedFaults"?: CliOptionDefinition<any> | undefined;
|
|
40
|
-
suggestedFeeRecipient: CliOptionDefinition<string | undefined>;
|
|
41
40
|
"chain.blsVerifyAllMultiThread"?: CliOptionDefinition<any> | undefined;
|
|
42
41
|
"chain.blsVerifyAllMainThread"?: CliOptionDefinition<any> | undefined;
|
|
43
42
|
"chain.disableBlsBatchVerify"?: CliOptionDefinition<any> | undefined;
|
|
@@ -54,8 +53,6 @@ export declare const devOptions: {
|
|
|
54
53
|
"chain.trustedSetup"?: CliOptionDefinition<any> | undefined;
|
|
55
54
|
"safe-slots-to-import-optimistically"?: CliOptionDefinition<any> | undefined;
|
|
56
55
|
"chain.archiveStateEpochFrequency"?: CliOptionDefinition<any> | undefined;
|
|
57
|
-
emitPayloadAttributes?: CliOptionDefinition<any> | undefined;
|
|
58
|
-
broadcastValidationStrictness?: CliOptionDefinition<any> | undefined;
|
|
59
56
|
"chain.minSameMessageSignatureSetsToBatch"?: CliOptionDefinition<any> | undefined;
|
|
60
57
|
"chain.maxShufflingCacheEpochs"?: CliOptionDefinition<any> | undefined;
|
|
61
58
|
"chain.archiveBlobEpochs"?: CliOptionDefinition<any> | undefined;
|
|
@@ -63,6 +60,9 @@ export declare const devOptions: {
|
|
|
63
60
|
"chain.nHistoricalStatesFileDataStore"?: CliOptionDefinition<any> | undefined;
|
|
64
61
|
"chain.maxBlockStates"?: CliOptionDefinition<any> | undefined;
|
|
65
62
|
"chain.maxCPStateEpochsInMemory"?: CliOptionDefinition<any> | undefined;
|
|
63
|
+
suggestedFeeRecipient: CliOptionDefinition<string | undefined>;
|
|
64
|
+
broadcastValidationStrictness?: CliOptionDefinition<any> | undefined;
|
|
65
|
+
emitPayloadAttributes?: CliOptionDefinition<any> | undefined;
|
|
66
66
|
"execution.engineMock"?: CliOptionDefinition<any> | undefined;
|
|
67
67
|
jwtId?: CliOptionDefinition<any> | undefined;
|
|
68
68
|
"execution.urls"?: CliOptionDefinition<any> | undefined;
|
|
@@ -88,13 +88,7 @@ export declare const devOptions: {
|
|
|
88
88
|
listenAddress6?: CliOptionDefinition<any> | undefined;
|
|
89
89
|
port6?: CliOptionDefinition<any> | undefined;
|
|
90
90
|
discoveryPort6?: CliOptionDefinition<any> | undefined;
|
|
91
|
-
targetPeers?: CliOptionDefinition<any> | undefined;
|
|
92
91
|
"network.maxPeers"?: CliOptionDefinition<any> | undefined;
|
|
93
|
-
discv5?: CliOptionDefinition<any> | undefined;
|
|
94
|
-
bootnodes?: CliOptionDefinition<any> | undefined;
|
|
95
|
-
subscribeAllSubnets?: CliOptionDefinition<any> | undefined;
|
|
96
|
-
slotsToSubscribeBeforeAggregatorDuty?: CliOptionDefinition<any> | undefined;
|
|
97
|
-
disablePeerScoring?: CliOptionDefinition<any> | undefined;
|
|
98
92
|
"network.connectToDiscv5Bootnodes"?: CliOptionDefinition<any> | undefined;
|
|
99
93
|
"network.discv5FirstQueryDelayMs"?: CliOptionDefinition<any> | undefined;
|
|
100
94
|
"network.dontSendGossipAttestationsToForkchoice"?: CliOptionDefinition<any> | undefined;
|
|
@@ -104,11 +98,17 @@ export declare const devOptions: {
|
|
|
104
98
|
"network.gossipsubDHigh"?: CliOptionDefinition<any> | undefined;
|
|
105
99
|
"network.gossipsubAwaitHandler"?: CliOptionDefinition<any> | undefined;
|
|
106
100
|
"network.disableFloodPublish"?: CliOptionDefinition<any> | undefined;
|
|
107
|
-
mdns?: CliOptionDefinition<any> | undefined;
|
|
108
101
|
"network.rateLimitMultiplier"?: CliOptionDefinition<any> | undefined;
|
|
109
102
|
"network.maxGossipTopicConcurrency"?: CliOptionDefinition<any> | undefined;
|
|
110
103
|
"network.useWorker"?: CliOptionDefinition<any> | undefined;
|
|
111
104
|
"network.maxYoungGenerationSizeMb"?: CliOptionDefinition<any> | undefined;
|
|
105
|
+
discv5?: CliOptionDefinition<any> | undefined;
|
|
106
|
+
bootnodes?: CliOptionDefinition<any> | undefined;
|
|
107
|
+
targetPeers?: CliOptionDefinition<any> | undefined;
|
|
108
|
+
subscribeAllSubnets?: CliOptionDefinition<any> | undefined;
|
|
109
|
+
slotsToSubscribeBeforeAggregatorDuty?: CliOptionDefinition<any> | undefined;
|
|
110
|
+
disablePeerScoring?: CliOptionDefinition<any> | undefined;
|
|
111
|
+
mdns?: CliOptionDefinition<any> | undefined;
|
|
112
112
|
"network.requestCountPeerLimit"?: CliOptionDefinition<any> | undefined;
|
|
113
113
|
"network.blockCountTotalLimit"?: CliOptionDefinition<any> | undefined;
|
|
114
114
|
"network.blockCountPeerLimit"?: CliOptionDefinition<any> | undefined;
|
package/lib/cmds/dev/options.js
CHANGED
|
@@ -62,12 +62,12 @@ const externalOptionsOverrides = {
|
|
|
62
62
|
default: true,
|
|
63
63
|
},
|
|
64
64
|
eth1: {
|
|
65
|
-
...beaconNodeOptions
|
|
65
|
+
...beaconNodeOptions.eth1,
|
|
66
66
|
defaultDescription: undefined,
|
|
67
67
|
default: false,
|
|
68
68
|
},
|
|
69
69
|
rest: {
|
|
70
|
-
...beaconNodeOptions
|
|
70
|
+
...beaconNodeOptions.rest,
|
|
71
71
|
defaultDescription: undefined,
|
|
72
72
|
default: true,
|
|
73
73
|
},
|