@chainsafe/lodestar 1.10.0-dev.85ac6cb99f → 1.10.0-dev.85ff3cf17e
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/validator/import.d.ts +3 -1
- package/lib/cmds/validator/import.js +3 -3
- package/lib/cmds/validator/import.js.map +1 -1
- package/lib/cmds/validator/keymanager/decryptKeystores/poolSize.js +1 -2
- package/lib/cmds/validator/keymanager/decryptKeystores/poolSize.js.map +1 -1
- package/lib/cmds/validator/voluntaryExit.js +1 -2
- package/lib/cmds/validator/voluntaryExit.js.map +1 -1
- package/lib/networks/index.d.ts +1 -1
- package/lib/networks/index.js +0 -4
- package/lib/networks/index.js.map +1 -1
- package/package.json +16 -18
- package/lib/networks/zhejiang.d.ts +0 -6
- package/lib/networks/zhejiang.js +0 -7
- package/lib/networks/zhejiang.js.map +0 -1
package/.git-data.json
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { CliCommand } from "../../util/index.js";
|
|
2
2
|
import { GlobalArgs } from "../../options/index.js";
|
|
3
3
|
import { IValidatorCliArgs } from "./options.js";
|
|
4
|
-
|
|
4
|
+
type ValidatorImportArgs = Pick<IValidatorCliArgs, "importKeystores" | "importKeystoresPassword">;
|
|
5
|
+
export declare const importCmd: CliCommand<ValidatorImportArgs, IValidatorCliArgs & GlobalArgs>;
|
|
6
|
+
export {};
|
|
5
7
|
//# sourceMappingURL=import.d.ts.map
|
|
@@ -6,7 +6,7 @@ import { validatorOptions } from "./options.js";
|
|
|
6
6
|
import { getAccountPaths } from "./paths.js";
|
|
7
7
|
import { importKeystoreDefinitionsFromExternalDir, readPassphraseOrPrompt } from "./signers/importExternalKeystores.js";
|
|
8
8
|
import { PersistedKeysBackend } from "./keymanager/persistedKeys.js";
|
|
9
|
-
|
|
9
|
+
const { importKeystores, importKeystoresPassword } = validatorOptions;
|
|
10
10
|
export const importCmd = {
|
|
11
11
|
command: "import",
|
|
12
12
|
describe: "Imports one or more EIP-2335 keystores into a Lodestar validator client directory, \
|
|
@@ -21,11 +21,11 @@ Ethereum Foundation utility.",
|
|
|
21
21
|
],
|
|
22
22
|
// Note: re-uses `--importKeystores` and `--importKeystoresPassword` from root validator command options
|
|
23
23
|
options: {
|
|
24
|
-
...validatorOptions,
|
|
25
24
|
importKeystores: {
|
|
26
|
-
...
|
|
25
|
+
...importKeystores,
|
|
27
26
|
requiresArg: true,
|
|
28
27
|
},
|
|
28
|
+
importKeystoresPassword,
|
|
29
29
|
},
|
|
30
30
|
handler: async (args) => {
|
|
31
31
|
const { network } = getBeaconConfigFromArgs(args);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../src/cmds/validator/import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAC,UAAU,EAAc,wBAAwB,EAAC,MAAM,qBAAqB,CAAC;AACrF,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AAErE,OAAO,EAAC,gBAAgB,EAAoB,MAAM,cAAc,CAAC;AACjE,OAAO,EAAC,eAAe,EAAC,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAC,wCAAwC,EAAE,sBAAsB,EAAC,MAAM,sCAAsC,CAAC;AACtH,OAAO,EAAC,oBAAoB,EAAC,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../src/cmds/validator/import.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,7 @@ try {
|
|
|
5
5
|
maxPoolSize = (_a = navigator.hardwareConcurrency) !== null && _a !== void 0 ? _a : 4;
|
|
6
6
|
}
|
|
7
7
|
else {
|
|
8
|
-
|
|
9
|
-
maxPoolSize = (await import("node:os")).cpus().length;
|
|
8
|
+
maxPoolSize = (await import("node:os")).availableParallelism();
|
|
10
9
|
}
|
|
11
10
|
}
|
|
12
11
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poolSize.js","sourceRoot":"","sources":["../../../../../src/cmds/validator/keymanager/decryptKeystores/poolSize.ts"],"names":[],"mappings":";AAAA,IAAI,WAAmB,CAAC;AAExB,IAAI;IACF,IAAI,OAAO,SAAS,KAAK,WAAW,EAAE;QACpC,WAAW,GAAG,MAAA,SAAS,CAAC,mBAAmB,mCAAI,CAAC,CAAC;KAClD;SAAM;QACL,
|
|
1
|
+
{"version":3,"file":"poolSize.js","sourceRoot":"","sources":["../../../../../src/cmds/validator/keymanager/decryptKeystores/poolSize.ts"],"names":[],"mappings":";AAAA,IAAI,WAAmB,CAAC;AAExB,IAAI;IACF,IAAI,OAAO,SAAS,KAAK,WAAW,EAAE;QACpC,WAAW,GAAG,MAAA,SAAS,CAAC,mBAAmB,mCAAI,CAAC,CAAC;KAClD;SAAM;QACL,WAAW,GAAG,CAAC,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,oBAAoB,EAAE,CAAC;KAChE;CACF;AAAC,OAAO,CAAC,EAAE;IACV,WAAW,GAAG,CAAC,CAAC;CACjB;AAED;;GAEG;AACH,OAAO,EAAC,WAAW,EAAC,CAAC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import inquirer from "inquirer";
|
|
2
2
|
import { computeSigningRoot, computeEpochAtSlot, computeStartSlotAtEpoch, getCurrentSlot, } from "@lodestar/state-transition";
|
|
3
|
-
import { DOMAIN_VOLUNTARY_EXIT } from "@lodestar/params";
|
|
4
3
|
import { createBeaconConfig } from "@lodestar/config";
|
|
5
4
|
import { ssz } from "@lodestar/types";
|
|
6
5
|
import { toHex } from "@lodestar/utils";
|
|
@@ -70,7 +69,7 @@ ${validatorsToExit.map((v) => `${v.pubkey} ${v.index} ${v.status}`).join("\n")}`
|
|
|
70
69
|
}
|
|
71
70
|
}
|
|
72
71
|
for (const [i, { index, signer, pubkey }] of validatorsToExit.entries()) {
|
|
73
|
-
const domain = config.
|
|
72
|
+
const domain = config.getDomainForVoluntaryExit(computeStartSlotAtEpoch(exitEpoch));
|
|
74
73
|
const voluntaryExit = { epoch: exitEpoch, validatorIndex: index };
|
|
75
74
|
const signingRoot = computeSigningRoot(ssz.phase0.VoluntaryExit, voluntaryExit, domain);
|
|
76
75
|
ApiError.assert(await client.beacon.submitPoolVoluntaryExit({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"voluntaryExit.js","sourceRoot":"","sources":["../../../src/cmds/validator/voluntaryExit.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,GACf,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"voluntaryExit.js","sourceRoot":"","sources":["../../../src/cmds/validator/voluntaryExit.ts"],"names":[],"mappings":"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"}
|
package/lib/networks/index.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { ChainConfig, ChainForkConfig } from "@lodestar/config";
|
|
|
2
2
|
import { Checkpoint } from "@lodestar/types/phase0";
|
|
3
3
|
import { Logger } from "@lodestar/utils";
|
|
4
4
|
import { BeaconStateAllForks } from "@lodestar/state-transition";
|
|
5
|
-
export type NetworkName = "mainnet" | "dev" | "gnosis" | "goerli" | "ropsten" | "sepolia" | "chiado"
|
|
5
|
+
export type NetworkName = "mainnet" | "dev" | "gnosis" | "goerli" | "ropsten" | "sepolia" | "chiado";
|
|
6
6
|
export declare const networkNames: NetworkName[];
|
|
7
7
|
export declare function isKnownNetworkName(network: string): network is NetworkName;
|
|
8
8
|
export type WeakSubjectivityFetchOptions = {
|
package/lib/networks/index.js
CHANGED
|
@@ -13,7 +13,6 @@ import * as goerli from "./goerli.js";
|
|
|
13
13
|
import * as ropsten from "./ropsten.js";
|
|
14
14
|
import * as sepolia from "./sepolia.js";
|
|
15
15
|
import * as chiado from "./chiado.js";
|
|
16
|
-
import * as zhejiang from "./zhejiang.js";
|
|
17
16
|
export const networkNames = [
|
|
18
17
|
"mainnet",
|
|
19
18
|
"gnosis",
|
|
@@ -21,7 +20,6 @@ export const networkNames = [
|
|
|
21
20
|
"ropsten",
|
|
22
21
|
"sepolia",
|
|
23
22
|
"chiado",
|
|
24
|
-
"zhejiang",
|
|
25
23
|
// Leave always as last network. The order matters for the --help printout
|
|
26
24
|
"dev",
|
|
27
25
|
];
|
|
@@ -46,8 +44,6 @@ export function getNetworkData(network) {
|
|
|
46
44
|
return sepolia;
|
|
47
45
|
case "chiado":
|
|
48
46
|
return chiado;
|
|
49
|
-
case "zhejiang":
|
|
50
|
-
return zhejiang;
|
|
51
47
|
default:
|
|
52
48
|
throw Error(`Network not supported: ${network}`);
|
|
53
49
|
}
|
|
@@ -1 +1 @@
|
|
|
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,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;
|
|
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,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;IAEpD,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"}
|
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.85ff3cf17e",
|
|
4
4
|
"description": "Command line interface for lodestar",
|
|
5
5
|
"author": "ChainSafe Systems",
|
|
6
6
|
"license": "LGPL-3.0",
|
|
@@ -57,21 +57,21 @@
|
|
|
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": "^4.0.0",
|
|
61
61
|
"@chainsafe/ssz": "^0.10.2",
|
|
62
62
|
"@libp2p/peer-id-factory": "^2.0.3",
|
|
63
|
-
"@lodestar/api": "1.10.0-dev.
|
|
64
|
-
"@lodestar/beacon-node": "1.10.0-dev.
|
|
65
|
-
"@lodestar/config": "1.10.0-dev.
|
|
66
|
-
"@lodestar/db": "1.10.0-dev.
|
|
67
|
-
"@lodestar/light-client": "1.10.0-dev.
|
|
68
|
-
"@lodestar/logger": "1.10.0-dev.
|
|
69
|
-
"@lodestar/params": "1.10.0-dev.
|
|
70
|
-
"@lodestar/state-transition": "1.10.0-dev.
|
|
71
|
-
"@lodestar/types": "1.10.0-dev.
|
|
72
|
-
"@lodestar/utils": "1.10.0-dev.
|
|
73
|
-
"@lodestar/validator": "1.10.0-dev.
|
|
74
|
-
"@multiformats/multiaddr": "^
|
|
63
|
+
"@lodestar/api": "1.10.0-dev.85ff3cf17e",
|
|
64
|
+
"@lodestar/beacon-node": "1.10.0-dev.85ff3cf17e",
|
|
65
|
+
"@lodestar/config": "1.10.0-dev.85ff3cf17e",
|
|
66
|
+
"@lodestar/db": "1.10.0-dev.85ff3cf17e",
|
|
67
|
+
"@lodestar/light-client": "1.10.0-dev.85ff3cf17e",
|
|
68
|
+
"@lodestar/logger": "1.10.0-dev.85ff3cf17e",
|
|
69
|
+
"@lodestar/params": "1.10.0-dev.85ff3cf17e",
|
|
70
|
+
"@lodestar/state-transition": "1.10.0-dev.85ff3cf17e",
|
|
71
|
+
"@lodestar/types": "1.10.0-dev.85ff3cf17e",
|
|
72
|
+
"@lodestar/utils": "1.10.0-dev.85ff3cf17e",
|
|
73
|
+
"@lodestar/validator": "1.10.0-dev.85ff3cf17e",
|
|
74
|
+
"@multiformats/multiaddr": "^12.1.3",
|
|
75
75
|
"@types/lockfile": "^1.0.2",
|
|
76
76
|
"bip39": "^3.1.0",
|
|
77
77
|
"deepmerge": "^4.3.1",
|
|
@@ -88,12 +88,10 @@
|
|
|
88
88
|
"source-map-support": "^0.5.21",
|
|
89
89
|
"uint8arrays": "^4.0.3",
|
|
90
90
|
"uuidv4": "^6.2.13",
|
|
91
|
-
"winston": "^3.8.2",
|
|
92
|
-
"winston-daily-rotate-file": "^4.7.1",
|
|
93
|
-
"winston-transport": "^4.5.0",
|
|
94
91
|
"yargs": "^17.7.1"
|
|
95
92
|
},
|
|
96
93
|
"devDependencies": {
|
|
94
|
+
"@lodestar/test-utils": "1.10.0-dev.85ff3cf17e",
|
|
97
95
|
"@types/debug": "^4.1.7",
|
|
98
96
|
"@types/expand-tilde": "^2.0.0",
|
|
99
97
|
"@types/got": "^9.6.12",
|
|
@@ -101,5 +99,5 @@
|
|
|
101
99
|
"@types/lodash": "^4.14.192",
|
|
102
100
|
"@types/yargs": "^17.0.24"
|
|
103
101
|
},
|
|
104
|
-
"gitHead": "
|
|
102
|
+
"gitHead": "3b95b8855089b01c280b828d4381c8892ed83891"
|
|
105
103
|
}
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
export { zhejiangChainConfig as chainConfig } from "@lodestar/config/networks";
|
|
2
|
-
export declare const depositContractDeployBlock = 0;
|
|
3
|
-
export declare const genesisFileUrl = "https://raw.githubusercontent.com/ethpandaops/withdrawals-testnet/master/zhejiang-testnet/custom_config_data/genesis.ssz";
|
|
4
|
-
export declare const bootnodesFileUrl = "https://raw.githubusercontent.com/ethpandaops/withdrawals-testnet/master/zhejiang-testnet/custom_config_data/bootstrap_nodes.txt";
|
|
5
|
-
export declare const bootEnrs: never[];
|
|
6
|
-
//# sourceMappingURL=zhejiang.d.ts.map
|
package/lib/networks/zhejiang.js
DELETED
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
export { zhejiangChainConfig as chainConfig } from "@lodestar/config/networks";
|
|
2
|
-
export const depositContractDeployBlock = 0;
|
|
3
|
-
export const genesisFileUrl = "https://raw.githubusercontent.com/ethpandaops/withdrawals-testnet/master/zhejiang-testnet/custom_config_data/genesis.ssz";
|
|
4
|
-
export const bootnodesFileUrl = "https://raw.githubusercontent.com/ethpandaops/withdrawals-testnet/master/zhejiang-testnet/custom_config_data/bootstrap_nodes.txt";
|
|
5
|
-
// Pick from above file
|
|
6
|
-
export const bootEnrs = [];
|
|
7
|
-
//# sourceMappingURL=zhejiang.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"zhejiang.js","sourceRoot":"","sources":["../../src/networks/zhejiang.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,mBAAmB,IAAI,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAE7E,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,CAAC;AAC5C,MAAM,CAAC,MAAM,cAAc,GACzB,0HAA0H,CAAC;AAC7H,MAAM,CAAC,MAAM,gBAAgB,GAC3B,kIAAkI,CAAC;AAErI,uBAAuB;AACvB,MAAM,CAAC,MAAM,QAAQ,GAAG,EAAE,CAAC"}
|