@chainsafe/lodestar 1.29.0-dev.30652b83f0 → 1.29.0-dev.4ea73abe94
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.git-data.json +1 -1
- package/lib/cmds/beacon/handler.d.ts +1 -1
- package/lib/cmds/beacon/handler.js +5 -5
- package/lib/cmds/beacon/handler.js.map +1 -1
- package/lib/cmds/beacon/initPeerIdAndEnr.d.ts +3 -3
- package/lib/cmds/beacon/initPeerIdAndEnr.js +24 -24
- 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 -7
- package/lib/cmds/bootnode/handler.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/networks/mainnet.d.ts +2 -2
- package/lib/networks/mainnet.js +5 -2
- package/lib/networks/mainnet.js.map +1 -1
- package/package.json +19 -19
package/.git-data.json
CHANGED
|
@@ -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 { parseBeaconNodeArgs } from "../../options/index.js";
|
|
|
13
13
|
import { cleanOldLogFiles, mkdir, onGracefulShutdown, parseLoggerArgs, pruneOldFilesInDir, writeFile600Perm, } from "../../util/index.js";
|
|
14
14
|
import { getVersionData } from "../../util/version.js";
|
|
15
15
|
import { initBeaconState } from "./initBeaconState.js";
|
|
16
|
-
import {
|
|
16
|
+
import { initPrivateKeyAndEnr } from "./initPeerIdAndEnr.js";
|
|
17
17
|
import { getBeaconPaths } from "./paths.js";
|
|
18
18
|
const DEFAULT_RETENTION_SSZ_OBJECTS_HOURS = 15 * 24;
|
|
19
19
|
const HOURS_TO_MS = 3600 * 1000;
|
|
@@ -22,7 +22,7 @@ const EIGHT_GB = 8 * 1024 * 1024 * 1024;
|
|
|
22
22
|
* Runs a beacon node.
|
|
23
23
|
*/
|
|
24
24
|
export async function beaconHandler(args) {
|
|
25
|
-
const { config, options, beaconPaths, network, version, commit,
|
|
25
|
+
const { config, options, beaconPaths, network, version, commit, privateKey, logger } = await beaconHandlerInit(args);
|
|
26
26
|
if (hasher.name !== "hashtree") {
|
|
27
27
|
throw Error(`Loaded incorrect hasher ${hasher.name}, expected hashtree`);
|
|
28
28
|
}
|
|
@@ -56,7 +56,7 @@ export async function beaconHandler(args) {
|
|
|
56
56
|
db,
|
|
57
57
|
logger,
|
|
58
58
|
processShutdownCallback,
|
|
59
|
-
|
|
59
|
+
privateKey,
|
|
60
60
|
dataDir: beaconPaths.dataDir,
|
|
61
61
|
peerStoreDir: beaconPaths.peerStoreDir,
|
|
62
62
|
anchorState,
|
|
@@ -144,7 +144,7 @@ export async function beaconHandlerInit(args) {
|
|
|
144
144
|
beaconNodeOptions.set({ eth1: { depositContractDeployBlock } });
|
|
145
145
|
}
|
|
146
146
|
const logger = initLogger(args, beaconPaths.dataDir, config);
|
|
147
|
-
const {
|
|
147
|
+
const { privateKey, enr } = await initPrivateKeyAndEnr(args, beaconPaths.beaconDir, logger);
|
|
148
148
|
if (args.discv5 !== false) {
|
|
149
149
|
// Inject ENR to beacon options
|
|
150
150
|
beaconNodeOptions.set({ network: { discv5: { enr: enr.encodeTxt(), config: { enrUpdate: !enr.ip && !enr.ip6 } } } });
|
|
@@ -173,7 +173,7 @@ export async function beaconHandlerInit(args) {
|
|
|
173
173
|
}
|
|
174
174
|
// Render final options
|
|
175
175
|
const options = beaconNodeOptions.getWithDefaults();
|
|
176
|
-
return { config, options, beaconPaths, network, version, commit,
|
|
176
|
+
return { config, options, beaconPaths, network, version, commit, privateKey, logger };
|
|
177
177
|
}
|
|
178
178
|
export function initLogger(args, dataDir, config, fileName = "beacon.log") {
|
|
179
179
|
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,MAAM,EAAC,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAkB,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAC,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAa,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAC,aAAa,EAAE,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAG7C,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,EAAa,mBAAmB,EAAC,MAAM,wBAAwB,CAAC;AAEvE,OAAO,EACL,gBAAgB,EAChB,KAAK,EACL,kBAAkB,EAClB,eAAe,EACf,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACrD,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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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SignableENR } from "@chainsafe/enr";
|
|
2
|
-
import type {
|
|
2
|
+
import type { PrivateKey } from "@libp2p/interface";
|
|
3
3
|
import { Logger } from "@lodestar/utils";
|
|
4
4
|
import { Multiaddr } from "@multiformats/multiaddr";
|
|
5
5
|
import { BeaconArgs } from "./options.js";
|
|
@@ -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 os from "node:os";
|
|
3
3
|
import path from "node:path";
|
|
4
|
-
import { SignableENR
|
|
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 { parseListenArgs } from "../../options/beaconNodeOptions/network.js";
|
|
8
8
|
import { writeFile600Perm } from "../../util/file.js";
|
|
9
9
|
/**
|
|
@@ -108,53 +108,53 @@ export function overwriteEnrWithCliArgs(enr, args, logger, opts) {
|
|
|
108
108
|
/**
|
|
109
109
|
* Create new PeerId and ENR by default, unless persistNetworkIdentity is provided
|
|
110
110
|
*/
|
|
111
|
-
export async function
|
|
111
|
+
export async function initPrivateKeyAndEnr(args, beaconDir, logger, bootnode) {
|
|
112
112
|
const { persistNetworkIdentity } = args;
|
|
113
|
-
const
|
|
114
|
-
const
|
|
115
|
-
const enr = SignableENR.
|
|
116
|
-
return {
|
|
113
|
+
const newPrivateKeyAndENR = async () => {
|
|
114
|
+
const privateKey = await generateKeyPair("secp256k1");
|
|
115
|
+
const enr = SignableENR.createFromPrivateKey(privateKey);
|
|
116
|
+
return { privateKey, enr };
|
|
117
117
|
};
|
|
118
|
-
const
|
|
119
|
-
let
|
|
118
|
+
const readPersistedPrivateKeyAndENR = async (peerIdFile, enrFile) => {
|
|
119
|
+
let privateKey;
|
|
120
120
|
let enr;
|
|
121
121
|
// attempt to read stored peer id
|
|
122
122
|
try {
|
|
123
|
-
|
|
123
|
+
privateKey = readPrivateKey(peerIdFile);
|
|
124
124
|
}
|
|
125
125
|
catch (_e) {
|
|
126
126
|
logger.warn("Unable to read peerIdFile, creating a new peer id");
|
|
127
|
-
return { ...(await
|
|
127
|
+
return { ...(await newPrivateKeyAndENR()), newEnr: true };
|
|
128
128
|
}
|
|
129
129
|
// attempt to read stored enr
|
|
130
130
|
try {
|
|
131
|
-
enr = SignableENR.decodeTxt(fs.readFileSync(enrFile, "utf-8"),
|
|
131
|
+
enr = SignableENR.decodeTxt(fs.readFileSync(enrFile, "utf-8"), privateKey.raw);
|
|
132
132
|
}
|
|
133
133
|
catch (_e) {
|
|
134
134
|
logger.warn("Unable to decode stored local ENR, creating a new ENR");
|
|
135
|
-
enr = SignableENR.
|
|
136
|
-
return {
|
|
135
|
+
enr = SignableENR.createFromPrivateKey(privateKey);
|
|
136
|
+
return { privateKey, enr, newEnr: true };
|
|
137
137
|
}
|
|
138
138
|
// check stored peer id against stored enr
|
|
139
|
-
if (!
|
|
139
|
+
if (!privateKey.equals(enr.peerId)) {
|
|
140
140
|
logger.warn("Stored local ENR doesn't match peerIdFile, creating a new ENR");
|
|
141
|
-
enr = SignableENR.
|
|
142
|
-
return {
|
|
141
|
+
enr = SignableENR.createFromPrivateKey(privateKey);
|
|
142
|
+
return { privateKey, enr, newEnr: true };
|
|
143
143
|
}
|
|
144
|
-
return {
|
|
144
|
+
return { privateKey, enr, newEnr: false };
|
|
145
145
|
};
|
|
146
146
|
if (persistNetworkIdentity) {
|
|
147
147
|
const enrFile = path.join(beaconDir, "enr");
|
|
148
148
|
const peerIdFile = path.join(beaconDir, "peer-id.json");
|
|
149
|
-
const {
|
|
149
|
+
const { privateKey, enr, newEnr } = await readPersistedPrivateKeyAndENR(peerIdFile, enrFile);
|
|
150
150
|
overwriteEnrWithCliArgs(enr, args, logger, { newEnr, bootnode });
|
|
151
151
|
// Re-persist peer-id and enr
|
|
152
|
-
writeFile600Perm(peerIdFile, exportToJSON(
|
|
152
|
+
writeFile600Perm(peerIdFile, exportToJSON(privateKey));
|
|
153
153
|
writeFile600Perm(enrFile, enr.encodeTxt());
|
|
154
|
-
return {
|
|
154
|
+
return { privateKey, enr };
|
|
155
155
|
}
|
|
156
|
-
const {
|
|
156
|
+
const { privateKey, enr } = await newPrivateKeyAndENR();
|
|
157
157
|
overwriteEnrWithCliArgs(enr, args, logger, { newEnr: true, bootnode });
|
|
158
|
-
return {
|
|
158
|
+
return { privateKey, enr };
|
|
159
159
|
}
|
|
160
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,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,WAAW,
|
|
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
|
}>;
|
|
@@ -11,13 +11,13 @@ import { parseArgs as parseNetworkArgs } from "../../options/beaconNodeOptions/n
|
|
|
11
11
|
import { mkdir, onGracefulShutdown, writeFile600Perm } from "../../util/index.js";
|
|
12
12
|
import { getVersionData } from "../../util/version.js";
|
|
13
13
|
import { initLogger } from "../beacon/handler.js";
|
|
14
|
-
import {
|
|
14
|
+
import { initPrivateKeyAndEnr } from "../beacon/initPeerIdAndEnr.js";
|
|
15
15
|
import { getBeaconPaths } from "../beacon/paths.js";
|
|
16
16
|
/**
|
|
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);
|
|
@@ -158,7 +158,7 @@ export async function bootnodeHandlerInit(args) {
|
|
|
158
158
|
// Fetch extra bootnodes
|
|
159
159
|
discv5Args.bootEnrs = (discv5Args.bootEnrs ?? []).concat(args.bootnodesFile ? readBootnodes(args.bootnodesFile) : [], isKnownNetworkName(network) ? await getNetworkBootnodes(network) : []);
|
|
160
160
|
const logger = initLogger(args, beaconPaths.dataDir, config, "bootnode.log");
|
|
161
|
-
const {
|
|
162
|
-
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 };
|
|
163
163
|
}
|
|
164
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,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAC,GAAG,EAAC,MAAM,gBAAgB,CAAC;AACnC,OAAO,EAAoB,qBAAqB,EAAE,oBAAoB,EAAC,MAAM,uBAAuB,CAAC;AACrG,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAY,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAE7D,OAAO,EAAC,uBAAuB,EAAC,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAC,mBAAmB,EAAE,kBAAkB,EAAE,aAAa,EAAC,MAAM,yBAAyB,CAAC;AAC/F,OAAO,EAAC,SAAS,IAAI,gBAAgB,EAAC,MAAM,4CAA4C,CAAC;AACzF,OAAO,EAAC,SAAS,IAAI,gBAAgB,EAAC,MAAM,4CAA4C,CAAC;AAEzF,OAAO,EAAC,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAC,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/cmds/bootnode/handler.ts"],"names":[],"mappings":"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"}
|
package/lib/config/peerId.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { PrivateKey } from "@libp2p/interface";
|
|
2
2
|
export type PeerIdJSON = {
|
|
3
3
|
id: string;
|
|
4
|
-
pubKey
|
|
5
|
-
privKey
|
|
4
|
+
pubKey: string;
|
|
5
|
+
privKey: string;
|
|
6
6
|
};
|
|
7
|
-
export declare function exportToJSON(
|
|
8
|
-
export declare function createFromJSON(obj: PeerIdJSON):
|
|
9
|
-
export declare function
|
|
10
|
-
export declare function
|
|
7
|
+
export declare function exportToJSON(privateKey: PrivateKey): PeerIdJSON;
|
|
8
|
+
export declare function createFromJSON(obj: PeerIdJSON): PrivateKey;
|
|
9
|
+
export declare function writePrivateKey(filepath: string, privateKey: PrivateKey): void;
|
|
10
|
+
export declare function readPrivateKey(filepath: string): PrivateKey;
|
|
11
11
|
//# sourceMappingURL=peerId.d.ts.map
|
package/lib/config/peerId.js
CHANGED
|
@@ -1,38 +1,33 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { createFromPrivKey, createFromPubKey } from "@libp2p/peer-id-factory";
|
|
1
|
+
import { privateKeyFromProtobuf, privateKeyToProtobuf, publicKeyFromProtobuf, publicKeyToProtobuf, } from "@libp2p/crypto/keys";
|
|
2
|
+
import { peerIdFromPrivateKey, peerIdFromString } from "@libp2p/peer-id";
|
|
4
3
|
import { fromString as uint8ArrayFromString } from "uint8arrays/from-string";
|
|
5
4
|
import { toString as uint8ArrayToString } from "uint8arrays/to-string";
|
|
6
5
|
import { readFile, writeFile600Perm } from "../util/index.js";
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
if (privKey != null) {
|
|
11
|
-
const key = await unmarshalPrivateKey(privKey);
|
|
12
|
-
return createFromPrivKey(key);
|
|
13
|
-
}
|
|
14
|
-
if (pubKey != null) {
|
|
15
|
-
const key = unmarshalPublicKey(pubKey);
|
|
16
|
-
return createFromPubKey(key);
|
|
17
|
-
}
|
|
18
|
-
return peerIdFromBytes(multihash);
|
|
19
|
-
}
|
|
20
|
-
export function exportToJSON(peerId, excludePrivateKey) {
|
|
6
|
+
export function exportToJSON(privateKey) {
|
|
7
|
+
const publicKey = privateKey.publicKey;
|
|
8
|
+
const peerId = peerIdFromPrivateKey(privateKey);
|
|
21
9
|
return {
|
|
22
|
-
id:
|
|
23
|
-
pubKey:
|
|
24
|
-
privKey:
|
|
25
|
-
? undefined
|
|
26
|
-
: uint8ArrayToString(peerId.privateKey, "base64pad"),
|
|
10
|
+
id: peerId.toString(),
|
|
11
|
+
pubKey: uint8ArrayToString(publicKeyToProtobuf(publicKey), "base64pad"),
|
|
12
|
+
privKey: uint8ArrayToString(privateKeyToProtobuf(privateKey), "base64pad"),
|
|
27
13
|
};
|
|
28
14
|
}
|
|
29
|
-
export
|
|
30
|
-
|
|
15
|
+
export function createFromJSON(obj) {
|
|
16
|
+
const privateKey = privateKeyFromProtobuf(uint8ArrayFromString(obj.privKey, "base64pad"));
|
|
17
|
+
const publicKey = publicKeyFromProtobuf(uint8ArrayFromString(obj.pubKey, "base64pad"));
|
|
18
|
+
const peerId = peerIdFromString(obj.id);
|
|
19
|
+
if (!publicKey.equals(privateKey.publicKey)) {
|
|
20
|
+
throw new Error("Public key does not match private key");
|
|
21
|
+
}
|
|
22
|
+
if (!peerId.equals(peerIdFromPrivateKey(privateKey))) {
|
|
23
|
+
throw new Error("Peer ID does not match private key");
|
|
24
|
+
}
|
|
25
|
+
return privateKey;
|
|
31
26
|
}
|
|
32
|
-
export function
|
|
33
|
-
writeFile600Perm(filepath, exportToJSON(
|
|
27
|
+
export function writePrivateKey(filepath, privateKey) {
|
|
28
|
+
writeFile600Perm(filepath, exportToJSON(privateKey));
|
|
34
29
|
}
|
|
35
|
-
export
|
|
30
|
+
export function readPrivateKey(filepath) {
|
|
36
31
|
return createFromJSON(readFile(filepath));
|
|
37
32
|
}
|
|
38
33
|
//# sourceMappingURL=peerId.js.map
|
package/lib/config/peerId.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"peerId.js","sourceRoot":"","sources":["../../src/config/peerId.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"peerId.js","sourceRoot":"","sources":["../../src/config/peerId.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAC,oBAAoB,EAAE,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAC,UAAU,IAAI,oBAAoB,EAAC,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAC,QAAQ,IAAI,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AACrE,OAAO,EAAC,QAAQ,EAAE,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAU5D,MAAM,UAAU,YAAY,CAAC,UAAsB;IACjD,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;IACvC,MAAM,MAAM,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAChD,OAAO;QACL,EAAE,EAAE,MAAM,CAAC,QAAQ,EAAE;QACrB,MAAM,EAAE,kBAAkB,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,WAAW,CAAC;QACvE,OAAO,EAAE,kBAAkB,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC;KAC3E,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,GAAe;IAC5C,MAAM,UAAU,GAAG,sBAAsB,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;IAC1F,MAAM,SAAS,GAAG,qBAAqB,CAAC,oBAAoB,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;IACvF,MAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACxC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC3D,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxD,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,QAAgB,EAAE,UAAsB;IACtE,gBAAgB,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC7C,OAAO,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC5C,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { mainnetChainConfig as chainConfig } from "@lodestar/config/networks";
|
|
2
2
|
export declare const depositContractDeployBlock = 11052984;
|
|
3
|
-
export declare const genesisFileUrl = "https://raw.githubusercontent.com/eth-clients/
|
|
4
|
-
export declare const bootnodesFileUrl = "https://raw.githubusercontent.com/eth-clients/
|
|
3
|
+
export declare const genesisFileUrl = "https://raw.githubusercontent.com/eth-clients/mainnet/refs/heads/main/metadata/genesis.ssz";
|
|
4
|
+
export declare const bootnodesFileUrl = "https://raw.githubusercontent.com/eth-clients/mainnet/refs/heads/main/metadata/bootstrap_nodes.yaml";
|
|
5
5
|
export declare const bootEnrs: string[];
|
|
6
6
|
//# sourceMappingURL=mainnet.d.ts.map
|
package/lib/networks/mainnet.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { mainnetChainConfig as chainConfig } from "@lodestar/config/networks";
|
|
2
2
|
export const depositContractDeployBlock = 11052984;
|
|
3
|
-
export const genesisFileUrl = "https://raw.githubusercontent.com/eth-clients/
|
|
4
|
-
export const bootnodesFileUrl = "https://raw.githubusercontent.com/eth-clients/
|
|
3
|
+
export const genesisFileUrl = "https://raw.githubusercontent.com/eth-clients/mainnet/refs/heads/main/metadata/genesis.ssz";
|
|
4
|
+
export const bootnodesFileUrl = "https://raw.githubusercontent.com/eth-clients/mainnet/refs/heads/main/metadata/bootstrap_nodes.yaml";
|
|
5
5
|
export const bootEnrs = [
|
|
6
6
|
// Teku team's bootnodes
|
|
7
7
|
"enr:-KG4QNTx85fjxABbSq_Rta9wy56nQ1fHK0PewJbGjLm1M4bMGx5-3Qq4ZX2-iFJ0pys_O90sVXNNOxp2E7afBsGsBrgDhGV0aDKQu6TalgMAAAD__________4JpZIJ2NIJpcIQEnfA2iXNlY3AyNTZrMaECGXWQ-rQ2KZKRH1aOW4IlPDBkY4XDphxg9pxKytFCkayDdGNwgiMog3VkcIIjKA",
|
|
@@ -23,5 +23,8 @@ export const bootEnrs = [
|
|
|
23
23
|
// Nimbus team's bootnodes
|
|
24
24
|
"enr:-LK4QA8FfhaAjlb_BXsXxSfiysR7R52Nhi9JBt4F8SPssu8hdE1BXQQEtVDC3qStCW60LSO7hEsVHv5zm8_6Vnjhcn0Bh2F0dG5ldHOIAAAAAAAAAACEZXRoMpC1MD8qAAAAAP__________gmlkgnY0gmlwhAN4aBKJc2VjcDI1NmsxoQJerDhsJ-KxZ8sHySMOCmTO6sHM3iCFQ6VMvLTe948MyYN0Y3CCI4yDdWRwgiOM",
|
|
25
25
|
"enr:-LK4QKWrXTpV9T78hNG6s8AM6IO4XH9kFT91uZtFg1GcsJ6dKovDOr1jtAAFPnS2lvNltkOGA9k29BUN7lFh_sjuc9QBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpC1MD8qAAAAAP__________gmlkgnY0gmlwhANAdd-Jc2VjcDI1NmsxoQLQa6ai7y9PMN5hpLe5HmiJSlYzMuzP7ZhwRiwHvqNXdoN0Y3CCI4yDdWRwgiOM",
|
|
26
|
+
// Lodestar team's bootnodes
|
|
27
|
+
"enr:-IS4QPi-onjNsT5xAIAenhCGTDl4z-4UOR25Uq-3TmG4V3kwB9ljLTb_Kp1wdjHNj-H8VVLRBSSWVZo3GUe3z6k0E-IBgmlkgnY0gmlwhKB3_qGJc2VjcDI1NmsxoQMvAfgB4cJXvvXeM6WbCG86CstbSxbQBSGx31FAwVtOTYN1ZHCCIyg",
|
|
28
|
+
"enr:-KG4QCb8NC3gEM3I0okStV5BPX7Bg6ZXTYCzzbYyEXUPGcZtHmvQtiJH4C4F2jG7azTcb9pN3JlgpfxAnRVFzJ3-LykBgmlkgnY0gmlwhFPlR9KDaXA2kP6AAAAAAAAAAlBW__4my5iJc2VjcDI1NmsxoQLdUv9Eo9sxCt0tc_CheLOWnX59yHJtkBSOL7kpxdJ6GYN1ZHCCIyiEdWRwNoIjKA",
|
|
26
29
|
];
|
|
27
30
|
//# sourceMappingURL=mainnet.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mainnet.js","sourceRoot":"","sources":["../../src/networks/mainnet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,IAAI,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAE5E,MAAM,CAAC,MAAM,0BAA0B,GAAG,QAAQ,CAAC;AACnD,MAAM,CAAC,MAAM,cAAc,GACzB
|
|
1
|
+
{"version":3,"file":"mainnet.js","sourceRoot":"","sources":["../../src/networks/mainnet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,IAAI,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAE5E,MAAM,CAAC,MAAM,0BAA0B,GAAG,QAAQ,CAAC;AACnD,MAAM,CAAC,MAAM,cAAc,GACzB,4FAA4F,CAAC;AAC/F,MAAM,CAAC,MAAM,gBAAgB,GAC3B,qGAAqG,CAAC;AAExG,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,wBAAwB;IACxB,gOAAgO;IAChO,gOAAgO;IAChO,0BAA0B;IAC1B,6OAA6O;IAC7O,6OAA6O;IAC7O,6OAA6O;IAC7O,8BAA8B;IAC9B,6PAA6P;IAC7P,6PAA6P;IAC7P,6PAA6P;IAC7P,6PAA6P;IAC7P,eAAe;IACf,6OAA6O;IAC7O,6OAA6O;IAC7O,6OAA6O;IAC7O,6OAA6O;IAC7O,0BAA0B;IAC1B,sPAAsP;IACtP,sPAAsP;IACtP,4BAA4B;IAC5B,yLAAyL;IACzL,gOAAgO;CACjO,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@chainsafe/lodestar",
|
|
3
|
-
"version": "1.29.0-dev.
|
|
3
|
+
"version": "1.29.0-dev.4ea73abe94",
|
|
4
4
|
"description": "Command line interface for lodestar",
|
|
5
5
|
"author": "ChainSafe Systems",
|
|
6
6
|
"license": "LGPL-3.0",
|
|
@@ -54,25 +54,25 @@
|
|
|
54
54
|
"@chainsafe/bls-keygen": "^0.4.0",
|
|
55
55
|
"@chainsafe/bls-keystore": "^3.1.0",
|
|
56
56
|
"@chainsafe/blst": "^2.1.0",
|
|
57
|
-
"@chainsafe/discv5": "^
|
|
58
|
-
"@chainsafe/enr": "^
|
|
57
|
+
"@chainsafe/discv5": "^11.0.0",
|
|
58
|
+
"@chainsafe/enr": "^5.0.0",
|
|
59
59
|
"@chainsafe/persistent-merkle-tree": "^1.1.0",
|
|
60
60
|
"@chainsafe/ssz": "^1.2.0",
|
|
61
61
|
"@chainsafe/threads": "^1.11.1",
|
|
62
|
-
"@libp2p/crypto": "^
|
|
63
|
-
"@libp2p/
|
|
64
|
-
"@libp2p/peer-id
|
|
65
|
-
"@lodestar/api": "1.29.0-dev.
|
|
66
|
-
"@lodestar/beacon-node": "1.29.0-dev.
|
|
67
|
-
"@lodestar/config": "1.29.0-dev.
|
|
68
|
-
"@lodestar/db": "1.29.0-dev.
|
|
69
|
-
"@lodestar/light-client": "1.29.0-dev.
|
|
70
|
-
"@lodestar/logger": "1.29.0-dev.
|
|
71
|
-
"@lodestar/params": "1.29.0-dev.
|
|
72
|
-
"@lodestar/state-transition": "1.29.0-dev.
|
|
73
|
-
"@lodestar/types": "1.29.0-dev.
|
|
74
|
-
"@lodestar/utils": "1.29.0-dev.
|
|
75
|
-
"@lodestar/validator": "1.29.0-dev.
|
|
62
|
+
"@libp2p/crypto": "^5.0.15",
|
|
63
|
+
"@libp2p/interface": "^2.7.0",
|
|
64
|
+
"@libp2p/peer-id": "^5.1.0",
|
|
65
|
+
"@lodestar/api": "1.29.0-dev.4ea73abe94",
|
|
66
|
+
"@lodestar/beacon-node": "1.29.0-dev.4ea73abe94",
|
|
67
|
+
"@lodestar/config": "1.29.0-dev.4ea73abe94",
|
|
68
|
+
"@lodestar/db": "1.29.0-dev.4ea73abe94",
|
|
69
|
+
"@lodestar/light-client": "1.29.0-dev.4ea73abe94",
|
|
70
|
+
"@lodestar/logger": "1.29.0-dev.4ea73abe94",
|
|
71
|
+
"@lodestar/params": "1.29.0-dev.4ea73abe94",
|
|
72
|
+
"@lodestar/state-transition": "1.29.0-dev.4ea73abe94",
|
|
73
|
+
"@lodestar/types": "1.29.0-dev.4ea73abe94",
|
|
74
|
+
"@lodestar/utils": "1.29.0-dev.4ea73abe94",
|
|
75
|
+
"@lodestar/validator": "1.29.0-dev.4ea73abe94",
|
|
76
76
|
"@multiformats/multiaddr": "^12.1.3",
|
|
77
77
|
"deepmerge": "^4.3.1",
|
|
78
78
|
"ethers": "^6.7.0",
|
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
"yargs": "^17.7.1"
|
|
89
89
|
},
|
|
90
90
|
"devDependencies": {
|
|
91
|
-
"@lodestar/test-utils": "1.29.0-dev.
|
|
91
|
+
"@lodestar/test-utils": "1.29.0-dev.4ea73abe94",
|
|
92
92
|
"@types/debug": "^4.1.7",
|
|
93
93
|
"@types/got": "^9.6.12",
|
|
94
94
|
"@types/inquirer": "^9.0.3",
|
|
@@ -96,5 +96,5 @@
|
|
|
96
96
|
"@types/yargs": "^17.0.24",
|
|
97
97
|
"fastify": "^5.2.1"
|
|
98
98
|
},
|
|
99
|
-
"gitHead": "
|
|
99
|
+
"gitHead": "95e18a70c55955e3db5ec77adfa5c5b3e1c58490"
|
|
100
100
|
}
|