@lodestar/prover 1.17.0-dev.8959bda79b → 1.17.0-dev.c999e4a353
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/lib/cli/cli.js +1 -1
- package/lib/cli/cli.js.map +1 -1
- package/lib/cli/cmds/index.d.ts +1 -1
- package/lib/cli/cmds/start/index.d.ts +1 -1
- package/lib/cli/cmds/start/options.d.ts +2 -2
- package/lib/cli/cmds/start/options.js +2 -5
- package/lib/cli/cmds/start/options.js.map +1 -1
- package/lib/cli/options.d.ts +4 -3
- package/lib/cli/options.js +4 -8
- package/lib/cli/options.js.map +1 -1
- package/lib/utils/command.d.ts +30 -0
- package/lib/utils/command.js +26 -0
- package/lib/utils/command.js.map +1 -0
- package/package.json +10 -10
package/lib/cli/cli.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// Must not use `* as yargs`, see https://github.com/yargs/yargs/issues/1131
|
|
2
2
|
import yargs from "yargs";
|
|
3
3
|
import { hideBin } from "yargs/helpers";
|
|
4
|
-
import { registerCommandToYargs } from "
|
|
4
|
+
import { registerCommandToYargs } from "../utils/command.js";
|
|
5
5
|
import { getVersionData } from "../utils/version.js";
|
|
6
6
|
import { cmds, proverProxyStartCommand } from "./cmds/index.js";
|
|
7
7
|
import { globalOptions } from "./options.js";
|
package/lib/cli/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAC,sBAAsB,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAC,sBAAsB,EAAC,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAC,IAAI,EAAE,uBAAuB,EAAC,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAC,aAAa,EAAC,MAAM,cAAc,CAAC;AAE3C,MAAM,EAAC,OAAO,EAAC,GAAG,cAAc,EAAE,CAAC;AACnC,MAAM,SAAS,GAAG;eACH,OAAO;iCACW,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;AAC5D,MAAM,YAAY,GAAG;;;;0CAIqB,CAAC;AAE3C,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,CAAE,OAAwC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;AAEnF;;;GAGG;AACH,MAAM,UAAU,oBAAoB;IAClC,MAAM,MAAM,GAAG,IAAI;SAChB,GAAG,CAAC,UAAU,CAAC;SACf,mBAAmB,CAAC;QACnB,0DAA0D;QAC1D,2DAA2D;QAC3D,cAAc,EAAE,KAAK;KACtB,CAAC;SACD,OAAO,CAAC,aAAa,CAAC;QACvB,sFAAsF;SACrF,UAAU,CAAC,EAAE,CAAC;SACd,aAAa,CAAC,CAAC,CAAC;QACjB,+CAA+C;SAC9C,cAAc,CAAC,KAAK,CAAC;SACrB,KAAK,CAAC,SAAS,CAAC;SAChB,QAAQ,CAAC,YAAY,CAAC;SACtB,OAAO,CAAC,SAAS,CAAC;SAClB,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;SAClB,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC;SACrB,iBAAiB,EAAE,CAAC;IAEvB,+BAA+B;IAC/B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,sBAAsB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACrC;IAED,gDAAgD;IAChD,sBAAsB,CAAC,MAAM,EAAE,EAAC,GAAG,uBAAuB,EAAE,OAAO,EAAE,GAAG,EAAC,CAAC,CAAC;IAE3E,+CAA+C;IAC/C,MAAM,CAAC,iBAAiB,EAAE,CAAC,MAAM,EAAE,CAAC;IAEpC,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/lib/cli/cmds/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CliCommand } from "
|
|
1
|
+
import { CliCommand } from "../../utils/command.js";
|
|
2
2
|
import { GlobalArgs } from "../options.js";
|
|
3
3
|
export { proverProxyStartCommand } from "./start/index.js";
|
|
4
4
|
export declare const cmds: Required<CliCommand<GlobalArgs, Record<never, never>>>["subcommands"];
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CliCommand } from "
|
|
1
|
+
import { CliCommand } from "../../../utils/command.js";
|
|
2
2
|
import { GlobalArgs } from "../../options.js";
|
|
3
3
|
import { StartArgs } from "./options.js";
|
|
4
4
|
export declare const proverProxyStartCommand: CliCommand<StartArgs, GlobalArgs>;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { CliCommandOptions } from "@lodestar/utils";
|
|
2
1
|
import { LCTransport } from "../../../interfaces.js";
|
|
2
|
+
import { CliCommandOptions } from "../../../utils/command.js";
|
|
3
3
|
export type StartArgs = {
|
|
4
4
|
port: number;
|
|
5
5
|
executionRpcUrl: string;
|
|
6
|
-
beaconUrls
|
|
6
|
+
beaconUrls?: string[];
|
|
7
7
|
wsCheckpoint?: string;
|
|
8
8
|
unverifiedWhitelist?: string[];
|
|
9
9
|
requestTimeout: number;
|
|
@@ -28,12 +28,9 @@ export const startOptions = {
|
|
|
28
28
|
},
|
|
29
29
|
beaconUrls: {
|
|
30
30
|
description: "Urls of the beacon nodes to connect to.",
|
|
31
|
-
type: "
|
|
32
|
-
string: true,
|
|
33
|
-
coerce: (urls) =>
|
|
34
|
-
// Parse ["url1,url2"] to ["url1", "url2"]
|
|
35
|
-
urls.map((item) => item.split(",")).flat(),
|
|
31
|
+
type: "string",
|
|
36
32
|
demandOption: true,
|
|
33
|
+
array: true,
|
|
37
34
|
group: "beacon",
|
|
38
35
|
},
|
|
39
36
|
wsCheckpoint: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../../src/cli/cmds/start/options.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../../src/cli/cmds/start/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,6BAA6B,EAAC,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAmB/D,MAAM,CAAC,MAAM,YAAY,GAAiC;IACxD,IAAI,EAAE;QACJ,WAAW,EAAE,iCAAiC;QAC9C,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,IAAI;KACd;IAED,eAAe,EAAE;QACf,WAAW,EAAE,iCAAiC;QAC9C,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,IAAI;QAClB,KAAK,EAAE,WAAW;KACnB;IAED,mBAAmB,EAAE;QACnB,WAAW,EAAE,mFAAmF,oBAAoB,CAAC,IAAI,CACvH,GAAG,CACJ,sBAAsB;QACvB,IAAI,EAAE,OAAO;QACb,YAAY,EAAE,KAAK;QACnB,KAAK,EAAE,WAAW;KACnB;IAED,cAAc,EAAE;QACd,WAAW,EAAE,8DAA8D;QAC3E,OAAO,EAAE,6BAA6B;QACtC,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,KAAK;QACnB,KAAK,EAAE,WAAW;KACnB;IAED,UAAU,EAAE;QACV,WAAW,EAAE,yCAAyC;QACtD,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,IAAI;QAClB,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,QAAQ;KAChB;IAED,YAAY,EAAE;QACZ,WAAW,EACT,2KAA2K;QAC7K,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,KAAK;QACnB,KAAK,EAAE,QAAQ;KAChB;CACF,CAAC;AAEF,MAAM,UAAU,cAAc,CAAC,IAAe;IAC5C,iFAAiF;IACjF,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,SAAS,EAAE,WAAW,CAAC,IAAI;QAC3B,IAAI,EAAE,IAAI,CAAC,UAAU,IAAI,EAAE;QAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;QAC7C,cAAc,EAAE,IAAI,CAAC,cAAc,IAAI,6BAA6B;KACrE,CAAC;AACJ,CAAC"}
|
package/lib/cli/options.d.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { NetworkName } from "@lodestar/config/networks";
|
|
2
|
-
import {
|
|
2
|
+
import { LogLevel } from "@lodestar/utils";
|
|
3
|
+
import { CliCommandOptions } from "../utils/command.js";
|
|
3
4
|
export type GlobalArgs = {
|
|
4
|
-
network
|
|
5
|
+
network: string;
|
|
5
6
|
logLevel: string;
|
|
6
7
|
presetFile?: string;
|
|
7
8
|
preset: string;
|
|
8
|
-
paramsFile
|
|
9
|
+
paramsFile: string;
|
|
9
10
|
};
|
|
10
11
|
export type GlobalOptions = {
|
|
11
12
|
logLevel: LogLevel;
|
package/lib/cli/options.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { networksChainConfig } from "@lodestar/config/networks";
|
|
2
2
|
import { LogLevels } from "@lodestar/utils";
|
|
3
3
|
import { ACTIVE_PRESET } from "@lodestar/params";
|
|
4
|
-
import { YargsError } from "../utils/errors.js";
|
|
5
4
|
export const globalOptions = {
|
|
6
5
|
network: {
|
|
7
6
|
description: "Specify the network to connect.",
|
|
@@ -43,12 +42,9 @@ export function parseGlobalArgs(args) {
|
|
|
43
42
|
logLevel: args.logLevel,
|
|
44
43
|
};
|
|
45
44
|
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
};
|
|
51
|
-
}
|
|
52
|
-
throw new YargsError("Either --network or --paramsFile must be provided");
|
|
45
|
+
return {
|
|
46
|
+
logLevel: args.logLevel,
|
|
47
|
+
paramsFile: args.paramsFile,
|
|
48
|
+
};
|
|
53
49
|
}
|
|
54
50
|
//# sourceMappingURL=options.js.map
|
package/lib/cli/options.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/cli/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,mBAAmB,EAAC,MAAM,2BAA2B,CAAC;AAC3E,OAAO,
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/cli/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,mBAAmB,EAAC,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAW,SAAS,EAAC,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAe/C,MAAM,CAAC,MAAM,aAAa,GAAkC;IAC1D,OAAO,EAAE;QACP,WAAW,EAAE,iCAAiC;QAC9C,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE;YACP,GAAG,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC;YACnC,KAAK;SACN;QACD,SAAS,EAAE,CAAC,YAAY,CAAC;KAC1B;IAED,UAAU,EAAE;QACV,WAAW,EAAE,4BAA4B;QACzC,IAAI,EAAE,QAAQ;QACd,SAAS,EAAE,CAAC,SAAS,CAAC;KACvB;IAED,QAAQ,EAAE;QACR,WAAW,EAAE,oBAAoB;QACjC,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,MAAM;KAChB;IAED,uDAAuD;IACvD,MAAM,EAAE;QACN,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,aAAa;KACvB;IAED,UAAU,EAAE;QACV,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,4EAA4E;QACzF,IAAI,EAAE,QAAQ;KACf;CACF,CAAC;AAEF,MAAM,UAAU,eAAe,CAAC,IAAgB;IAC9C,iFAAiF;IACjF,IAAI,IAAI,CAAC,OAAO,EAAE;QAChB,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAsB;YACpC,QAAQ,EAAE,IAAI,CAAC,QAAoB;SACpC,CAAC;KACH;IAED,OAAO;QACL,QAAQ,EAAE,IAAI,CAAC,QAAoB;QACnC,UAAU,EAAE,IAAI,CAAC,UAAU;KAC5B,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { Options, Argv } from "yargs";
|
|
2
|
+
export interface CliExample {
|
|
3
|
+
command: string;
|
|
4
|
+
title?: string;
|
|
5
|
+
description?: string;
|
|
6
|
+
}
|
|
7
|
+
export interface CliOptionDefinition extends Options {
|
|
8
|
+
example?: CliExample;
|
|
9
|
+
}
|
|
10
|
+
export type CliCommandOptions<OwnArgs> = Required<{
|
|
11
|
+
[key in keyof OwnArgs]: CliOptionDefinition;
|
|
12
|
+
}>;
|
|
13
|
+
export interface CliCommand<OwnArgs = Record<never, never>, ParentArgs = Record<never, never>, R = any> {
|
|
14
|
+
command: string;
|
|
15
|
+
describe: string;
|
|
16
|
+
examples?: {
|
|
17
|
+
command: string;
|
|
18
|
+
description: string;
|
|
19
|
+
}[];
|
|
20
|
+
options?: CliCommandOptions<OwnArgs>;
|
|
21
|
+
subcommands?: CliCommand<any, OwnArgs & ParentArgs>[];
|
|
22
|
+
handler?: (args: OwnArgs & ParentArgs) => Promise<R>;
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Register a CliCommand type to yargs. Recursively registers subcommands too.
|
|
26
|
+
* @param yargs
|
|
27
|
+
* @param cliCommand
|
|
28
|
+
*/
|
|
29
|
+
export declare function registerCommandToYargs(yargs: Argv, cliCommand: CliCommand<any, any>): void;
|
|
30
|
+
//# sourceMappingURL=command.d.ts.map
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Register a CliCommand type to yargs. Recursively registers subcommands too.
|
|
3
|
+
* @param yargs
|
|
4
|
+
* @param cliCommand
|
|
5
|
+
*/
|
|
6
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
7
|
+
export function registerCommandToYargs(yargs, cliCommand) {
|
|
8
|
+
yargs.command({
|
|
9
|
+
command: cliCommand.command,
|
|
10
|
+
describe: cliCommand.describe,
|
|
11
|
+
builder: (yargsBuilder) => {
|
|
12
|
+
yargsBuilder.options(cliCommand.options || {});
|
|
13
|
+
for (const subcommand of cliCommand.subcommands || []) {
|
|
14
|
+
registerCommandToYargs(yargsBuilder, subcommand);
|
|
15
|
+
}
|
|
16
|
+
if (cliCommand.examples) {
|
|
17
|
+
for (const example of cliCommand.examples) {
|
|
18
|
+
yargsBuilder.example(`$0 ${example.command}`, example.description);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
return yargs;
|
|
22
|
+
},
|
|
23
|
+
handler: cliCommand.handler || function emptyHandler() { },
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=command.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/utils/command.ts"],"names":[],"mappings":"AA2BA;;;;GAIG;AACH,8DAA8D;AAC9D,MAAM,UAAU,sBAAsB,CAAC,KAAW,EAAE,UAAgC;IAClF,KAAK,CAAC,OAAO,CAAC;QACZ,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,OAAO,EAAE,CAAC,YAAY,EAAE,EAAE;YACxB,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;YAC/C,KAAK,MAAM,UAAU,IAAI,UAAU,CAAC,WAAW,IAAI,EAAE,EAAE;gBACrD,sBAAsB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;aAClD;YACD,IAAI,UAAU,CAAC,QAAQ,EAAE;gBACvB,KAAK,MAAM,OAAO,IAAI,UAAU,CAAC,QAAQ,EAAE;oBACzC,YAAY,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;iBACpE;aACF;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,SAAS,YAAY,KAAU,CAAC;KAChE,CAAC,CAAC;AACL,CAAC"}
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"bugs": {
|
|
12
12
|
"url": "https://github.com/ChainSafe/lodestar/issues"
|
|
13
13
|
},
|
|
14
|
-
"version": "1.17.0-dev.
|
|
14
|
+
"version": "1.17.0-dev.c999e4a353",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
@@ -70,13 +70,13 @@
|
|
|
70
70
|
"@ethereumjs/tx": "^4.1.2",
|
|
71
71
|
"@ethereumjs/util": "^8.0.6",
|
|
72
72
|
"@ethereumjs/vm": "^6.4.2",
|
|
73
|
-
"@lodestar/api": "1.17.0-dev.
|
|
74
|
-
"@lodestar/config": "1.17.0-dev.
|
|
75
|
-
"@lodestar/light-client": "1.17.0-dev.
|
|
76
|
-
"@lodestar/logger": "1.17.0-dev.
|
|
77
|
-
"@lodestar/params": "1.17.0-dev.
|
|
78
|
-
"@lodestar/types": "1.17.0-dev.
|
|
79
|
-
"@lodestar/utils": "1.17.0-dev.
|
|
73
|
+
"@lodestar/api": "1.17.0-dev.c999e4a353",
|
|
74
|
+
"@lodestar/config": "1.17.0-dev.c999e4a353",
|
|
75
|
+
"@lodestar/light-client": "1.17.0-dev.c999e4a353",
|
|
76
|
+
"@lodestar/logger": "1.17.0-dev.c999e4a353",
|
|
77
|
+
"@lodestar/params": "1.17.0-dev.c999e4a353",
|
|
78
|
+
"@lodestar/types": "1.17.0-dev.c999e4a353",
|
|
79
|
+
"@lodestar/utils": "1.17.0-dev.c999e4a353",
|
|
80
80
|
"ethereum-cryptography": "^2.0.0",
|
|
81
81
|
"find-up": "^6.3.0",
|
|
82
82
|
"http-proxy": "^1.18.1",
|
|
@@ -85,7 +85,7 @@
|
|
|
85
85
|
"yargs": "^17.7.1"
|
|
86
86
|
},
|
|
87
87
|
"devDependencies": {
|
|
88
|
-
"@lodestar/test-utils": "1.17.0-dev.
|
|
88
|
+
"@lodestar/test-utils": "1.17.0-dev.c999e4a353",
|
|
89
89
|
"@types/http-proxy": "^1.17.10",
|
|
90
90
|
"@types/yargs": "^17.0.24",
|
|
91
91
|
"axios": "^1.3.4",
|
|
@@ -100,5 +100,5 @@
|
|
|
100
100
|
"blockchain",
|
|
101
101
|
"prover"
|
|
102
102
|
],
|
|
103
|
-
"gitHead": "
|
|
103
|
+
"gitHead": "aaa50b1c046b7c3a82430a22664e42788f75d145"
|
|
104
104
|
}
|