@chainsafe/lodestar 1.46.0-dev.d96240a05e → 1.46.0-dev.de5f89eae1
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/bin/lodestar.ts +1 -1
- package/lib/applyPreset.js.map +1 -1
- package/lib/cli.js.map +1 -1
- package/lib/cmds/beacon/handler.d.ts +1 -1
- package/lib/cmds/beacon/handler.js.map +1 -1
- package/lib/cmds/beacon/initBeaconState.js.map +1 -1
- package/lib/cmds/beacon/initPeerIdAndEnr.js.map +1 -1
- package/lib/cmds/beacon/paths.d.ts +1 -1
- package/lib/cmds/beacon/paths.d.ts.map +1 -1
- package/lib/cmds/beacon/paths.js.map +1 -1
- package/lib/cmds/bootnode/handler.js.map +1 -1
- package/lib/cmds/builder/handler.d.ts +4 -0
- package/lib/cmds/builder/handler.d.ts.map +1 -0
- package/lib/cmds/builder/handler.js +38 -0
- package/lib/cmds/builder/handler.js.map +1 -0
- package/lib/cmds/builder/index.d.ts +5 -0
- package/lib/cmds/builder/index.d.ts.map +1 -0
- package/lib/cmds/builder/index.js +18 -0
- package/lib/cmds/builder/index.js.map +1 -0
- package/lib/cmds/builder/loadKeypair.d.ts +3 -0
- package/lib/cmds/builder/loadKeypair.d.ts.map +1 -0
- package/lib/cmds/builder/loadKeypair.js +22 -0
- package/lib/cmds/builder/loadKeypair.js.map +1 -0
- package/lib/cmds/builder/options.d.ts +10 -0
- package/lib/cmds/builder/options.d.ts.map +1 -0
- package/lib/cmds/builder/options.js +25 -0
- package/lib/cmds/builder/options.js.map +1 -0
- package/lib/cmds/dev/files.js.map +1 -1
- package/lib/cmds/dev/handler.js.map +1 -1
- package/lib/cmds/dev/options.d.ts +1 -0
- package/lib/cmds/dev/options.d.ts.map +1 -1
- package/lib/cmds/index.d.ts.map +1 -1
- package/lib/cmds/index.js +2 -0
- package/lib/cmds/index.js.map +1 -1
- package/lib/cmds/validator/blsToExecutionChange.js.map +1 -1
- package/lib/cmds/validator/handler.js.map +1 -1
- package/lib/cmds/validator/import.js.map +1 -1
- package/lib/cmds/validator/keymanager/decryptKeystoreDefinitions.js.map +1 -1
- package/lib/cmds/validator/keymanager/decryptKeystores/threadPool.js.map +1 -1
- package/lib/cmds/validator/keymanager/decryptKeystores/types.js.map +1 -1
- package/lib/cmds/validator/keymanager/decryptKeystores/worker.js.map +1 -1
- package/lib/cmds/validator/keymanager/impl.d.ts +3 -3
- package/lib/cmds/validator/keymanager/impl.d.ts.map +1 -1
- package/lib/cmds/validator/keymanager/impl.js.map +1 -1
- package/lib/cmds/validator/keymanager/keystoreCache.js.map +1 -1
- package/lib/cmds/validator/keymanager/persistedKeys.d.ts +2 -2
- package/lib/cmds/validator/keymanager/persistedKeys.d.ts.map +1 -1
- package/lib/cmds/validator/keymanager/persistedKeys.js.map +1 -1
- package/lib/cmds/validator/keymanager/server.js.map +1 -1
- package/lib/cmds/validator/list.js.map +1 -1
- package/lib/cmds/validator/options.d.ts.map +1 -1
- package/lib/cmds/validator/options.js.map +1 -1
- package/lib/cmds/validator/paths.js.map +1 -1
- package/lib/cmds/validator/signers/importExternalKeystores.js.map +1 -1
- package/lib/cmds/validator/signers/index.js.map +1 -1
- package/lib/cmds/validator/signers/logSigners.js.map +1 -1
- package/lib/cmds/validator/slashingProtection/export.js.map +1 -1
- package/lib/cmds/validator/slashingProtection/import.js.map +1 -1
- package/lib/cmds/validator/slashingProtection/utils.js.map +1 -1
- package/lib/cmds/validator/voluntaryExit.js.map +1 -1
- package/lib/config/beaconNodeOptions.js.map +1 -1
- package/lib/config/beaconParams.js.map +1 -1
- package/lib/config/peerId.js.map +1 -1
- package/lib/index.js.map +1 -1
- package/lib/networks/index.d.ts +1 -1
- package/lib/networks/index.d.ts.map +1 -1
- package/lib/networks/index.js.map +1 -1
- package/lib/options/beaconNodeOptions/api.js.map +1 -1
- 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/execution.js.map +1 -1
- package/lib/options/beaconNodeOptions/index.d.ts +1 -0
- package/lib/options/beaconNodeOptions/index.d.ts.map +1 -1
- package/lib/options/beaconNodeOptions/index.js.map +1 -1
- package/lib/options/beaconNodeOptions/metrics.js.map +1 -1
- package/lib/options/beaconNodeOptions/monitoring.js.map +1 -1
- package/lib/options/beaconNodeOptions/network.js.map +1 -1
- package/lib/options/beaconNodeOptions/sync.js.map +1 -1
- package/lib/options/paramsOptions.js.map +1 -1
- package/lib/paths/global.js.map +1 -1
- package/lib/paths/rootDir.js.map +1 -1
- package/lib/util/errors.js.map +1 -1
- package/lib/util/ethers.d.ts +1 -1
- package/lib/util/ethers.d.ts.map +1 -1
- package/lib/util/ethers.js.map +1 -1
- package/lib/util/feeRecipient.js.map +1 -1
- package/lib/util/file.js +1 -2
- package/lib/util/file.js.map +1 -1
- package/lib/util/format.js.map +1 -1
- package/lib/util/fs.js.map +1 -1
- package/lib/util/gitData/gitDataPath.js.map +1 -1
- package/lib/util/gitData/index.js.map +1 -1
- package/lib/util/jwt.js.map +1 -1
- package/lib/util/lockfile.js.map +1 -1
- package/lib/util/logger.js.map +1 -1
- package/lib/util/object.js.map +1 -1
- package/lib/util/passphrase.js.map +1 -1
- package/lib/util/process.js.map +1 -1
- package/lib/util/progress.d.ts +1 -1
- package/lib/util/progress.d.ts.map +1 -1
- package/lib/util/progress.js.map +1 -1
- package/lib/util/proposerConfig.js.map +1 -1
- package/lib/util/pruneOldFilesInDir.js.map +1 -1
- package/lib/util/sleep.js.map +1 -1
- package/lib/util/stripOffNewlines.js.map +1 -1
- package/lib/util/types.js.map +1 -1
- package/lib/util/version.js.map +1 -1
- package/package.json +18 -17
- package/src/cmds/builder/handler.ts +46 -0
- package/src/cmds/builder/index.ts +20 -0
- package/src/cmds/builder/loadKeypair.ts +32 -0
- package/src/cmds/builder/options.ts +37 -0
- package/src/cmds/index.ts +2 -0
- package/src/options/beaconNodeOptions/chain.ts +11 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@chainsafe/lodestar",
|
|
3
|
-
"version": "1.46.0-dev.
|
|
3
|
+
"version": "1.46.0-dev.de5f89eae1",
|
|
4
4
|
"description": "Command line interface for lodestar",
|
|
5
5
|
"author": "ChainSafe Systems",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"type": "module",
|
|
12
12
|
"exports": {
|
|
13
13
|
".": {
|
|
14
|
-
"
|
|
14
|
+
"typescript": "./src/index.ts",
|
|
15
15
|
"types": "./lib/index.d.ts",
|
|
16
16
|
"import": "./lib/index.js"
|
|
17
17
|
}
|
|
@@ -28,12 +28,12 @@
|
|
|
28
28
|
},
|
|
29
29
|
"scripts": {
|
|
30
30
|
"clean": "rm -rf lib && rm -f *.tsbuildinfo",
|
|
31
|
-
"build": "
|
|
31
|
+
"build": "tsc -p tsconfig.build.json && pnpm write-git-data",
|
|
32
32
|
"build:release": "pnpm clean && pnpm run build",
|
|
33
|
-
"build:watch": "
|
|
33
|
+
"build:watch": "tsc -p tsconfig.build.json --watch",
|
|
34
34
|
"write-git-data": "node lib/util/gitData/writeGitData.js",
|
|
35
35
|
"check-build": "node -e \"(async function() { await import('./lib/index.js') })()\" lodestar --help",
|
|
36
|
-
"check-types": "
|
|
36
|
+
"check-types": "tsc",
|
|
37
37
|
"docs:build": "node --import tsx ./docsgen/index.ts",
|
|
38
38
|
"lint": "biome check src/ test/",
|
|
39
39
|
"lint:fix": "pnpm run lint --write",
|
|
@@ -68,16 +68,17 @@
|
|
|
68
68
|
"@libp2p/crypto": "^5.1.13",
|
|
69
69
|
"@libp2p/interface": "^3.1.0",
|
|
70
70
|
"@libp2p/peer-id": "^6.0.4",
|
|
71
|
-
"@lodestar/api": "^1.46.0-dev.
|
|
72
|
-
"@lodestar/beacon-node": "^1.46.0-dev.
|
|
73
|
-
"@lodestar/
|
|
74
|
-
"@lodestar/
|
|
75
|
-
"@lodestar/
|
|
76
|
-
"@lodestar/
|
|
77
|
-
"@lodestar/
|
|
78
|
-
"@lodestar/
|
|
79
|
-
"@lodestar/
|
|
80
|
-
"@lodestar/
|
|
71
|
+
"@lodestar/api": "^1.46.0-dev.de5f89eae1",
|
|
72
|
+
"@lodestar/beacon-node": "^1.46.0-dev.de5f89eae1",
|
|
73
|
+
"@lodestar/builder": "^1.46.0-dev.de5f89eae1",
|
|
74
|
+
"@lodestar/config": "^1.46.0-dev.de5f89eae1",
|
|
75
|
+
"@lodestar/db": "^1.46.0-dev.de5f89eae1",
|
|
76
|
+
"@lodestar/logger": "^1.46.0-dev.de5f89eae1",
|
|
77
|
+
"@lodestar/params": "^1.46.0-dev.de5f89eae1",
|
|
78
|
+
"@lodestar/state-transition": "^1.46.0-dev.de5f89eae1",
|
|
79
|
+
"@lodestar/types": "^1.46.0-dev.de5f89eae1",
|
|
80
|
+
"@lodestar/utils": "^1.46.0-dev.de5f89eae1",
|
|
81
|
+
"@lodestar/validator": "^1.46.0-dev.de5f89eae1",
|
|
81
82
|
"@multiformats/multiaddr": "^13.0.1",
|
|
82
83
|
"deepmerge": "^4.3.1",
|
|
83
84
|
"ethers": "^6.7.0",
|
|
@@ -93,7 +94,7 @@
|
|
|
93
94
|
"devDependencies": {
|
|
94
95
|
"@chainsafe/as-sha256": "^1.2.4",
|
|
95
96
|
"@ethereumjs/rlp": "^4.0.1",
|
|
96
|
-
"@lodestar/test-utils": "^1.46.0-dev.
|
|
97
|
+
"@lodestar/test-utils": "^1.46.0-dev.de5f89eae1",
|
|
97
98
|
"@types/debug": "^4.1.7",
|
|
98
99
|
"@types/inquirer": "^9.0.3",
|
|
99
100
|
"@types/js-yaml": "^4.0.5",
|
|
@@ -107,5 +108,5 @@
|
|
|
107
108
|
"web3": "^4.0.3",
|
|
108
109
|
"web3-eth-accounts": "^4.0.3"
|
|
109
110
|
},
|
|
110
|
-
"gitHead": "
|
|
111
|
+
"gitHead": "be4f4cc1a397f425a67a91a73ee8751e57f690dc"
|
|
111
112
|
}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import path from "node:path";
|
|
2
|
+
import {getClient} from "@lodestar/api";
|
|
3
|
+
import {Builder} from "@lodestar/builder";
|
|
4
|
+
import {getNodeLogger} from "@lodestar/logger/node";
|
|
5
|
+
import {getBeaconConfigFromArgs} from "../../config/beaconParams.js";
|
|
6
|
+
import {GlobalArgs} from "../../options/index.js";
|
|
7
|
+
import {getGlobalPaths} from "../../paths/global.js";
|
|
8
|
+
import {cleanOldLogFiles, onGracefulShutdown, parseLoggerArgs} from "../../util/index.js";
|
|
9
|
+
import {loadBuilderKeypair} from "./loadKeypair.js";
|
|
10
|
+
import {IBuilderCliArgs} from "./options.js";
|
|
11
|
+
|
|
12
|
+
export async function builderHandler(args: IBuilderCliArgs & GlobalArgs): Promise<void> {
|
|
13
|
+
const {config, network} = getBeaconConfigFromArgs(args);
|
|
14
|
+
|
|
15
|
+
const globalPaths = getGlobalPaths(args, network);
|
|
16
|
+
const defaultLogFilepath = path.join(globalPaths.dataDir, "builder.log");
|
|
17
|
+
const logger = getNodeLogger(parseLoggerArgs(args, {defaultLogFilepath}, config));
|
|
18
|
+
|
|
19
|
+
try {
|
|
20
|
+
cleanOldLogFiles(args, {defaultLogFilepath});
|
|
21
|
+
} catch (e) {
|
|
22
|
+
logger.debug("Not able to delete log files", {}, e as Error);
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
const keypair = await loadBuilderKeypair(args.keystore, args.keystorePassword, args.builderPubkey);
|
|
26
|
+
|
|
27
|
+
const onGracefulShutdownCbs: (() => Promise<void> | void)[] = [];
|
|
28
|
+
onGracefulShutdown(async () => {
|
|
29
|
+
for (const cb of onGracefulShutdownCbs) await cb();
|
|
30
|
+
}, logger.info.bind(logger));
|
|
31
|
+
|
|
32
|
+
const abortController = new AbortController();
|
|
33
|
+
onGracefulShutdownCbs.push(async () => abortController.abort());
|
|
34
|
+
|
|
35
|
+
const api = getClient({urls: [args.beaconNodeUrl], globalInit: {signal: abortController.signal}}, {config, logger});
|
|
36
|
+
|
|
37
|
+
const builder = await Builder.init({
|
|
38
|
+
keypair,
|
|
39
|
+
logger,
|
|
40
|
+
config,
|
|
41
|
+
abortController,
|
|
42
|
+
api,
|
|
43
|
+
});
|
|
44
|
+
|
|
45
|
+
onGracefulShutdownCbs.push(() => builder.close());
|
|
46
|
+
}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import {CliCommand} from "@lodestar/utils";
|
|
2
|
+
import {GlobalArgs} from "../../options/index.js";
|
|
3
|
+
import {builderHandler} from "./handler.js";
|
|
4
|
+
import {IBuilderCliArgs, builderOptions} from "./options.js";
|
|
5
|
+
|
|
6
|
+
export const builder: CliCommand<IBuilderCliArgs, GlobalArgs> = {
|
|
7
|
+
command: "builder",
|
|
8
|
+
describe: "Run a builder client",
|
|
9
|
+
docsFolder: "run/builder-management",
|
|
10
|
+
examples: [
|
|
11
|
+
{
|
|
12
|
+
command: "builder",
|
|
13
|
+
title: "Base `builder` command",
|
|
14
|
+
description: "Run builder client",
|
|
15
|
+
},
|
|
16
|
+
],
|
|
17
|
+
options: builderOptions,
|
|
18
|
+
handler: builderHandler,
|
|
19
|
+
subcommands: [],
|
|
20
|
+
};
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import {Keystore} from "@chainsafe/bls-keystore";
|
|
3
|
+
import {SecretKey} from "@chainsafe/blst";
|
|
4
|
+
import {Keypair} from "@lodestar/builder";
|
|
5
|
+
import {ensure0xPrefix} from "../../util/format.js";
|
|
6
|
+
import {readPassphraseFile} from "../../util/passphrase.js";
|
|
7
|
+
|
|
8
|
+
export async function loadBuilderKeypair(
|
|
9
|
+
keystorePath: string,
|
|
10
|
+
passwordPath: string,
|
|
11
|
+
expectedPubkey?: string
|
|
12
|
+
): Promise<Keypair> {
|
|
13
|
+
const password = readPassphraseFile(passwordPath);
|
|
14
|
+
const keystoreStr = fs.readFileSync(keystorePath, "utf8");
|
|
15
|
+
const keystore = Keystore.parse(keystoreStr);
|
|
16
|
+
|
|
17
|
+
if (!(await keystore.verifyPassword(password))) {
|
|
18
|
+
throw Error(`Invalid password for keystore ${keystorePath}`);
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
const secretKeyBytes = await keystore.decrypt(password);
|
|
22
|
+
const secretKey = SecretKey.fromBytes(secretKeyBytes);
|
|
23
|
+
|
|
24
|
+
const publicKey = secretKey.toPublicKey();
|
|
25
|
+
const publicKeyHex = publicKey.toHex();
|
|
26
|
+
|
|
27
|
+
if (expectedPubkey && publicKeyHex !== ensure0xPrefix(expectedPubkey.toLowerCase())) {
|
|
28
|
+
throw Error(`Pubkey mismatch: keystore ${publicKeyHex}, expected ${expectedPubkey}`);
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
return {secretKey, publicKey};
|
|
32
|
+
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import {defaultOptions} from "@lodestar/builder";
|
|
2
|
+
import {CliCommandOptions} from "@lodestar/utils";
|
|
3
|
+
import {LogArgs, logOptions} from "../../options/logOptions.js";
|
|
4
|
+
|
|
5
|
+
export type IBuilderCliArgs = LogArgs & {
|
|
6
|
+
beaconNodeUrl: string;
|
|
7
|
+
keystore: string;
|
|
8
|
+
keystorePassword: string;
|
|
9
|
+
builderPubkey?: string;
|
|
10
|
+
};
|
|
11
|
+
|
|
12
|
+
export const builderOptions: CliCommandOptions<IBuilderCliArgs> = {
|
|
13
|
+
...logOptions,
|
|
14
|
+
|
|
15
|
+
beaconNodeUrl: {
|
|
16
|
+
description: "Url to a trusted beacon node",
|
|
17
|
+
type: "string",
|
|
18
|
+
default: defaultOptions.beaconNodeUrl,
|
|
19
|
+
},
|
|
20
|
+
|
|
21
|
+
keystore: {
|
|
22
|
+
description: "Path to a keystore file",
|
|
23
|
+
type: "string",
|
|
24
|
+
demandOption: true,
|
|
25
|
+
},
|
|
26
|
+
|
|
27
|
+
keystorePassword: {
|
|
28
|
+
description: "Path to a file with password to decrypt the keystore from 'keystore' option",
|
|
29
|
+
type: "string",
|
|
30
|
+
demandOption: true,
|
|
31
|
+
},
|
|
32
|
+
|
|
33
|
+
builderPubkey: {
|
|
34
|
+
description: "Builder's expected public key based on the keystore from 'keystore' option",
|
|
35
|
+
type: "string",
|
|
36
|
+
},
|
|
37
|
+
};
|
package/src/cmds/index.ts
CHANGED
|
@@ -2,12 +2,14 @@ import {CliCommand} from "@lodestar/utils";
|
|
|
2
2
|
import {GlobalArgs} from "../options/index.js";
|
|
3
3
|
import {beacon} from "./beacon/index.js";
|
|
4
4
|
import {bootnode} from "./bootnode/index.js";
|
|
5
|
+
import {builder} from "./builder/index.js";
|
|
5
6
|
import {dev} from "./dev/index.js";
|
|
6
7
|
import {validator} from "./validator/index.js";
|
|
7
8
|
|
|
8
9
|
export const cmds: Required<CliCommand<GlobalArgs, Record<never, never>>>["subcommands"] = [
|
|
9
10
|
beacon,
|
|
10
11
|
validator,
|
|
12
|
+
builder,
|
|
11
13
|
dev,
|
|
12
14
|
bootnode,
|
|
13
15
|
];
|
|
@@ -26,6 +26,7 @@ export type ChainArgs = {
|
|
|
26
26
|
"chain.fastConfirmation"?: boolean;
|
|
27
27
|
"chain.assertCorrectProgressiveBalances"?: boolean;
|
|
28
28
|
"chain.maxSkipSlots"?: number;
|
|
29
|
+
"chain.disableProposerSlashings"?: boolean;
|
|
29
30
|
emitPayloadAttributes?: boolean;
|
|
30
31
|
broadcastValidationStrictness?: string;
|
|
31
32
|
"chain.minSameMessageSignatureSetsToBatch"?: number;
|
|
@@ -67,6 +68,7 @@ export function parseArgs(args: ChainArgs & CircuitBreakerArgs): IBeaconNodeOpti
|
|
|
67
68
|
fastConfirmation: args["chain.fastConfirmation"],
|
|
68
69
|
assertCorrectProgressiveBalances: args["chain.assertCorrectProgressiveBalances"],
|
|
69
70
|
maxSkipSlots: args["chain.maxSkipSlots"],
|
|
71
|
+
disableProposerSlashings: args["chain.disableProposerSlashings"],
|
|
70
72
|
emitPayloadAttributes: args.emitPayloadAttributes,
|
|
71
73
|
broadcastValidationStrictness: args.broadcastValidationStrictness,
|
|
72
74
|
minSameMessageSignatureSetsToBatch:
|
|
@@ -242,6 +244,15 @@ Will double processing times. Use only for debugging purposes.",
|
|
|
242
244
|
group: "chain",
|
|
243
245
|
},
|
|
244
246
|
|
|
247
|
+
"chain.disableProposerSlashings": {
|
|
248
|
+
hidden: true,
|
|
249
|
+
type: "boolean",
|
|
250
|
+
description:
|
|
251
|
+
"Do not produce proposer slashings from observed equivocations and do not include proposer slashings in produced blocks",
|
|
252
|
+
defaultDescription: String(defaultOptions.chain.disableProposerSlashings),
|
|
253
|
+
group: "chain",
|
|
254
|
+
},
|
|
255
|
+
|
|
245
256
|
"chain.assertCorrectProgressiveBalances": {
|
|
246
257
|
hidden: true,
|
|
247
258
|
description: "Enable asserting the progressive balances",
|