@chainsafe/lodestar 1.15.0-dev.c423687aa9 → 1.15.0-dev.cbf349c73d
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/handler.js +3 -19
- package/lib/cmds/validator/handler.js.map +1 -1
- package/lib/cmds/validator/options.d.ts +1 -1
- package/lib/cmds/validator/voluntaryExit.js +48 -25
- package/lib/cmds/validator/voluntaryExit.js.map +1 -1
- package/lib/networks/dev.js +1 -1
- package/lib/util/errors.d.ts +7 -0
- package/lib/util/errors.js +8 -0
- package/lib/util/errors.js.map +1 -1
- package/lib/util/proposerConfig.d.ts +3 -0
- package/lib/util/proposerConfig.js +32 -2
- package/lib/util/proposerConfig.js.map +1 -1
- package/package.json +16 -17
package/.git-data.json
CHANGED
|
@@ -9,6 +9,7 @@ import { getBeaconConfigFromArgs } from "../../config/index.js";
|
|
|
9
9
|
import { YargsError, cleanOldLogFiles, getDefaultGraffiti, mkdir, parseLoggerArgs } from "../../util/index.js";
|
|
10
10
|
import { onGracefulShutdown, parseFeeRecipient, parseProposerConfig } from "../../util/index.js";
|
|
11
11
|
import { getVersionData } from "../../util/version.js";
|
|
12
|
+
import { parseBuilderSelection, parseBuilderBoostFactor } from "../../util/proposerConfig.js";
|
|
12
13
|
import { getAccountPaths, getValidatorPaths } from "./paths.js";
|
|
13
14
|
import { validatorMetricsDefaultOptions, validatorMonitoringDefaultOptions } from "./options.js";
|
|
14
15
|
import { getSignersFromArgs } from "./signers/index.js";
|
|
@@ -158,7 +159,7 @@ function getProposerConfigFromArgs(args, { persistedKeysBackend, accountPaths, }
|
|
|
158
159
|
builder: {
|
|
159
160
|
gasLimit: args.defaultGasLimit,
|
|
160
161
|
selection: parseBuilderSelection(args["builder.selection"] ?? (args["builder"] ? defaultOptions.builderAliasSelection : undefined)),
|
|
161
|
-
boostFactor:
|
|
162
|
+
boostFactor: parseBuilderBoostFactor(args["builder.boostFactor"]),
|
|
162
163
|
},
|
|
163
164
|
};
|
|
164
165
|
let valProposerConfig;
|
|
@@ -182,23 +183,6 @@ function getProposerConfigFromArgs(args, { persistedKeysBackend, accountPaths, }
|
|
|
182
183
|
}
|
|
183
184
|
return valProposerConfig;
|
|
184
185
|
}
|
|
185
|
-
function parseBuilderSelection(builderSelection) {
|
|
186
|
-
if (builderSelection) {
|
|
187
|
-
switch (builderSelection) {
|
|
188
|
-
case "maxprofit":
|
|
189
|
-
break;
|
|
190
|
-
case "builderalways":
|
|
191
|
-
break;
|
|
192
|
-
case "builderonly":
|
|
193
|
-
break;
|
|
194
|
-
case "executiononly":
|
|
195
|
-
break;
|
|
196
|
-
default:
|
|
197
|
-
throw Error("Invalid input for builder selection, check help.");
|
|
198
|
-
}
|
|
199
|
-
}
|
|
200
|
-
return builderSelection;
|
|
201
|
-
}
|
|
202
186
|
function parseBroadcastValidation(broadcastValidation) {
|
|
203
187
|
if (broadcastValidation) {
|
|
204
188
|
switch (broadcastValidation) {
|
|
@@ -207,7 +191,7 @@ function parseBroadcastValidation(broadcastValidation) {
|
|
|
207
191
|
case "consensus_and_equivocation":
|
|
208
192
|
break;
|
|
209
193
|
default:
|
|
210
|
-
throw
|
|
194
|
+
throw new YargsError("Invalid input for broadcastValidation, check help");
|
|
211
195
|
}
|
|
212
196
|
}
|
|
213
197
|
return broadcastValidation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/cmds/validator/handler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/cmds/validator/handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ export type IValidatorCliArgs = AccountValidatorArgs & KeymanagerArgs & LogArgs
|
|
|
33
33
|
defaultGasLimit?: number;
|
|
34
34
|
builder?: boolean;
|
|
35
35
|
"builder.selection"?: string;
|
|
36
|
-
"builder.boostFactor"?:
|
|
36
|
+
"builder.boostFactor"?: string;
|
|
37
37
|
useProduceBlockV3?: boolean;
|
|
38
38
|
broadcastValidation?: string;
|
|
39
39
|
blindedLocal?: boolean;
|
|
@@ -6,7 +6,7 @@ import { ssz } from "@lodestar/types";
|
|
|
6
6
|
import { toHex } from "@lodestar/utils";
|
|
7
7
|
import { externalSignerPostSignature, SignableMessageType, SignerType } from "@lodestar/validator";
|
|
8
8
|
import { ApiError, getClient } from "@lodestar/api";
|
|
9
|
-
import { ensure0xPrefix, YargsError } from "../../util/index.js";
|
|
9
|
+
import { ensure0xPrefix, YargsError, wrapError } from "../../util/index.js";
|
|
10
10
|
import { getBeaconConfigFromArgs } from "../../config/index.js";
|
|
11
11
|
import { getSignersFromArgs } from "./signers/index.js";
|
|
12
12
|
export const voluntaryExit = {
|
|
@@ -84,35 +84,58 @@ ${validatorsToExit.map((v) => `${v.pubkey} ${v.index} ${v.status}`).join("\n")}`
|
|
|
84
84
|
throw new YargsError("not confirmed");
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
const
|
|
90
|
-
const
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
type: SignableMessageType.VOLUNTARY_EXIT,
|
|
101
|
-
});
|
|
102
|
-
signature = bls.Signature.fromHex(signatureHex);
|
|
103
|
-
break;
|
|
87
|
+
const alreadySubmitted = [];
|
|
88
|
+
for (const [i, validatorToExit] of validatorsToExit.entries()) {
|
|
89
|
+
const { err } = await wrapError(processVoluntaryExit({ config, client }, exitEpoch, validatorToExit));
|
|
90
|
+
const { pubkey, index } = validatorToExit;
|
|
91
|
+
if (err === null) {
|
|
92
|
+
console.log(`Submitted voluntary exit for ${pubkey} (${index}) ${i + 1}/${signersToExit.length}`);
|
|
93
|
+
}
|
|
94
|
+
else {
|
|
95
|
+
if (err.message.includes("ALREADY_EXISTS")) {
|
|
96
|
+
alreadySubmitted.push(validatorToExit);
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
console.log(`Voluntary exit errored for ${pubkey} (${index}) ${i + 1}/${signersToExit.length}: ${err.message}`);
|
|
104
100
|
}
|
|
105
|
-
default:
|
|
106
|
-
throw new YargsError(`Unexpected signer type for ${pubkey}`);
|
|
107
101
|
}
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
102
|
+
}
|
|
103
|
+
if (alreadySubmitted.length > 0) {
|
|
104
|
+
console.log(`Voluntary exit already submitted for ${alreadySubmitted.length}/${signersToExit.length}`);
|
|
105
|
+
for (const validatorToExit of alreadySubmitted) {
|
|
106
|
+
const { index, pubkey } = validatorToExit;
|
|
107
|
+
console.log(` - ${pubkey} (${index})`);
|
|
108
|
+
}
|
|
113
109
|
}
|
|
114
110
|
},
|
|
115
111
|
};
|
|
112
|
+
async function processVoluntaryExit({ config, client }, exitEpoch, validatorToExit) {
|
|
113
|
+
const { index, signer, pubkey } = validatorToExit;
|
|
114
|
+
const slot = computeStartSlotAtEpoch(exitEpoch);
|
|
115
|
+
const domain = config.getDomainForVoluntaryExit(slot);
|
|
116
|
+
const voluntaryExit = { epoch: exitEpoch, validatorIndex: index };
|
|
117
|
+
const signingRoot = computeSigningRoot(ssz.phase0.VoluntaryExit, voluntaryExit, domain);
|
|
118
|
+
let signature;
|
|
119
|
+
switch (signer.type) {
|
|
120
|
+
case SignerType.Local:
|
|
121
|
+
signature = signer.secretKey.sign(signingRoot);
|
|
122
|
+
break;
|
|
123
|
+
case SignerType.Remote: {
|
|
124
|
+
const signatureHex = await externalSignerPostSignature(config, signer.url, pubkey, signingRoot, slot, {
|
|
125
|
+
data: voluntaryExit,
|
|
126
|
+
type: SignableMessageType.VOLUNTARY_EXIT,
|
|
127
|
+
});
|
|
128
|
+
signature = bls.Signature.fromHex(signatureHex);
|
|
129
|
+
break;
|
|
130
|
+
}
|
|
131
|
+
default:
|
|
132
|
+
throw new YargsError(`Unexpected signer type for ${pubkey}`);
|
|
133
|
+
}
|
|
134
|
+
ApiError.assert(await client.beacon.submitPoolVoluntaryExit({
|
|
135
|
+
message: voluntaryExit,
|
|
136
|
+
signature: signature.toBytes(),
|
|
137
|
+
}));
|
|
138
|
+
}
|
|
116
139
|
function selectSignersToExit(args, signers) {
|
|
117
140
|
const signersWithPubkey = signers.map((signer) => ({
|
|
118
141
|
signer,
|
|
@@ -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,GAAG,MAAM,gBAAgB,CAAC;AACjC,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,GACf,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAC,kBAAkB,
|
|
1
|
+
{"version":3,"file":"voluntaryExit.js","sourceRoot":"","sources":["../../../src/cmds/validator/voluntaryExit.ts"],"names":[],"mappings":"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"}
|
package/lib/networks/dev.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { gnosisChainConfig } from "@lodestar/config/networks";
|
|
2
|
-
import { minimalChainConfig, mainnetChainConfig } from "@lodestar/config/
|
|
2
|
+
import { minimalChainConfig, mainnetChainConfig } from "@lodestar/config/configs";
|
|
3
3
|
import { ACTIVE_PRESET, PresetName } from "@lodestar/params";
|
|
4
4
|
let chainConfig;
|
|
5
5
|
switch (ACTIVE_PRESET) {
|
package/lib/util/errors.d.ts
CHANGED
|
@@ -3,4 +3,11 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export declare class YargsError extends Error {
|
|
5
5
|
}
|
|
6
|
+
export type Result<T> = {
|
|
7
|
+
err: null;
|
|
8
|
+
result: T;
|
|
9
|
+
} | {
|
|
10
|
+
err: Error;
|
|
11
|
+
};
|
|
12
|
+
export declare function wrapError<T>(promise: Promise<T>): Promise<Result<T>>;
|
|
6
13
|
//# sourceMappingURL=errors.d.ts.map
|
package/lib/util/errors.js
CHANGED
package/lib/util/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/util/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,OAAO,UAAW,SAAQ,KAAK;CAAG"}
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/util/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,OAAO,UAAW,SAAQ,KAAK;CAAG;AAGxC,MAAM,CAAC,KAAK,UAAU,SAAS,CAAI,OAAmB;IACpD,IAAI;QACF,OAAO,EAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,OAAO,EAAC,CAAC;KAC3C;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,EAAC,GAAG,EAAE,GAAY,EAAC,CAAC;KAC5B;AACH,CAAC"}
|
|
@@ -8,9 +8,12 @@ type ProposerConfigFileSection = {
|
|
|
8
8
|
builder?: {
|
|
9
9
|
gas_limit?: number;
|
|
10
10
|
selection?: routes.validator.BuilderSelection;
|
|
11
|
+
boost_factor?: bigint;
|
|
11
12
|
};
|
|
12
13
|
};
|
|
13
14
|
export declare function parseProposerConfig(configFilePath: string, defaultArgsConfig?: ProposerConfig): ValidatorProposerConfig;
|
|
14
15
|
export declare function readProposerConfigDir(filepath: string, filename: string): ProposerConfigFileSection;
|
|
16
|
+
export declare function parseBuilderSelection(builderSelection?: string): routes.validator.BuilderSelection | undefined;
|
|
17
|
+
export declare function parseBuilderBoostFactor(boostFactor?: string): bigint | undefined;
|
|
15
18
|
export {};
|
|
16
19
|
//# sourceMappingURL=proposerConfig.d.ts.map
|
|
@@ -3,6 +3,7 @@ import fs from "node:fs";
|
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
import { parseFeeRecipient } from "./feeRecipient.js";
|
|
5
5
|
import { readFile } from "./file.js";
|
|
6
|
+
import { YargsError } from "./index.js";
|
|
6
7
|
export function parseProposerConfig(configFilePath, defaultArgsConfig) {
|
|
7
8
|
const configFile = readFile(configFilePath, ["yml", "yaml"]);
|
|
8
9
|
const defaultConfigParsed = parseProposerConfigSection(configFile.default_config || {}, defaultArgsConfig);
|
|
@@ -22,7 +23,7 @@ function stringtoBool(input) {
|
|
|
22
23
|
}
|
|
23
24
|
function parseProposerConfigSection(proposerFileSection, overrideConfig) {
|
|
24
25
|
const { graffiti, strict_fee_recipient_check, fee_recipient, builder } = proposerFileSection;
|
|
25
|
-
const { gas_limit, selection: builderSelection } = builder || {};
|
|
26
|
+
const { gas_limit, selection: builderSelection, boost_factor } = builder || {};
|
|
26
27
|
if (graffiti !== undefined && typeof graffiti !== "string") {
|
|
27
28
|
throw Error("graffiti is not 'string");
|
|
28
29
|
}
|
|
@@ -41,6 +42,9 @@ function parseProposerConfigSection(proposerFileSection, overrideConfig) {
|
|
|
41
42
|
throw Error("(Number.isNaN(Number(gas_limit)) 2");
|
|
42
43
|
}
|
|
43
44
|
}
|
|
45
|
+
if (boost_factor !== undefined && typeof boost_factor !== "string") {
|
|
46
|
+
throw Error("boost_factor is not 'string");
|
|
47
|
+
}
|
|
44
48
|
return {
|
|
45
49
|
graffiti: overrideConfig?.graffiti ?? graffiti,
|
|
46
50
|
strictFeeRecipientCheck: overrideConfig?.strictFeeRecipientCheck ??
|
|
@@ -48,7 +52,8 @@ function parseProposerConfigSection(proposerFileSection, overrideConfig) {
|
|
|
48
52
|
feeRecipient: overrideConfig?.feeRecipient ?? (fee_recipient ? parseFeeRecipient(fee_recipient) : undefined),
|
|
49
53
|
builder: {
|
|
50
54
|
gasLimit: overrideConfig?.builder?.gasLimit ?? (gas_limit !== undefined ? Number(gas_limit) : undefined),
|
|
51
|
-
selection: overrideConfig?.builder?.selection ?? builderSelection,
|
|
55
|
+
selection: overrideConfig?.builder?.selection ?? parseBuilderSelection(builderSelection),
|
|
56
|
+
boostFactor: overrideConfig?.builder?.boostFactor ?? parseBuilderBoostFactor(boost_factor),
|
|
52
57
|
},
|
|
53
58
|
};
|
|
54
59
|
}
|
|
@@ -57,4 +62,29 @@ export function readProposerConfigDir(filepath, filename) {
|
|
|
57
62
|
const proposerConfigJSON = JSON.parse(proposerConfigStr);
|
|
58
63
|
return proposerConfigJSON;
|
|
59
64
|
}
|
|
65
|
+
export function parseBuilderSelection(builderSelection) {
|
|
66
|
+
if (builderSelection) {
|
|
67
|
+
switch (builderSelection) {
|
|
68
|
+
case "maxprofit":
|
|
69
|
+
break;
|
|
70
|
+
case "builderalways":
|
|
71
|
+
break;
|
|
72
|
+
case "builderonly":
|
|
73
|
+
break;
|
|
74
|
+
case "executiononly":
|
|
75
|
+
break;
|
|
76
|
+
default:
|
|
77
|
+
throw new YargsError("Invalid input for builder selection, check help");
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
return builderSelection;
|
|
81
|
+
}
|
|
82
|
+
export function parseBuilderBoostFactor(boostFactor) {
|
|
83
|
+
if (boostFactor === undefined)
|
|
84
|
+
return;
|
|
85
|
+
if (!/^\d+$/.test(boostFactor)) {
|
|
86
|
+
throw new YargsError("Invalid input for builder boost factor, must be a valid number without decimals");
|
|
87
|
+
}
|
|
88
|
+
return BigInt(boostFactor);
|
|
89
|
+
}
|
|
60
90
|
//# sourceMappingURL=proposerConfig.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proposerConfig.js","sourceRoot":"","sources":["../../src/util/proposerConfig.ts"],"names":[],"mappings":"AAAA,yDAAyD;AAEzD,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAC,QAAQ,EAAC,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"proposerConfig.js","sourceRoot":"","sources":["../../src/util/proposerConfig.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@chainsafe/lodestar",
|
|
3
|
-
"version": "1.15.0-dev.
|
|
3
|
+
"version": "1.15.0-dev.cbf349c73d",
|
|
4
4
|
"description": "Command line interface for lodestar",
|
|
5
5
|
"author": "ChainSafe Systems",
|
|
6
6
|
"license": "LGPL-3.0",
|
|
@@ -30,9 +30,8 @@
|
|
|
30
30
|
"docs:build": "node --loader ts-node/esm ./docsgen/index.ts",
|
|
31
31
|
"lint": "eslint --color --ext .ts src/ test/",
|
|
32
32
|
"lint:fix": "yarn run lint --fix",
|
|
33
|
-
"
|
|
34
|
-
"test:
|
|
35
|
-
"test:e2e": "vitest --run --poolOptions.threads.singleThread true --dir test/e2e/",
|
|
33
|
+
"test:unit": "vitest --run --dir test/unit/",
|
|
34
|
+
"test:e2e": "vitest --run --config vitest.config.e2e.ts --dir test/e2e/",
|
|
36
35
|
"test:sim:multifork": "LODESTAR_PRESET=minimal node --loader ts-node/esm test/sim/multi_fork.test.ts",
|
|
37
36
|
"test:sim:mixedclient": "LODESTAR_PRESET=minimal node --loader ts-node/esm test/sim/mixed_client.test.ts",
|
|
38
37
|
"test:sim:endpoints": "LODESTAR_PRESET=minimal node --loader ts-node/esm test/sim/endpoints.test.ts",
|
|
@@ -66,17 +65,17 @@
|
|
|
66
65
|
"@libp2p/crypto": "^3.0.4",
|
|
67
66
|
"@libp2p/peer-id": "^4.0.4",
|
|
68
67
|
"@libp2p/peer-id-factory": "^4.0.3",
|
|
69
|
-
"@lodestar/api": "1.15.0-dev.
|
|
70
|
-
"@lodestar/beacon-node": "1.15.0-dev.
|
|
71
|
-
"@lodestar/config": "1.15.0-dev.
|
|
72
|
-
"@lodestar/db": "1.15.0-dev.
|
|
73
|
-
"@lodestar/light-client": "1.15.0-dev.
|
|
74
|
-
"@lodestar/logger": "1.15.0-dev.
|
|
75
|
-
"@lodestar/params": "1.15.0-dev.
|
|
76
|
-
"@lodestar/state-transition": "1.15.0-dev.
|
|
77
|
-
"@lodestar/types": "1.15.0-dev.
|
|
78
|
-
"@lodestar/utils": "1.15.0-dev.
|
|
79
|
-
"@lodestar/validator": "1.15.0-dev.
|
|
68
|
+
"@lodestar/api": "1.15.0-dev.cbf349c73d",
|
|
69
|
+
"@lodestar/beacon-node": "1.15.0-dev.cbf349c73d",
|
|
70
|
+
"@lodestar/config": "1.15.0-dev.cbf349c73d",
|
|
71
|
+
"@lodestar/db": "1.15.0-dev.cbf349c73d",
|
|
72
|
+
"@lodestar/light-client": "1.15.0-dev.cbf349c73d",
|
|
73
|
+
"@lodestar/logger": "1.15.0-dev.cbf349c73d",
|
|
74
|
+
"@lodestar/params": "1.15.0-dev.cbf349c73d",
|
|
75
|
+
"@lodestar/state-transition": "1.15.0-dev.cbf349c73d",
|
|
76
|
+
"@lodestar/types": "1.15.0-dev.cbf349c73d",
|
|
77
|
+
"@lodestar/utils": "1.15.0-dev.cbf349c73d",
|
|
78
|
+
"@lodestar/validator": "1.15.0-dev.cbf349c73d",
|
|
80
79
|
"@multiformats/multiaddr": "^12.1.3",
|
|
81
80
|
"@types/lockfile": "^1.0.2",
|
|
82
81
|
"bip39": "^3.1.0",
|
|
@@ -97,7 +96,7 @@
|
|
|
97
96
|
"yargs": "^17.7.1"
|
|
98
97
|
},
|
|
99
98
|
"devDependencies": {
|
|
100
|
-
"@lodestar/test-utils": "1.15.0-dev.
|
|
99
|
+
"@lodestar/test-utils": "1.15.0-dev.cbf349c73d",
|
|
101
100
|
"@types/debug": "^4.1.7",
|
|
102
101
|
"@types/expand-tilde": "^2.0.0",
|
|
103
102
|
"@types/got": "^9.6.12",
|
|
@@ -105,5 +104,5 @@
|
|
|
105
104
|
"@types/lodash": "^4.14.192",
|
|
106
105
|
"@types/yargs": "^17.0.24"
|
|
107
106
|
},
|
|
108
|
-
"gitHead": "
|
|
107
|
+
"gitHead": "1850f68f8188783cab289a87815b7c70575efbd9"
|
|
109
108
|
}
|