@chainsafe/lodestar 1.51.0-dev.3da261f88e → 1.51.0-dev.3fada841a9
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/cmds/beacon/handler.d.ts.map +1 -1
- package/lib/cmds/beacon/handler.js +1 -1
- 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 +48 -3
- 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/builder/options.d.ts +13 -0
- package/lib/cmds/builder/options.d.ts.map +1 -1
- package/lib/cmds/builder/options.js +83 -1
- package/lib/cmds/builder/options.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 +0 -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/chain.d.ts +0 -1
- package/lib/options/beaconNodeOptions/chain.d.ts.map +1 -1
- package/lib/options/beaconNodeOptions/chain.js +0 -8
- package/lib/options/beaconNodeOptions/chain.js.map +1 -1
- package/lib/options/beaconNodeOptions/index.d.ts +0 -1
- package/lib/options/beaconNodeOptions/index.d.ts.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/cmds/beacon/handler.ts +1 -1
- package/src/cmds/beacon/initBeaconState.ts +1 -1
- package/src/cmds/beacon/pubkeysFile.ts +1 -1
- package/src/cmds/builder/handler.ts +68 -3
- package/src/cmds/builder/loadKeypair.ts +1 -1
- package/src/cmds/builder/options.ts +118 -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/chain.ts +0 -11
- package/src/util/file.ts +3 -2
- package/src/util/format.ts +1 -1
package/lib/util/file.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
|
+
import { copyFile, readFile as fsReadFile } from "node:fs/promises";
|
|
2
3
|
import path from "node:path";
|
|
3
4
|
import { Readable } from "node:stream";
|
|
4
5
|
import stream from "node:stream/promises";
|
|
@@ -112,7 +113,7 @@ export async function downloadOrCopyFile(pathDest, urlOrPathSrc) {
|
|
|
112
113
|
}
|
|
113
114
|
else {
|
|
114
115
|
mkdir(path.dirname(pathDest));
|
|
115
|
-
await
|
|
116
|
+
await copyFile(urlOrPathSrc, pathDest);
|
|
116
117
|
}
|
|
117
118
|
}
|
|
118
119
|
/**
|
|
@@ -147,7 +148,7 @@ export async function downloadOrLoadFile(pathOrUrl) {
|
|
|
147
148
|
const arrayBuffer = await res.arrayBuffer();
|
|
148
149
|
return new Uint8Array(arrayBuffer);
|
|
149
150
|
}
|
|
150
|
-
return
|
|
151
|
+
return fsReadFile(pathOrUrl);
|
|
151
152
|
}
|
|
152
153
|
/**
|
|
153
154
|
* Returns boolean for whether the string is a URL.
|
package/lib/util/file.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":"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"}
|
package/lib/util/format.js
CHANGED
package/lib/util/format.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/util/format.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/util/format.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@chainsafe/lodestar",
|
|
3
|
-
"version": "1.51.0-dev.
|
|
3
|
+
"version": "1.51.0-dev.3fada841a9",
|
|
4
4
|
"description": "Command line interface for lodestar",
|
|
5
5
|
"author": "ChainSafe Systems",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -9,6 +9,9 @@
|
|
|
9
9
|
},
|
|
10
10
|
"homepage": "https://github.com/ChainSafe/lodestar#readme",
|
|
11
11
|
"type": "module",
|
|
12
|
+
"engines": {
|
|
13
|
+
"node": "^24.22.1"
|
|
14
|
+
},
|
|
12
15
|
"exports": {
|
|
13
16
|
".": {
|
|
14
17
|
"typescript": "./src/index.ts",
|
|
@@ -61,24 +64,24 @@
|
|
|
61
64
|
"@chainsafe/bls-keystore": "^3.1.0",
|
|
62
65
|
"@chainsafe/discv5": "^12.0.2",
|
|
63
66
|
"@chainsafe/enr": "^6.0.2",
|
|
64
|
-
"@chainsafe/lodestar-z": "catalog:",
|
|
65
67
|
"@chainsafe/persistent-merkle-tree": "^1.3.1",
|
|
66
68
|
"@chainsafe/ssz": "^1.9.0",
|
|
67
69
|
"@chainsafe/threads": "^1.11.3",
|
|
68
70
|
"@libp2p/crypto": "^5.1.25",
|
|
69
71
|
"@libp2p/interface": "^3.4.0",
|
|
70
72
|
"@libp2p/peer-id": "^6.0.17",
|
|
71
|
-
"@lodestar/api": "^1.51.0-dev.
|
|
72
|
-
"@lodestar/beacon-node": "^1.51.0-dev.
|
|
73
|
-
"@lodestar/builder": "^1.51.0-dev.
|
|
74
|
-
"@lodestar/config": "^1.51.0-dev.
|
|
75
|
-
"@lodestar/db": "^1.51.0-dev.
|
|
76
|
-
"@lodestar/logger": "^1.51.0-dev.
|
|
77
|
-
"@lodestar/
|
|
78
|
-
"@lodestar/
|
|
79
|
-
"@lodestar/
|
|
80
|
-
"@lodestar/
|
|
81
|
-
"@lodestar/
|
|
73
|
+
"@lodestar/api": "^1.51.0-dev.3fada841a9",
|
|
74
|
+
"@lodestar/beacon-node": "^1.51.0-dev.3fada841a9",
|
|
75
|
+
"@lodestar/builder": "^1.51.0-dev.3fada841a9",
|
|
76
|
+
"@lodestar/config": "^1.51.0-dev.3fada841a9",
|
|
77
|
+
"@lodestar/db": "^1.51.0-dev.3fada841a9",
|
|
78
|
+
"@lodestar/logger": "^1.51.0-dev.3fada841a9",
|
|
79
|
+
"@lodestar/native": "^1.51.0-dev.3fada841a9",
|
|
80
|
+
"@lodestar/params": "^1.51.0-dev.3fada841a9",
|
|
81
|
+
"@lodestar/state-transition": "^1.51.0-dev.3fada841a9",
|
|
82
|
+
"@lodestar/types": "^1.51.0-dev.3fada841a9",
|
|
83
|
+
"@lodestar/utils": "^1.51.0-dev.3fada841a9",
|
|
84
|
+
"@lodestar/validator": "^1.51.0-dev.3fada841a9",
|
|
82
85
|
"@multiformats/multiaddr": "^13.0.1",
|
|
83
86
|
"deepmerge": "^4.3.1",
|
|
84
87
|
"ethers": "^6.7.0",
|
|
@@ -86,7 +89,6 @@
|
|
|
86
89
|
"inquirer": "^9.1.5",
|
|
87
90
|
"js-yaml": "^4.1.0",
|
|
88
91
|
"proper-lockfile": "^4.1.2",
|
|
89
|
-
"rimraf": "^4.4.1",
|
|
90
92
|
"source-map-support": "^0.5.21",
|
|
91
93
|
"uint8arrays": "^5.0.1",
|
|
92
94
|
"yargs": "^17.7.1"
|
|
@@ -94,7 +96,7 @@
|
|
|
94
96
|
"devDependencies": {
|
|
95
97
|
"@chainsafe/as-sha256": "^1.2.5",
|
|
96
98
|
"@ethereumjs/rlp": "^4.0.1",
|
|
97
|
-
"@lodestar/test-utils": "^1.51.0-dev.
|
|
99
|
+
"@lodestar/test-utils": "^1.51.0-dev.3fada841a9",
|
|
98
100
|
"@types/debug": "^4.1.7",
|
|
99
101
|
"@types/inquirer": "^9.0.3",
|
|
100
102
|
"@types/js-yaml": "^4.0.5",
|
|
@@ -108,5 +110,5 @@
|
|
|
108
110
|
"web3": "^4.0.3",
|
|
109
111
|
"web3-eth-accounts": "^4.0.3"
|
|
110
112
|
},
|
|
111
|
-
"gitHead": "
|
|
113
|
+
"gitHead": "2707b5a195a0edd60c5c4fab2472cf4ca2e689f5"
|
|
112
114
|
}
|
|
@@ -1,12 +1,12 @@
|
|
|
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
5
|
import {BeaconDb, BeaconNode} from "@lodestar/beacon-node";
|
|
7
6
|
import {ChainForkConfig} from "@lodestar/config";
|
|
8
7
|
import {LevelDbController} from "@lodestar/db/controller/level";
|
|
9
8
|
import {LoggerNode, getNodeLogger} from "@lodestar/logger/node";
|
|
9
|
+
import {pubkeyCache} from "@lodestar/native/pubkeys";
|
|
10
10
|
import {ACTIVE_PRESET, PresetName} from "@lodestar/params";
|
|
11
11
|
import {ErrorAborted, bytesToInt, formatBytes} from "@lodestar/utils";
|
|
12
12
|
import {ProcessShutdownCallback} from "@lodestar/validator";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {pubkeyCache} from "@chainsafe/lodestar-z/pubkeys";
|
|
2
1
|
import {IBeaconDb} from "@lodestar/beacon-node";
|
|
3
2
|
import {BeaconConfig, ChainForkConfig} from "@lodestar/config";
|
|
3
|
+
import {pubkeyCache} from "@lodestar/native/pubkeys";
|
|
4
4
|
import {MAX_PENDING_DEPOSITS_PER_EPOCH, SLOTS_PER_EPOCH} from "@lodestar/params";
|
|
5
5
|
import {
|
|
6
6
|
IBeaconStateView,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {type PubkeyCache} from "@chainsafe/lodestar-z/pubkeys";
|
|
2
1
|
import {ChainForkConfig} from "@lodestar/config";
|
|
2
|
+
import {type PubkeyCache} from "@lodestar/native/pubkeys";
|
|
3
3
|
import {getValidatorPubkeyFromStateBytes} from "@lodestar/state-transition";
|
|
4
4
|
import {Logger, byteArrayEquals} from "@lodestar/utils";
|
|
5
5
|
|
|
@@ -1,13 +1,26 @@
|
|
|
1
|
+
import fs from "node:fs";
|
|
1
2
|
import path from "node:path";
|
|
2
3
|
import {getClient} from "@lodestar/api";
|
|
3
|
-
import {
|
|
4
|
-
|
|
4
|
+
import {
|
|
5
|
+
RegistryMetricCreator,
|
|
6
|
+
collectNodeJSMetrics,
|
|
7
|
+
defaultExecutionEngineHttpOpts,
|
|
8
|
+
getHttpMetricsServer,
|
|
9
|
+
initializeExecutionEngine,
|
|
10
|
+
} from "@lodestar/beacon-node";
|
|
11
|
+
import {Builder, EnginePayloadResult, EnginePayloadSource, getMetrics} from "@lodestar/builder";
|
|
5
12
|
import {getNodeLogger} from "@lodestar/logger/node";
|
|
6
13
|
import {fromHex, toPrintableUrl} from "@lodestar/utils";
|
|
7
14
|
import {getBeaconConfigFromArgs} from "../../config/beaconParams.js";
|
|
8
15
|
import {GlobalArgs} from "../../options/index.js";
|
|
9
16
|
import {getGlobalPaths} from "../../paths/global.js";
|
|
10
|
-
import {
|
|
17
|
+
import {
|
|
18
|
+
cleanOldLogFiles,
|
|
19
|
+
extractJwtHexSecret,
|
|
20
|
+
onGracefulShutdown,
|
|
21
|
+
parseFeeRecipient,
|
|
22
|
+
parseLoggerArgs,
|
|
23
|
+
} from "../../util/index.js";
|
|
11
24
|
import {getVersionData} from "../../util/version.js";
|
|
12
25
|
import {loadBuilderKeypair} from "./loadKeypair.js";
|
|
13
26
|
import {IBuilderCliArgs, builderMetricsDefaultOptions} from "./options.js";
|
|
@@ -71,6 +84,47 @@ export async function builderHandler(args: IBuilderCliArgs & GlobalArgs): Promis
|
|
|
71
84
|
|
|
72
85
|
logger.info("Beacon node", {beaconNode: toPrintableUrl(args.beaconNodeUrl), timeoutMs: args.requestTimeout});
|
|
73
86
|
|
|
87
|
+
// Payload ids are local to the execution client that issued them, fallback urls can't be used
|
|
88
|
+
if (args["execution.urls"].length !== 1) {
|
|
89
|
+
throw Error("Exactly one execution client url is required");
|
|
90
|
+
}
|
|
91
|
+
const executionUrl = args["execution.urls"][0];
|
|
92
|
+
const engine = initializeExecutionEngine(
|
|
93
|
+
{
|
|
94
|
+
mode: "http",
|
|
95
|
+
urls: [executionUrl],
|
|
96
|
+
timeout: args["execution.timeout"] ?? defaultExecutionEngineHttpOpts.timeout,
|
|
97
|
+
retries: args["execution.retries"],
|
|
98
|
+
retryDelay: args["execution.retryDelay"],
|
|
99
|
+
jwtSecretHex: args["execution.jwtSecret"]
|
|
100
|
+
? extractJwtHexSecret(fs.readFileSync(args["execution.jwtSecret"], "utf-8").trim())
|
|
101
|
+
: undefined,
|
|
102
|
+
version,
|
|
103
|
+
commit,
|
|
104
|
+
},
|
|
105
|
+
{signal: abortController.signal, logger}
|
|
106
|
+
);
|
|
107
|
+
const payloadSource = new EnginePayloadSource(toPrintableUrl(executionUrl), {
|
|
108
|
+
notifyForkchoiceUpdate: async (fork, headBlockHash, safeBlockHash, finalizedBlockHash, payloadAttributes) => {
|
|
109
|
+
try {
|
|
110
|
+
return await engine.notifyForkchoiceUpdate(
|
|
111
|
+
fork,
|
|
112
|
+
headBlockHash,
|
|
113
|
+
safeBlockHash,
|
|
114
|
+
finalizedBlockHash,
|
|
115
|
+
payloadAttributes
|
|
116
|
+
);
|
|
117
|
+
} catch (e) {
|
|
118
|
+
// Only retry while the execution client is syncing, it has not imported the parent payload yet.
|
|
119
|
+
// The engine interface does not expose the fcU status, this matches the error thrown for the SYNCING status
|
|
120
|
+
// in ExecutionEngineHttp.notifyForkchoiceUpdate until a typed error is added to the beacon node
|
|
121
|
+
if (e instanceof Error && e.message === "Execution Layer Syncing") return null;
|
|
122
|
+
throw e;
|
|
123
|
+
}
|
|
124
|
+
},
|
|
125
|
+
getPayload: async (fork, payloadId) => (await engine.getPayload(fork, payloadId)) as EnginePayloadResult,
|
|
126
|
+
});
|
|
127
|
+
|
|
74
128
|
const builder = await Builder.init({
|
|
75
129
|
keypair,
|
|
76
130
|
logger,
|
|
@@ -79,6 +133,17 @@ export async function builderHandler(args: IBuilderCliArgs & GlobalArgs): Promis
|
|
|
79
133
|
api,
|
|
80
134
|
executionFeeRecipient: fromHex(executionFeeRecipient),
|
|
81
135
|
metrics,
|
|
136
|
+
payloadSource,
|
|
137
|
+
bidding: {
|
|
138
|
+
shareBps: args["bidding.shareBps"],
|
|
139
|
+
fixedCostGwei: args["bidding.fixedCostGwei"],
|
|
140
|
+
minValueGwei: args["bidding.minValueGwei"],
|
|
141
|
+
maxValueGwei: args["bidding.maxValueGwei"],
|
|
142
|
+
deadlineBps: args["bidding.deadlineBps"],
|
|
143
|
+
getPayloadTimeout: args["bidding.getPayloadTimeout"],
|
|
144
|
+
minOperatingBalanceGwei: args["bidding.minOperatingBalanceGwei"],
|
|
145
|
+
},
|
|
146
|
+
reveal: {cutoffBps: args["reveal.cutoffBps"]},
|
|
82
147
|
});
|
|
83
148
|
|
|
84
149
|
onGracefulShutdownCbs.push(() => builder.close());
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
2
|
import {Keystore} from "@chainsafe/bls-keystore";
|
|
3
|
-
import {SecretKey} from "@chainsafe/lodestar-z/blst";
|
|
4
3
|
import {Keypair} from "@lodestar/builder";
|
|
4
|
+
import {SecretKey} from "@lodestar/native/blst";
|
|
5
5
|
import {Logger} from "@lodestar/utils";
|
|
6
6
|
import {ensure0xPrefix} from "../../util/format.js";
|
|
7
7
|
import {readPassphraseFile} from "../../util/passphrase.js";
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import {defaultExecutionEngineHttpOpts} from "@lodestar/beacon-node";
|
|
1
2
|
import {defaultOptions} from "@lodestar/builder";
|
|
2
3
|
import {CliCommandOptions} from "@lodestar/utils";
|
|
3
4
|
import {LogArgs, logOptions} from "../../options/logOptions.js";
|
|
@@ -16,6 +17,21 @@ export type IBuilderCliArgs = LogArgs & {
|
|
|
16
17
|
executionFeeRecipient: string;
|
|
17
18
|
requestTimeout: number;
|
|
18
19
|
|
|
20
|
+
"execution.urls": string[];
|
|
21
|
+
"execution.timeout"?: number;
|
|
22
|
+
"execution.retries": number;
|
|
23
|
+
"execution.retryDelay": number;
|
|
24
|
+
"execution.jwtSecret"?: string;
|
|
25
|
+
|
|
26
|
+
"bidding.shareBps": number;
|
|
27
|
+
"bidding.fixedCostGwei": number;
|
|
28
|
+
"bidding.minValueGwei": number;
|
|
29
|
+
"bidding.maxValueGwei"?: number;
|
|
30
|
+
"bidding.deadlineBps": number;
|
|
31
|
+
"bidding.getPayloadTimeout": number;
|
|
32
|
+
"bidding.minOperatingBalanceGwei": number;
|
|
33
|
+
"reveal.cutoffBps"?: number;
|
|
34
|
+
|
|
19
35
|
metrics?: boolean;
|
|
20
36
|
"metrics.port"?: number;
|
|
21
37
|
"metrics.address"?: string;
|
|
@@ -25,7 +41,8 @@ export const builderOptions: CliCommandOptions<IBuilderCliArgs> = {
|
|
|
25
41
|
...logOptions,
|
|
26
42
|
|
|
27
43
|
beaconNodeUrl: {
|
|
28
|
-
description:
|
|
44
|
+
description:
|
|
45
|
+
"URL of the beacon node. It must run with `--emitPayloadAttributes` to emit payload attributes for every slot",
|
|
29
46
|
type: "string",
|
|
30
47
|
default: defaultOptions.beaconNodeUrl,
|
|
31
48
|
},
|
|
@@ -59,6 +76,106 @@ export const builderOptions: CliCommandOptions<IBuilderCliArgs> = {
|
|
|
59
76
|
default: defaultOptions.requestTimeout,
|
|
60
77
|
},
|
|
61
78
|
|
|
79
|
+
// Execution
|
|
80
|
+
|
|
81
|
+
"execution.urls": {
|
|
82
|
+
description:
|
|
83
|
+
"Url to the execution client engine API that builds the payloads. The execution client must be kept in sync by a beacon node",
|
|
84
|
+
default: defaultExecutionEngineHttpOpts.urls.join(","),
|
|
85
|
+
type: "array",
|
|
86
|
+
string: true,
|
|
87
|
+
coerce: (urls: string[]): string[] =>
|
|
88
|
+
// Parse ["url1,url2"] to ["url1", "url2"]
|
|
89
|
+
urls.flatMap((item) => item.split(",")),
|
|
90
|
+
group: "execution",
|
|
91
|
+
},
|
|
92
|
+
|
|
93
|
+
"execution.timeout": {
|
|
94
|
+
description: "Timeout in milliseconds for execution engine API HTTP client",
|
|
95
|
+
type: "number",
|
|
96
|
+
defaultDescription: String(defaultExecutionEngineHttpOpts.timeout),
|
|
97
|
+
group: "execution",
|
|
98
|
+
},
|
|
99
|
+
|
|
100
|
+
"execution.retries": {
|
|
101
|
+
description: "Number of retries when calling execution engine API",
|
|
102
|
+
type: "number",
|
|
103
|
+
default: defaultExecutionEngineHttpOpts.retries,
|
|
104
|
+
group: "execution",
|
|
105
|
+
},
|
|
106
|
+
|
|
107
|
+
"execution.retryDelay": {
|
|
108
|
+
description: "Delay time in milliseconds between retries when retrying calls to the execution engine API",
|
|
109
|
+
type: "number",
|
|
110
|
+
default: defaultExecutionEngineHttpOpts.retryDelay,
|
|
111
|
+
group: "execution",
|
|
112
|
+
},
|
|
113
|
+
|
|
114
|
+
"execution.jwtSecret": {
|
|
115
|
+
description:
|
|
116
|
+
"File path to a shared hex-encoded jwt secret which will be used to generate and bundle HS256 encoded jwt tokens for authentication with the EL client's rpc server hosting engine apis. Secret to be exactly same as the one used by the corresponding EL client.",
|
|
117
|
+
type: "string",
|
|
118
|
+
group: "execution",
|
|
119
|
+
},
|
|
120
|
+
|
|
121
|
+
// Bidding
|
|
122
|
+
|
|
123
|
+
"bidding.shareBps": {
|
|
124
|
+
description: "Share of the payload value offered to the proposer, in basis points",
|
|
125
|
+
type: "number",
|
|
126
|
+
default: defaultOptions.bidding.shareBps,
|
|
127
|
+
group: "bidding",
|
|
128
|
+
},
|
|
129
|
+
|
|
130
|
+
"bidding.fixedCostGwei": {
|
|
131
|
+
description: "Fixed amount in gwei deducted from the proposer share of every bid",
|
|
132
|
+
type: "number",
|
|
133
|
+
default: defaultOptions.bidding.fixedCostGwei,
|
|
134
|
+
group: "bidding",
|
|
135
|
+
},
|
|
136
|
+
|
|
137
|
+
"bidding.minValueGwei": {
|
|
138
|
+
description: "Never bid below this value in gwei",
|
|
139
|
+
type: "number",
|
|
140
|
+
default: defaultOptions.bidding.minValueGwei,
|
|
141
|
+
group: "bidding",
|
|
142
|
+
},
|
|
143
|
+
|
|
144
|
+
"bidding.maxValueGwei": {
|
|
145
|
+
description: "Never bid above this value in gwei",
|
|
146
|
+
type: "number",
|
|
147
|
+
group: "bidding",
|
|
148
|
+
},
|
|
149
|
+
|
|
150
|
+
"bidding.deadlineBps": {
|
|
151
|
+
description:
|
|
152
|
+
"Point within the slot before the proposal slot at which the payload is retrieved and the bid is published, in basis points",
|
|
153
|
+
type: "number",
|
|
154
|
+
default: defaultOptions.bidding.deadlineBps,
|
|
155
|
+
group: "bidding",
|
|
156
|
+
},
|
|
157
|
+
|
|
158
|
+
"bidding.getPayloadTimeout": {
|
|
159
|
+
description: "Timeout in milliseconds for retrieving the payload from the execution client at the bid deadline",
|
|
160
|
+
type: "number",
|
|
161
|
+
default: defaultOptions.bidding.getPayloadTimeout,
|
|
162
|
+
group: "bidding",
|
|
163
|
+
},
|
|
164
|
+
|
|
165
|
+
"bidding.minOperatingBalanceGwei": {
|
|
166
|
+
description: "Do not bid while the builder balance is below this value in gwei",
|
|
167
|
+
type: "number",
|
|
168
|
+
default: defaultOptions.bidding.minOperatingBalanceGwei,
|
|
169
|
+
group: "bidding",
|
|
170
|
+
},
|
|
171
|
+
|
|
172
|
+
"reveal.cutoffBps": {
|
|
173
|
+
description:
|
|
174
|
+
"Do not reveal the payload if the block committing to our bid arrives after this point within its slot, in basis points. Defaults to PAYLOAD_ATTESTATION_DUE_BPS of the network",
|
|
175
|
+
type: "number",
|
|
176
|
+
group: "reveal",
|
|
177
|
+
},
|
|
178
|
+
|
|
62
179
|
// Metrics
|
|
63
180
|
|
|
64
181
|
metrics: {
|
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: {
|