@chainsafe/lodestar 1.10.0-dev.85ff3cf17e → 1.10.0-dev.8a57890b6c
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.js +3 -0
- package/lib/cmds/beacon/handler.js.map +1 -1
- package/lib/cmds/beacon/initPeerIdAndEnr.d.ts +1 -2
- package/lib/cmds/beacon/initPeerIdAndEnr.js +28 -27
- package/lib/cmds/beacon/initPeerIdAndEnr.js.map +1 -1
- package/lib/cmds/dev/files.js +1 -1
- package/lib/cmds/dev/files.js.map +1 -1
- package/lib/cmds/dev/options.d.ts +8 -2
- package/lib/cmds/lightclient/handler.js +1 -1
- package/lib/cmds/lightclient/handler.js.map +1 -1
- package/lib/cmds/validator/blsToExecutionChange.js +3 -3
- package/lib/cmds/validator/blsToExecutionChange.js.map +1 -1
- package/lib/cmds/validator/keymanager/decryptKeystoreDefinitions.js +4 -1
- package/lib/cmds/validator/keymanager/decryptKeystoreDefinitions.js.map +1 -1
- package/lib/cmds/validator/keymanager/decryptKeystores/threadPool.js.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/server.js +1 -1
- package/lib/cmds/validator/keymanager/server.js.map +1 -1
- package/lib/cmds/validator/signers/index.js +3 -3
- package/lib/cmds/validator/signers/index.js.map +1 -1
- package/lib/cmds/validator/voluntaryExit.js +8 -2
- package/lib/cmds/validator/voluntaryExit.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 +2 -2
- package/lib/networks/gnosis.js.map +1 -1
- package/lib/networks/goerli.d.ts +2 -2
- package/lib/networks/goerli.js +2 -2
- package/lib/networks/goerli.js.map +1 -1
- package/lib/networks/index.js +9 -0
- package/lib/networks/index.js.map +1 -1
- package/lib/networks/mainnet.d.ts +2 -2
- package/lib/networks/mainnet.js +2 -2
- 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 +2 -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 +6 -0
- package/lib/options/beaconNodeOptions/network.d.ts +14 -0
- package/lib/options/beaconNodeOptions/network.js +108 -14
- package/lib/options/beaconNodeOptions/network.js.map +1 -1
- package/lib/util/format.js +1 -1
- package/lib/util/format.js.map +1 -1
- package/package.json +23 -20
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/b90374a1c63703db8235fcdb65aff2e909bc42b5/chiado/genesis.ssz";
|
|
5
|
+
export const bootnodesFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/b90374a1c63703db8235fcdb65aff2e909bc42b5/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,GACzB,mHAAmH,CAAC;AACtH,MAAM,CAAC,MAAM,gBAAgB,GAC3B,sHAAsH,CAAC;AAEzH,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/b90374a1c63703db8235fcdb65aff2e909bc42b5/mainnet/genesis.ssz";
|
|
4
|
+
export declare const bootnodesFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/b90374a1c63703db8235fcdb65aff2e909bc42b5/mainnet/bootnodes.yaml";
|
|
5
5
|
export declare const bootEnrs: string[];
|
|
6
6
|
//# sourceMappingURL=gnosis.d.ts.map
|
package/lib/networks/gnosis.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
export { gnosisChainConfig as chainConfig } from "@lodestar/config/networks";
|
|
2
2
|
// eth1.providerUrls suggestion: https://rpc.gnosischain.com
|
|
3
3
|
export const depositContractDeployBlock = 19469077;
|
|
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/b90374a1c63703db8235fcdb65aff2e909bc42b5/mainnet/genesis.ssz";
|
|
5
|
+
export const bootnodesFileUrl = "https://raw.githubusercontent.com/gnosischain/configs/b90374a1c63703db8235fcdb65aff2e909bc42b5/mainnet/bootnodes.yaml";
|
|
6
6
|
export const bootEnrs = [
|
|
7
7
|
"enr:-Ly4QMU1y81COwm1VZgxGF4_eZ21ub9-GHF6dXZ29aEJ0oZpcV2Rysw-viaEKfpcpu9ZarILJLxFZjcKOjE0Sybs3MQBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpCCS-QxAgAAZP__________gmlkgnY0gmlwhANLnx-Jc2VjcDI1NmsxoQKoaYT8I-wf2I_f_ii6EgoSSXj5T3bhiDyW-7ZLsY3T64hzeW5jbmV0cwCDdGNwgiMog3VkcIIjKA",
|
|
8
8
|
"enr:-Ly4QBf76jLiCA_pDXoZjhyRbuwzFOscFY-MIKkPnmHPQbvaKhIDZutfe38G9ibzgQP0RKrTo3vcWOy4hf_8wOZ-U5MBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpCCS-QxAgAAZP__________gmlkgnY0gmlwhBLGgjaJc2VjcDI1NmsxoQLGeo0Q4lDvxIjHjnkAqEuETTaFIjsNrEcSpdDhcHXWFYhzeW5jbmV0cwCDdGNwgiMog3VkcIIjKA",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gnosis.js","sourceRoot":"","sources":["../../src/networks/gnosis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,IAAI,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAE3E,4DAA4D;AAC5D,MAAM,CAAC,MAAM,0BAA0B,GAAG,QAAQ,CAAC;AACnD,MAAM,CAAC,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"gnosis.js","sourceRoot":"","sources":["../../src/networks/gnosis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,IAAI,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAE3E,4DAA4D;AAC5D,MAAM,CAAC,MAAM,0BAA0B,GAAG,QAAQ,CAAC;AACnD,MAAM,CAAC,MAAM,cAAc,GACzB,oHAAoH,CAAC;AACvH,MAAM,CAAC,MAAM,gBAAgB,GAC3B,uHAAuH,CAAC;AAE1H,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,oQAAoQ;IACpQ,oQAAoQ;IACpQ,oQAAoQ;IACpQ,oQAAoQ;IACpQ,oQAAoQ;IACpQ,oQAAoQ;IACpQ,oQAAoQ;IACpQ,oQAAoQ;CACrQ,CAAC"}
|
package/lib/networks/goerli.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { goerliChainConfig as chainConfig } from "@lodestar/config/networks";
|
|
2
2
|
export declare const depositContractDeployBlock = 4367322;
|
|
3
|
-
export declare const genesisFileUrl = "https://raw.githubusercontent.com/
|
|
4
|
-
export declare const bootnodesFileUrl = "https://raw.githubusercontent.com/
|
|
3
|
+
export declare const genesisFileUrl = "https://raw.githubusercontent.com/eth-clients/eth2-networks/f94c4d9499e55bec0fd21d31203350080633c60a/shared/prater/genesis.ssz";
|
|
4
|
+
export declare const bootnodesFileUrl = "https://raw.githubusercontent.com/eth-clients/eth2-networks/f94c4d9499e55bec0fd21d31203350080633c60a/shared/prater/bootstrap_nodes.txt";
|
|
5
5
|
export declare const bootEnrs: never[];
|
|
6
6
|
//# sourceMappingURL=goerli.d.ts.map
|
package/lib/networks/goerli.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { goerliChainConfig as chainConfig } from "@lodestar/config/networks";
|
|
2
2
|
export const depositContractDeployBlock = 4367322;
|
|
3
|
-
export const genesisFileUrl = "https://raw.githubusercontent.com/
|
|
4
|
-
export const bootnodesFileUrl = "https://raw.githubusercontent.com/
|
|
3
|
+
export const genesisFileUrl = "https://raw.githubusercontent.com/eth-clients/eth2-networks/f94c4d9499e55bec0fd21d31203350080633c60a/shared/prater/genesis.ssz";
|
|
4
|
+
export const bootnodesFileUrl = "https://raw.githubusercontent.com/eth-clients/eth2-networks/f94c4d9499e55bec0fd21d31203350080633c60a/shared/prater/bootstrap_nodes.txt";
|
|
5
5
|
export const bootEnrs = [];
|
|
6
6
|
//# sourceMappingURL=goerli.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"goerli.js","sourceRoot":"","sources":["../../src/networks/goerli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,IAAI,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAE3E,MAAM,CAAC,MAAM,0BAA0B,GAAG,OAAO,CAAC;AAClD,MAAM,CAAC,MAAM,cAAc,GACzB
|
|
1
|
+
{"version":3,"file":"goerli.js","sourceRoot":"","sources":["../../src/networks/goerli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,IAAI,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAE3E,MAAM,CAAC,MAAM,0BAA0B,GAAG,OAAO,CAAC;AAClD,MAAM,CAAC,MAAM,cAAc,GACzB,gIAAgI,CAAC;AACnI,MAAM,CAAC,MAAM,gBAAgB,GAC3B,wIAAwI,CAAC;AAE3I,MAAM,CAAC,MAAM,QAAQ,GAAG,EAAE,CAAC"}
|
package/lib/networks/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
2
|
import got from "got";
|
|
3
|
+
import { ENR } from "@chainsafe/discv5";
|
|
3
4
|
import { SLOTS_PER_EPOCH } from "@lodestar/params";
|
|
4
5
|
import { ApiError, getClient } from "@lodestar/api";
|
|
5
6
|
import { getStateTypeFromBytes } from "@lodestar/beacon-node";
|
|
@@ -90,6 +91,14 @@ export async function getNetworkBootnodes(network) {
|
|
|
90
91
|
export function readBootnodes(bootnodesFilePath) {
|
|
91
92
|
const bootnodesFile = fs.readFileSync(bootnodesFilePath, "utf8");
|
|
92
93
|
const bootnodes = parseBootnodesFile(bootnodesFile);
|
|
94
|
+
for (const enrStr of bootnodes) {
|
|
95
|
+
try {
|
|
96
|
+
ENR.decodeTxt(enrStr);
|
|
97
|
+
}
|
|
98
|
+
catch (e) {
|
|
99
|
+
throw new Error(`Invalid ENR found in ${bootnodesFilePath}:\n ${enrStr}`);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
93
102
|
if (bootnodes.length === 0) {
|
|
94
103
|
throw new Error(`No bootnodes found on file ${bootnodesFilePath}`);
|
|
95
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/networks/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/networks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAC,GAAG,EAAC,MAAM,mBAAmB,CAAC;AACtC,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,QAAQ,EAAE,SAAS,EAAC,MAAM,eAAe,CAAC;AAClD,OAAO,EAAC,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;AAI5D,OAAO,EAAC,OAAO,EAAE,eAAe,EAAS,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAsB,kBAAkB,EAAE,iCAAiC,EAAC,MAAM,4BAA4B,CAAC;AACtH,OAAO,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AAGtC,MAAM,CAAC,MAAM,YAAY,GAAkB;IACzC,SAAS;IACT,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,SAAS;IACT,QAAQ;IAER,0EAA0E;IAC1E,KAAK;CACN,CAAC;AAEF,MAAM,UAAU,kBAAkB,CAAC,OAAe;IAChD,OAAO,YAAY,CAAC,QAAQ,CAAC,OAAsB,CAAC,CAAC;AACvD,CAAC;AAOD,sEAAsE;AACtE,MAAM,sBAAsB,GAAG,EAAE,GAAG,IAAI,CAAC;AAEzC,MAAM,UAAU,cAAc,CAAC,OAAoB;IAOjD,QAAQ,OAAO,EAAE;QACf,KAAK,SAAS;YACZ,OAAO,OAAO,CAAC;QACjB,KAAK,KAAK;YACR,OAAO,GAAG,CAAC;QACb,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC;QAChB,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC;QAChB,KAAK,SAAS;YACZ,OAAO,OAAO,CAAC;QACjB,KAAK,SAAS;YACZ,OAAO,OAAO,CAAC;QACjB,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC;QAChB;YACE,MAAM,KAAK,CAAC,0BAA0B,OAAO,EAAE,CAAC,CAAC;KACpD;AACH,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,OAAoB;IACzD,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC;AAC7C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAoB;IACpD,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC;AAChD,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAoB;IACvD,MAAM,gBAAgB,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,gBAAgB,CAAC;IAClE,IAAI,gBAAgB,KAAK,IAAI,EAAE;QAC7B,OAAO,EAAE,CAAC;KACX;IAED,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7D,OAAO,kBAAkB,CAAC,aAAa,CAAC,CAAC;AAC3C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAAoB;IAC5D,MAAM,SAAS,GAAG,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;IAExD,4BAA4B;IAC5B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAE;QAC7C,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;YAC/C,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;SAC7B;QAAC,OAAO,CAAC,EAAE;YACV,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,oCAAqC,CAAW,CAAC,KAAK,EAAE,CAAC,CAAC;SACzE;KACF;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,iBAAyB;IACrD,MAAM,aAAa,GAAG,EAAE,CAAC,YAAY,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;IAEjE,MAAM,SAAS,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC;IACpD,KAAK,MAAM,MAAM,IAAI,SAAS,EAAE;QAC9B,IAAI;YACF,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;SACvB;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,wBAAwB,iBAAiB,UAAU,MAAM,EAAE,CAAC,CAAC;SAC9E;KACF;IAED,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,8BAA8B,iBAAiB,EAAE,CAAC,CAAC;KACpE;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,MAAuB,EACvB,MAAc,EACd,EAAC,iBAAiB,EAAE,aAAa,EAAsD;IAEvF,IAAI;QACF,IAAI,YAA+B,CAAC;QACpC,IAAI,OAA2B,CAAC;QAEhC,MAAM,GAAG,GAAG,SAAS,CAAC,EAAC,OAAO,EAAE,iBAAiB,EAAC,EAAE,EAAC,MAAM,EAAC,CAAC,CAAC;QAC9D,IAAI,aAAa,EAAE;YACjB,YAAY,GAAG,oBAAoB,CAAC,aAAa,CAAC,CAAC;YACnD,OAAO,GAAG,YAAY,CAAC,KAAK,GAAG,eAAe,CAAC;SAChD;aAAM;YACL,+DAA+D;YAC/D,OAAO,GAAG,WAAW,CAAC;YACtB,YAAY,GAAG,IAAI,CAAC;SACrB;QAED,gEAAgE;QAChE,MAAM,eAAe,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAE7D,MAAM,UAAU,GAAG,MAAM,eAAe,CACtC,eAAe,EACf,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,EACzD,sBAAsB,CACvB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,sCAAsC,CAAC,CAAC;YAC7D,OAAO,GAAG,CAAC,QAAQ,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAC,OAAO,EAAC,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,qBAAqB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;QAE1F,OAAO;YACL,OAAO;YACP,YAAY,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,sBAAsB,CAAC,OAAO,CAAC;SAC9D,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,2CAA2C,GAAI,CAAW,CAAC,OAAO,CAAC,CAAC;KACrF;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,aAAqB;IACxD,MAAM,eAAe,GAAG,IAAI,MAAM,CAAC,kCAAkC,CAAC,CAAC;IACvE,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,CAAC;IAChE,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,sCAAsC,aAAa,EAAE,CAAC,CAAC;KACxE;IACD,OAAO,EAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAC,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAA0B;IAC/D,OAAO;QACL,+FAA+F;QAC/F,mBAAmB;QACnB,KAAK,EAAE,iCAAiC,CAAC,KAAK,CAAC,IAAI,CAAC;QACpD,IAAI,EAAE,kBAAkB,CAAC,KAAK,CAAC;KAChC,CAAC;AACJ,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/
|
|
4
|
-
export declare const bootnodesFileUrl = "https://raw.githubusercontent.com/
|
|
3
|
+
export declare const genesisFileUrl = "https://raw.githubusercontent.com/eth-clients/eth2-networks/f94c4d9499e55bec0fd21d31203350080633c60a/shared/mainnet/genesis.ssz";
|
|
4
|
+
export declare const bootnodesFileUrl = "https://raw.githubusercontent.com/eth-clients/eth2-networks/f94c4d9499e55bec0fd21d31203350080633c60a/shared/mainnet/bootstrap_nodes.txt";
|
|
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/
|
|
4
|
-
export const bootnodesFileUrl = "https://raw.githubusercontent.com/
|
|
3
|
+
export const genesisFileUrl = "https://raw.githubusercontent.com/eth-clients/eth2-networks/f94c4d9499e55bec0fd21d31203350080633c60a/shared/mainnet/genesis.ssz";
|
|
4
|
+
export const bootnodesFileUrl = "https://raw.githubusercontent.com/eth-clients/eth2-networks/f94c4d9499e55bec0fd21d31203350080633c60a/shared/mainnet/bootstrap_nodes.txt";
|
|
5
5
|
export const bootEnrs = [
|
|
6
6
|
// # Teku team's bootnodes",
|
|
7
7
|
"enr:-KG4QOtcP9X1FbIMOe17QNMKqDxCpm14jcX5tiOE4_TyMrFqbmhPZHK_ZPG2Gxb1GE2xdtodOfx9-cgvNtxnRyHEmC0ghGV0aDKQ9aX9QgAAAAD__________4JpZIJ2NIJpcIQDE8KdiXNlY3AyNTZrMaEDhpehBDbZjM_L9ek699Y7vhUJ-eAdMyQW_Fil522Y0fODdGNwgiMog3VkcIIjKA",
|
|
@@ -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,iIAAiI,CAAC;AACpI,MAAM,CAAC,MAAM,gBAAgB,GAC3B,yIAAyI,CAAC;AAE5I,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,4BAA4B;IAC5B,gOAAgO;IAChO,gOAAgO;IAEhO,6BAA6B;IAC7B,6OAA6O;IAC7O,6OAA6O;IAC7O,6OAA6O;IAE7O,iCAAiC;IACjC,sNAAsN;IACtN,sNAAsN;IAEtN,kBAAkB;IAClB,6OAA6O;IAC7O,6OAA6O;IAC7O,6OAA6O;IAC7O,6OAA6O;IAE7O,6BAA6B;IAC7B,sPAAsP;IACtP,sPAAsP;CACvP,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { ropstenChainConfig as chainConfig } from "@lodestar/config/networks";
|
|
2
2
|
export declare const depositContractDeployBlock = 12269949;
|
|
3
|
-
export declare const genesisFileUrl = "https://raw.githubusercontent.com/eth-clients/merge-testnets/
|
|
4
|
-
export declare const bootnodesFileUrl = "https://raw.githubusercontent.com/eth-clients/merge-testnets/
|
|
3
|
+
export declare const genesisFileUrl = "https://raw.githubusercontent.com/eth-clients/merge-testnets/baebfaba3c0dcb8b6e4d5113e52fd6981253a152/ropsten-beacon-chain/genesis.ssz";
|
|
4
|
+
export declare const bootnodesFileUrl = "https://raw.githubusercontent.com/eth-clients/merge-testnets/baebfaba3c0dcb8b6e4d5113e52fd6981253a152/ropsten-beacon-chain/bootstrap_nodes.txt";
|
|
5
5
|
export declare const bootEnrs: never[];
|
|
6
6
|
//# sourceMappingURL=ropsten.d.ts.map
|
package/lib/networks/ropsten.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { ropstenChainConfig as chainConfig } from "@lodestar/config/networks";
|
|
2
2
|
export const depositContractDeployBlock = 12269949;
|
|
3
|
-
export const genesisFileUrl = "https://raw.githubusercontent.com/eth-clients/merge-testnets/
|
|
4
|
-
export const bootnodesFileUrl = "https://raw.githubusercontent.com/eth-clients/merge-testnets/
|
|
3
|
+
export const genesisFileUrl = "https://raw.githubusercontent.com/eth-clients/merge-testnets/baebfaba3c0dcb8b6e4d5113e52fd6981253a152/ropsten-beacon-chain/genesis.ssz";
|
|
4
|
+
export const bootnodesFileUrl = "https://raw.githubusercontent.com/eth-clients/merge-testnets/baebfaba3c0dcb8b6e4d5113e52fd6981253a152/ropsten-beacon-chain/bootstrap_nodes.txt";
|
|
5
5
|
export const bootEnrs = [];
|
|
6
6
|
//# sourceMappingURL=ropsten.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ropsten.js","sourceRoot":"","sources":["../../src/networks/ropsten.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":"ropsten.js","sourceRoot":"","sources":["../../src/networks/ropsten.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,wIAAwI,CAAC;AAC3I,MAAM,CAAC,MAAM,gBAAgB,GAC3B,gJAAgJ,CAAC;AAEnJ,MAAM,CAAC,MAAM,QAAQ,GAAG,EAAE,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export { sepoliaChainConfig as chainConfig } from "@lodestar/config/networks";
|
|
2
2
|
export declare const depositContractDeployBlock = 1273020;
|
|
3
|
-
export declare const genesisFileUrl = "https://raw.githubusercontent.com/eth-clients/merge-testnets/
|
|
4
|
-
export declare const bootnodesFileUrl = "https://raw.githubusercontent.com/eth-clients/merge-testnets/
|
|
3
|
+
export declare const genesisFileUrl = "https://raw.githubusercontent.com/eth-clients/merge-testnets/baebfaba3c0dcb8b6e4d5113e52fd6981253a152/sepolia/genesis.ssz";
|
|
4
|
+
export declare const bootnodesFileUrl = "https://raw.githubusercontent.com/eth-clients/merge-testnets/baebfaba3c0dcb8b6e4d5113e52fd6981253a152/sepolia/bootstrap_nodes.txt";
|
|
5
5
|
export declare const bootEnrs: string[];
|
|
6
6
|
//# sourceMappingURL=sepolia.d.ts.map
|
package/lib/networks/sepolia.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { sepoliaChainConfig as chainConfig } from "@lodestar/config/networks";
|
|
2
2
|
export const depositContractDeployBlock = 1273020;
|
|
3
|
-
export const genesisFileUrl = "https://raw.githubusercontent.com/eth-clients/merge-testnets/
|
|
4
|
-
export const bootnodesFileUrl = "https://raw.githubusercontent.com/eth-clients/merge-testnets/
|
|
3
|
+
export const genesisFileUrl = "https://raw.githubusercontent.com/eth-clients/merge-testnets/baebfaba3c0dcb8b6e4d5113e52fd6981253a152/sepolia/genesis.ssz";
|
|
4
|
+
export const bootnodesFileUrl = "https://raw.githubusercontent.com/eth-clients/merge-testnets/baebfaba3c0dcb8b6e4d5113e52fd6981253a152/sepolia/bootstrap_nodes.txt";
|
|
5
5
|
export const bootEnrs = [
|
|
6
6
|
"enr:-Iq4QMCTfIMXnow27baRUb35Q8iiFHSIDBJh6hQM5Axohhf4b6Kr_cOCu0htQ5WvVqKvFgY28893DHAg8gnBAXsAVqmGAX53x8JggmlkgnY0gmlwhLKAlv6Jc2VjcDI1NmsxoQK6S-Cii_KmfFdUJL2TANL3ksaKUnNXvTCv1tLwXs0QgIN1ZHCCIyk",
|
|
7
7
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sepolia.js","sourceRoot":"","sources":["../../src/networks/sepolia.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,IAAI,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAE5E,MAAM,CAAC,MAAM,0BAA0B,GAAG,OAAO,CAAC;AAClD,MAAM,CAAC,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"sepolia.js","sourceRoot":"","sources":["../../src/networks/sepolia.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,IAAI,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAE5E,MAAM,CAAC,MAAM,0BAA0B,GAAG,OAAO,CAAC;AAClD,MAAM,CAAC,MAAM,cAAc,GACzB,2HAA2H,CAAC;AAC9H,MAAM,CAAC,MAAM,gBAAgB,GAC3B,mIAAmI,CAAC;AAEtI,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,iMAAiM;CAClM,CAAC"}
|
|
@@ -17,6 +17,7 @@ export type ChainArgs = {
|
|
|
17
17
|
"safe-slots-to-import-optimistically": number;
|
|
18
18
|
"chain.archiveStateEpochFrequency": number;
|
|
19
19
|
emitPayloadAttributes?: boolean;
|
|
20
|
+
broadcastValidationStrictness?: string;
|
|
20
21
|
};
|
|
21
22
|
export declare function parseArgs(args: ChainArgs): IBeaconNodeOptions["chain"];
|
|
22
23
|
export declare const options: CliCommandOptions<ChainArgs>;
|
|
@@ -20,6 +20,7 @@ export function parseArgs(args) {
|
|
|
20
20
|
safeSlotsToImportOptimistically: args["safe-slots-to-import-optimistically"],
|
|
21
21
|
archiveStateEpochFrequency: args["chain.archiveStateEpochFrequency"],
|
|
22
22
|
emitPayloadAttributes: args["emitPayloadAttributes"],
|
|
23
|
+
broadcastValidationStrictness: args["broadcastValidationStrictness"],
|
|
23
24
|
};
|
|
24
25
|
}
|
|
25
26
|
export const options = {
|
|
@@ -128,5 +129,12 @@ Will double processing times. Use only for debugging purposes.",
|
|
|
128
129
|
type: "number",
|
|
129
130
|
group: "chain",
|
|
130
131
|
},
|
|
132
|
+
broadcastValidationStrictness: {
|
|
133
|
+
// TODO: hide the option till validations fully implemented
|
|
134
|
+
hidden: true,
|
|
135
|
+
description: "'warn' or 'error' - options to either throw error or to log warning when broadcast validation can't be performed",
|
|
136
|
+
type: "string",
|
|
137
|
+
default: "warn",
|
|
138
|
+
},
|
|
131
139
|
};
|
|
132
140
|
//# sourceMappingURL=chain.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chain.js","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/chain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAC,cAAc,EAAqB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"chain.js","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/chain.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,9 +21,14 @@ 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;
|
|
29
|
+
deterministicLongLivedAttnets: import("yargs").Options;
|
|
26
30
|
subscribeAllSubnets: import("yargs").Options;
|
|
31
|
+
slotsToSubscribeBeforeAggregatorDuty: import("yargs").Options;
|
|
27
32
|
disablePeerScoring: import("yargs").Options;
|
|
28
33
|
mdns: import("yargs").Options;
|
|
29
34
|
"network.maxPeers": import("yargs").Options;
|
|
@@ -83,6 +88,7 @@ export declare const beaconNodeOptions: {
|
|
|
83
88
|
"safe-slots-to-import-optimistically": import("yargs").Options & Required<Pick<import("yargs").Options, "default">>;
|
|
84
89
|
"chain.archiveStateEpochFrequency": import("yargs").Options & Required<Pick<import("yargs").Options, "default">>;
|
|
85
90
|
emitPayloadAttributes: import("yargs").Options;
|
|
91
|
+
broadcastValidationStrictness: import("yargs").Options;
|
|
86
92
|
"api.maxGindicesInProof": import("yargs").Options;
|
|
87
93
|
"rest.namespace": import("yargs").Options;
|
|
88
94
|
"rest.cors": import("yargs").Options;
|
|
@@ -1,14 +1,20 @@
|
|
|
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;
|
|
15
|
+
deterministicLongLivedAttnets?: boolean;
|
|
11
16
|
subscribeAllSubnets?: boolean;
|
|
17
|
+
slotsToSubscribeBeforeAggregatorDuty?: number;
|
|
12
18
|
disablePeerScoring?: boolean;
|
|
13
19
|
mdns?: boolean;
|
|
14
20
|
"network.maxPeers"?: number;
|
|
@@ -32,6 +38,14 @@ export type NetworkArgs = {
|
|
|
32
38
|
/** @deprecated This option is deprecated and should be removed in next major release. */
|
|
33
39
|
"network.rateTrackerTimeoutMs"?: number;
|
|
34
40
|
};
|
|
41
|
+
export declare function parseListenArgs(args: NetworkArgs): {
|
|
42
|
+
listenAddress: string | undefined;
|
|
43
|
+
port: number | undefined;
|
|
44
|
+
discoveryPort: number | undefined;
|
|
45
|
+
listenAddress6: string | undefined;
|
|
46
|
+
port6: number | undefined;
|
|
47
|
+
discoveryPort6: number | undefined;
|
|
48
|
+
};
|
|
35
49
|
export declare function parseArgs(args: NetworkArgs): IBeaconNodeOptions["network"];
|
|
36
50
|
export declare const options: CliCommandOptions<NetworkArgs>;
|
|
37
51
|
//# sourceMappingURL=network.d.ts.map
|
|
@@ -1,34 +1,97 @@
|
|
|
1
|
+
import { multiaddr } from "@multiformats/multiaddr";
|
|
2
|
+
import { ENR } from "@chainsafe/discv5";
|
|
1
3
|
import { defaultOptions } from "@lodestar/beacon-node";
|
|
2
4
|
import { YargsError } from "../../util/index.js";
|
|
3
5
|
const defaultListenAddress = "0.0.0.0";
|
|
4
6
|
export const defaultP2pPort = 9000;
|
|
7
|
+
export const defaultP2pPort6 = 9090;
|
|
8
|
+
function validateMultiaddrArg(args, key) {
|
|
9
|
+
if (args[key]) {
|
|
10
|
+
try {
|
|
11
|
+
multiaddr(args[key]);
|
|
12
|
+
}
|
|
13
|
+
catch (e) {
|
|
14
|
+
throw new YargsError(`Invalid ${key}: ${e.message}`);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
|
|
19
|
+
export function parseListenArgs(args) {
|
|
20
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
21
|
+
// If listenAddress is explicitly set, use it
|
|
22
|
+
// If listenAddress6 is not set, use defaultListenAddress
|
|
23
|
+
const listenAddress = (_a = args.listenAddress) !== null && _a !== void 0 ? _a : (args.listenAddress6 ? undefined : defaultListenAddress);
|
|
24
|
+
const port = listenAddress ? (_b = args.port) !== null && _b !== void 0 ? _b : defaultP2pPort : undefined;
|
|
25
|
+
const discoveryPort = listenAddress ? (_d = (_c = args.discoveryPort) !== null && _c !== void 0 ? _c : args.port) !== null && _d !== void 0 ? _d : defaultP2pPort : undefined;
|
|
26
|
+
// Only use listenAddress6 if it is explicitly set
|
|
27
|
+
const listenAddress6 = args.listenAddress6;
|
|
28
|
+
const port6 = listenAddress6 ? (_e = args.port6) !== null && _e !== void 0 ? _e : defaultP2pPort6 : undefined;
|
|
29
|
+
const discoveryPort6 = listenAddress6 ? (_g = (_f = args.discoveryPort6) !== null && _f !== void 0 ? _f : args.port6) !== null && _g !== void 0 ? _g : defaultP2pPort6 : undefined;
|
|
30
|
+
return { listenAddress, port, discoveryPort, listenAddress6, port6, discoveryPort6 };
|
|
31
|
+
}
|
|
5
32
|
export function parseArgs(args) {
|
|
6
|
-
var _a, _b, _c, _d
|
|
7
|
-
const listenAddress = args
|
|
8
|
-
|
|
9
|
-
const
|
|
33
|
+
var _a, _b, _c, _d;
|
|
34
|
+
const { listenAddress, port, discoveryPort, listenAddress6, port6, discoveryPort6 } = parseListenArgs(args);
|
|
35
|
+
// validate ip, ip6, ports
|
|
36
|
+
const muArgs = {
|
|
37
|
+
listenAddress: listenAddress ? `/ip4/${listenAddress}` : undefined,
|
|
38
|
+
port: listenAddress ? `/tcp/${port}` : undefined,
|
|
39
|
+
discoveryPort: listenAddress ? `/udp/${discoveryPort}` : undefined,
|
|
40
|
+
listenAddress6: listenAddress6 ? `/ip6/${listenAddress6}` : undefined,
|
|
41
|
+
port6: listenAddress6 ? `/tcp/${port6}` : undefined,
|
|
42
|
+
discoveryPort6: listenAddress6 ? `/udp/${discoveryPort6}` : undefined,
|
|
43
|
+
};
|
|
44
|
+
for (const key of [
|
|
45
|
+
"listenAddress",
|
|
46
|
+
"port",
|
|
47
|
+
"discoveryPort",
|
|
48
|
+
"listenAddress6",
|
|
49
|
+
"port6",
|
|
50
|
+
"discoveryPort6",
|
|
51
|
+
]) {
|
|
52
|
+
validateMultiaddrArg(muArgs, key);
|
|
53
|
+
}
|
|
54
|
+
const bindMu = listenAddress ? `${muArgs.listenAddress}${muArgs.discoveryPort}` : undefined;
|
|
55
|
+
const localMu = listenAddress ? `${muArgs.listenAddress}${muArgs.port}` : undefined;
|
|
56
|
+
const bindMu6 = listenAddress6 ? `${muArgs.listenAddress6}${muArgs.discoveryPort6}` : undefined;
|
|
57
|
+
const localMu6 = listenAddress6 ? `${muArgs.listenAddress6}${muArgs.port6}` : undefined;
|
|
10
58
|
const targetPeers = args["targetPeers"];
|
|
11
|
-
const maxPeers = (
|
|
59
|
+
const maxPeers = (_a = args["network.maxPeers"]) !== null && _a !== void 0 ? _a : (targetPeers !== undefined ? Math.floor(targetPeers * 1.1) : undefined);
|
|
12
60
|
if (targetPeers != null && maxPeers != null && targetPeers > maxPeers) {
|
|
13
61
|
throw new YargsError("network.maxPeers must be greater than or equal to targetPeers");
|
|
14
62
|
}
|
|
15
63
|
// Set discv5 opts to null to disable only if explicitly disabled
|
|
16
|
-
const enableDiscv5 = (
|
|
64
|
+
const enableDiscv5 = (_b = args["discv5"]) !== null && _b !== void 0 ? _b : true;
|
|
65
|
+
// TODO: Okay to set to empty array?
|
|
66
|
+
const bootEnrs = (_c = args["bootnodes"]) !== null && _c !== void 0 ? _c : [];
|
|
67
|
+
// throw if user-provided enrs are invalid
|
|
68
|
+
for (const enrStr of bootEnrs) {
|
|
69
|
+
try {
|
|
70
|
+
ENR.decodeTxt(enrStr);
|
|
71
|
+
}
|
|
72
|
+
catch (e) {
|
|
73
|
+
throw new YargsError(`Provided ENR in bootnodes is invalid:\n ${enrStr}`);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
17
76
|
return {
|
|
18
77
|
discv5: enableDiscv5
|
|
19
78
|
? {
|
|
20
79
|
config: {},
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
80
|
+
bindAddrs: {
|
|
81
|
+
ip4: bindMu,
|
|
82
|
+
ip6: bindMu6,
|
|
83
|
+
},
|
|
84
|
+
bootEnrs,
|
|
24
85
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-explicit-any
|
|
25
86
|
enr: undefined,
|
|
26
87
|
}
|
|
27
88
|
: null,
|
|
28
89
|
maxPeers: maxPeers !== null && maxPeers !== void 0 ? maxPeers : defaultOptions.network.maxPeers,
|
|
29
90
|
targetPeers: targetPeers !== null && targetPeers !== void 0 ? targetPeers : defaultOptions.network.targetPeers,
|
|
30
|
-
localMultiaddrs: [
|
|
91
|
+
localMultiaddrs: [localMu, localMu6].filter(Boolean),
|
|
92
|
+
deterministicLongLivedAttnets: args["deterministicLongLivedAttnets"],
|
|
31
93
|
subscribeAllSubnets: args["subscribeAllSubnets"],
|
|
94
|
+
slotsToSubscribeBeforeAggregatorDuty: (_d = args["slotsToSubscribeBeforeAggregatorDuty"]) !== null && _d !== void 0 ? _d : defaultOptions.network.slotsToSubscribeBeforeAggregatorDuty,
|
|
32
95
|
disablePeerScoring: args["disablePeerScoring"],
|
|
33
96
|
connectToDiscv5Bootnodes: args["network.connectToDiscv5Bootnodes"],
|
|
34
97
|
discv5FirstQueryDelayMs: args["network.discv5FirstQueryDelayMs"],
|
|
@@ -54,12 +117,12 @@ export const options = {
|
|
|
54
117
|
},
|
|
55
118
|
listenAddress: {
|
|
56
119
|
type: "string",
|
|
57
|
-
description: "The address to listen for p2p UDP and TCP connections",
|
|
120
|
+
description: "The IPv4 address to listen for p2p UDP and TCP connections",
|
|
58
121
|
defaultDescription: defaultListenAddress,
|
|
59
122
|
group: "network",
|
|
60
123
|
},
|
|
61
124
|
port: {
|
|
62
|
-
description: "The TCP/UDP port to listen on. The UDP port can be modified by the --
|
|
125
|
+
description: "The TCP/UDP port to listen on. The UDP port can be modified by the --discoveryPort flag.",
|
|
63
126
|
type: "number",
|
|
64
127
|
// TODO: Derive from BeaconNode defaults
|
|
65
128
|
defaultDescription: String(defaultP2pPort),
|
|
@@ -71,6 +134,24 @@ export const options = {
|
|
|
71
134
|
defaultDescription: "`port`",
|
|
72
135
|
group: "network",
|
|
73
136
|
},
|
|
137
|
+
listenAddress6: {
|
|
138
|
+
type: "string",
|
|
139
|
+
description: "The IPv6 address to listen for p2p UDP and TCP connections",
|
|
140
|
+
group: "network",
|
|
141
|
+
},
|
|
142
|
+
port6: {
|
|
143
|
+
description: "The TCP/UDP port to listen on. The UDP port can be modified by the --discoveryPort6 flag.",
|
|
144
|
+
type: "number",
|
|
145
|
+
// TODO: Derive from BeaconNode defaults
|
|
146
|
+
defaultDescription: String(defaultP2pPort6),
|
|
147
|
+
group: "network",
|
|
148
|
+
},
|
|
149
|
+
discoveryPort6: {
|
|
150
|
+
description: "The UDP port that discovery will listen on. Defaults to `port6`",
|
|
151
|
+
type: "number",
|
|
152
|
+
defaultDescription: "`port6`",
|
|
153
|
+
group: "network",
|
|
154
|
+
},
|
|
74
155
|
bootnodes: {
|
|
75
156
|
type: "array",
|
|
76
157
|
description: "Bootnodes for discv5 discovery",
|
|
@@ -87,12 +168,25 @@ export const options = {
|
|
|
87
168
|
defaultDescription: String(defaultOptions.network.targetPeers),
|
|
88
169
|
group: "network",
|
|
89
170
|
},
|
|
171
|
+
deterministicLongLivedAttnets: {
|
|
172
|
+
type: "boolean",
|
|
173
|
+
description: "Use deterministic subnet selection for long-lived subnet subscriptions",
|
|
174
|
+
defaultDescription: String(defaultOptions.network.deterministicLongLivedAttnets === true),
|
|
175
|
+
group: "network",
|
|
176
|
+
},
|
|
90
177
|
subscribeAllSubnets: {
|
|
91
178
|
type: "boolean",
|
|
92
179
|
description: "Subscribe to all subnets regardless of validator count",
|
|
93
180
|
defaultDescription: String(defaultOptions.network.subscribeAllSubnets === true),
|
|
94
181
|
group: "network",
|
|
95
182
|
},
|
|
183
|
+
slotsToSubscribeBeforeAggregatorDuty: {
|
|
184
|
+
hidden: true,
|
|
185
|
+
type: "number",
|
|
186
|
+
description: "Number of slots before an aggregator duty to subscribe to subnets",
|
|
187
|
+
defaultDescription: String(defaultOptions.network.slotsToSubscribeBeforeAggregatorDuty),
|
|
188
|
+
group: "network",
|
|
189
|
+
},
|
|
96
190
|
disablePeerScoring: {
|
|
97
191
|
type: "boolean",
|
|
98
192
|
description: "Disable peer scoring, used for testing on devnets",
|
|
@@ -114,7 +208,7 @@ export const options = {
|
|
|
114
208
|
},
|
|
115
209
|
"network.connectToDiscv5Bootnodes": {
|
|
116
210
|
type: "boolean",
|
|
117
|
-
description: "Attempt direct connection to discv5 bootnodes
|
|
211
|
+
description: "Attempt direct connection to discv5 bootnodes",
|
|
118
212
|
hidden: true,
|
|
119
213
|
defaultDescription: String(defaultOptions.network.connectToDiscv5Bootnodes === true),
|
|
120
214
|
group: "network",
|
|
@@ -149,7 +243,7 @@ export const options = {
|
|
|
149
243
|
},
|
|
150
244
|
"network.rateTrackerTimeoutMs": {
|
|
151
245
|
type: "number",
|
|
152
|
-
description: "Time window to track rate limit in
|
|
246
|
+
description: "Time window to track rate limit in milliseconds",
|
|
153
247
|
hidden: true,
|
|
154
248
|
group: "network",
|
|
155
249
|
deprecated: true,
|
|
@@ -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/lib/util/format.js
CHANGED
|
@@ -69,7 +69,7 @@ export function parseBootnodesFile(bootnodesFile) {
|
|
|
69
69
|
for (const entry of line.split(",")) {
|
|
70
70
|
const sanitizedEntry = entry.replace(/['",[\]{}.]+/g, "").trim();
|
|
71
71
|
if (sanitizedEntry.includes("enr:-")) {
|
|
72
|
-
const parsedEnr = `enr:-${sanitizedEntry.split("enr:-")[1]}`;
|
|
72
|
+
const parsedEnr = `enr:-${sanitizedEntry.split("enr:-")[1].split("#")[0].trim()}`;
|
|
73
73
|
enrs.push(parsedEnr);
|
|
74
74
|
}
|
|
75
75
|
}
|
package/lib/util/format.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/util/format.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/util/format.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,gBAAgB,CAAC;AACjC,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAE7C;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,GAAG,GAAG,KAAK,GAAG,EAAE,CAAC;IAC5C,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,SAAiB;IACnD,OAAO,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,QAA2B;IAClE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;QACpB,MAAM,KAAK,CAAC,iDAAiD,CAAC,CAAC;KAChE;IAED,MAAM,SAAS,GAAG,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAClD,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE;QACnC,MAAM,KAAK,CAAC,kCAAkC,SAAS,EAAE,CAAC,CAAC;KAC5D;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,KAAa;IACtC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACzB,MAAM,KAAK,CAAC,kBAAkB,KAAK,sBAAsB,CAAC,CAAC;KAC5D;IAED,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAE7D,IAAI,KAAK,CAAC,IAAI,CAAC;QAAE,MAAM,KAAK,CAAC,6BAA6B,KAAK,GAAG,CAAC,CAAC;IACpE,IAAI,KAAK,CAAC,EAAE,CAAC;QAAE,MAAM,KAAK,CAAC,2BAA2B,KAAK,GAAG,CAAC,CAAC;IAChE,IAAI,IAAI,GAAG,EAAE;QAAE,MAAM,KAAK,CAAC,4BAA4B,KAAK,GAAG,CAAC,CAAC;IAEjE,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,KAAK,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;QAC/B,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACb;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,UAAoB;IACxD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;QAClC,MAAM,WAAW,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;QAC7C,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;KAChE;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAc;IAC3C,IAAI,GAAG,CAAC;IACR,IAAI;QACF,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;KACvB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,KAAK,CAAC;KACd;IAED,OAAO,GAAG,CAAC,QAAQ,KAAK,OAAO,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC;AAC/D,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,aAAqB;IACtD,MAAM,IAAI,GAAG,EAAE,CAAC;IAChB,KAAK,MAAM,IAAI,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QACtD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACnC,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YAEjE,IAAI,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBACpC,MAAM,SAAS,GAAG,QAAQ,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;gBAClF,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACtB;SACF;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|