@chainsafe/lodestar 1.11.0-dev.042adb1372 → 1.11.0-dev.2b8a500cf6
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 +3 -2
- package/lib/cmds/beacon/handler.js +6 -5
- package/lib/cmds/beacon/handler.js.map +1 -1
- package/lib/cmds/beacon/initPeerIdAndEnr.d.ts +1 -1
- package/lib/cmds/bootnode/handler.d.ts +19 -0
- package/lib/cmds/bootnode/handler.js +164 -0
- package/lib/cmds/bootnode/handler.js.map +1 -0
- package/lib/cmds/bootnode/index.d.ts +5 -0
- package/lib/cmds/bootnode/index.js +9 -0
- package/lib/cmds/bootnode/index.js.map +1 -0
- package/lib/cmds/bootnode/options.d.ts +25 -0
- package/lib/cmds/bootnode/options.js +82 -0
- package/lib/cmds/bootnode/options.js.map +1 -0
- package/lib/cmds/dev/options.d.ts +2 -0
- package/lib/cmds/index.js +2 -0
- package/lib/cmds/index.js.map +1 -1
- package/lib/cmds/validator/keymanager/impl.js +2 -1
- package/lib/cmds/validator/keymanager/impl.js.map +1 -1
- package/lib/cmds/validator/signers/index.js +2 -1
- package/lib/cmds/validator/signers/index.js.map +1 -1
- package/lib/config/peerId.d.ts +1 -1
- package/lib/networks/chiado.d.ts +2 -2
- package/lib/networks/chiado.js +2 -2
- package/lib/networks/chiado.js.map +1 -1
- package/lib/networks/gnosis.d.ts +2 -2
- package/lib/networks/gnosis.js +7 -2
- package/lib/networks/gnosis.js.map +1 -1
- package/lib/networks/goerli.d.ts +3 -3
- package/lib/networks/goerli.js +11 -3
- package/lib/networks/goerli.js.map +1 -1
- package/lib/networks/holesky.d.ts +6 -0
- package/lib/networks/holesky.js +10 -0
- package/lib/networks/holesky.js.map +1 -0
- package/lib/networks/index.d.ts +1 -1
- package/lib/networks/index.js +4 -0
- package/lib/networks/index.js.map +1 -1
- package/lib/networks/mainnet.d.ts +2 -2
- package/lib/networks/mainnet.js +14 -12
- package/lib/networks/mainnet.js.map +1 -1
- package/lib/networks/ropsten.d.ts +2 -2
- package/lib/networks/ropsten.js +2 -2
- package/lib/networks/ropsten.js.map +1 -1
- package/lib/networks/sepolia.d.ts +2 -2
- package/lib/networks/sepolia.js +5 -2
- package/lib/networks/sepolia.js.map +1 -1
- package/lib/options/beaconNodeOptions/chain.d.ts +1 -0
- package/lib/options/beaconNodeOptions/chain.js +8 -0
- package/lib/options/beaconNodeOptions/chain.js.map +1 -1
- package/lib/options/beaconNodeOptions/index.d.ts +2 -0
- package/lib/options/beaconNodeOptions/network.d.ts +2 -0
- package/lib/options/beaconNodeOptions/network.js +9 -2
- package/lib/options/beaconNodeOptions/network.js.map +1 -1
- package/lib/util/format.d.ts +0 -1
- package/lib/util/format.js +0 -10
- package/lib/util/format.js.map +1 -1
- package/package.json +19 -18
package/.git-data.json
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ChainForkConfig } from "@lodestar/config";
|
|
2
2
|
import { LoggerNode } from "@lodestar/logger/node";
|
|
3
3
|
import { GlobalArgs } from "../../options/index.js";
|
|
4
|
+
import { LogArgs } from "../../options/logOptions.js";
|
|
4
5
|
import { BeaconArgs } from "./options.js";
|
|
5
6
|
/**
|
|
6
7
|
* Runs a beacon node.
|
|
@@ -19,8 +20,8 @@ export declare function beaconHandlerInit(args: BeaconArgs & GlobalArgs): Promis
|
|
|
19
20
|
network: string;
|
|
20
21
|
version: string;
|
|
21
22
|
commit: string;
|
|
22
|
-
peerId: import("@libp2p/interface
|
|
23
|
+
peerId: import("@libp2p/interface/dist/src/peer-id/index.js").PeerId;
|
|
23
24
|
logger: LoggerNode;
|
|
24
25
|
}>;
|
|
25
|
-
export declare function initLogger(args:
|
|
26
|
+
export declare function initLogger(args: LogArgs & Pick<GlobalArgs, "dataDir">, dataDir: string, config: ChainForkConfig, fileName?: string): LoggerNode;
|
|
26
27
|
//# sourceMappingURL=handler.d.ts.map
|
|
@@ -135,9 +135,10 @@ export async function beaconHandlerInit(args) {
|
|
|
135
135
|
beaconNodeOptions.set({ metrics: { metadata: { version, commit, network } } });
|
|
136
136
|
// Add detailed version string for API node/version endpoint
|
|
137
137
|
beaconNodeOptions.set({ api: { version } });
|
|
138
|
-
//
|
|
139
|
-
const
|
|
140
|
-
|
|
138
|
+
// Combine bootnodes from different sources
|
|
139
|
+
const bootnodes = (beaconNodeOptions.get().network?.discv5?.bootEnrs ?? []).concat(args.bootnodesFile ? readBootnodes(args.bootnodesFile) : [], isKnownNetworkName(network) ? await getNetworkBootnodes(network) : []);
|
|
140
|
+
// Deduplicate and set combined bootnodes
|
|
141
|
+
beaconNodeOptions.set({ network: { discv5: { bootEnrs: [...new Set(bootnodes)] } } });
|
|
141
142
|
// Set known depositContractDeployBlock
|
|
142
143
|
if (isKnownNetworkName(network)) {
|
|
143
144
|
const { depositContractDeployBlock } = getNetworkData(network);
|
|
@@ -160,8 +161,8 @@ export async function beaconHandlerInit(args) {
|
|
|
160
161
|
const options = beaconNodeOptions.getWithDefaults();
|
|
161
162
|
return { config, options, beaconPaths, network, version, commit, peerId, logger };
|
|
162
163
|
}
|
|
163
|
-
export function initLogger(args, dataDir, config) {
|
|
164
|
-
const defaultLogFilepath = path.join(dataDir,
|
|
164
|
+
export function initLogger(args, dataDir, config, fileName = "beacon.log") {
|
|
165
|
+
const defaultLogFilepath = path.join(dataDir, fileName);
|
|
165
166
|
const logger = getNodeLogger(parseLoggerArgs(args, { defaultLogFilepath }, config));
|
|
166
167
|
try {
|
|
167
168
|
cleanOldLogFiles(args, { defaultLogFilepath });
|
|
@@ -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,QAAQ,EAAC,MAAM,aAAa,CAAC;AACrC,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAkB,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAC,aAAa,EAAE,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAa,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAEhE,OAAO,EAAa,mBAAmB,EAAC,MAAM,wBAAwB,CAAC;AACvE,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,EACL,kBAAkB,EAClB,KAAK,EACL,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,EACf,kBAAkB,GACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/cmds/beacon/handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { GlobalArgs } from "../../options/index.js";
|
|
2
|
+
import { BootnodeArgs } from "./options.js";
|
|
3
|
+
/**
|
|
4
|
+
* Runs a bootnode.
|
|
5
|
+
*/
|
|
6
|
+
export declare function bootnodeHandler(args: BootnodeArgs & GlobalArgs): Promise<void>;
|
|
7
|
+
/** Separate function to simplify unit testing of options merging */
|
|
8
|
+
export declare function bootnodeHandlerInit(args: BootnodeArgs & GlobalArgs): Promise<{
|
|
9
|
+
discv5Args: import("@lodestar/beacon-node/lib/network/discv5/types.js").LodestarDiscv5Opts;
|
|
10
|
+
metricsArgs: import("@lodestar/beacon-node/lib/metrics/options.js").MetricsOptions;
|
|
11
|
+
bootnodeDir: string;
|
|
12
|
+
network: string;
|
|
13
|
+
version: string;
|
|
14
|
+
commit: string;
|
|
15
|
+
peerId: import("@libp2p/interface/dist/src/peer-id/index.js").PeerId;
|
|
16
|
+
enr: import("@chainsafe/discv5").SignableENR;
|
|
17
|
+
logger: import("@lodestar/logger/lib/node.js").LoggerNode;
|
|
18
|
+
}>;
|
|
19
|
+
//# sourceMappingURL=handler.d.ts.map
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
import path from "node:path";
|
|
2
|
+
import { multiaddr } from "@multiformats/multiaddr";
|
|
3
|
+
import { Discv5, ENR } from "@chainsafe/discv5";
|
|
4
|
+
import { ErrorAborted } from "@lodestar/utils";
|
|
5
|
+
import { RegistryMetricCreator, getHttpMetricsServer } from "@lodestar/beacon-node";
|
|
6
|
+
import { getBeaconConfigFromArgs } from "../../config/index.js";
|
|
7
|
+
import { getNetworkBootnodes, isKnownNetworkName, readBootnodes } from "../../networks/index.js";
|
|
8
|
+
import { onGracefulShutdown, mkdir, writeFile600Perm } from "../../util/index.js";
|
|
9
|
+
import { getVersionData } from "../../util/version.js";
|
|
10
|
+
import { initPeerIdAndEnr } from "../beacon/initPeerIdAndEnr.js";
|
|
11
|
+
import { parseArgs as parseMetricsArgs } from "../../options/beaconNodeOptions/metrics.js";
|
|
12
|
+
import { parseArgs as parseNetworkArgs } from "../../options/beaconNodeOptions/network.js";
|
|
13
|
+
import { getBeaconPaths } from "../beacon/paths.js";
|
|
14
|
+
import { initLogger } from "../beacon/handler.js";
|
|
15
|
+
/**
|
|
16
|
+
* Runs a bootnode.
|
|
17
|
+
*/
|
|
18
|
+
export async function bootnodeHandler(args) {
|
|
19
|
+
const { discv5Args, metricsArgs, bootnodeDir, network, version, commit, peerId, enr, logger } = await bootnodeHandlerInit(args);
|
|
20
|
+
const abortController = new AbortController();
|
|
21
|
+
const bindAddrs = discv5Args.bindAddrs;
|
|
22
|
+
logger.info("Lodestar Bootnode", { network, version, commit });
|
|
23
|
+
logger.info("Bind address", bindAddrs);
|
|
24
|
+
logger.info("Advertised address", {
|
|
25
|
+
ip4: enr.getLocationMultiaddr("udp4")?.toString(),
|
|
26
|
+
ip6: enr.getLocationMultiaddr("udp6")?.toString(),
|
|
27
|
+
});
|
|
28
|
+
logger.info("Identity", { peerId: peerId.toString(), nodeId: enr.nodeId });
|
|
29
|
+
logger.info("ENR", { enr: enr.encodeTxt() });
|
|
30
|
+
// bootnode setup
|
|
31
|
+
try {
|
|
32
|
+
let metricsRegistry;
|
|
33
|
+
let metricsServer;
|
|
34
|
+
if (metricsArgs.enabled) {
|
|
35
|
+
metricsRegistry = new RegistryMetricCreator();
|
|
36
|
+
metricsRegistry.static({
|
|
37
|
+
name: "bootnode_version",
|
|
38
|
+
help: "Bootnode version",
|
|
39
|
+
value: { version, commit, network },
|
|
40
|
+
});
|
|
41
|
+
metricsServer = await getHttpMetricsServer(metricsArgs, { register: metricsRegistry, logger });
|
|
42
|
+
}
|
|
43
|
+
const discv5 = Discv5.create({
|
|
44
|
+
enr,
|
|
45
|
+
peerId,
|
|
46
|
+
bindAddrs: {
|
|
47
|
+
ip4: (bindAddrs.ip4 ? multiaddr(bindAddrs.ip4) : undefined),
|
|
48
|
+
ip6: bindAddrs.ip6 ? multiaddr(bindAddrs.ip6) : undefined,
|
|
49
|
+
},
|
|
50
|
+
config: { enrUpdate: !enr.ip && !enr.ip6 },
|
|
51
|
+
metricsRegistry,
|
|
52
|
+
});
|
|
53
|
+
// If there are any bootnodes, add them to the routing table
|
|
54
|
+
for (const bootEnrStr of Array.from(new Set(discv5Args.bootEnrs).values())) {
|
|
55
|
+
const bootEnr = ENR.decodeTxt(bootEnrStr);
|
|
56
|
+
logger.info("Adding bootnode", {
|
|
57
|
+
ip4: bootEnr.getLocationMultiaddr("udp4")?.toString(),
|
|
58
|
+
ip6: bootEnr.getLocationMultiaddr("udp6")?.toString(),
|
|
59
|
+
peerId: (await bootEnr.peerId()).toString(),
|
|
60
|
+
nodeId: enr.nodeId,
|
|
61
|
+
});
|
|
62
|
+
discv5.addEnr(bootEnr);
|
|
63
|
+
}
|
|
64
|
+
// start the server
|
|
65
|
+
await discv5.start();
|
|
66
|
+
// if there are peers in the local routing table, establish a session by running a query
|
|
67
|
+
if (discv5.kadValues().length) {
|
|
68
|
+
void discv5.findRandomNode();
|
|
69
|
+
}
|
|
70
|
+
discv5.on("multiaddrUpdated", (addr) => {
|
|
71
|
+
logger.info("Advertised socket address updated", { addr: addr.toString() });
|
|
72
|
+
});
|
|
73
|
+
// respond with metrics every 10 seconds
|
|
74
|
+
const printInterval = setInterval(() => {
|
|
75
|
+
let ip4Only = 0;
|
|
76
|
+
let ip6Only = 0;
|
|
77
|
+
let ip4ip6 = 0;
|
|
78
|
+
let unreachable = 0;
|
|
79
|
+
for (const kadEnr of discv5.kadValues()) {
|
|
80
|
+
const hasIp4 = kadEnr.getLocationMultiaddr("udp4");
|
|
81
|
+
const hasIp6 = kadEnr.getLocationMultiaddr("udp6");
|
|
82
|
+
if (hasIp4 && hasIp6) {
|
|
83
|
+
ip4ip6++;
|
|
84
|
+
}
|
|
85
|
+
else if (hasIp4) {
|
|
86
|
+
ip4Only++;
|
|
87
|
+
}
|
|
88
|
+
else if (hasIp6) {
|
|
89
|
+
ip6Only++;
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
unreachable++;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
logger.info("Server metrics", {
|
|
96
|
+
connectedPeers: discv5.connectedPeerCount,
|
|
97
|
+
activeSessions: discv5.sessionService.sessionsSize(),
|
|
98
|
+
ip4Nodes: ip4Only,
|
|
99
|
+
ip6Nodes: ip6Only,
|
|
100
|
+
ip4AndIp6Nodes: ip4ip6,
|
|
101
|
+
unreachableNodes: unreachable,
|
|
102
|
+
});
|
|
103
|
+
}, 10000);
|
|
104
|
+
// Intercept SIGINT signal, to perform final ops before exiting
|
|
105
|
+
onGracefulShutdown(async () => {
|
|
106
|
+
if (args.persistNetworkIdentity) {
|
|
107
|
+
try {
|
|
108
|
+
const enrPath = path.join(bootnodeDir, "enr");
|
|
109
|
+
writeFile600Perm(enrPath, enr.encodeTxt());
|
|
110
|
+
}
|
|
111
|
+
catch (e) {
|
|
112
|
+
logger.warn("Unable to persist enr", {}, e);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
abortController.abort();
|
|
116
|
+
}, logger.info.bind(logger));
|
|
117
|
+
abortController.signal.addEventListener("abort", async () => {
|
|
118
|
+
try {
|
|
119
|
+
discv5.removeAllListeners();
|
|
120
|
+
clearInterval(printInterval);
|
|
121
|
+
await metricsServer?.close();
|
|
122
|
+
await discv5.stop();
|
|
123
|
+
logger.debug("Bootnode closed");
|
|
124
|
+
}
|
|
125
|
+
catch (e) {
|
|
126
|
+
logger.error("Error closing bootnode", {}, e);
|
|
127
|
+
// Must explicitly exit process due to potential active handles
|
|
128
|
+
process.exit(1);
|
|
129
|
+
}
|
|
130
|
+
}, { once: true });
|
|
131
|
+
}
|
|
132
|
+
catch (e) {
|
|
133
|
+
if (e instanceof ErrorAborted) {
|
|
134
|
+
logger.info(e.message); // Let the user know the abort was received but don't print as error
|
|
135
|
+
}
|
|
136
|
+
else {
|
|
137
|
+
throw e;
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
/** Separate function to simplify unit testing of options merging */
|
|
142
|
+
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
|
|
143
|
+
export async function bootnodeHandlerInit(args) {
|
|
144
|
+
const { config, network } = getBeaconConfigFromArgs(args);
|
|
145
|
+
const { version, commit } = getVersionData();
|
|
146
|
+
const beaconPaths = getBeaconPaths(args, network);
|
|
147
|
+
// Use a separate directory to store bootnode enr + peer-id
|
|
148
|
+
const bootnodeDir = path.join(beaconPaths.dataDir, "bootnode");
|
|
149
|
+
const { discv5: discv5Args } = parseNetworkArgs(args);
|
|
150
|
+
const metricsArgs = parseMetricsArgs(args);
|
|
151
|
+
if (!discv5Args) {
|
|
152
|
+
// Unreachable because bootnode requires discv5 to be enabled - duh
|
|
153
|
+
throw new Error("unreachable - bootnode requires discv5 to be enabled");
|
|
154
|
+
}
|
|
155
|
+
// initialize directories
|
|
156
|
+
mkdir(beaconPaths.dataDir);
|
|
157
|
+
mkdir(bootnodeDir);
|
|
158
|
+
// Fetch extra bootnodes
|
|
159
|
+
discv5Args.bootEnrs = (discv5Args.bootEnrs ?? []).concat(args.bootnodesFile ? readBootnodes(args.bootnodesFile) : [], isKnownNetworkName(network) ? await getNetworkBootnodes(network) : []);
|
|
160
|
+
const logger = initLogger(args, beaconPaths.dataDir, config, "bootnode.log");
|
|
161
|
+
const { peerId, enr } = await initPeerIdAndEnr(args, bootnodeDir, logger);
|
|
162
|
+
return { discv5Args, metricsArgs, bootnodeDir, network, version, commit, peerId, enr, logger };
|
|
163
|
+
}
|
|
164
|
+
//# sourceMappingURL=handler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/cmds/bootnode/handler.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAY,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,MAAM,EAAE,GAAG,EAAC,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAoB,qBAAqB,EAAE,oBAAoB,EAAC,MAAM,uBAAuB,CAAC;AAGrG,OAAO,EAAC,uBAAuB,EAAC,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAC,mBAAmB,EAAE,kBAAkB,EAAE,aAAa,EAAC,MAAM,yBAAyB,CAAC;AAC/F,OAAO,EAAC,kBAAkB,EAAE,KAAK,EAAE,gBAAgB,EAAC,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAC,SAAS,IAAI,gBAAgB,EAAC,MAAM,4CAA4C,CAAC;AACzF,OAAO,EAAC,SAAS,IAAI,gBAAgB,EAAC,MAAM,4CAA4C,CAAC;AACzF,OAAO,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAGhD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAA+B;IACnE,MAAM,EAAC,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAC,GACzF,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAElC,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;IAC9C,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;IAEvC,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAC,CAAC,CAAC;IAC7D,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IACvC,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE;QAChC,GAAG,EAAE,GAAG,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE;QACjD,GAAG,EAAE,GAAG,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE;KAClD,CAAC,CAAC;IACH,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,EAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAC,CAAC,CAAC;IACzE,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,EAAC,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE,EAAC,CAAC,CAAC;IAE3C,iBAAiB;IACjB,IAAI;QACF,IAAI,eAAkD,CAAC;QACvD,IAAI,aAA4C,CAAC;QACjD,IAAI,WAAW,CAAC,OAAO,EAAE;YACvB,eAAe,GAAG,IAAI,qBAAqB,EAAE,CAAC;YAC9C,eAAe,CAAC,MAAM,CAAC;gBACrB,IAAI,EAAE,kBAAkB;gBACxB,IAAI,EAAE,kBAAkB;gBACxB,KAAK,EAAE,EAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAC;aAClC,CAAC,CAAC;YACH,aAAa,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE,EAAC,QAAQ,EAAE,eAAe,EAAE,MAAM,EAAC,CAAC,CAAC;SAC9F;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;YAC3B,GAAG;YACH,MAAM;YACN,SAAS,EAAE;gBACT,GAAG,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAc;gBACxE,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;aAC1D;YACD,MAAM,EAAE,EAAC,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAC;YACxC,eAAe;SAChB,CAAC,CAAC;QAEH,4DAA4D;QAC5D,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE;YAC1E,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAC1C,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBAC7B,GAAG,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE;gBACrD,GAAG,EAAE,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE;gBACrD,MAAM,EAAE,CAAC,MAAM,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;gBAC3C,MAAM,EAAE,GAAG,CAAC,MAAM;aACnB,CAAC,CAAC;YACH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SACxB;QAED,mBAAmB;QACnB,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QAErB,wFAAwF;QACxF,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE;YAC7B,KAAK,MAAM,CAAC,cAAc,EAAE,CAAC;SAC9B;QAED,MAAM,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAC,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;QAEH,wCAAwC;QACxC,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE;YACrC,IAAI,OAAO,GAAG,CAAC,CAAC;YAChB,IAAI,OAAO,GAAG,CAAC,CAAC;YAChB,IAAI,MAAM,GAAG,CAAC,CAAC;YACf,IAAI,WAAW,GAAG,CAAC,CAAC;YACpB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,SAAS,EAAE,EAAE;gBACvC,MAAM,MAAM,GAAG,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;gBACnD,MAAM,MAAM,GAAG,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;gBACnD,IAAI,MAAM,IAAI,MAAM,EAAE;oBACpB,MAAM,EAAE,CAAC;iBACV;qBAAM,IAAI,MAAM,EAAE;oBACjB,OAAO,EAAE,CAAC;iBACX;qBAAM,IAAI,MAAM,EAAE;oBACjB,OAAO,EAAE,CAAC;iBACX;qBAAM;oBACL,WAAW,EAAE,CAAC;iBACf;aACF;YACD,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE;gBAC5B,cAAc,EAAE,MAAM,CAAC,kBAAkB;gBACzC,cAAc,EAAE,MAAM,CAAC,cAAc,CAAC,YAAY,EAAE;gBACpD,QAAQ,EAAE,OAAO;gBACjB,QAAQ,EAAE,OAAO;gBACjB,cAAc,EAAE,MAAM;gBACtB,gBAAgB,EAAE,WAAW;aAC9B,CAAC,CAAC;QACL,CAAC,EAAE,KAAM,CAAC,CAAC;QAEX,+DAA+D;QAC/D,kBAAkB,CAAC,KAAK,IAAI,EAAE;YAC5B,IAAI,IAAI,CAAC,sBAAsB,EAAE;gBAC/B,IAAI;oBACF,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;oBAC9C,gBAAgB,CAAC,OAAO,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;iBAC5C;gBAAC,OAAO,CAAC,EAAE;oBACV,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,EAAE,EAAE,CAAU,CAAC,CAAC;iBACtD;aACF;YACD,eAAe,CAAC,KAAK,EAAE,CAAC;QAC1B,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAE7B,eAAe,CAAC,MAAM,CAAC,gBAAgB,CACrC,OAAO,EACP,KAAK,IAAI,EAAE;YACT,IAAI;gBACF,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBAC5B,aAAa,CAAC,aAAa,CAAC,CAAC;gBAE7B,MAAM,aAAa,EAAE,KAAK,EAAE,CAAC;gBAC7B,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;gBACpB,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;aACjC;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,EAAE,EAAE,CAAU,CAAC,CAAC;gBACvD,+DAA+D;gBAC/D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;QACH,CAAC,EACD,EAAC,IAAI,EAAE,IAAI,EAAC,CACb,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,YAAY,YAAY,EAAE;YAC7B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,oEAAoE;SAC7F;aAAM;YACL,MAAM,CAAC,CAAC;SACT;KACF;AACH,CAAC;AAED,oEAAoE;AACpE,4EAA4E;AAC5E,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,IAA+B;IACvE,MAAM,EAAC,MAAM,EAAE,OAAO,EAAC,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;IACxD,MAAM,EAAC,OAAO,EAAE,MAAM,EAAC,GAAG,cAAc,EAAE,CAAC;IAC3C,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClD,2DAA2D;IAC3D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC/D,MAAM,EAAC,MAAM,EAAE,UAAU,EAAC,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,CAAC,UAAU,EAAE;QACf,mEAAmE;QACnE,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;KACzE;IAED,yBAAyB;IACzB,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;IAEnB,wBAAwB;IACxB,UAAU,CAAC,QAAQ,GAAG,CAAC,UAAU,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CACtD,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,EAC3D,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CACtE,CAAC;IAEF,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;IAC7E,MAAM,EAAC,MAAM,EAAE,GAAG,EAAC,GAAG,MAAM,gBAAgB,CAAC,IAA6B,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IAEjG,OAAO,EAAC,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAC,CAAC;AAC/F,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { bootnodeOptions } from "./options.js";
|
|
2
|
+
import { bootnodeHandler } from "./handler.js";
|
|
3
|
+
export const bootnode = {
|
|
4
|
+
command: "bootnode",
|
|
5
|
+
describe: "Run a discv5 bootnode. This will NOT perform any beacon node functions, rather, it will run a discv5 service that allows nodes on the network to discover one another.",
|
|
6
|
+
options: bootnodeOptions,
|
|
7
|
+
handler: bootnodeHandler,
|
|
8
|
+
};
|
|
9
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cmds/bootnode/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,eAAe,EAAe,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAC,eAAe,EAAC,MAAM,cAAc,CAAC;AAE7C,MAAM,CAAC,MAAM,QAAQ,GAAyC;IAC5D,OAAO,EAAE,UAAU;IACnB,QAAQ,EACN,wKAAwK;IAC1K,OAAO,EAAE,eAAkD;IAC3D,OAAO,EAAE,eAAe;CACzB,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { Options } from "yargs";
|
|
2
|
+
import { LogArgs } from "../../options/logOptions.js";
|
|
3
|
+
import { CliCommandOptions } from "../../util/index.js";
|
|
4
|
+
import { MetricsArgs } from "../../options/beaconNodeOptions/metrics.js";
|
|
5
|
+
type BootnodeExtraArgs = {
|
|
6
|
+
listenAddress?: string;
|
|
7
|
+
port?: number;
|
|
8
|
+
listenAddress6?: string;
|
|
9
|
+
port6?: number;
|
|
10
|
+
bootnodes?: string[];
|
|
11
|
+
bootnodesFile?: string;
|
|
12
|
+
persistNetworkIdentity?: boolean;
|
|
13
|
+
"enr.ip"?: string;
|
|
14
|
+
"enr.ip6"?: string;
|
|
15
|
+
"enr.udp"?: number;
|
|
16
|
+
"enr.udp6"?: number;
|
|
17
|
+
nat?: boolean;
|
|
18
|
+
};
|
|
19
|
+
export declare const bootnodeExtraOptions: CliCommandOptions<BootnodeExtraArgs>;
|
|
20
|
+
export type BootnodeArgs = BootnodeExtraArgs & LogArgs & MetricsArgs;
|
|
21
|
+
export declare const bootnodeOptions: {
|
|
22
|
+
[k: string]: Options;
|
|
23
|
+
};
|
|
24
|
+
export {};
|
|
25
|
+
//# sourceMappingURL=options.d.ts.map
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import { logOptions } from "../../options/logOptions.js";
|
|
2
|
+
import { options as metricsOptions } from "../../options/beaconNodeOptions/metrics.js";
|
|
3
|
+
import { defaultListenAddress, defaultP2pPort, defaultP2pPort6 } from "../../options/beaconNodeOptions/network.js";
|
|
4
|
+
export const bootnodeExtraOptions = {
|
|
5
|
+
listenAddress: {
|
|
6
|
+
type: "string",
|
|
7
|
+
description: "The IPv4 address to listen for discv5 connections",
|
|
8
|
+
defaultDescription: defaultListenAddress,
|
|
9
|
+
group: "network",
|
|
10
|
+
},
|
|
11
|
+
port: {
|
|
12
|
+
alias: "discoveryPort",
|
|
13
|
+
description: "The UDP port to listen on",
|
|
14
|
+
type: "number",
|
|
15
|
+
defaultDescription: String(defaultP2pPort),
|
|
16
|
+
group: "network",
|
|
17
|
+
},
|
|
18
|
+
listenAddress6: {
|
|
19
|
+
type: "string",
|
|
20
|
+
description: "The IPv6 address to listen for discv5 connections",
|
|
21
|
+
group: "network",
|
|
22
|
+
},
|
|
23
|
+
port6: {
|
|
24
|
+
alias: "discoveryPort6",
|
|
25
|
+
description: "The UDP port to listen on",
|
|
26
|
+
type: "number",
|
|
27
|
+
defaultDescription: String(defaultP2pPort6),
|
|
28
|
+
group: "network",
|
|
29
|
+
},
|
|
30
|
+
bootnodes: {
|
|
31
|
+
type: "array",
|
|
32
|
+
description: "Additional bootnodes for discv5 discovery",
|
|
33
|
+
defaultDescription: JSON.stringify([]),
|
|
34
|
+
// Each bootnode entry could be comma separated, just deserialize it into a single array
|
|
35
|
+
// as comma separated entries are generally most friendly in ansible kind of setups, i.e.
|
|
36
|
+
// [ "en1", "en2,en3" ] => [ 'en1', 'en2', 'en3' ]
|
|
37
|
+
coerce: (args) => args.map((item) => item.split(",")).flat(1),
|
|
38
|
+
group: "network",
|
|
39
|
+
},
|
|
40
|
+
bootnodesFile: {
|
|
41
|
+
description: "Additional bootnodes for discv5 discovery file path",
|
|
42
|
+
type: "string",
|
|
43
|
+
group: "network",
|
|
44
|
+
},
|
|
45
|
+
persistNetworkIdentity: {
|
|
46
|
+
description: "Whether to reuse the same peer-id across restarts",
|
|
47
|
+
default: true,
|
|
48
|
+
type: "boolean",
|
|
49
|
+
group: "network",
|
|
50
|
+
},
|
|
51
|
+
"enr.ip": {
|
|
52
|
+
description: "Override ENR IP entry",
|
|
53
|
+
type: "string",
|
|
54
|
+
group: "enr",
|
|
55
|
+
},
|
|
56
|
+
"enr.udp": {
|
|
57
|
+
description: "Override ENR UDP entry",
|
|
58
|
+
type: "number",
|
|
59
|
+
group: "enr",
|
|
60
|
+
},
|
|
61
|
+
"enr.ip6": {
|
|
62
|
+
description: "Override ENR IPv6 entry",
|
|
63
|
+
type: "string",
|
|
64
|
+
group: "enr",
|
|
65
|
+
},
|
|
66
|
+
"enr.udp6": {
|
|
67
|
+
description: "Override ENR (IPv6-specific) UDP entry",
|
|
68
|
+
type: "number",
|
|
69
|
+
group: "enr",
|
|
70
|
+
},
|
|
71
|
+
nat: {
|
|
72
|
+
type: "boolean",
|
|
73
|
+
description: "Allow ENR configuration of non-local addresses",
|
|
74
|
+
group: "enr",
|
|
75
|
+
},
|
|
76
|
+
};
|
|
77
|
+
export const bootnodeOptions = {
|
|
78
|
+
...bootnodeExtraOptions,
|
|
79
|
+
...logOptions,
|
|
80
|
+
...metricsOptions,
|
|
81
|
+
};
|
|
82
|
+
//# sourceMappingURL=options.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/cmds/bootnode/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,UAAU,EAAC,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAc,OAAO,IAAI,cAAc,EAAC,MAAM,4CAA4C,CAAC;AAClG,OAAO,EAAC,oBAAoB,EAAE,cAAc,EAAE,eAAe,EAAC,MAAM,4CAA4C,CAAC;AAiBjH,MAAM,CAAC,MAAM,oBAAoB,GAAyC;IACxE,aAAa,EAAE;QACb,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,mDAAmD;QAChE,kBAAkB,EAAE,oBAAoB;QACxC,KAAK,EAAE,SAAS;KACjB;IAED,IAAI,EAAE;QACJ,KAAK,EAAE,eAAe;QACtB,WAAW,EAAE,2BAA2B;QACxC,IAAI,EAAE,QAAQ;QACd,kBAAkB,EAAE,MAAM,CAAC,cAAc,CAAC;QAC1C,KAAK,EAAE,SAAS;KACjB;IAED,cAAc,EAAE;QACd,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,mDAAmD;QAChE,KAAK,EAAE,SAAS;KACjB;IAED,KAAK,EAAE;QACL,KAAK,EAAE,gBAAgB;QACvB,WAAW,EAAE,2BAA2B;QACxC,IAAI,EAAE,QAAQ;QACd,kBAAkB,EAAE,MAAM,CAAC,eAAe,CAAC;QAC3C,KAAK,EAAE,SAAS;KACjB;IAED,SAAS,EAAE;QACT,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,2CAA2C;QACxD,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QACtC,wFAAwF;QACxF,yFAAyF;QACzF,kDAAkD;QAClD,MAAM,EAAE,CAAC,IAAc,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACvE,KAAK,EAAE,SAAS;KACjB;IAED,aAAa,EAAE;QACb,WAAW,EAAE,qDAAqD;QAClE,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,SAAS;KACjB;IAED,sBAAsB,EAAE;QACtB,WAAW,EAAE,mDAAmD;QAChE,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,SAAS;KACjB;IAED,QAAQ,EAAE;QACR,WAAW,EAAE,uBAAuB;QACpC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,KAAK;KACb;IACD,SAAS,EAAE;QACT,WAAW,EAAE,wBAAwB;QACrC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,KAAK;KACb;IACD,SAAS,EAAE;QACT,WAAW,EAAE,yBAAyB;QACtC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,KAAK;KACb;IACD,UAAU,EAAE;QACV,WAAW,EAAE,wCAAwC;QACrD,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,KAAK;KACb;IACD,GAAG,EAAE;QACH,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,gDAAgD;QAC7D,KAAK,EAAE,KAAK;KACb;CACF,CAAC;AAIF,MAAM,CAAC,MAAM,eAAe,GAA2B;IACrD,GAAG,oBAAoB;IACvB,GAAG,UAAU;IACb,GAAG,cAAc;CAClB,CAAC"}
|
|
@@ -57,6 +57,7 @@ export declare const devOptions: {
|
|
|
57
57
|
"chain.archiveStateEpochFrequency"?: Options | undefined;
|
|
58
58
|
emitPayloadAttributes?: Options | undefined;
|
|
59
59
|
broadcastValidationStrictness?: Options | undefined;
|
|
60
|
+
"chain.minSameMessageSignatureSetsToBatch"?: Options | undefined;
|
|
60
61
|
"execution.engineMock"?: Options | undefined;
|
|
61
62
|
"execution.urls"?: Options | undefined;
|
|
62
63
|
"execution.timeout"?: Options | undefined;
|
|
@@ -85,6 +86,7 @@ export declare const devOptions: {
|
|
|
85
86
|
"network.connectToDiscv5Bootnodes"?: Options | undefined;
|
|
86
87
|
"network.discv5FirstQueryDelayMs"?: Options | undefined;
|
|
87
88
|
"network.dontSendGossipAttestationsToForkchoice"?: Options | undefined;
|
|
89
|
+
"network.beaconAttestationBatchValidation"?: Options | undefined;
|
|
88
90
|
"network.allowPublishToZeroPeers"?: Options | undefined;
|
|
89
91
|
"network.gossipsubD"?: Options | undefined;
|
|
90
92
|
"network.gossipsubDLow"?: Options | undefined;
|
package/lib/cmds/index.js
CHANGED
|
@@ -2,10 +2,12 @@ import { beacon } from "./beacon/index.js";
|
|
|
2
2
|
import { dev } from "./dev/index.js";
|
|
3
3
|
import { validator } from "./validator/index.js";
|
|
4
4
|
import { lightclient } from "./lightclient/index.js";
|
|
5
|
+
import { bootnode } from "./bootnode/index.js";
|
|
5
6
|
export const cmds = [
|
|
6
7
|
beacon,
|
|
7
8
|
validator,
|
|
8
9
|
lightclient,
|
|
9
10
|
dev,
|
|
11
|
+
bootnode,
|
|
10
12
|
];
|
|
11
13
|
//# sourceMappingURL=index.js.map
|
package/lib/cmds/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cmds/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAC,GAAG,EAAC,MAAM,gBAAgB,CAAC;AACnC,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cmds/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAC,GAAG,EAAC,MAAM,gBAAgB,CAAC;AACnC,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAC,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAE7C,MAAM,CAAC,MAAM,IAAI,GAA0E;IACzF,MAAM;IACN,SAAS;IACT,WAAW;IACX,GAAG;IACH,QAAQ;CACT,CAAC"}
|
|
@@ -3,7 +3,8 @@ import { Keystore } from "@chainsafe/bls-keystore";
|
|
|
3
3
|
import { fromHexString } from "@chainsafe/ssz";
|
|
4
4
|
import { DeleteRemoteKeyStatus, DeletionStatus, ImportStatus, ImportRemoteKeyStatus, } from "@lodestar/api/keymanager";
|
|
5
5
|
import { SignerType } from "@lodestar/validator";
|
|
6
|
-
import {
|
|
6
|
+
import { isValidHttpUrl } from "@lodestar/utils";
|
|
7
|
+
import { getPubkeyHexFromKeystore, isValidatePubkeyHex } from "../../../util/format.js";
|
|
7
8
|
import { parseFeeRecipient } from "../../../util/index.js";
|
|
8
9
|
import { DecryptKeystoresThreadPool } from "./decryptKeystores/index.js";
|
|
9
10
|
export class KeymanagerApi {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"impl.js","sourceRoot":"","sources":["../../../../src/cmds/validator/keymanager/impl.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,gBAAgB,CAAC;AACjC,OAAO,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAEL,qBAAqB,EACrB,cAAc,EACd,YAAY,EAMZ,qBAAqB,GACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAc,UAAU,EAAY,MAAM,qBAAqB,CAAC;AAEvE,OAAO,EAAC,wBAAwB,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"impl.js","sourceRoot":"","sources":["../../../../src/cmds/validator/keymanager/impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,9 @@ import { deriveEth2ValidatorKeys, deriveKeyFromMnemonic } from "@chainsafe/bls-k
|
|
|
4
4
|
import { toHexString } from "@chainsafe/ssz";
|
|
5
5
|
import { interopSecretKey } from "@lodestar/state-transition";
|
|
6
6
|
import { externalSignerGetKeys, SignerType } from "@lodestar/validator";
|
|
7
|
+
import { isValidHttpUrl } from "@lodestar/utils";
|
|
7
8
|
import { defaultNetwork } from "../../../options/index.js";
|
|
8
|
-
import { assertValidPubkeysHex,
|
|
9
|
+
import { assertValidPubkeysHex, parseRange, YargsError } from "../../../util/index.js";
|
|
9
10
|
import { getAccountPaths } from "../paths.js";
|
|
10
11
|
import { PersistedKeysBackend } from "../keymanager/persistedKeys.js";
|
|
11
12
|
import { decryptKeystoreDefinitions } from "../keymanager/decryptKeystoreDefinitions.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cmds/validator/signers/index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,GAAG,MAAM,gBAAgB,CAAC;AACjC,OAAO,EAAC,uBAAuB,EAAE,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAC,gBAAgB,EAAC,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAC,qBAAqB,EAAU,UAAU,EAAC,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cmds/validator/signers/index.ts"],"names":[],"mappings":"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"}
|
package/lib/config/peerId.d.ts
CHANGED
package/lib/networks/chiado.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { chiadoChainConfig as chainConfig } from "@lodestar/config/networks";
|
|
2
2
|
export declare const depositContractDeployBlock = 155435;
|
|
3
|
-
export declare const genesisFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/
|
|
4
|
-
export declare const bootnodesFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/
|
|
3
|
+
export declare const genesisFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/main/chiado/genesis.ssz";
|
|
4
|
+
export declare const bootnodesFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/main/chiado/bootnodes.yaml";
|
|
5
5
|
export declare const bootEnrs: string[];
|
|
6
6
|
//# sourceMappingURL=chiado.d.ts.map
|
package/lib/networks/chiado.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
export { chiadoChainConfig as chainConfig } from "@lodestar/config/networks";
|
|
2
2
|
// eth1.providerUrls suggestion: https://rpc.chiado.gnosis.gateway.fm
|
|
3
3
|
export const depositContractDeployBlock = 155435;
|
|
4
|
-
export const genesisFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/
|
|
5
|
-
export const bootnodesFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/
|
|
4
|
+
export const genesisFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/main/chiado/genesis.ssz";
|
|
5
|
+
export const bootnodesFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/main/chiado/bootnodes.yaml";
|
|
6
6
|
export const bootEnrs = [
|
|
7
7
|
"enr:-L64QOijsdi9aVIawMb5h5PWueaPM9Ai6P17GNPFlHzz7MGJQ8tFMdYrEx8WQitNKLG924g2Q9cCdzg54M0UtKa3QIKCMxaHYXR0bmV0c4j__________4RldGgykDE2cEMCAABv__________-CaWSCdjSCaXCEi5AaWYlzZWNwMjU2azGhA8CjTkD4m1s8FbKCN18LgqlYcE65jrT148vFtwd9U62SiHN5bmNuZXRzD4N0Y3CCIyiDdWRwgiMo",
|
|
8
8
|
"enr:-L64QKYKGQj5ybkfBxyFU5IEVzP7oJkGHJlie4W8BCGAYEi4P0mmMksaasiYF789mVW_AxYVNVFUjg9CyzmdvpyWQ1KCMlmHYXR0bmV0c4j__________4RldGgykDE2cEMCAABv__________-CaWSCdjSCaXCEi5CtNolzZWNwMjU2azGhAuA7BAwIijy1z81AO9nz_MOukA1ER68rGA67PYQ5pF1qiHN5bmNuZXRzD4N0Y3CCIyiDdWRwgiMo",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chiado.js","sourceRoot":"","sources":["../../src/networks/chiado.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,IAAI,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAE3E,qEAAqE;AACrE,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC;AACjD,MAAM,CAAC,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"chiado.js","sourceRoot":"","sources":["../../src/networks/chiado.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,IAAI,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAE3E,qEAAqE;AACrE,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC;AACjD,MAAM,CAAC,MAAM,cAAc,GAAG,+EAA+E,CAAC;AAC9G,MAAM,CAAC,MAAM,gBAAgB,GAAG,kFAAkF,CAAC;AAEnH,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,sQAAsQ;IACtQ,sQAAsQ;IACtQ,oQAAoQ;IACpQ,8QAA8Q;IAC9Q,oQAAoQ;IACpQ,oQAAoQ;IACpQ,oQAAoQ;IACpQ,oQAAoQ;CACrQ,CAAC"}
|
package/lib/networks/gnosis.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { gnosisChainConfig as chainConfig } from "@lodestar/config/networks";
|
|
2
2
|
export declare const depositContractDeployBlock = 19469077;
|
|
3
|
-
export declare const genesisFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/
|
|
4
|
-
export declare const bootnodesFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/
|
|
3
|
+
export declare const genesisFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/main/mainnet/genesis.ssz";
|
|
4
|
+
export declare const bootnodesFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/main/mainnet/bootnodes.yaml";
|
|
5
5
|
export declare const bootEnrs: string[];
|
|
6
6
|
//# sourceMappingURL=gnosis.d.ts.map
|