@chainsafe/lodestar 1.33.0 → 1.34.0-dev.60e037958a
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
CHANGED
|
@@ -3,6 +3,7 @@ import os from "node:os";
|
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
import { SignableENR } from "@chainsafe/enr";
|
|
5
5
|
import { generateKeyPair } from "@libp2p/crypto/keys";
|
|
6
|
+
import { peerIdFromPrivateKey } from "@libp2p/peer-id";
|
|
6
7
|
import { exportToJSON, readPrivateKey } from "../../config/index.js";
|
|
7
8
|
import { parseListenArgs } from "../../options/beaconNodeOptions/network.js";
|
|
8
9
|
import { writeFile600Perm } from "../../util/file.js";
|
|
@@ -118,7 +119,7 @@ export async function initPrivateKeyAndEnr(args, beaconDir, logger, bootnode) {
|
|
|
118
119
|
const readPersistedPrivateKeyAndENR = async (peerIdFile, enrFile) => {
|
|
119
120
|
let privateKey;
|
|
120
121
|
let enr;
|
|
121
|
-
// attempt to read stored
|
|
122
|
+
// attempt to read stored private key
|
|
122
123
|
try {
|
|
123
124
|
privateKey = readPrivateKey(peerIdFile);
|
|
124
125
|
}
|
|
@@ -136,7 +137,7 @@ export async function initPrivateKeyAndEnr(args, beaconDir, logger, bootnode) {
|
|
|
136
137
|
return { privateKey, enr, newEnr: true };
|
|
137
138
|
}
|
|
138
139
|
// check stored peer id against stored enr
|
|
139
|
-
if (!privateKey.equals(enr.peerId)) {
|
|
140
|
+
if (!peerIdFromPrivateKey(privateKey).equals(enr.peerId)) {
|
|
140
141
|
logger.warn("Stored local ENR doesn't match peerIdFile, creating a new ENR");
|
|
141
142
|
enr = SignableENR.createFromPrivateKey(privateKey);
|
|
142
143
|
return { privateKey, enr, newEnr: true };
|
|
@@ -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,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAC,eAAe,EAAC,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"initPeerIdAndEnr.js","sourceRoot":"","sources":["../../../src/cmds/beacon/initPeerIdAndEnr.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.
|
|
3
|
+
"version": "1.34.0-dev.60e037958a",
|
|
4
4
|
"description": "Command line interface for lodestar",
|
|
5
5
|
"author": "ChainSafe Systems",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -62,17 +62,17 @@
|
|
|
62
62
|
"@libp2p/crypto": "^5.0.15",
|
|
63
63
|
"@libp2p/interface": "^2.7.0",
|
|
64
64
|
"@libp2p/peer-id": "^5.1.0",
|
|
65
|
-
"@lodestar/api": "
|
|
66
|
-
"@lodestar/beacon-node": "
|
|
67
|
-
"@lodestar/config": "
|
|
68
|
-
"@lodestar/db": "
|
|
69
|
-
"@lodestar/light-client": "
|
|
70
|
-
"@lodestar/logger": "
|
|
71
|
-
"@lodestar/params": "
|
|
72
|
-
"@lodestar/state-transition": "
|
|
73
|
-
"@lodestar/types": "
|
|
74
|
-
"@lodestar/utils": "
|
|
75
|
-
"@lodestar/validator": "
|
|
65
|
+
"@lodestar/api": "1.34.0-dev.60e037958a",
|
|
66
|
+
"@lodestar/beacon-node": "1.34.0-dev.60e037958a",
|
|
67
|
+
"@lodestar/config": "1.34.0-dev.60e037958a",
|
|
68
|
+
"@lodestar/db": "1.34.0-dev.60e037958a",
|
|
69
|
+
"@lodestar/light-client": "1.34.0-dev.60e037958a",
|
|
70
|
+
"@lodestar/logger": "1.34.0-dev.60e037958a",
|
|
71
|
+
"@lodestar/params": "1.34.0-dev.60e037958a",
|
|
72
|
+
"@lodestar/state-transition": "1.34.0-dev.60e037958a",
|
|
73
|
+
"@lodestar/types": "1.34.0-dev.60e037958a",
|
|
74
|
+
"@lodestar/utils": "1.34.0-dev.60e037958a",
|
|
75
|
+
"@lodestar/validator": "1.34.0-dev.60e037958a",
|
|
76
76
|
"@multiformats/multiaddr": "^12.1.3",
|
|
77
77
|
"cpu-features": "^0.0.10",
|
|
78
78
|
"deepmerge": "^4.3.1",
|
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
"yargs": "^17.7.1"
|
|
89
89
|
},
|
|
90
90
|
"devDependencies": {
|
|
91
|
-
"@lodestar/test-utils": "
|
|
91
|
+
"@lodestar/test-utils": "1.34.0-dev.60e037958a",
|
|
92
92
|
"@types/cpu-features": "^0.0.3",
|
|
93
93
|
"@types/debug": "^4.1.7",
|
|
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": "d65e38549355c35e02e94ef1f19225dd7f29291f"
|
|
100
100
|
}
|