@chainsafe/lodestar 1.10.0-dev.e3eb0557ee → 1.10.0-dev.ec8153153c
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/initPeerIdAndEnr.d.ts +0 -1
- package/lib/cmds/beacon/initPeerIdAndEnr.js +28 -27
- package/lib/cmds/beacon/initPeerIdAndEnr.js.map +1 -1
- package/lib/cmds/dev/options.d.ts +5 -2
- package/lib/options/beaconNodeOptions/index.d.ts +3 -0
- package/lib/options/beaconNodeOptions/network.d.ts +12 -0
- package/lib/options/beaconNodeOptions/network.js +79 -11
- package/lib/options/beaconNodeOptions/network.js.map +1 -1
- package/package.json +15 -15
package/.git-data.json
CHANGED
|
@@ -7,7 +7,6 @@ import { BeaconArgs } from "./options.js";
|
|
|
7
7
|
* Check if multiaddr belongs to the local network interfaces.
|
|
8
8
|
*/
|
|
9
9
|
export declare function isLocalMultiAddr(multiaddr: Multiaddr | undefined): boolean;
|
|
10
|
-
export declare function clearMultiaddrUDP(enr: SignableENR): void;
|
|
11
10
|
export declare function overwriteEnrWithCliArgs(enr: SignableENR, args: BeaconArgs, logger: Logger): void;
|
|
12
11
|
/**
|
|
13
12
|
* Create new PeerId and ENR by default, unless persistNetworkIdentity is provided
|
|
@@ -5,7 +5,7 @@ import { createSecp256k1PeerId } from "@libp2p/peer-id-factory";
|
|
|
5
5
|
import { createKeypairFromPeerId, SignableENR } from "@chainsafe/discv5";
|
|
6
6
|
import { exportToJSON, readPeerId } from "../../config/index.js";
|
|
7
7
|
import { writeFile600Perm } from "../../util/file.js";
|
|
8
|
-
import {
|
|
8
|
+
import { parseListenArgs } from "../../options/beaconNodeOptions/network.js";
|
|
9
9
|
/**
|
|
10
10
|
* Check if multiaddr belongs to the local network interfaces.
|
|
11
11
|
*/
|
|
@@ -42,31 +42,17 @@ export function isLocalMultiAddr(multiaddr) {
|
|
|
42
42
|
}
|
|
43
43
|
return false;
|
|
44
44
|
}
|
|
45
|
-
export function clearMultiaddrUDP(enr) {
|
|
46
|
-
// enr.multiaddrUDP = undefined in new version
|
|
47
|
-
enr.delete("ip");
|
|
48
|
-
enr.delete("udp");
|
|
49
|
-
enr.delete("ip6");
|
|
50
|
-
enr.delete("udp6");
|
|
51
|
-
}
|
|
52
45
|
export function overwriteEnrWithCliArgs(enr, args, logger) {
|
|
53
|
-
var _a, _b, _c, _d, _e;
|
|
54
|
-
|
|
55
|
-
enr.
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
if (args["enr.tcp6"] != null)
|
|
64
|
-
enr.tcp6 = args["enr.tcp6"];
|
|
65
|
-
if (args["enr.udp6"] != null)
|
|
66
|
-
enr.udp6 = args["enr.udp6"];
|
|
67
|
-
const udpMultiaddr = enr.getLocationMultiaddr("udp");
|
|
68
|
-
if (udpMultiaddr) {
|
|
69
|
-
const isLocal = isLocalMultiAddr(udpMultiaddr);
|
|
46
|
+
var _a, _b, _c, _d, _e, _f;
|
|
47
|
+
const { listenAddress, port, discoveryPort, listenAddress6, port6, discoveryPort6 } = parseListenArgs(args);
|
|
48
|
+
enr.ip = (_a = args["enr.ip"]) !== null && _a !== void 0 ? _a : listenAddress;
|
|
49
|
+
enr.tcp = (_b = args["enr.tcp"]) !== null && _b !== void 0 ? _b : port;
|
|
50
|
+
enr.udp = (_c = args["enr.udp"]) !== null && _c !== void 0 ? _c : discoveryPort;
|
|
51
|
+
enr.ip6 = (_d = args["enr.ip6"]) !== null && _d !== void 0 ? _d : listenAddress6;
|
|
52
|
+
enr.tcp6 = (_e = args["enr.tcp6"]) !== null && _e !== void 0 ? _e : port6;
|
|
53
|
+
enr.udp6 = (_f = args["enr.udp6"]) !== null && _f !== void 0 ? _f : discoveryPort6;
|
|
54
|
+
function testMultiaddrForLocal(mu, ip4) {
|
|
55
|
+
const isLocal = isLocalMultiAddr(mu);
|
|
70
56
|
if (args.nat) {
|
|
71
57
|
if (isLocal) {
|
|
72
58
|
logger.warn("--nat flag is set with no purpose");
|
|
@@ -74,11 +60,26 @@ export function overwriteEnrWithCliArgs(enr, args, logger) {
|
|
|
74
60
|
}
|
|
75
61
|
else {
|
|
76
62
|
if (!isLocal) {
|
|
77
|
-
logger.warn(
|
|
78
|
-
|
|
63
|
+
logger.warn(`Configured ENR ${ip4 ? "IPv4" : "IPv6"} address is not local, clearing ENR ${ip4 ? "ip" : "ip6"} and ${ip4 ? "udp" : "udp6"}. Set the --nat flag to prevent this`);
|
|
64
|
+
if (ip4) {
|
|
65
|
+
enr.delete("ip");
|
|
66
|
+
enr.delete("udp");
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
enr.delete("ip6");
|
|
70
|
+
enr.delete("udp6");
|
|
71
|
+
}
|
|
79
72
|
}
|
|
80
73
|
}
|
|
81
74
|
}
|
|
75
|
+
const udpMultiaddr4 = enr.getLocationMultiaddr("udp4");
|
|
76
|
+
if (udpMultiaddr4) {
|
|
77
|
+
testMultiaddrForLocal(udpMultiaddr4, true);
|
|
78
|
+
}
|
|
79
|
+
const udpMultiaddr6 = enr.getLocationMultiaddr("udp6");
|
|
80
|
+
if (udpMultiaddr6) {
|
|
81
|
+
testMultiaddrForLocal(udpMultiaddr6, false);
|
|
82
|
+
}
|
|
82
83
|
}
|
|
83
84
|
/**
|
|
84
85
|
* Create new PeerId and ENR by default, unless persistNetworkIdentity is provided
|
|
@@ -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;AAEzB,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAE9D,OAAO,EAAC,uBAAuB,EAAE,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAEvE,OAAO,EAAC,YAAY,EAAE,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"initPeerIdAndEnr.js","sourceRoot":"","sources":["../../../src/cmds/beacon/initPeerIdAndEnr.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,6 +73,11 @@ export declare const devOptions: {
|
|
|
73
73
|
"monitoring.initialDelay": Options;
|
|
74
74
|
"monitoring.requestTimeout": Options;
|
|
75
75
|
"monitoring.collectSystemStats": Options;
|
|
76
|
+
listenAddress?: Options | undefined;
|
|
77
|
+
discoveryPort?: Options | undefined;
|
|
78
|
+
listenAddress6?: Options | undefined;
|
|
79
|
+
port6?: Options | undefined;
|
|
80
|
+
discoveryPort6?: Options | undefined;
|
|
76
81
|
"network.maxPeers"?: Options | undefined;
|
|
77
82
|
bootnodes?: Options | undefined;
|
|
78
83
|
"network.connectToDiscv5Bootnodes"?: Options | undefined;
|
|
@@ -86,8 +91,6 @@ export declare const devOptions: {
|
|
|
86
91
|
"network.rateLimitMultiplier"?: Options | undefined;
|
|
87
92
|
"network.maxGossipTopicConcurrency"?: Options | undefined;
|
|
88
93
|
"network.useWorker"?: Options | undefined;
|
|
89
|
-
listenAddress?: Options | undefined;
|
|
90
|
-
discoveryPort?: Options | undefined;
|
|
91
94
|
"network.requestCountPeerLimit"?: Options | undefined;
|
|
92
95
|
"network.blockCountTotalLimit"?: Options | undefined;
|
|
93
96
|
"network.blockCountPeerLimit"?: Options | undefined;
|
|
@@ -21,6 +21,9 @@ export declare const beaconNodeOptions: {
|
|
|
21
21
|
listenAddress: import("yargs").Options;
|
|
22
22
|
port: import("yargs").Options;
|
|
23
23
|
discoveryPort: import("yargs").Options;
|
|
24
|
+
listenAddress6: import("yargs").Options;
|
|
25
|
+
port6: import("yargs").Options;
|
|
26
|
+
discoveryPort6: import("yargs").Options;
|
|
24
27
|
bootnodes: import("yargs").Options;
|
|
25
28
|
targetPeers: import("yargs").Options;
|
|
26
29
|
deterministicLongLivedAttnets: import("yargs").Options;
|
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
import { IBeaconNodeOptions } from "@lodestar/beacon-node";
|
|
2
2
|
import { CliCommandOptions } from "../../util/index.js";
|
|
3
3
|
export declare const defaultP2pPort = 9000;
|
|
4
|
+
export declare const defaultP2pPort6 = 9090;
|
|
4
5
|
export type NetworkArgs = {
|
|
5
6
|
discv5?: boolean;
|
|
6
7
|
listenAddress?: string;
|
|
7
8
|
port?: number;
|
|
8
9
|
discoveryPort?: number;
|
|
10
|
+
listenAddress6?: string;
|
|
11
|
+
port6?: number;
|
|
12
|
+
discoveryPort6?: number;
|
|
9
13
|
bootnodes?: string[];
|
|
10
14
|
targetPeers?: number;
|
|
11
15
|
deterministicLongLivedAttnets?: boolean;
|
|
@@ -33,6 +37,14 @@ export type NetworkArgs = {
|
|
|
33
37
|
/** @deprecated This option is deprecated and should be removed in next major release. */
|
|
34
38
|
"network.rateTrackerTimeoutMs"?: number;
|
|
35
39
|
};
|
|
40
|
+
export declare function parseListenArgs(args: NetworkArgs): {
|
|
41
|
+
listenAddress: string | undefined;
|
|
42
|
+
port: number | undefined;
|
|
43
|
+
discoveryPort: number | undefined;
|
|
44
|
+
listenAddress6: string | undefined;
|
|
45
|
+
port6: number | undefined;
|
|
46
|
+
discoveryPort6: number | undefined;
|
|
47
|
+
};
|
|
36
48
|
export declare function parseArgs(args: NetworkArgs): IBeaconNodeOptions["network"];
|
|
37
49
|
export declare const options: CliCommandOptions<NetworkArgs>;
|
|
38
50
|
//# sourceMappingURL=network.d.ts.map
|
|
@@ -1,33 +1,83 @@
|
|
|
1
|
+
import { multiaddr } from "@multiformats/multiaddr";
|
|
1
2
|
import { defaultOptions } from "@lodestar/beacon-node";
|
|
2
3
|
import { YargsError } from "../../util/index.js";
|
|
3
4
|
const defaultListenAddress = "0.0.0.0";
|
|
4
5
|
export const defaultP2pPort = 9000;
|
|
6
|
+
export const defaultP2pPort6 = 9090;
|
|
7
|
+
function validateMultiaddrArg(args, key) {
|
|
8
|
+
if (args[key]) {
|
|
9
|
+
try {
|
|
10
|
+
multiaddr(args[key]);
|
|
11
|
+
}
|
|
12
|
+
catch (e) {
|
|
13
|
+
throw new YargsError(`Invalid ${key}: ${e.message}`);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
|
|
18
|
+
export function parseListenArgs(args) {
|
|
19
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
20
|
+
// If listenAddress is explicitly set, use it
|
|
21
|
+
// If listenAddress6 is not set, use defaultListenAddress
|
|
22
|
+
const listenAddress = (_a = args.listenAddress) !== null && _a !== void 0 ? _a : (args.listenAddress6 ? undefined : defaultListenAddress);
|
|
23
|
+
const port = listenAddress ? (_b = args.port) !== null && _b !== void 0 ? _b : defaultP2pPort : undefined;
|
|
24
|
+
const discoveryPort = listenAddress ? (_d = (_c = args.discoveryPort) !== null && _c !== void 0 ? _c : args.port) !== null && _d !== void 0 ? _d : defaultP2pPort : undefined;
|
|
25
|
+
// Only use listenAddress6 if it is explicitly set
|
|
26
|
+
const listenAddress6 = args.listenAddress6;
|
|
27
|
+
const port6 = listenAddress6 ? (_e = args.port6) !== null && _e !== void 0 ? _e : defaultP2pPort6 : undefined;
|
|
28
|
+
const discoveryPort6 = listenAddress6 ? (_g = (_f = args.discoveryPort6) !== null && _f !== void 0 ? _f : args.port6) !== null && _g !== void 0 ? _g : defaultP2pPort6 : undefined;
|
|
29
|
+
return { listenAddress, port, discoveryPort, listenAddress6, port6, discoveryPort6 };
|
|
30
|
+
}
|
|
5
31
|
export function parseArgs(args) {
|
|
6
|
-
var _a, _b, _c
|
|
7
|
-
const listenAddress = args
|
|
8
|
-
|
|
9
|
-
const
|
|
32
|
+
var _a, _b, _c;
|
|
33
|
+
const { listenAddress, port, discoveryPort, listenAddress6, port6, discoveryPort6 } = parseListenArgs(args);
|
|
34
|
+
// validate ip, ip6, ports
|
|
35
|
+
const muArgs = {
|
|
36
|
+
listenAddress: listenAddress ? `/ip4/${listenAddress}` : undefined,
|
|
37
|
+
port: listenAddress ? `/tcp/${port}` : undefined,
|
|
38
|
+
discoveryPort: listenAddress ? `/udp/${discoveryPort}` : undefined,
|
|
39
|
+
listenAddress6: listenAddress6 ? `/ip6/${listenAddress6}` : undefined,
|
|
40
|
+
port6: listenAddress6 ? `/tcp/${port6}` : undefined,
|
|
41
|
+
discoveryPort6: listenAddress6 ? `/udp/${discoveryPort6}` : undefined,
|
|
42
|
+
};
|
|
43
|
+
for (const key of [
|
|
44
|
+
"listenAddress",
|
|
45
|
+
"port",
|
|
46
|
+
"discoveryPort",
|
|
47
|
+
"listenAddress6",
|
|
48
|
+
"port6",
|
|
49
|
+
"discoveryPort6",
|
|
50
|
+
]) {
|
|
51
|
+
validateMultiaddrArg(muArgs, key);
|
|
52
|
+
}
|
|
53
|
+
const bindMu = listenAddress ? `${muArgs.listenAddress}${muArgs.discoveryPort}` : undefined;
|
|
54
|
+
const localMu = listenAddress ? `${muArgs.listenAddress}${muArgs.port}` : undefined;
|
|
55
|
+
const bindMu6 = listenAddress6 ? `${muArgs.listenAddress6}${muArgs.discoveryPort6}` : undefined;
|
|
56
|
+
const localMu6 = listenAddress6 ? `${muArgs.listenAddress6}${muArgs.port6}` : undefined;
|
|
10
57
|
const targetPeers = args["targetPeers"];
|
|
11
|
-
const maxPeers = (
|
|
58
|
+
const maxPeers = (_a = args["network.maxPeers"]) !== null && _a !== void 0 ? _a : (targetPeers !== undefined ? Math.floor(targetPeers * 1.1) : undefined);
|
|
12
59
|
if (targetPeers != null && maxPeers != null && targetPeers > maxPeers) {
|
|
13
60
|
throw new YargsError("network.maxPeers must be greater than or equal to targetPeers");
|
|
14
61
|
}
|
|
15
62
|
// Set discv5 opts to null to disable only if explicitly disabled
|
|
16
|
-
const enableDiscv5 = (
|
|
63
|
+
const enableDiscv5 = (_b = args["discv5"]) !== null && _b !== void 0 ? _b : true;
|
|
17
64
|
return {
|
|
18
65
|
discv5: enableDiscv5
|
|
19
66
|
? {
|
|
20
67
|
config: {},
|
|
21
|
-
|
|
68
|
+
bindAddrs: {
|
|
69
|
+
ip4: bindMu,
|
|
70
|
+
ip6: bindMu6,
|
|
71
|
+
},
|
|
22
72
|
// TODO: Okay to set to empty array?
|
|
23
|
-
bootEnrs: (
|
|
73
|
+
bootEnrs: (_c = args["bootnodes"]) !== null && _c !== void 0 ? _c : [],
|
|
24
74
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-explicit-any
|
|
25
75
|
enr: undefined,
|
|
26
76
|
}
|
|
27
77
|
: null,
|
|
28
78
|
maxPeers: maxPeers !== null && maxPeers !== void 0 ? maxPeers : defaultOptions.network.maxPeers,
|
|
29
79
|
targetPeers: targetPeers !== null && targetPeers !== void 0 ? targetPeers : defaultOptions.network.targetPeers,
|
|
30
|
-
localMultiaddrs: [
|
|
80
|
+
localMultiaddrs: [localMu, localMu6].filter(Boolean),
|
|
31
81
|
deterministicLongLivedAttnets: args["deterministicLongLivedAttnets"],
|
|
32
82
|
subscribeAllSubnets: args["subscribeAllSubnets"],
|
|
33
83
|
disablePeerScoring: args["disablePeerScoring"],
|
|
@@ -55,12 +105,12 @@ export const options = {
|
|
|
55
105
|
},
|
|
56
106
|
listenAddress: {
|
|
57
107
|
type: "string",
|
|
58
|
-
description: "The address to listen for p2p UDP and TCP connections",
|
|
108
|
+
description: "The IPv4 address to listen for p2p UDP and TCP connections",
|
|
59
109
|
defaultDescription: defaultListenAddress,
|
|
60
110
|
group: "network",
|
|
61
111
|
},
|
|
62
112
|
port: {
|
|
63
|
-
description: "The TCP/UDP port to listen on. The UDP port can be modified by the --
|
|
113
|
+
description: "The TCP/UDP port to listen on. The UDP port can be modified by the --discoveryPort flag.",
|
|
64
114
|
type: "number",
|
|
65
115
|
// TODO: Derive from BeaconNode defaults
|
|
66
116
|
defaultDescription: String(defaultP2pPort),
|
|
@@ -72,6 +122,24 @@ export const options = {
|
|
|
72
122
|
defaultDescription: "`port`",
|
|
73
123
|
group: "network",
|
|
74
124
|
},
|
|
125
|
+
listenAddress6: {
|
|
126
|
+
type: "string",
|
|
127
|
+
description: "The IPv6 address to listen for p2p UDP and TCP connections",
|
|
128
|
+
group: "network",
|
|
129
|
+
},
|
|
130
|
+
port6: {
|
|
131
|
+
description: "The TCP/UDP port to listen on. The UDP port can be modified by the --discoveryPort6 flag.",
|
|
132
|
+
type: "number",
|
|
133
|
+
// TODO: Derive from BeaconNode defaults
|
|
134
|
+
defaultDescription: String(defaultP2pPort6),
|
|
135
|
+
group: "network",
|
|
136
|
+
},
|
|
137
|
+
discoveryPort6: {
|
|
138
|
+
description: "The UDP port that discovery will listen on. Defaults to `port6`",
|
|
139
|
+
type: "number",
|
|
140
|
+
defaultDescription: "`port6`",
|
|
141
|
+
group: "network",
|
|
142
|
+
},
|
|
75
143
|
bootnodes: {
|
|
76
144
|
type: "array",
|
|
77
145
|
description: "Bootnodes for discv5 discovery",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAqB,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAoB,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAElE,MAAM,oBAAoB,GAAG,SAAS,CAAC;AACvC,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/network.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.10.0-dev.
|
|
3
|
+
"version": "1.10.0-dev.ec8153153c",
|
|
4
4
|
"description": "Command line interface for lodestar",
|
|
5
5
|
"author": "ChainSafe Systems",
|
|
6
6
|
"license": "LGPL-3.0",
|
|
@@ -57,23 +57,23 @@
|
|
|
57
57
|
"@chainsafe/bls-keygen": "^0.3.0",
|
|
58
58
|
"@chainsafe/bls-keystore": "^2.0.0",
|
|
59
59
|
"@chainsafe/blst": "^0.2.9",
|
|
60
|
-
"@chainsafe/discv5": "^
|
|
60
|
+
"@chainsafe/discv5": "^5.0.0",
|
|
61
61
|
"@chainsafe/ssz": "^0.10.2",
|
|
62
62
|
"@chainsafe/threads": "^1.11.1",
|
|
63
63
|
"@libp2p/crypto": "^1.0.0",
|
|
64
64
|
"@libp2p/peer-id": "^2.0.3",
|
|
65
65
|
"@libp2p/peer-id-factory": "^2.0.3",
|
|
66
|
-
"@lodestar/api": "1.10.0-dev.
|
|
67
|
-
"@lodestar/beacon-node": "1.10.0-dev.
|
|
68
|
-
"@lodestar/config": "1.10.0-dev.
|
|
69
|
-
"@lodestar/db": "1.10.0-dev.
|
|
70
|
-
"@lodestar/light-client": "1.10.0-dev.
|
|
71
|
-
"@lodestar/logger": "1.10.0-dev.
|
|
72
|
-
"@lodestar/params": "1.10.0-dev.
|
|
73
|
-
"@lodestar/state-transition": "1.10.0-dev.
|
|
74
|
-
"@lodestar/types": "1.10.0-dev.
|
|
75
|
-
"@lodestar/utils": "1.10.0-dev.
|
|
76
|
-
"@lodestar/validator": "1.10.0-dev.
|
|
66
|
+
"@lodestar/api": "1.10.0-dev.ec8153153c",
|
|
67
|
+
"@lodestar/beacon-node": "1.10.0-dev.ec8153153c",
|
|
68
|
+
"@lodestar/config": "1.10.0-dev.ec8153153c",
|
|
69
|
+
"@lodestar/db": "1.10.0-dev.ec8153153c",
|
|
70
|
+
"@lodestar/light-client": "1.10.0-dev.ec8153153c",
|
|
71
|
+
"@lodestar/logger": "1.10.0-dev.ec8153153c",
|
|
72
|
+
"@lodestar/params": "1.10.0-dev.ec8153153c",
|
|
73
|
+
"@lodestar/state-transition": "1.10.0-dev.ec8153153c",
|
|
74
|
+
"@lodestar/types": "1.10.0-dev.ec8153153c",
|
|
75
|
+
"@lodestar/utils": "1.10.0-dev.ec8153153c",
|
|
76
|
+
"@lodestar/validator": "1.10.0-dev.ec8153153c",
|
|
77
77
|
"@multiformats/multiaddr": "^12.1.3",
|
|
78
78
|
"@types/lockfile": "^1.0.2",
|
|
79
79
|
"bip39": "^3.1.0",
|
|
@@ -94,7 +94,7 @@
|
|
|
94
94
|
"yargs": "^17.7.1"
|
|
95
95
|
},
|
|
96
96
|
"devDependencies": {
|
|
97
|
-
"@lodestar/test-utils": "1.10.0-dev.
|
|
97
|
+
"@lodestar/test-utils": "1.10.0-dev.ec8153153c",
|
|
98
98
|
"@types/debug": "^4.1.7",
|
|
99
99
|
"@types/expand-tilde": "^2.0.0",
|
|
100
100
|
"@types/got": "^9.6.12",
|
|
@@ -102,5 +102,5 @@
|
|
|
102
102
|
"@types/lodash": "^4.14.192",
|
|
103
103
|
"@types/yargs": "^17.0.24"
|
|
104
104
|
},
|
|
105
|
-
"gitHead": "
|
|
105
|
+
"gitHead": "7705584fc7353bfbba8c21a488b0dc42b8d2ff8e"
|
|
106
106
|
}
|