@chainsafe/lodestar 1.23.0-dev.2a7f7e6afd → 1.23.0-dev.2e8b8bb478

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.
Files changed (147) hide show
  1. package/.git-data.json +1 -1
  2. package/lib/applyPreset.js +1 -1
  3. package/lib/applyPreset.js.map +1 -1
  4. package/lib/cli.js +1 -1
  5. package/lib/cli.js.map +1 -1
  6. package/lib/cmds/beacon/handler.d.ts +1 -1
  7. package/lib/cmds/beacon/handler.js +12 -12
  8. package/lib/cmds/beacon/handler.js.map +1 -1
  9. package/lib/cmds/beacon/index.js +1 -1
  10. package/lib/cmds/beacon/index.js.map +1 -1
  11. package/lib/cmds/beacon/initBeaconState.d.ts +2 -2
  12. package/lib/cmds/beacon/initBeaconState.js +20 -24
  13. package/lib/cmds/beacon/initBeaconState.js.map +1 -1
  14. package/lib/cmds/beacon/initPeerIdAndEnr.d.ts +4 -4
  15. package/lib/cmds/beacon/initPeerIdAndEnr.js +28 -29
  16. package/lib/cmds/beacon/initPeerIdAndEnr.js.map +1 -1
  17. package/lib/cmds/beacon/options.js.map +1 -1
  18. package/lib/cmds/beacon/paths.js.map +1 -1
  19. package/lib/cmds/bootnode/handler.d.ts +1 -1
  20. package/lib/cmds/bootnode/handler.js +12 -12
  21. package/lib/cmds/bootnode/handler.js.map +1 -1
  22. package/lib/cmds/bootnode/index.js +1 -1
  23. package/lib/cmds/bootnode/index.js.map +1 -1
  24. package/lib/cmds/bootnode/options.d.ts +2 -2
  25. package/lib/cmds/bootnode/options.js +2 -2
  26. package/lib/cmds/bootnode/options.js.map +1 -1
  27. package/lib/cmds/dev/files.js +1 -1
  28. package/lib/cmds/dev/files.js.map +1 -1
  29. package/lib/cmds/dev/handler.js +5 -5
  30. package/lib/cmds/dev/handler.js.map +1 -1
  31. package/lib/cmds/dev/index.js +1 -1
  32. package/lib/cmds/dev/index.js.map +1 -1
  33. package/lib/cmds/dev/options.d.ts +18 -17
  34. package/lib/cmds/dev/options.js +3 -3
  35. package/lib/cmds/dev/options.js.map +1 -1
  36. package/lib/cmds/index.js +2 -2
  37. package/lib/cmds/index.js.map +1 -1
  38. package/lib/cmds/lightclient/handler.js.map +1 -1
  39. package/lib/cmds/lightclient/index.js +1 -1
  40. package/lib/cmds/lightclient/index.js.map +1 -1
  41. package/lib/cmds/validator/blsToExecutionChange.js +3 -3
  42. package/lib/cmds/validator/blsToExecutionChange.js.map +1 -1
  43. package/lib/cmds/validator/handler.js +13 -13
  44. package/lib/cmds/validator/handler.js.map +1 -1
  45. package/lib/cmds/validator/import.js +2 -2
  46. package/lib/cmds/validator/import.js.map +1 -1
  47. package/lib/cmds/validator/index.js +5 -5
  48. package/lib/cmds/validator/index.js.map +1 -1
  49. package/lib/cmds/validator/keymanager/decryptKeystoreDefinitions.d.ts +1 -1
  50. package/lib/cmds/validator/keymanager/decryptKeystoreDefinitions.js +2 -2
  51. package/lib/cmds/validator/keymanager/decryptKeystoreDefinitions.js.map +1 -1
  52. package/lib/cmds/validator/keymanager/decryptKeystores/threadPool.js +1 -1
  53. package/lib/cmds/validator/keymanager/decryptKeystores/threadPool.js.map +1 -1
  54. package/lib/cmds/validator/keymanager/decryptKeystores/worker.js +2 -2
  55. package/lib/cmds/validator/keymanager/decryptKeystores/worker.js.map +1 -1
  56. package/lib/cmds/validator/keymanager/impl.d.ts +6 -2
  57. package/lib/cmds/validator/keymanager/impl.js +41 -9
  58. package/lib/cmds/validator/keymanager/impl.js.map +1 -1
  59. package/lib/cmds/validator/keymanager/keystoreCache.js +1 -1
  60. package/lib/cmds/validator/keymanager/keystoreCache.js.map +1 -1
  61. package/lib/cmds/validator/keymanager/persistedKeys.d.ts +1 -1
  62. package/lib/cmds/validator/keymanager/persistedKeys.js +1 -1
  63. package/lib/cmds/validator/keymanager/persistedKeys.js.map +1 -1
  64. package/lib/cmds/validator/keymanager/server.d.ts +1 -1
  65. package/lib/cmds/validator/keymanager/server.js +2 -3
  66. package/lib/cmds/validator/keymanager/server.js.map +1 -1
  67. package/lib/cmds/validator/options.js +2 -5
  68. package/lib/cmds/validator/options.js.map +1 -1
  69. package/lib/cmds/validator/signers/importExternalKeystores.js +8 -10
  70. package/lib/cmds/validator/signers/importExternalKeystores.js.map +1 -1
  71. package/lib/cmds/validator/signers/index.d.ts +1 -1
  72. package/lib/cmds/validator/signers/index.js +33 -37
  73. package/lib/cmds/validator/signers/index.js.map +1 -1
  74. package/lib/cmds/validator/signers/logSigners.d.ts +1 -1
  75. package/lib/cmds/validator/signers/logSigners.js +4 -4
  76. package/lib/cmds/validator/signers/logSigners.js.map +1 -1
  77. package/lib/cmds/validator/slashingProtection/export.js +2 -3
  78. package/lib/cmds/validator/slashingProtection/export.js.map +1 -1
  79. package/lib/cmds/validator/slashingProtection/import.js +1 -1
  80. package/lib/cmds/validator/slashingProtection/import.js.map +1 -1
  81. package/lib/cmds/validator/slashingProtection/index.js +2 -2
  82. package/lib/cmds/validator/slashingProtection/index.js.map +1 -1
  83. package/lib/cmds/validator/slashingProtection/utils.d.ts +1 -1
  84. package/lib/cmds/validator/slashingProtection/utils.js +3 -3
  85. package/lib/cmds/validator/slashingProtection/utils.js.map +1 -1
  86. package/lib/cmds/validator/voluntaryExit.js +8 -13
  87. package/lib/cmds/validator/voluntaryExit.js.map +1 -1
  88. package/lib/config/beaconNodeOptions.js +1 -1
  89. package/lib/config/beaconNodeOptions.js.map +1 -1
  90. package/lib/config/beaconParams.js +3 -3
  91. package/lib/config/beaconParams.js.map +1 -1
  92. package/lib/config/peerId.d.ts +7 -7
  93. package/lib/config/peerId.js +28 -23
  94. package/lib/config/peerId.js.map +1 -1
  95. package/lib/index.js +1 -1
  96. package/lib/index.js.map +1 -1
  97. package/lib/networks/dev.d.ts +2 -1
  98. package/lib/networks/dev.js +1 -1
  99. package/lib/networks/dev.js.map +1 -1
  100. package/lib/networks/index.d.ts +2 -2
  101. package/lib/networks/index.js +13 -9
  102. package/lib/networks/index.js.map +1 -1
  103. package/lib/networks/mekong.d.ts +6 -0
  104. package/lib/networks/mekong.js +127 -0
  105. package/lib/networks/mekong.js.map +1 -0
  106. package/lib/options/beaconNodeOptions/api.js +3 -3
  107. package/lib/options/beaconNodeOptions/api.js.map +1 -1
  108. package/lib/options/beaconNodeOptions/builder.js +1 -1
  109. package/lib/options/beaconNodeOptions/builder.js.map +1 -1
  110. package/lib/options/beaconNodeOptions/chain.d.ts +3 -2
  111. package/lib/options/beaconNodeOptions/chain.js +14 -5
  112. package/lib/options/beaconNodeOptions/chain.js.map +1 -1
  113. package/lib/options/beaconNodeOptions/eth1.js +4 -8
  114. package/lib/options/beaconNodeOptions/eth1.js.map +1 -1
  115. package/lib/options/beaconNodeOptions/execution.js +3 -7
  116. package/lib/options/beaconNodeOptions/execution.js.map +1 -1
  117. package/lib/options/beaconNodeOptions/index.d.ts +6 -3
  118. package/lib/options/beaconNodeOptions/metrics.js +1 -1
  119. package/lib/options/beaconNodeOptions/metrics.js.map +1 -1
  120. package/lib/options/beaconNodeOptions/monitoring.js.map +1 -1
  121. package/lib/options/beaconNodeOptions/network.js +10 -10
  122. package/lib/options/beaconNodeOptions/network.js.map +1 -1
  123. package/lib/options/beaconNodeOptions/sync.js.map +1 -1
  124. package/lib/options/globalOptions.js.map +1 -1
  125. package/lib/options/logOptions.d.ts +1 -1
  126. package/lib/options/logOptions.js +2 -2
  127. package/lib/options/logOptions.js.map +1 -1
  128. package/lib/options/paramsOptions.js +5 -5
  129. package/lib/options/paramsOptions.js.map +1 -1
  130. package/lib/util/file.js +2 -6
  131. package/lib/util/file.js.map +1 -1
  132. package/lib/util/format.js +2 -2
  133. package/lib/util/format.js.map +1 -1
  134. package/lib/util/fs.js +2 -4
  135. package/lib/util/fs.js.map +1 -1
  136. package/lib/util/gitData/gitDataPath.js +1 -1
  137. package/lib/util/gitData/gitDataPath.js.map +1 -1
  138. package/lib/util/gitData/index.js.map +1 -1
  139. package/lib/util/jwt.js +1 -1
  140. package/lib/util/jwt.js.map +1 -1
  141. package/lib/util/logger.d.ts +1 -1
  142. package/lib/util/logger.js +6 -4
  143. package/lib/util/logger.js.map +1 -1
  144. package/lib/util/proposerConfig.d.ts +1 -1
  145. package/lib/util/proposerConfig.js +7 -5
  146. package/lib/util/proposerConfig.js.map +1 -1
  147. package/package.json +21 -21
@@ -1,9 +1,9 @@
1
1
  import { Keystore } from "@chainsafe/bls-keystore";
2
2
  import { SecretKey } from "@chainsafe/blst";
3
- import { DeleteRemoteKeyStatus, DeletionStatus, ImportStatus, ImportRemoteKeyStatus, } from "@lodestar/api/keymanager";
4
- import { SignerType } from "@lodestar/validator";
3
+ import { DeleteRemoteKeyStatus, DeletionStatus, ImportRemoteKeyStatus, ImportStatus, } from "@lodestar/api/keymanager";
5
4
  import { ApiError } from "@lodestar/api/server";
6
5
  import { fromHex, isValidHttpUrl } from "@lodestar/utils";
6
+ import { SignerType } from "@lodestar/validator";
7
7
  import { getPubkeyHexFromKeystore, isValidatePubkeyHex } from "../../../util/format.js";
8
8
  import { parseFeeRecipient } from "../../../util/index.js";
9
9
  import { DecryptKeystoresThreadPool } from "./decryptKeystores/index.js";
@@ -20,21 +20,25 @@ export class KeymanagerApi {
20
20
  }
21
21
  }
22
22
  async listFeeRecipient({ pubkey }) {
23
+ this.assertValidKnownPubkey(pubkey);
23
24
  return { data: { pubkey, ethaddress: this.validator.validatorStore.getFeeRecipient(pubkey) } };
24
25
  }
25
26
  async setFeeRecipient({ pubkey, ethaddress }) {
26
27
  this.checkIfProposerWriteEnabled();
28
+ this.assertValidKnownPubkey(pubkey);
27
29
  this.validator.validatorStore.setFeeRecipient(pubkey, parseFeeRecipient(ethaddress));
28
30
  this.persistedKeysBackend.writeProposerConfig(pubkey, this.validator.validatorStore.getProposerConfig(pubkey));
29
31
  return { status: 202 };
30
32
  }
31
33
  async deleteFeeRecipient({ pubkey }) {
32
34
  this.checkIfProposerWriteEnabled();
35
+ this.assertValidKnownPubkey(pubkey);
33
36
  this.validator.validatorStore.deleteFeeRecipient(pubkey);
34
37
  this.persistedKeysBackend.writeProposerConfig(pubkey, this.validator.validatorStore.getProposerConfig(pubkey));
35
38
  return { status: 204 };
36
39
  }
37
40
  async getGraffiti({ pubkey }) {
41
+ this.assertValidKnownPubkey(pubkey);
38
42
  const graffiti = this.validator.validatorStore.getGraffiti(pubkey);
39
43
  if (graffiti === undefined) {
40
44
  throw new ApiError(404, `No graffiti for pubkey ${pubkey}`);
@@ -43,39 +47,46 @@ export class KeymanagerApi {
43
47
  }
44
48
  async setGraffiti({ pubkey, graffiti }) {
45
49
  this.checkIfProposerWriteEnabled();
50
+ this.assertValidKnownPubkey(pubkey);
46
51
  this.validator.validatorStore.setGraffiti(pubkey, graffiti);
47
52
  this.persistedKeysBackend.writeProposerConfig(pubkey, this.validator.validatorStore.getProposerConfig(pubkey));
48
53
  return { status: 202 };
49
54
  }
50
55
  async deleteGraffiti({ pubkey }) {
51
56
  this.checkIfProposerWriteEnabled();
57
+ this.assertValidKnownPubkey(pubkey);
52
58
  this.validator.validatorStore.deleteGraffiti(pubkey);
53
59
  this.persistedKeysBackend.writeProposerConfig(pubkey, this.validator.validatorStore.getProposerConfig(pubkey));
54
60
  return { status: 204 };
55
61
  }
56
62
  async getGasLimit({ pubkey }) {
63
+ this.assertValidKnownPubkey(pubkey);
57
64
  const gasLimit = this.validator.validatorStore.getGasLimit(pubkey);
58
65
  return { data: { pubkey, gasLimit } };
59
66
  }
60
67
  async setGasLimit({ pubkey, gasLimit }) {
61
68
  this.checkIfProposerWriteEnabled();
69
+ this.assertValidKnownPubkey(pubkey);
62
70
  this.validator.validatorStore.setGasLimit(pubkey, gasLimit);
63
71
  this.persistedKeysBackend.writeProposerConfig(pubkey, this.validator.validatorStore.getProposerConfig(pubkey));
64
72
  return { status: 202 };
65
73
  }
66
74
  async deleteGasLimit({ pubkey }) {
67
75
  this.checkIfProposerWriteEnabled();
76
+ this.assertValidKnownPubkey(pubkey);
68
77
  this.validator.validatorStore.deleteGasLimit(pubkey);
69
78
  this.persistedKeysBackend.writeProposerConfig(pubkey, this.validator.validatorStore.getProposerConfig(pubkey));
70
79
  return { status: 204 };
71
80
  }
72
81
  async listKeys() {
73
- const pubkeys = this.validator.validatorStore.votingPubkeys();
82
+ const localKeys = this.validator.validatorStore
83
+ .votingPubkeys()
84
+ .filter((pubkey) => this.validator.validatorStore.getSigner(pubkey)?.type === SignerType.Local);
74
85
  return {
75
- data: pubkeys.map((pubkey) => ({
86
+ data: localKeys.map((pubkey) => ({
76
87
  validatingPubkey: pubkey,
77
88
  derivationPath: "",
78
- readonly: this.validator.validatorStore.getSigner(pubkey)?.type !== SignerType.Local,
89
+ readonly: false,
79
90
  })),
80
91
  };
81
92
  }
@@ -259,11 +270,13 @@ export class KeymanagerApi {
259
270
  };
260
271
  }
261
272
  async getBuilderBoostFactor({ pubkey }) {
273
+ this.assertValidKnownPubkey(pubkey);
262
274
  const builderBoostFactor = this.validator.validatorStore.getBuilderBoostFactor(pubkey);
263
275
  return { data: { pubkey, builderBoostFactor } };
264
276
  }
265
277
  async setBuilderBoostFactor({ pubkey, builderBoostFactor, }) {
266
278
  this.checkIfProposerWriteEnabled();
279
+ this.assertValidKnownPubkey(pubkey);
267
280
  this.validator.validatorStore.setBuilderBoostFactor(pubkey, builderBoostFactor);
268
281
  this.persistedKeysBackend.writeProposerConfig(pubkey, this.validator.validatorStore.getProposerConfig(pubkey));
269
282
  return { status: 202 };
@@ -274,11 +287,32 @@ export class KeymanagerApi {
274
287
  this.persistedKeysBackend.writeProposerConfig(pubkey, this.validator.validatorStore.getProposerConfig(pubkey));
275
288
  return { status: 204 };
276
289
  }
290
+ async getProposerConfig({ pubkey }) {
291
+ this.assertValidKnownPubkey(pubkey);
292
+ const config = this.validator.validatorStore.getProposerConfig(pubkey);
293
+ const data = {
294
+ ...config,
295
+ builder: config?.builder
296
+ ? {
297
+ ...config.builder,
298
+ // Default JSON serialization can't handle BigInt
299
+ boostFactor: config.builder.boostFactor ? config.builder.boostFactor.toString() : undefined,
300
+ }
301
+ : undefined,
302
+ };
303
+ return { data };
304
+ }
277
305
  async signVoluntaryExit({ pubkey, epoch }) {
306
+ this.assertValidKnownPubkey(pubkey);
307
+ return { data: await this.validator.signVoluntaryExit(pubkey, epoch) };
308
+ }
309
+ assertValidKnownPubkey(pubkey) {
278
310
  if (!isValidatePubkeyHex(pubkey)) {
279
311
  throw new ApiError(400, `Invalid pubkey ${pubkey}`);
280
312
  }
281
- return { data: await this.validator.signVoluntaryExit(pubkey, epoch) };
313
+ if (!this.validator.validatorStore.hasVotingPubkey(pubkey)) {
314
+ throw new ApiError(404, `Validator pubkey ${pubkey} not known`);
315
+ }
282
316
  }
283
317
  }
284
318
  /**
@@ -288,8 +322,6 @@ function ensureJSON(strOrJson) {
288
322
  if (typeof strOrJson === "string") {
289
323
  return JSON.parse(strOrJson);
290
324
  }
291
- else {
292
- return strOrJson;
293
- }
325
+ return strOrJson;
294
326
  }
295
327
  //# sourceMappingURL=impl.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"impl.js","sourceRoot":"","sources":["../../../../src/cmds/validator/keymanager/impl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"impl.js","sourceRoot":"","sources":["../../../../src/cmds/validator/keymanager/impl.ts"],"names":[],"mappings":"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"}
@@ -2,8 +2,8 @@ import fs from "node:fs";
2
2
  import path from "node:path";
3
3
  import { Keystore } from "@chainsafe/bls-keystore";
4
4
  import { SecretKey } from "@chainsafe/blst";
5
- import { SignerType } from "@lodestar/validator";
6
5
  import { fromHex, toHex, toPubkeyHex } from "@lodestar/utils";
6
+ import { SignerType } from "@lodestar/validator";
7
7
  import { writeFile600Perm } from "../../../util/file.js";
8
8
  import { lockFilepath, unlockFilepath } from "../../../util/lockfile.js";
9
9
  export async function loadKeystoreCache(cacheFilepath, keystoreDefinitions) {
@@ -1 +1 @@
1
- {"version":3,"file":"keystoreCache.js","sourceRoot":"","sources":["../../../../src/cmds/validator/keymanager/keystoreCache.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"keystoreCache.js","sourceRoot":"","sources":["../../../../src/cmds/validator/keymanager/keystoreCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAc,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAC,YAAY,EAAE,cAAc,EAAC,MAAM,2BAA2B,CAAC;AAGvE,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,aAAqB,EACrB,mBAA8C;IAE9C,MAAM,SAAS,GAAe,EAAE,CAAC;IACjC,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,KAAK,MAAM,EAAC,YAAY,EAAE,QAAQ,EAAC,IAAI,mBAAmB,EAAE,CAAC;QAC3D,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QACtE,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CACb,8DAA8D,SAAS,CAAC,MAAM,eAAe,SAAS,CAAC,MAAM,EAAE,CAChH,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,cAAc,aAAa,mBAAmB,CAAC,CAAC;IAClE,CAAC;IAED,YAAY,CAAC,aAAa,CAAC,CAAC;IAE5B,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACpC,2FAA2F;IAC3F,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;IAClF,MAAM,0BAA0B,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEpE,MAAM,MAAM,GAAkB,EAAE,CAAC;IACjC,KAAK,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;QAC7C,MAAM,cAAc,GAAG,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,0BAA0B,EAAE,KAAK,GAAG,EAAE,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;QACjH,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,SAAS,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,CAAC;QAEpD,IAAI,WAAW,CAAC,SAAS,CAAC,KAAK,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YAC9D,MAAM,IAAI,KAAK,CACb,YAAY,CAAC,CAAC,IAAI,iDAAiD,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,WAAW,KAAK,CAC/G,SAAS,CACV,EAAE,CACJ,CAAC;QACJ,CAAC;QAED,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,UAAU,CAAC,KAAK;YACtB,SAAS;SACV,CAAC,CAAC;IACL,CAAC;IAED,cAAc,CAAC,aAAa,CAAC,CAAC;IAE9B,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,aAAqB,EACrB,OAAsB,EACtB,SAAmB;IAEnB,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CACb,0DAA0D,OAAO,CAAC,MAAM,eAAe,SAAS,CAAC,MAAM,EAAE,CAC1G,CAAC;IACJ,CAAC;IACD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IAC3E,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACpC,MAAM,0BAA0B,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC7D,MAAM,uBAAuB,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,aAAa,CAAC,CAAC;IACrH,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;IAC9G,YAAY,CAAC,aAAa,CAAC,CAAC;IAC5B,gBAAgB,CAAC,aAAa,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;IACtD,cAAc,CAAC,aAAa,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,aAAqB;IAC5D,IAAI,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;QACjC,cAAc,CAAC,aAAa,CAAC,CAAC;QAC9B,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAC/B,CAAC;AACH,CAAC"}
@@ -1,5 +1,5 @@
1
- import { ProposerConfig } from "@lodestar/validator";
2
1
  import { DeletionStatus, ImportStatus, PubkeyHex, SignerDefinition } from "@lodestar/api/keymanager";
2
+ import { ProposerConfig } from "@lodestar/validator";
3
3
  import { IPersistedKeysBackend, LocalKeystoreDefinition } from "./interface.js";
4
4
  export { ImportStatus, DeletionStatus };
5
5
  type PathArgs = {
@@ -2,7 +2,7 @@ import fs from "node:fs";
2
2
  import path from "node:path";
3
3
  import { Keystore } from "@chainsafe/bls-keystore";
4
4
  import { DeletionStatus, ImportStatus } from "@lodestar/api/keymanager";
5
- import { getPubkeyHexFromKeystore, readPassphraseFile, rmdirSyncMaybe, unlinkSyncMaybe, writeFile600Perm, readProposerConfigDir, } from "../../../util/index.js";
5
+ import { getPubkeyHexFromKeystore, readPassphraseFile, readProposerConfigDir, rmdirSyncMaybe, unlinkSyncMaybe, writeFile600Perm, } from "../../../util/index.js";
6
6
  import { lockFilepath } from "../../../util/lockfile.js";
7
7
  export { ImportStatus, DeletionStatus };
8
8
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"persistedKeys.js","sourceRoot":"","sources":["../../../../src/cmds/validator/keymanager/persistedKeys.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"persistedKeys.js","sourceRoot":"","sources":["../../../../src/cmds/validator/keymanager/persistedKeys.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
- import { RestApiServer, RestApiServerOpts, RestApiServerModules } from "@lodestar/beacon-node";
2
1
  import { KeymanagerApiMethods } from "@lodestar/api/keymanager/server";
2
+ import { RestApiServer, RestApiServerModules, RestApiServerOpts } from "@lodestar/beacon-node";
3
3
  import { ChainForkConfig } from "@lodestar/config";
4
4
  export type KeymanagerRestApiServerOpts = RestApiServerOpts & {
5
5
  isAuthEnabled: boolean;
@@ -1,8 +1,8 @@
1
1
  import crypto from "node:crypto";
2
2
  import fs from "node:fs";
3
3
  import path from "node:path";
4
- import { RestApiServer } from "@lodestar/beacon-node";
5
4
  import { registerRoutes } from "@lodestar/api/keymanager/server";
5
+ import { RestApiServer } from "@lodestar/beacon-node";
6
6
  import { toHex } from "@lodestar/utils";
7
7
  import { writeFile600Perm } from "../../../util/index.js";
8
8
  export const keymanagerRestApiServerOptsDefault = {
@@ -56,8 +56,7 @@ function readFileIfExists(filepath) {
56
56
  catch (e) {
57
57
  if (e.code === "ENOENT")
58
58
  return null;
59
- else
60
- throw e;
59
+ throw e;
61
60
  }
62
61
  }
63
62
  //# sourceMappingURL=server.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/cmds/validator/keymanager/server.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,aAAa,EAA0C,MAAM,uBAAuB,CAAC;AAC7F,OAAO,EAAuB,cAAc,EAAC,MAAM,iCAAiC,CAAC;AAErF,OAAO,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AASxD,MAAM,CAAC,MAAM,kCAAkC,GAAgC;IAC7E,OAAO,EAAE,WAAW;IACpB,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,GAAG;IACT,aAAa,EAAE,IAAI;IACnB,uGAAuG;IACvG,SAAS,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,OAAO;IACpC,WAAW,EAAE,KAAK;CACnB,CAAC;AAOF,MAAM,CAAC,MAAM,gBAAgB,GAAG,eAAe,CAAC;AAEhD,MAAM,OAAO,uBAAwB,SAAQ,aAAa;IAIxD,YAAY,OAA6C,EAAE,OAAuC;QAChG,sBAAsB;QACtB,MAAM,IAAI,GAAG;YACX,GAAG,kCAAkC;YACrC,kGAAkG;YAClG,gFAAgF;YAChF,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;SAC7E,CAAC;QAEF,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS;YACjC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC;YAC9B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,GAAG,EAAE,gBAAgB,CAAC,CAAC;QACtD,IAAI,WAA+B,CAAC;QAEpC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,mFAAmF;YACnF,WAAW,GAAG,gBAAgB,CAAC,YAAY,CAAC,IAAI,aAAa,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YAC7F,gBAAgB,CAAC,YAAY,EAAE,WAAW,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC,CAAC;QAClE,CAAC;QAED,KAAK,CAAC,EAAC,GAAG,IAAI,EAAE,WAAW,EAAC,EAAE,OAAO,CAAC,CAAC;QAEvC,iDAAiD;QACjD,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QAEzD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,MAAM;QACV,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;QAErB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iEAAiE,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC;QAC3G,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;QAChF,CAAC;IACH,CAAC;CACF;AAED,SAAS,gBAAgB,CAAC,QAAgB;IACxC,IAAI,CAAC;QACH,OAAO,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IAClD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAK,CAAoB,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;;YACpD,MAAM,CAAC,CAAC;IACf,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/cmds/validator/keymanager/server.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAuB,cAAc,EAAC,MAAM,iCAAiC,CAAC;AACrF,OAAO,EAAC,aAAa,EAA0C,MAAM,uBAAuB,CAAC;AAE7F,OAAO,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AASxD,MAAM,CAAC,MAAM,kCAAkC,GAAgC;IAC7E,OAAO,EAAE,WAAW;IACpB,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,GAAG;IACT,aAAa,EAAE,IAAI;IACnB,uGAAuG;IACvG,SAAS,EAAE,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,OAAO;IACpC,WAAW,EAAE,KAAK;CACnB,CAAC;AAOF,MAAM,CAAC,MAAM,gBAAgB,GAAG,eAAe,CAAC;AAEhD,MAAM,OAAO,uBAAwB,SAAQ,aAAa;IAIxD,YAAY,OAA6C,EAAE,OAAuC;QAChG,sBAAsB;QACtB,MAAM,IAAI,GAAG;YACX,GAAG,kCAAkC;YACrC,kGAAkG;YAClG,gFAAgF;YAChF,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;SAC7E,CAAC;QAEF,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS;YACjC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC;YAC9B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,GAAG,EAAE,gBAAgB,CAAC,CAAC;QACtD,IAAI,WAA+B,CAAC;QAEpC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,mFAAmF;YACnF,WAAW,GAAG,gBAAgB,CAAC,YAAY,CAAC,IAAI,aAAa,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YAC7F,gBAAgB,CAAC,YAAY,EAAE,WAAW,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC,CAAC;QAClE,CAAC;QAED,KAAK,CAAC,EAAC,GAAG,IAAI,EAAE,WAAW,EAAC,EAAE,OAAO,CAAC,CAAC;QAEvC,iDAAiD;QACjD,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QAEzD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,MAAM;QACV,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;QAErB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iEAAiE,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC;QAC3G,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2DAA2D,CAAC,CAAC;QAChF,CAAC;IACH,CAAC;CACF;AAED,SAAS,gBAAgB,CAAC,QAAgB;IACxC,IAAI,CAAC;QACH,OAAO,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IAClD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAK,CAAoB,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QAEzD,MAAM,CAAC,CAAC;IACV,CAAC;AACH,CAAC"}
@@ -111,9 +111,7 @@ export const validatorOptions = {
111
111
  string: true,
112
112
  coerce: (urls) =>
113
113
  // Parse ["url1,url2"] to ["url1", "url2"]
114
- urls
115
- .map((item) => item.split(","))
116
- .flat(1),
114
+ urls.flatMap((item) => item.split(",")),
117
115
  alias: ["server"], // for backwards compatibility
118
116
  },
119
117
  force: {
@@ -237,8 +235,7 @@ export const validatorOptions = {
237
235
  coerce: (pubkeys) =>
238
236
  // Parse ["0x11,0x22"] to ["0x11", "0x22"]
239
237
  pubkeys
240
- .map((item) => item.split(","))
241
- .flat(1)
238
+ .flatMap((item) => item.split(","))
242
239
  .map(ensure0xPrefix),
243
240
  group: "externalSigner",
244
241
  },
@@ -1 +1 @@
1
- {"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/cmds/validator/options.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/cmds/validator/options.ts"],"names":[],"mappings":"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"}
@@ -21,16 +21,14 @@ export async function readPassphraseOrPrompt(args) {
21
21
  if (args.importKeystoresPassword) {
22
22
  return readPassphraseFile(args.importKeystoresPassword);
23
23
  }
24
- else {
25
- const answers = await inquirer.prompt([
26
- {
27
- name: "password",
28
- type: "password",
29
- message: "Enter the keystore(s) password",
30
- },
31
- ]);
32
- return answers.password;
33
- }
24
+ const answers = await inquirer.prompt([
25
+ {
26
+ name: "password",
27
+ type: "password",
28
+ message: "Enter the keystore(s) password",
29
+ },
30
+ ]);
31
+ return answers.password;
34
32
  }
35
33
  /**
36
34
  * Returns `true` if we should consider the `filename` to represent a voting keystore.
@@ -1 +1 @@
1
- {"version":3,"file":"importExternalKeystores.js","sourceRoot":"","sources":["../../../../src/cmds/validator/signers/importExternalKeystores.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,kBAAkB,EAAE,eAAe,EAAC,MAAM,wBAAwB,CAAC;AAG3E;;;;GAIG;AACH,MAAM,UAAU,wCAAwC,CAAC,IAGxD;IACC,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,eAAe,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED,OAAO,QAAQ;SACZ,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;SAChD,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QACtB,YAAY;QACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ;KACxB,CAAC,CAAC,CAAC;AACR,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,IAAwC;IACnF,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACjC,OAAO,kBAAkB,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAC1D,CAAC;SAAM,CAAC;QACN,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAqB;YACxD;gBACE,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,gCAAgC;aAC1C;SACF,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,QAAQ,CAAC;IAC1B,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,QAAgB;IAC/C,gCAAgC;IAChC,OAAO,CACL,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;QAC1B,yGAAyG;QACzG,gHAAgH;QAChH,CAAC,2BAA2B,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC3C,+FAA+F;IAC/F,wEAAwE;IACxE,EAAE;IACF,4DAA4D;IAC5D,EAAE;IACF,kDAAkD;IAClD,mIAAmI;IACnI,EAAE;IACF,+FAA+F;IAC/F,0DAA0D;IAC1D,EAAE;IACF,iCAAiC;IACjC,EAAE;IACF,0CAA0C;KAC3C,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"importExternalKeystores.js","sourceRoot":"","sources":["../../../../src/cmds/validator/signers/importExternalKeystores.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAC,kBAAkB,EAAE,eAAe,EAAC,MAAM,wBAAwB,CAAC;AAG3E;;;;GAIG;AACH,MAAM,UAAU,wCAAwC,CAAC,IAGxD;IACC,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,eAAe,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC;IAED,OAAO,QAAQ;SACZ,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;SAChD,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QACtB,YAAY;QACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ;KACxB,CAAC,CAAC,CAAC;AACR,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,IAAwC;IACnF,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACjC,OAAO,kBAAkB,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAC1D,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAqB;QACxD;YACE,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,gCAAgC;SAC1C;KACF,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,QAAQ,CAAC;AAC1B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,QAAgB;IAC/C,gCAAgC;IAChC,OAAO,CACL,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;QAC1B,yGAAyG;QACzG,gHAAgH;QAChH,CAAC,2BAA2B,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC3C,+FAA+F;IAC/F,wEAAwE;IACxE,EAAE;IACF,4DAA4D;IAC5D,EAAE;IACF,kDAAkD;IAClD,mIAAmI;IACnI,EAAE;IACF,+FAA+F;IAC/F,0DAA0D;IAC1D,EAAE;IACF,iCAAiC;IACjC,EAAE;IACF,0CAA0C;KAC3C,CAAC;AACJ,CAAC"}
@@ -1,5 +1,5 @@
1
- import { Signer } from "@lodestar/validator";
2
1
  import { LogLevel, Logger } from "@lodestar/utils";
2
+ import { Signer } from "@lodestar/validator";
3
3
  import { GlobalArgs } from "../../../options/index.js";
4
4
  import { IValidatorCliArgs } from "../options.js";
5
5
  /**
@@ -2,14 +2,14 @@ import path from "node:path";
2
2
  import { deriveEth2ValidatorKeys, deriveKeyFromMnemonic } from "@chainsafe/bls-keygen";
3
3
  import { SecretKey } from "@chainsafe/blst";
4
4
  import { interopSecretKey } from "@lodestar/state-transition";
5
- import { externalSignerGetKeys, SignerType } from "@lodestar/validator";
6
5
  import { isValidHttpUrl } from "@lodestar/utils";
6
+ import { SignerType, externalSignerGetKeys } from "@lodestar/validator";
7
7
  import { defaultNetwork } from "../../../options/index.js";
8
- import { assertValidPubkeysHex, parseRange, YargsError } from "../../../util/index.js";
9
- import { getAccountPaths } from "../paths.js";
10
- import { PersistedKeysBackend } from "../keymanager/persistedKeys.js";
11
- import { decryptKeystoreDefinitions } from "../keymanager/decryptKeystoreDefinitions.js";
8
+ import { YargsError, assertValidPubkeysHex, parseRange } from "../../../util/index.js";
12
9
  import { showProgress } from "../../../util/progress.js";
10
+ import { decryptKeystoreDefinitions } from "../keymanager/decryptKeystoreDefinitions.js";
11
+ import { PersistedKeysBackend } from "../keymanager/persistedKeys.js";
12
+ import { getAccountPaths } from "../paths.js";
13
13
  import { importKeystoreDefinitionsFromExternalDir, readPassphraseOrPrompt } from "./importExternalKeystores.js";
14
14
  const KEYSTORE_IMPORT_PROGRESS_MS = 10000;
15
15
  /**
@@ -46,12 +46,10 @@ export async function getSignersFromArgs(args, network, { logger, signal }) {
46
46
  if (args["externalSigner.pubkeys"] || args["externalSigner.fetch"]) {
47
47
  return getRemoteSigners(args);
48
48
  }
49
- else {
50
- return indexes.map((index) => ({ type: SignerType.Local, secretKey: interopSecretKey(index) }));
51
- }
49
+ return indexes.map((index) => ({ type: SignerType.Local, secretKey: interopSecretKey(index) }));
52
50
  }
53
51
  // UNSAFE, ONLY USE FOR TESTNETS - Derive keys directly from a mnemonic
54
- else if (args.fromMnemonic) {
52
+ if (args.fromMnemonic) {
55
53
  if (network === defaultNetwork) {
56
54
  throw new YargsError("fromMnemonic must only be used in testnets");
57
55
  }
@@ -66,7 +64,7 @@ export async function getSignersFromArgs(args, network, { logger, signal }) {
66
64
  }));
67
65
  }
68
66
  // Import JSON keystores and run
69
- else if (args.importKeystores) {
67
+ if (args.importKeystores) {
70
68
  const keystoreDefinitions = importKeystoreDefinitionsFromExternalDir({
71
69
  keystoresPath: args.importKeystores,
72
70
  password: await readPassphraseOrPrompt(args),
@@ -83,41 +81,39 @@ export async function getSignersFromArgs(args, network, { logger, signal }) {
83
81
  ignoreLockFile: args.force,
84
82
  onDecrypt: needle,
85
83
  cacheFilePath: path.join(accountPaths.cacheDir, "imported_keystores.cache"),
86
- disableThreadPool: args["disableKeystoresThreadPool"],
84
+ disableThreadPool: args.disableKeystoresThreadPool,
87
85
  logger,
88
86
  signal,
89
87
  });
90
88
  }
91
89
  // Remote keys are declared manually or will be fetched from external signer
92
- else if (args["externalSigner.pubkeys"] || args["externalSigner.fetch"]) {
90
+ if (args["externalSigner.pubkeys"] || args["externalSigner.fetch"]) {
93
91
  return getRemoteSigners(args);
94
92
  }
95
93
  // Read keys from local account manager
96
- else {
97
- const persistedKeysBackend = new PersistedKeysBackend(accountPaths);
98
- // Read and decrypt local keystores, imported via keymanager api or import cmd
99
- const keystoreDefinitions = persistedKeysBackend.readAllKeystores();
100
- const needle = showProgress({
101
- total: keystoreDefinitions.length,
102
- frequencyMs: KEYSTORE_IMPORT_PROGRESS_MS,
103
- signal,
104
- progress: ({ ratePerSec, percentage, current, total }) => {
105
- logger.info(`${percentage.toFixed(0)}% of local keystores imported. current=${current} total=${total} rate=${(ratePerSec * 60).toFixed(2)}keys/m`);
106
- },
107
- });
108
- const keystoreSigners = await decryptKeystoreDefinitions(keystoreDefinitions, {
109
- ignoreLockFile: args.force,
110
- onDecrypt: needle,
111
- cacheFilePath: path.join(accountPaths.cacheDir, "local_keystores.cache"),
112
- disableThreadPool: args["disableKeystoresThreadPool"],
113
- logger,
114
- signal,
115
- });
116
- // Read local remote keys, imported via keymanager api
117
- const signerDefinitions = persistedKeysBackend.readAllRemoteKeys();
118
- const remoteSigners = signerDefinitions.map(({ url, pubkey }) => ({ type: SignerType.Remote, url, pubkey }));
119
- return [...keystoreSigners, ...remoteSigners];
120
- }
94
+ const persistedKeysBackend = new PersistedKeysBackend(accountPaths);
95
+ // Read and decrypt local keystores, imported via keymanager api or import cmd
96
+ const keystoreDefinitions = persistedKeysBackend.readAllKeystores();
97
+ const needle = showProgress({
98
+ total: keystoreDefinitions.length,
99
+ frequencyMs: KEYSTORE_IMPORT_PROGRESS_MS,
100
+ signal,
101
+ progress: ({ ratePerSec, percentage, current, total }) => {
102
+ logger.info(`${percentage.toFixed(0)}% of local keystores imported. current=${current} total=${total} rate=${(ratePerSec * 60).toFixed(2)}keys/m`);
103
+ },
104
+ });
105
+ const keystoreSigners = await decryptKeystoreDefinitions(keystoreDefinitions, {
106
+ ignoreLockFile: args.force,
107
+ onDecrypt: needle,
108
+ cacheFilePath: path.join(accountPaths.cacheDir, "local_keystores.cache"),
109
+ disableThreadPool: args.disableKeystoresThreadPool,
110
+ logger,
111
+ signal,
112
+ });
113
+ // Read local remote keys, imported via keymanager api
114
+ const signerDefinitions = persistedKeysBackend.readAllRemoteKeys();
115
+ const remoteSigners = signerDefinitions.map(({ url, pubkey }) => ({ type: SignerType.Remote, url, pubkey }));
116
+ return [...keystoreSigners, ...remoteSigners];
121
117
  }
122
118
  export function getSignerPubkeyHex(signer) {
123
119
  switch (signer.type) {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cmds/validator/signers/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cmds/validator/signers/index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAC,uBAAuB,EAAE,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,gBAAgB,EAAC,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAmB,cAAc,EAAC,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAS,UAAU,EAAE,qBAAqB,EAAC,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAa,cAAc,EAAC,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAC,UAAU,EAAE,qBAAqB,EAAE,UAAU,EAAC,MAAM,wBAAwB,CAAC;AACrF,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAC,0BAA0B,EAAC,MAAM,6CAA6C,CAAC;AACvF,OAAO,EAAC,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AAEpE,OAAO,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAC,wCAAwC,EAAE,sBAAsB,EAAC,MAAM,8BAA8B,CAAC;AAE9G,MAAM,2BAA2B,GAAG,KAAK,CAAC;AAE1C;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAAoC,EACpC,OAAe,EACf,EAAC,MAAM,EAAE,MAAM,EAA8F;IAE7G,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEpD,8CAA8C;IAC9C,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;QACxB,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAChD,sCAAsC;QACtC,IAAI,IAAI,CAAC,wBAAwB,CAAC,IAAI,IAAI,CAAC,sBAAsB,CAAC,EAAE,CAAC;YACnE,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAC,IAAI,EAAE,UAAU,CAAC,KAAK,EAAE,SAAS,EAAE,gBAAgB,CAAC,KAAK,CAAC,EAAC,CAAC,CAAC,CAAC;IAChG,CAAC;IAED,uEAAuE;IACvE,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QACtB,IAAI,OAAO,KAAK,cAAc,EAAE,CAAC;YAC/B,MAAM,IAAI,UAAU,CAAC,4CAA4C,CAAC,CAAC;QACrE,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;YAC1B,MAAM,IAAI,UAAU,CAAC,gDAAgD,CAAC,CAAC;QACzE,CAAC;QAED,MAAM,QAAQ,GAAG,qBAAqB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1D,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACjD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC7B,IAAI,EAAE,UAAU,CAAC,KAAK;YACtB,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,uBAAuB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC;SACjF,CAAC,CAAC,CAAC;IACN,CAAC;IAED,gCAAgC;IAChC,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,MAAM,mBAAmB,GAAG,wCAAwC,CAAC;YACnE,aAAa,EAAE,IAAI,CAAC,eAAe;YACnC,QAAQ,EAAE,MAAM,sBAAsB,CAAC,IAAI,CAAC;SAC7C,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,YAAY,CAAC;YAC1B,KAAK,EAAE,mBAAmB,CAAC,MAAM;YACjC,WAAW,EAAE,2BAA2B;YACxC,MAAM;YACN,QAAQ,EAAE,CAAC,EAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAC,EAAE,EAAE;gBACrD,MAAM,CAAC,IAAI,CACT,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,oCAAoC,OAAO,UAAU,KAAK,SAAS,CACzF,UAAU,GAAG,EAAE,CAChB,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CACrB,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;QACH,OAAO,0BAA0B,CAAC,mBAAmB,EAAE;YACrD,cAAc,EAAE,IAAI,CAAC,KAAK;YAC1B,SAAS,EAAE,MAAM;YACjB,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,0BAA0B,CAAC;YAC3E,iBAAiB,EAAE,IAAI,CAAC,0BAA0B;YAClD,MAAM;YACN,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED,4EAA4E;IAC5E,IAAI,IAAI,CAAC,wBAAwB,CAAC,IAAI,IAAI,CAAC,sBAAsB,CAAC,EAAE,CAAC;QACnE,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,uCAAuC;IACvC,MAAM,oBAAoB,GAAG,IAAI,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAEpE,8EAA8E;IAC9E,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,gBAAgB,EAAE,CAAC;IAEpE,MAAM,MAAM,GAAG,YAAY,CAAC;QAC1B,KAAK,EAAE,mBAAmB,CAAC,MAAM;QACjC,WAAW,EAAE,2BAA2B;QACxC,MAAM;QACN,QAAQ,EAAE,CAAC,EAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAC,EAAE,EAAE;YACrD,MAAM,CAAC,IAAI,CACT,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,0CAA0C,OAAO,UAAU,KAAK,SAAS,CAC/F,UAAU,GAAG,EAAE,CAChB,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CACrB,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,MAAM,0BAA0B,CAAC,mBAAmB,EAAE;QAC5E,cAAc,EAAE,IAAI,CAAC,KAAK;QAC1B,SAAS,EAAE,MAAM;QACjB,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,uBAAuB,CAAC;QACxE,iBAAiB,EAAE,IAAI,CAAC,0BAA0B;QAClD,MAAM;QACN,MAAM;KACP,CAAC,CAAC;IAEH,sDAAsD;IACtD,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;IACnE,MAAM,aAAa,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAC,GAAG,EAAE,MAAM,EAAC,EAAU,EAAE,CAAC,CAAC,EAAC,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAC,CAAC,CAAC,CAAC;IAEjH,OAAO,CAAC,GAAG,eAAe,EAAE,GAAG,aAAa,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAAc;IAC/C,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,UAAU,CAAC,KAAK;YACnB,OAAO,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,CAAC;QAEhD,KAAK,UAAU,CAAC,MAAM;YACpB,OAAO,MAAM,CAAC,MAAM,CAAC;IACzB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,IAAoC;IAClE,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACrD,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,MAAM,IAAI,UAAU,CAClB,oCACE,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,sBAC9D,EAAE,CACH,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,UAAU,CAAC,gCAAgC,iBAAiB,EAAE,CAAC,CAAC;IAC5E,CAAC;IACD,IAAI,IAAI,CAAC,wBAAwB,CAAC,IAAI,IAAI,CAAC,wBAAwB,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClF,MAAM,IAAI,UAAU,CAAC,gDAAgD,CAAC,CAAC;IACzE,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,MAAM,qBAAqB,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACnG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAE/B,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,EAAC,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,iBAAiB,EAAC,CAAC,CAAC,CAAC;AAC9F,CAAC"}
@@ -1,5 +1,5 @@
1
- import { Signer } from "@lodestar/validator";
2
1
  import { LogLevel, Logger } from "@lodestar/utils";
2
+ import { Signer } from "@lodestar/validator";
3
3
  import { IValidatorCliArgs } from "../options.js";
4
4
  /**
5
5
  * Log each pubkeys for auditing out keys are loaded from the logs
@@ -1,5 +1,5 @@
1
- import { SignerType } from "@lodestar/validator";
2
1
  import { toPrintableUrl } from "@lodestar/utils";
2
+ import { SignerType } from "@lodestar/validator";
3
3
  import { YargsError } from "../../../util/errors.js";
4
4
  /**
5
5
  * Log each pubkeys for auditing out keys are loaded from the logs
@@ -51,13 +51,13 @@ function groupRemoteSignersByUrl(remoteSigners) {
51
51
  * is connected with fetching enabled, but otherwise exit the process and suggest a different configuration.
52
52
  */
53
53
  export function warnOrExitNoSigners(args, logger) {
54
- if (args["keymanager"] && !args["externalSigner.fetch"]) {
54
+ if (args.keymanager && !args["externalSigner.fetch"]) {
55
55
  logger.warn("No local keystores or remote keys found with current args, expecting to be added via keymanager");
56
56
  }
57
- else if (!args["keymanager"] && args["externalSigner.fetch"]) {
57
+ else if (!args.keymanager && args["externalSigner.fetch"]) {
58
58
  logger.warn("No remote keys found with current args, expecting to be added to external signer and fetched later");
59
59
  }
60
- else if (args["keymanager"] && args["externalSigner.fetch"]) {
60
+ else if (args.keymanager && args["externalSigner.fetch"]) {
61
61
  logger.warn("No local keystores or remote keys found with current args, expecting to be added via keymanager or fetched from external signer later");
62
62
  }
63
63
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"logSigners.js","sourceRoot":"","sources":["../../../../src/cmds/validator/signers/logSigners.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logSigners.js","sourceRoot":"","sources":["../../../../src/cmds/validator/signers/logSigners.ts"],"names":[],"mappings":"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"}