@lodestar/validator 1.46.0-dev.d96240a05e → 1.46.0-dev.df02c7532b

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 (123) hide show
  1. package/lib/buckets.js +1 -2
  2. package/lib/buckets.js.map +1 -1
  3. package/lib/defaults.d.ts.map +1 -1
  4. package/lib/genesis.js.map +1 -1
  5. package/lib/metrics.d.ts +2 -2
  6. package/lib/metrics.d.ts.map +1 -1
  7. package/lib/metrics.js +2 -4
  8. package/lib/metrics.js.map +1 -1
  9. package/lib/repositories/metaDataRepository.js.map +1 -1
  10. package/lib/services/attestation.d.ts +22 -1
  11. package/lib/services/attestation.d.ts.map +1 -1
  12. package/lib/services/attestation.js.map +1 -1
  13. package/lib/services/attestationDuties.d.ts +22 -1
  14. package/lib/services/attestationDuties.d.ts.map +1 -1
  15. package/lib/services/attestationDuties.js +1 -1
  16. package/lib/services/attestationDuties.js.map +1 -1
  17. package/lib/services/block.d.ts +18 -1
  18. package/lib/services/block.d.ts.map +1 -1
  19. package/lib/services/block.js.map +1 -1
  20. package/lib/services/blockDuties.d.ts +11 -1
  21. package/lib/services/blockDuties.d.ts.map +1 -1
  22. package/lib/services/blockDuties.js.map +1 -1
  23. package/lib/services/chainHeaderTracker.js.map +1 -1
  24. package/lib/services/doppelgangerService.d.ts +1 -1
  25. package/lib/services/doppelgangerService.d.ts.map +1 -1
  26. package/lib/services/doppelgangerService.js +1 -2
  27. package/lib/services/doppelgangerService.js.map +1 -1
  28. package/lib/services/emitter.d.ts +1 -1
  29. package/lib/services/emitter.d.ts.map +1 -1
  30. package/lib/services/emitter.js +1 -2
  31. package/lib/services/emitter.js.map +1 -1
  32. package/lib/services/externalSignerSync.js.map +1 -1
  33. package/lib/services/indices.d.ts +2 -0
  34. package/lib/services/indices.d.ts.map +1 -1
  35. package/lib/services/indices.js.map +1 -1
  36. package/lib/services/prepareBeaconProposer.d.ts +2 -1
  37. package/lib/services/prepareBeaconProposer.d.ts.map +1 -1
  38. package/lib/services/prepareBeaconProposer.js.map +1 -1
  39. package/lib/services/proposerPreferences.d.ts +2 -1
  40. package/lib/services/proposerPreferences.d.ts.map +1 -1
  41. package/lib/services/proposerPreferences.js.map +1 -1
  42. package/lib/services/ptc.d.ts +2 -1
  43. package/lib/services/ptc.d.ts.map +1 -1
  44. package/lib/services/ptc.js.map +1 -1
  45. package/lib/services/ptcDuties.d.ts +2 -1
  46. package/lib/services/ptcDuties.d.ts.map +1 -1
  47. package/lib/services/ptcDuties.js.map +1 -1
  48. package/lib/services/syncCommittee.d.ts +21 -1
  49. package/lib/services/syncCommittee.d.ts.map +1 -1
  50. package/lib/services/syncCommittee.js.map +1 -1
  51. package/lib/services/syncCommitteeDuties.d.ts +22 -1
  52. package/lib/services/syncCommitteeDuties.d.ts.map +1 -1
  53. package/lib/services/syncCommitteeDuties.js.map +1 -1
  54. package/lib/services/syncingStatusTracker.d.ts +1 -1
  55. package/lib/services/syncingStatusTracker.d.ts.map +1 -1
  56. package/lib/services/syncingStatusTracker.js.map +1 -1
  57. package/lib/services/utils.js.map +1 -1
  58. package/lib/services/validatorStore.js +2 -3
  59. package/lib/services/validatorStore.js.map +1 -1
  60. package/lib/slashingProtection/attestation/attestationByTargetRepository.js.map +1 -1
  61. package/lib/slashingProtection/attestation/attestationLowerBoundRepository.js.map +1 -1
  62. package/lib/slashingProtection/attestation/errors.js +1 -2
  63. package/lib/slashingProtection/attestation/errors.js.map +1 -1
  64. package/lib/slashingProtection/attestation/index.js.map +1 -1
  65. package/lib/slashingProtection/block/blockBySlotRepository.js.map +1 -1
  66. package/lib/slashingProtection/block/errors.js +1 -2
  67. package/lib/slashingProtection/block/errors.js.map +1 -1
  68. package/lib/slashingProtection/block/index.js.map +1 -1
  69. package/lib/slashingProtection/index.js.map +1 -1
  70. package/lib/slashingProtection/interchange/errors.js +1 -2
  71. package/lib/slashingProtection/interchange/errors.js.map +1 -1
  72. package/lib/slashingProtection/interchange/formats/completeV4.d.ts +1 -1
  73. package/lib/slashingProtection/interchange/formats/completeV4.d.ts.map +1 -1
  74. package/lib/slashingProtection/interchange/formats/completeV4.js.map +1 -1
  75. package/lib/slashingProtection/interchange/formats/v5.js.map +1 -1
  76. package/lib/slashingProtection/interchange/parseInterchange.js.map +1 -1
  77. package/lib/slashingProtection/interchange/serializeInterchange.js.map +1 -1
  78. package/lib/slashingProtection/minMaxSurround/distanceStoreRepository.js.map +1 -1
  79. package/lib/slashingProtection/minMaxSurround/errors.js +1 -2
  80. package/lib/slashingProtection/minMaxSurround/errors.js.map +1 -1
  81. package/lib/slashingProtection/minMaxSurround/minMaxSurround.js.map +1 -1
  82. package/lib/slashingProtection/utils.d.ts +1 -1
  83. package/lib/slashingProtection/utils.d.ts.map +1 -1
  84. package/lib/slashingProtection/utils.js.map +1 -1
  85. package/lib/util/batch.js.map +1 -1
  86. package/lib/util/difference.js.map +1 -1
  87. package/lib/util/externalSignerClient.js +1 -2
  88. package/lib/util/externalSignerClient.js.map +1 -1
  89. package/lib/util/format.js.map +1 -1
  90. package/lib/util/index.d.ts +0 -1
  91. package/lib/util/index.d.ts.map +1 -1
  92. package/lib/util/index.js +0 -1
  93. package/lib/util/index.js.map +1 -1
  94. package/lib/util/logger.d.ts +1 -1
  95. package/lib/util/logger.d.ts.map +1 -1
  96. package/lib/util/logger.js.map +1 -1
  97. package/lib/util/url.js.map +1 -1
  98. package/lib/validator.d.ts +2 -2
  99. package/lib/validator.d.ts.map +1 -1
  100. package/lib/validator.js +2 -3
  101. package/lib/validator.js.map +1 -1
  102. package/package.json +15 -15
  103. package/src/services/attestation.ts +2 -2
  104. package/src/services/attestationDuties.ts +7 -2
  105. package/src/services/block.ts +2 -1
  106. package/src/services/blockDuties.ts +2 -2
  107. package/src/services/doppelgangerService.ts +1 -2
  108. package/src/services/prepareBeaconProposer.ts +2 -1
  109. package/src/services/proposerPreferences.ts +2 -2
  110. package/src/services/ptc.ts +2 -1
  111. package/src/services/ptcDuties.ts +2 -2
  112. package/src/services/syncCommittee.ts +2 -1
  113. package/src/services/syncCommitteeDuties.ts +2 -1
  114. package/src/services/syncingStatusTracker.ts +1 -1
  115. package/src/services/validatorStore.ts +1 -1
  116. package/src/util/index.ts +0 -1
  117. package/src/util/logger.ts +1 -1
  118. package/src/validator.ts +2 -3
  119. package/lib/util/clock.d.ts +0 -55
  120. package/lib/util/clock.d.ts.map +0 -1
  121. package/lib/util/clock.js +0 -141
  122. package/lib/util/clock.js.map +0 -1
  123. package/src/util/clock.ts +0 -182
package/lib/validator.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { defaultInit, getClient } from "@lodestar/api";
2
2
  import { NotEqualParamsError, assertEqualParams, createBeaconConfig, } from "@lodestar/config";
3
- import { computeEpochAtSlot, getCurrentSlot } from "@lodestar/state-transition";
3
+ import { Clock, computeEpochAtSlot, getCurrentSlot } from "@lodestar/state-transition";
4
4
  import { ssz } from "@lodestar/types";
5
5
  import { toPrintableUrl, toRootHex } from "@lodestar/utils";
6
6
  import { waitForGenesis } from "./genesis.js";
@@ -19,7 +19,6 @@ import { PtcService } from "./services/ptc.js";
19
19
  import { SyncCommitteeService } from "./services/syncCommittee.js";
20
20
  import { SyncingStatusTracker } from "./services/syncingStatusTracker.js";
21
21
  import { ValidatorStore, defaultOptions } from "./services/validatorStore.js";
22
- import { Clock } from "./util/clock.js";
23
22
  import { getLoggerVc } from "./util/index.js";
24
23
  // TODO: Extend the timeout, and let it be customizable
25
24
  /// The global timeout for HTTP requests to the beacon node.
@@ -202,7 +201,7 @@ export class Validator {
202
201
  logger.info("Genesis fetched from the beacon node");
203
202
  const res = await api.config.getSpec();
204
203
  assertEqualParams(config, res.value());
205
- logger.info("Verified connected beacon node and validator have same the config");
204
+ logger.info("Verified connected beacon node and validator have the same config");
206
205
  await assertEqualGenesis(opts, genesis);
207
206
  logger.info("Verified connected beacon node and validator have the same genesisValidatorRoot");
208
207
  const { broadcastValidation = defaultOptions.broadcastValidation, valProposerConfig } = opts;
@@ -1 +1 @@
1
- {"version":3,"file":"validator.js","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validator.js","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,WAAW,EAAE,SAAS,EAAS,MAAM,eAAe,CAAC;AACxF,OAAO,EAGL,mBAAmB,EACnB,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,KAAK,EAAwB,kBAAkB,EAAE,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAC3G,OAAO,EAAoB,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAS,cAAc,EAAE,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAC,kBAAkB,EAAC,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAC,kBAAkB,EAAC,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAC,qBAAqB,EAAC,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAC,kBAAkB,EAAC,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAC,kBAAkB,EAAC,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAC,mBAAmB,EAAC,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAC,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAwB,yBAAyB,EAAC,MAAM,kCAAkC,CAAC;AAClG,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAC,gCAAgC,EAAE,yBAAyB,EAAC,MAAM,qCAAqC,CAAC;AAChH,OAAO,EAAC,0BAA0B,EAAC,MAAM,mCAAmC,CAAC;AAC7E,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAC,oBAAoB,EAAC,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAC,oBAAoB,EAAC,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAkC,cAAc,EAAE,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAG7G,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AA+C5C,uDAAuD;AACvD,4DAA4D;AAC5D,qCAAqC;AAErC,IAAK,MAGJ;AAHD,WAAK,MAAM;IACT,yCAAO,CAAA;IACP,uCAAM,CAAA;AACR,CAAC,EAHI,MAAM,KAAN,MAAM,QAGV;AAED;;GAEG;AACH,MAAM,OAAO,SAAS;IACH,OAAO,CAAU;IACzB,cAAc,CAAiB;IACvB,kBAAkB,CAAsB;IACxC,qBAAqB,CAAwB;IAC7C,kBAAkB,CAAqB;IACvC,UAAU,CAAa;IACvB,oBAAoB,CAAuB;IAC3C,MAAM,CAAe;IACrB,GAAG,CAAY;IACf,KAAK,CAAS;IACd,kBAAkB,CAAqB;IAC/C,oBAAoB,CAAuB;IACnC,MAAM,CAAS;IACf,EAAE,CAAsC;IACjD,KAAK,CAAS;IACL,UAAU,CAAkB;IAE7C,YAAY,EACV,IAAI,EACJ,OAAO,EACP,cAAc,EACd,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EAClB,UAAU,EACV,oBAAoB,EACpB,MAAM,EACN,GAAG,EACH,KAAK,EACL,kBAAkB,EAClB,oBAAoB,EACpB,MAAM,EACN,EAAE,EACF,OAAO,EACP,UAAU,GACO;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;QACnD,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QACjD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QAEb,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,wEAAwE;YACxE,4EAA4E;YAC5E,MAAM,EAAC,UAAU,EAAC,GAAG,IAAI,CAAC,GAAG,CAAC;YAC9B,IAAI,UAAU,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpC,MAAM,cAAc,GAAG,cAAc,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBAEvE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,IAAI,EAAE;oBAClC,iEAAiE;oBACjE,yEAAyE;oBACzE,IAAI,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;wBAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,EAAC,GAAG,EAAE,cAAc,EAAC,CAAC,CAAC;oBAC9E,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;YAED,IAAI,OAAO,EAAE,CAAC;gBACZ,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACjC,CAAC;YAED,wBAAwB;YACxB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC;YAC5B,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACzC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,KAAK,KAAK,MAAM,CAAC,OAAO,CAAC;IACvC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAsB,EAAE,OAAgB,EAAE,OAAO,GAAmB,IAAI;QACxF,MAAM,EAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,kBAAkB,EAAE,OAAO,EAAE,iBAAiB,EAAC,GAAG,IAAI,CAAC;QAC/F,MAAM,MAAM,GAAG,kBAAkB,CAAC,WAAW,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;QAC9E,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC;QACxC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,EAAC,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,EAAC,CAAC,CAAC;QACnG,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAE5C,IAAI,GAAc,CAAC;QACnB,MAAM,EAAC,YAAY,EAAE,UAAU,EAAC,GAAG,IAAI,CAAC,GAAG,CAAC;QAC5C,IAAI,OAAO,YAAY,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACpE,GAAG,GAAG,SAAS,CACb;gBACE,IAAI,EAAE,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY;gBACtE,6DAA6D;gBAC7D,sEAAsE;gBACtE,UAAU,EAAE;oBACV,MAAM,EAAE,UAAU,CAAC,MAAM;oBACzB,GAAG,UAAU;oBACb,SAAS,EAAE,UAAU,EAAE,SAAS,IAAI,MAAM,CAAC,gBAAgB;iBAC5D;aACF,EACD,EAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAC,CAClD,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,YAAY,CAAC;QACrB,CAAC;QAED,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QAEhE,MAAM,mBAAmB,GAAG,IAAI,CAAC,sBAAsB;YACrD,CAAC,CAAC,IAAI,mBAAmB,CACrB,MAAM,EACN,KAAK,EACL,GAAG,EACH,cAAc,EACd,kBAAkB,EAClB,IAAI,CAAC,uBAAuB,EAC5B,OAAO,CACR;YACH,CAAC,CAAC,IAAI,CAAC;QAET,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,IAAI,CAC9C;YACE,MAAM;YACN,kBAAkB;YAClB,cAAc;YACd,mBAAmB;YACnB,OAAO;SACR,EACD,OAAO,EACP,iBAAiB,CAClB,CAAC;QACF,yBAAyB,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;QACjF,gCAAgC,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;QACxF,yBAAyB,CAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAEpG,MAAM,OAAO,GAAG,IAAI,qBAAqB,EAAE,CAAC;QAC5C,0FAA0F;QAC1F,8FAA8F;QAC9F,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAElC,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QAChF,MAAM,oBAAoB,GAAG,IAAI,oBAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAEnF,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAC/C,MAAM,EACN,QAAQ,EACR,GAAG,EACH,KAAK,EACL,cAAc,EACd,kBAAkB,EAClB,OAAO,CACR,CAAC;QAEF,MAAM,qBAAqB,GAAG,IAAI,qBAAqB,CACrD,MAAM,EACN,QAAQ,EACR,GAAG,EACH,KAAK,EACL,cAAc,EACd,kBAAkB,EAClB,OAAO,EACP;YACE,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,IAAI,cAAc,CAAC,mBAAmB;YACnF,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,cAAc,CAAC,YAAY;YAC9D,mFAAmF;YACnF,uFAAuF;YACvF,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC;SACxE,CACF,CAAC;QAEF,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAC/C,QAAQ,EACR,GAAG,EACH,KAAK,EACL,cAAc,EACd,OAAO,EACP,kBAAkB,EAClB,oBAAoB,EACpB,OAAO,EACP,MAAM,EACN;YACE,2BAA2B,EAAE,IAAI,CAAC,2BAA2B;YAC7D,+BAA+B,EAAE,IAAI,CAAC,WAAW;SAClD,CACF,CAAC;QAEF,MAAM,UAAU,GAAG,IAAI,UAAU,CAC/B,MAAM,EACN,QAAQ,EACR,GAAG,EACH,KAAK,EACL,cAAc,EACd,OAAO,EACP,kBAAkB,EAClB,oBAAoB,EACpB,OAAO,CACR,CAAC;QAEF,MAAM,oBAAoB,GAAG,IAAI,oBAAoB,CACnD,MAAM,EACN,QAAQ,EACR,GAAG,EACH,KAAK,EACL,cAAc,EACd,OAAO,EACP,kBAAkB,EAClB,oBAAoB,EACpB,OAAO,EACP;YACE,6BAA6B,EAAE,IAAI,CAAC,6BAA6B;YACjE,+BAA+B,EAAE,IAAI,CAAC,WAAW;SAClD,CACF,CAAC;QAEF,IAAI,0BAA0B,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;QAE1G,OAAO,IAAI,SAAS,CAAC;YACnB,IAAI;YACJ,OAAO;YACP,cAAc;YACd,kBAAkB;YAClB,qBAAqB;YACrB,kBAAkB;YAClB,UAAU;YACV,oBAAoB;YACpB,MAAM;YACN,GAAG;YACH,KAAK;YACL,kBAAkB;YAClB,oBAAoB;YACpB,MAAM;YACN,EAAE;YACF,OAAO;YACP,UAAU;SACX,CAAC,CAAC;IACL,CAAC;IAED,yCAAyC;IACzC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,IAAsB,EAAE,OAAwB;QACpF,MAAM,EAAC,MAAM,EAAE,MAAM,EAAC,GAAG,IAAI,CAAC;QAE9B,IAAI,GAAc,CAAC;QACnB,MAAM,EAAC,YAAY,EAAE,UAAU,EAAC,GAAG,IAAI,CAAC,GAAG,CAAC;QAC5C,IAAI,OAAO,YAAY,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACpE,MAAM,IAAI,GAAG,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;YAC9E,gFAAgF;YAChF,uEAAuE;YACvE,GAAG,GAAG,SAAS,CAAC,EAAC,IAAI,EAAE,UAAU,EAAE,EAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,GAAG,UAAU,EAAC,EAAC,EAAE,EAAC,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC;YAC5G,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE;gBACzB,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE;gBACzC,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,IAAI,WAAW,CAAC,iBAAiB;gBACjF,kBAAkB,EAAE,UAAU,EAAE,kBAAkB,IAAI,WAAW,CAAC,kBAAkB;gBACpF,gBAAgB,EAAE,UAAU,EAAE,SAAS,IAAI,MAAM,CAAC,gBAAgB;aACnE,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,YAAY,CAAC;QACrB,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACpF,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QAEpD,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACvC,iBAAiB,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;QACvC,MAAM,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAC;QAEjF,MAAM,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxC,MAAM,CAAC,IAAI,CAAC,iFAAiF,CAAC,CAAC;QAE/F,MAAM,EAAC,mBAAmB,GAAG,cAAc,CAAC,mBAAmB,EAAE,iBAAiB,EAAC,GAAG,IAAI,CAAC;QAC3F,MAAM,uBAAuB,GAC3B,iBAAiB,EAAE,aAAa,CAAC,OAAO,EAAE,SAAS,IAAI,cAAc,CAAC,gBAAgB,CAAC;QACzF,MAAM,uBAAuB,GAAG,iBAAiB,EAAE,aAAa,CAAC,uBAAuB,IAAI,KAAK,CAAC;QAClG,MAAM,qBAAqB,GAAG,iBAAiB,EAAE,aAAa,CAAC,YAAY,IAAI,cAAc,CAAC,qBAAqB,CAAC;QAEpH,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE;YACpC,mBAAmB;YACnB,uBAAuB;YACvB,qBAAqB;YACrB,uBAAuB;SACxB,CAAC,CAAC;QAEH,OAAO,EAAE,oBAAoB,CAAC,GAAG,CAAC,EAAC,gBAAgB,EAAE,uBAAuB,EAAE,mBAAmB,EAAC,EAAE,CAAC,CAAC,CAAC;QAEvG,6FAA6F;QAC7F,OAAO,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,kBAAkB,CAAC,MAAiB;QAClC,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACnD,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,KAAK,KAAK,MAAM,CAAC,MAAM;YAAE,OAAO;QACzC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACxB,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,WAAwB;QAC9C,OAAO,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACpG,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAoB,EAAE,aAAuC;QACnF,OAAO,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IAC/G,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,aAAa,CAAC,SAAiB,EAAE,SAAkB;QACvD,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAE/E,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,uBAAuB,CAAC,EAAC,mBAAmB,EAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAElF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,SAAS,iBAAiB,CAAC,CAAC;IAC/E,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,iBAAiB,CAAC,SAAiB,EAAE,SAAkB;QAC3D,MAAM,UAAU,GAAG,CACjB,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,SAAS,CAAC,EAAC,CAAC,CACxF,CAAC,KAAK,EAAE,CAAC;QAEV,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,oBAAoB,SAAS,qBAAqB,CAAC,CAAC;QACtE,CAAC;QAED,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,SAAS,GAAG,kBAAkB,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QACtF,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,SAAS,EAAE,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACtF,CAAC;CACF;AAED,2DAA2D;AAC3D,KAAK,UAAU,kBAAkB,CAAC,IAAsB,EAAE,OAAgB;IACxE,MAAM,wBAAwB,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAC/D,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3D,MAAM,qBAAqB,GAAG,MAAM,kBAAkB,CAAC,wBAAwB,EAAE,CAAC;IAClF,IAAI,qBAAqB,EAAE,CAAC;QAC1B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE,wBAAwB,CAAC,EAAE,CAAC;YACtE,4EAA4E;YAC5E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE;gBACrD,QAAQ,EAAE,SAAS,CAAC,wBAAwB,CAAC;gBAC7C,MAAM,EAAE,SAAS,CAAC,qBAAqB,CAAC;aACzC,CAAC,CAAC;YACH,MAAM,IAAI,mBAAmB,CAAC,mCAAmC,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,kBAAkB,CAAC,wBAAwB,CAAC,wBAAwB,CAAC,CAAC;QAC5E,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,EAAE,SAAS,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAC1F,CAAC;IAED,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC;IAC5C,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,cAAc,EAAE,CAAC;IAC9D,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;QACzB,IAAI,WAAW,KAAK,eAAe,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAC,QAAQ,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAC,CAAC,CAAC;YAChG,MAAM,IAAI,mBAAmB,CAAC,0BAA0B,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,kBAAkB,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,eAAe,CAAC,CAAC;IAC7D,CAAC;AACH,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lodestar/validator",
3
- "version": "1.46.0-dev.d96240a05e",
3
+ "version": "1.46.0-dev.df02c7532b",
4
4
  "description": "A Typescript implementation of the validator client",
5
5
  "author": "ChainSafe Systems",
6
6
  "license": "Apache-2.0",
@@ -11,7 +11,7 @@
11
11
  "type": "module",
12
12
  "exports": {
13
13
  ".": {
14
- "bun": "./src/index.ts",
14
+ "typescript": "./src/index.ts",
15
15
  "types": "./lib/index.d.ts",
16
16
  "import": "./lib/index.js"
17
17
  }
@@ -23,11 +23,11 @@
23
23
  ],
24
24
  "scripts": {
25
25
  "clean": "rm -rf lib && rm -f *.tsbuildinfo",
26
- "build": "tsgo -p tsconfig.build.json",
26
+ "build": "tsc -p tsconfig.build.json",
27
27
  "build:release": "pnpm clean && pnpm run build",
28
28
  "build:watch": "pnpm run build --watch",
29
29
  "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\"",
30
- "check-types": "tsgo",
30
+ "check-types": "tsc",
31
31
  "lint": "biome check src/ test/",
32
32
  "lint:fix": "pnpm run lint --write",
33
33
  "test:unit": "vitest run --project unit --project unit-minimal",
@@ -50,21 +50,21 @@
50
50
  "dependencies": {
51
51
  "@chainsafe/blst": "^2.2.0",
52
52
  "@chainsafe/ssz": "^1.6.2",
53
- "@lodestar/api": "^1.46.0-dev.d96240a05e",
54
- "@lodestar/config": "^1.46.0-dev.d96240a05e",
55
- "@lodestar/db": "^1.46.0-dev.d96240a05e",
56
- "@lodestar/params": "^1.46.0-dev.d96240a05e",
57
- "@lodestar/state-transition": "^1.46.0-dev.d96240a05e",
58
- "@lodestar/types": "^1.46.0-dev.d96240a05e",
59
- "@lodestar/utils": "^1.46.0-dev.d96240a05e",
53
+ "@lodestar/api": "^1.46.0-dev.df02c7532b",
54
+ "@lodestar/config": "^1.46.0-dev.df02c7532b",
55
+ "@lodestar/db": "^1.46.0-dev.df02c7532b",
56
+ "@lodestar/params": "^1.46.0-dev.df02c7532b",
57
+ "@lodestar/state-transition": "^1.46.0-dev.df02c7532b",
58
+ "@lodestar/types": "^1.46.0-dev.df02c7532b",
59
+ "@lodestar/utils": "^1.46.0-dev.df02c7532b",
60
60
  "strict-event-emitter-types": "^2.0.0"
61
61
  },
62
62
  "devDependencies": {
63
- "@lodestar/logger": "^1.46.0-dev.d96240a05e",
64
- "@lodestar/spec-test-util": "^1.46.0-dev.d96240a05e",
65
- "@lodestar/test-utils": "^1.46.0-dev.d96240a05e",
63
+ "@lodestar/logger": "^1.46.0-dev.df02c7532b",
64
+ "@lodestar/spec-test-util": "^1.46.0-dev.df02c7532b",
65
+ "@lodestar/test-utils": "^1.46.0-dev.df02c7532b",
66
66
  "@vekexasia/bigint-buffer2": "^1.1.1",
67
67
  "rimraf": "^4.4.1"
68
68
  },
69
- "gitHead": "13dc301178bf8758a83823d784472034ff91860a"
69
+ "gitHead": "eb68180b2d55f16defaab3f92df19985369ef73c"
70
70
  }
@@ -1,12 +1,12 @@
1
1
  import {ApiClient} from "@lodestar/api";
2
2
  import {ChainForkConfig} from "@lodestar/config";
3
3
  import {ForkName, isForkPostElectra, isForkPostGloas} from "@lodestar/params";
4
- import {computeEpochAtSlot} from "@lodestar/state-transition";
4
+ import {IClock, computeEpochAtSlot} from "@lodestar/state-transition";
5
5
  import {SignedAggregateAndProof, SingleAttestation, Slot, phase0, ssz} from "@lodestar/types";
6
6
  import {prettyBytes, sleep, toRootHex} from "@lodestar/utils";
7
7
  import {Metrics} from "../metrics.js";
8
8
  import {PubkeyHex} from "../types.js";
9
- import {IClock, LoggerVc} from "../util/index.js";
9
+ import {LoggerVc} from "../util/index.js";
10
10
  import {AttDutyAndProof, AttestationDutiesService} from "./attestationDuties.js";
11
11
  import {ChainHeaderTracker} from "./chainHeaderTracker.js";
12
12
  import {ValidatorEventEmitter} from "./emitter.js";
@@ -1,11 +1,16 @@
1
1
  import {ApiClient, routes} from "@lodestar/api";
2
2
  import {SLOTS_PER_EPOCH} from "@lodestar/params";
3
- import {computeEpochAtSlot, isAggregatorFromCommitteeLength, isStartSlotOfEpoch} from "@lodestar/state-transition";
3
+ import {
4
+ IClock,
5
+ computeEpochAtSlot,
6
+ isAggregatorFromCommitteeLength,
7
+ isStartSlotOfEpoch,
8
+ } from "@lodestar/state-transition";
4
9
  import {BLSSignature, Epoch, RootHex, Slot, ValidatorIndex} from "@lodestar/types";
5
10
  import {sleep, toPubkeyHex} from "@lodestar/utils";
6
11
  import {Metrics} from "../metrics.js";
7
12
  import {PubkeyHex} from "../types.js";
8
- import {IClock, LoggerVc, batchItems} from "../util/index.js";
13
+ import {LoggerVc, batchItems} from "../util/index.js";
9
14
  import {ChainHeaderTracker, HeadEventData} from "./chainHeaderTracker.js";
10
15
  import {SyncingStatusTracker} from "./syncingStatusTracker.js";
11
16
  import {ValidatorStore} from "./validatorStore.js";
@@ -1,6 +1,7 @@
1
1
  import {ApiClient, routes} from "@lodestar/api";
2
2
  import {ChainForkConfig} from "@lodestar/config";
3
3
  import {BUILDER_INDEX_SELF_BUILD, ForkPostGloas, isForkPostGloas} from "@lodestar/params";
4
+ import {IClock} from "@lodestar/state-transition";
4
5
  import {
5
6
  BLSPubkey,
6
7
  BLSSignature,
@@ -16,7 +17,7 @@ import {
16
17
  import {extendError, prettyBytes, prettyWeiToEth, toPubkeyHex, toRootHex} from "@lodestar/utils";
17
18
  import {Metrics} from "../metrics.js";
18
19
  import {PubkeyHex} from "../types.js";
19
- import {IClock, LoggerVc} from "../util/index.js";
20
+ import {LoggerVc} from "../util/index.js";
20
21
  import {BlockDutiesService, GENESIS_SLOT} from "./blockDuties.js";
21
22
  import {ValidatorStore} from "./validatorStore.js";
22
23
 
@@ -1,12 +1,12 @@
1
1
  import {ApiClient, routes} from "@lodestar/api";
2
2
  import {ChainForkConfig} from "@lodestar/config";
3
3
  import {isForkPostGloas} from "@lodestar/params";
4
- import {computeEpochAtSlot, computeStartSlotAtEpoch} from "@lodestar/state-transition";
4
+ import {IClock, computeEpochAtSlot, computeStartSlotAtEpoch} from "@lodestar/state-transition";
5
5
  import {BLSPubkey, Epoch, RootHex, Slot} from "@lodestar/types";
6
6
  import {sleep, toPubkeyHex} from "@lodestar/utils";
7
7
  import {Metrics} from "../metrics.js";
8
8
  import {PubkeyHex} from "../types.js";
9
- import {IClock, LoggerVc} from "../util/index.js";
9
+ import {LoggerVc} from "../util/index.js";
10
10
  import {ChainHeaderTracker, HeadEventData} from "./chainHeaderTracker.js";
11
11
  import {ValidatorStore} from "./validatorStore.js";
12
12
 
@@ -1,11 +1,10 @@
1
1
  import {ApiClient, routes} from "@lodestar/api";
2
- import {computeStartSlotAtEpoch} from "@lodestar/state-transition";
2
+ import {IClock, computeStartSlotAtEpoch} from "@lodestar/state-transition";
3
3
  import {Epoch, ValidatorIndex} from "@lodestar/types";
4
4
  import {Logger, fromHex, sleep, truncBytes} from "@lodestar/utils";
5
5
  import {Metrics} from "../metrics.js";
6
6
  import {ISlashingProtection} from "../slashingProtection/index.js";
7
7
  import {ProcessShutdownCallback, PubkeyHex} from "../types.js";
8
- import {IClock} from "../util/index.js";
9
8
  import {IndicesService} from "./indices.js";
10
9
 
11
10
  // The number of epochs that must be checked before we assume that there are
@@ -1,9 +1,10 @@
1
1
  import {ApiClient, routes} from "@lodestar/api";
2
2
  import {BeaconConfig} from "@lodestar/config";
3
3
  import {GENESIS_EPOCH, SLOTS_PER_EPOCH} from "@lodestar/params";
4
+ import {IClock} from "@lodestar/state-transition";
4
5
  import {Epoch, bellatrix} from "@lodestar/types";
5
6
  import {Metrics} from "../metrics.js";
6
- import {IClock, LoggerVc, batchItems} from "../util/index.js";
7
+ import {LoggerVc, batchItems} from "../util/index.js";
7
8
  import {ValidatorStore} from "./validatorStore.js";
8
9
 
9
10
  const REGISTRATION_CHUNK_SIZE = 512;
@@ -1,11 +1,11 @@
1
1
  import {ApiClient} from "@lodestar/api";
2
2
  import {ChainForkConfig} from "@lodestar/config";
3
3
  import {SLOTS_PER_EPOCH, isForkPostGloas} from "@lodestar/params";
4
- import {computeEpochAtSlot} from "@lodestar/state-transition";
4
+ import {IClock, computeEpochAtSlot} from "@lodestar/state-transition";
5
5
  import {Epoch, RootHex, Slot, gloas} from "@lodestar/types";
6
6
  import {fromHex, toPubkeyHex} from "@lodestar/utils";
7
7
  import {Metrics} from "../metrics.js";
8
- import {IClock, LoggerVc} from "../util/index.js";
8
+ import {LoggerVc} from "../util/index.js";
9
9
  import {BlockDutiesService} from "./blockDuties.js";
10
10
  import {ValidatorStore} from "./validatorStore.js";
11
11
 
@@ -1,11 +1,12 @@
1
1
  import {ApiClient, routes} from "@lodestar/api";
2
2
  import {ChainForkConfig} from "@lodestar/config";
3
3
  import {isForkPostGloas} from "@lodestar/params";
4
+ import {IClock} from "@lodestar/state-transition";
4
5
  import {Slot, gloas} from "@lodestar/types";
5
6
  import {prettyBytes, sleep, toRootHex} from "@lodestar/utils";
6
7
  import {Metrics} from "../metrics.js";
7
8
  import {PubkeyHex} from "../types.js";
8
- import {IClock, LoggerVc} from "../util/index.js";
9
+ import {LoggerVc} from "../util/index.js";
9
10
  import {ChainHeaderTracker} from "./chainHeaderTracker.js";
10
11
  import {ExecutionPayloadAvailableEventData, ValidatorEvent, ValidatorEventEmitter} from "./emitter.js";
11
12
  import {PtcDutiesService} from "./ptcDuties.js";
@@ -1,12 +1,12 @@
1
1
  import {ApiClient, routes} from "@lodestar/api";
2
2
  import {ChainForkConfig} from "@lodestar/config";
3
3
  import {SLOTS_PER_EPOCH, isForkPostGloas} from "@lodestar/params";
4
- import {computeEpochAtSlot, isStartSlotOfEpoch} from "@lodestar/state-transition";
4
+ import {IClock, computeEpochAtSlot, isStartSlotOfEpoch} from "@lodestar/state-transition";
5
5
  import {Epoch, RootHex, Slot, ValidatorIndex} from "@lodestar/types";
6
6
  import {toPubkeyHex} from "@lodestar/utils";
7
7
  import {Metrics} from "../metrics.js";
8
8
  import {PubkeyHex} from "../types.js";
9
- import {IClock, LoggerVc} from "../util/index.js";
9
+ import {LoggerVc} from "../util/index.js";
10
10
  import {ChainHeaderTracker, HeadEventData} from "./chainHeaderTracker.js";
11
11
  import {SyncingStatusTracker} from "./syncingStatusTracker.js";
12
12
  import {ValidatorStore} from "./validatorStore.js";
@@ -1,11 +1,12 @@
1
1
  import {ApiClient} from "@lodestar/api";
2
2
  import {ChainForkConfig} from "@lodestar/config";
3
3
  import {ForkName, isForkPostAltair} from "@lodestar/params";
4
+ import {IClock} from "@lodestar/state-transition";
4
5
  import {CommitteeIndex, Root, Slot, altair} from "@lodestar/types";
5
6
  import {sleep} from "@lodestar/utils";
6
7
  import {Metrics} from "../metrics.js";
7
8
  import {PubkeyHex} from "../types.js";
8
- import {IClock, LoggerVc} from "../util/index.js";
9
+ import {LoggerVc} from "../util/index.js";
9
10
  import {ChainHeaderTracker} from "./chainHeaderTracker.js";
10
11
  import {ValidatorEventEmitter} from "./emitter.js";
11
12
  import {SyncCommitteeDutiesService, SyncDutyAndProofs} from "./syncCommitteeDuties.js";
@@ -2,6 +2,7 @@ import {ApiClient, routes} from "@lodestar/api";
2
2
  import {ChainForkConfig} from "@lodestar/config";
3
3
  import {EPOCHS_PER_SYNC_COMMITTEE_PERIOD, SYNC_COMMITTEE_SUBNET_SIZE} from "@lodestar/params";
4
4
  import {
5
+ IClock,
5
6
  computeEpochAtSlot,
6
7
  computeSyncPeriodAtEpoch,
7
8
  computeSyncPeriodAtSlot,
@@ -12,7 +13,7 @@ import {BLSSignature, Epoch, Slot, SyncPeriod, ValidatorIndex} from "@lodestar/t
12
13
  import {toPubkeyHex} from "@lodestar/utils";
13
14
  import {Metrics} from "../metrics.js";
14
15
  import {PubkeyHex} from "../types.js";
15
- import {IClock, LoggerVc} from "../util/index.js";
16
+ import {LoggerVc} from "../util/index.js";
16
17
  import {SyncingStatusTracker} from "./syncingStatusTracker.js";
17
18
  import {syncCommitteeIndicesToSubnets} from "./utils.js";
18
19
  import {ValidatorStore} from "./validatorStore.js";
@@ -1,8 +1,8 @@
1
1
  import {ApiClient, routes} from "@lodestar/api";
2
+ import {IClock} from "@lodestar/state-transition";
2
3
  import {Slot} from "@lodestar/types";
3
4
  import {Logger} from "@lodestar/utils";
4
5
  import {BeaconHealth, Metrics} from "../metrics.js";
5
- import {IClock} from "../util/clock.js";
6
6
 
7
7
  export type SyncingStatus = routes.node.SyncingStatus;
8
8
 
@@ -738,7 +738,7 @@ export class ValidatorStore {
738
738
  proposalSlot: duty.slot,
739
739
  validatorIndex: duty.validatorIndex,
740
740
  feeRecipient: fromHex(feeRecipient),
741
- targetGasLimit: gasLimit,
741
+ targetGasLimit: BigInt(gasLimit),
742
742
  };
743
743
 
744
744
  const signingSlot = duty.slot;
package/src/util/index.ts CHANGED
@@ -1,5 +1,4 @@
1
1
  export * from "./batch.js";
2
- export * from "./clock.js";
3
2
  export * from "./difference.js";
4
3
  export * from "./logger.js";
5
4
  export * from "./url.js";
@@ -1,6 +1,6 @@
1
1
  import {ApiError} from "@lodestar/api";
2
+ import {IClock} from "@lodestar/state-transition";
2
3
  import {LogData, Logger, isErrorAborted} from "@lodestar/utils";
3
- import {IClock} from "./clock.js";
4
4
 
5
5
  export type LoggerVc = Logger & {
6
6
  isSyncing(e: Error): void;
package/src/validator.ts CHANGED
@@ -6,7 +6,7 @@ import {
6
6
  assertEqualParams,
7
7
  createBeaconConfig,
8
8
  } from "@lodestar/config";
9
- import {computeEpochAtSlot, getCurrentSlot} from "@lodestar/state-transition";
9
+ import {Clock, ClockOptions, IClock, computeEpochAtSlot, getCurrentSlot} from "@lodestar/state-transition";
10
10
  import {BLSPubkey, phase0, ssz} from "@lodestar/types";
11
11
  import {Genesis} from "@lodestar/types/phase0";
12
12
  import {Logger, toPrintableUrl, toRootHex} from "@lodestar/utils";
@@ -29,7 +29,6 @@ import {SyncingStatusTracker} from "./services/syncingStatusTracker.js";
29
29
  import {Signer, ValidatorProposerConfig, ValidatorStore, defaultOptions} from "./services/validatorStore.js";
30
30
  import {ISlashingProtection, Interchange, InterchangeFormatVersion} from "./slashingProtection/index.js";
31
31
  import {LodestarValidatorDatabaseController, ProcessShutdownCallback, PubkeyHex} from "./types.js";
32
- import {Clock, ClockOptions, IClock} from "./util/clock.js";
33
32
  import {getLoggerVc} from "./util/index.js";
34
33
 
35
34
  export type ValidatorModules = {
@@ -362,7 +361,7 @@ export class Validator {
362
361
 
363
362
  const res = await api.config.getSpec();
364
363
  assertEqualParams(config, res.value());
365
- logger.info("Verified connected beacon node and validator have same the config");
364
+ logger.info("Verified connected beacon node and validator have the same config");
366
365
 
367
366
  await assertEqualGenesis(opts, genesis);
368
367
  logger.info("Verified connected beacon node and validator have the same genesisValidatorRoot");
@@ -1,55 +0,0 @@
1
- import { ChainForkConfig } from "@lodestar/config";
2
- import { Epoch, Slot, TimeSeconds } from "@lodestar/types";
3
- import { Logger } from "@lodestar/utils";
4
- type RunEveryFn = (slot: Slot, signal: AbortSignal) => Promise<void>;
5
- export type ClockOptions = {
6
- skipSlots?: boolean;
7
- };
8
- export interface IClock {
9
- readonly genesisTime: number;
10
- readonly secondsPerSlot: number;
11
- readonly currentEpoch: number;
12
- start(signal: AbortSignal): void;
13
- runEverySlot(fn: (slot: Slot, signal: AbortSignal) => Promise<void>): void;
14
- runEveryEpoch(fn: (epoch: Epoch, signal: AbortSignal) => Promise<void>): void;
15
- msToSlot(slot: Slot): number;
16
- msFromSlot(slot: Slot): number;
17
- secFromSlot(slot: Slot): number;
18
- getCurrentSlot(): Slot;
19
- getCurrentEpoch(): Epoch;
20
- }
21
- export declare enum TimeItem {
22
- Slot = 0,
23
- Epoch = 1
24
- }
25
- export declare class Clock implements IClock {
26
- private readonly opts;
27
- readonly genesisTime: number;
28
- readonly secondsPerSlot: number;
29
- private readonly config;
30
- private readonly logger;
31
- private readonly fns;
32
- constructor(config: ChainForkConfig, logger: Logger, opts: {
33
- genesisTime: number;
34
- } & ClockOptions);
35
- get currentEpoch(): Epoch;
36
- start(signal: AbortSignal): void;
37
- getCurrentSlot(): Slot;
38
- getCurrentEpoch(): Epoch;
39
- runEverySlot(fn: RunEveryFn): void;
40
- runEveryEpoch(fn: RunEveryFn): void;
41
- /** Milliseconds from now to a specific slot */
42
- msToSlot(slot: Slot): number;
43
- /** Milliseconds elapsed from a specific slot to now */
44
- msFromSlot(slot: Slot): number;
45
- /** Seconds elapsed from a specific slot to now */
46
- secFromSlot(slot: Slot): number;
47
- private runAtMostEvery;
48
- private timeUntilNext;
49
- }
50
- /**
51
- * Same to the spec but we use Math.round instead of Math.floor.
52
- */
53
- export declare function getCurrentSlotAround(config: ChainForkConfig, genesisTime: TimeSeconds): Slot;
54
- export {};
55
- //# sourceMappingURL=clock.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"clock.d.ts","sourceRoot":"","sources":["../../src/util/clock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAC,KAAK,EAAE,IAAI,EAAE,WAAW,EAAC,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAe,MAAM,EAAwB,MAAM,iBAAiB,CAAC;AAE5E,KAAK,UAAU,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAErE,MAAM,MAAM,YAAY,GAAG;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAEhC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAE9B,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAAC;IACjC,YAAY,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC3E,aAAa,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC9E,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAAC;IAC7B,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAAC;IAC/B,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAAC;IAChC,cAAc,IAAI,IAAI,CAAC;IACvB,eAAe,IAAI,KAAK,CAAC;CAC1B;AAED,oBAAY,QAAQ;IAClB,IAAI,IAAA;IACJ,KAAK,IAAA;CACN;AAED,qBAAa,KAAM,YAAW,MAAM;IAUhC,OAAO,CAAC,QAAQ,CAAC,IAAI;IATvB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA8C;IAElE,YACE,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,EACG,IAAI,EAAE;QAAC,WAAW,EAAE,MAAM,CAAA;KAAC,GAAG,YAAY,EAM5D;IAED,IAAI,YAAY,IAAI,KAAK,CAExB;IAED,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI,CAQ/B;IAED,cAAc,IAAI,IAAI,CAErB;IAED,eAAe,IAAI,KAAK,CAEvB;IAED,YAAY,CAAC,EAAE,EAAE,UAAU,GAAG,IAAI,CAEjC;IAED,aAAa,CAAC,EAAE,EAAE,UAAU,GAAG,IAAI,CAElC;IAED,+CAA+C;IAC/C,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAE3B;IAED,uDAAuD;IACvD,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAE7B;IAED,kDAAkD;IAClD,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAE9B;YAQa,cAAc;IA2C5B,OAAO,CAAC,aAAa;CAgBtB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,CAI5F"}
package/lib/util/clock.js DELETED
@@ -1,141 +0,0 @@
1
- import { GENESIS_SLOT, SLOTS_PER_EPOCH } from "@lodestar/params";
2
- import { computeEpochAtSlot, computeTimeAtSlot, getCurrentSlot } from "@lodestar/state-transition";
3
- import { ErrorAborted, isErrorAborted, sleep } from "@lodestar/utils";
4
- export { TimeItem };
5
- var TimeItem;
6
- (function (TimeItem) {
7
- TimeItem[TimeItem["Slot"] = 0] = "Slot";
8
- TimeItem[TimeItem["Epoch"] = 1] = "Epoch";
9
- })(TimeItem || (TimeItem = {}));
10
- export class Clock {
11
- opts;
12
- genesisTime;
13
- secondsPerSlot;
14
- config;
15
- logger;
16
- fns = [];
17
- constructor(config, logger, opts) {
18
- this.opts = opts;
19
- this.genesisTime = opts.genesisTime;
20
- this.secondsPerSlot = config.SLOT_DURATION_MS / 1000;
21
- this.config = config;
22
- this.logger = logger;
23
- }
24
- get currentEpoch() {
25
- return computeEpochAtSlot(getCurrentSlot(this.config, this.genesisTime));
26
- }
27
- start(signal) {
28
- for (const { timeItem, fn } of this.fns) {
29
- this.runAtMostEvery(timeItem, signal, fn).catch((e) => {
30
- if (!isErrorAborted(e)) {
31
- this.logger.error("runAtMostEvery", {}, e);
32
- }
33
- });
34
- }
35
- }
36
- getCurrentSlot() {
37
- return getCurrentSlot(this.config, this.genesisTime);
38
- }
39
- getCurrentEpoch() {
40
- return computeEpochAtSlot(getCurrentSlot(this.config, this.genesisTime));
41
- }
42
- runEverySlot(fn) {
43
- this.fns.push({ timeItem: TimeItem.Slot, fn });
44
- }
45
- runEveryEpoch(fn) {
46
- this.fns.push({ timeItem: TimeItem.Epoch, fn });
47
- }
48
- /** Milliseconds from now to a specific slot */
49
- msToSlot(slot) {
50
- return computeTimeAtSlot(this.config, slot, this.genesisTime) * 1000 - Date.now();
51
- }
52
- /** Milliseconds elapsed from a specific slot to now */
53
- msFromSlot(slot) {
54
- return Date.now() - computeTimeAtSlot(this.config, slot, this.genesisTime) * 1000;
55
- }
56
- /** Seconds elapsed from a specific slot to now */
57
- secFromSlot(slot) {
58
- return Date.now() / 1000 - computeTimeAtSlot(this.config, slot, this.genesisTime);
59
- }
60
- /**
61
- * If a task happens to take more than one slot to run, we might skip a slot. This is unfortunate,
62
- * however the alternative is to *always* process every slot, which has the chance of creating a
63
- * theoretically unlimited backlog of tasks. It was a conscious decision to choose to drop tasks
64
- * on an overloaded/latent system rather than overload it even more.
65
- */
66
- async runAtMostEvery(timeItem, signal, fn) {
67
- // Run immediately first
68
- let slot = getCurrentSlot(this.config, this.genesisTime);
69
- let slotOrEpoch = timeItem === TimeItem.Slot ? slot : computeEpochAtSlot(slot);
70
- while (!signal.aborted) {
71
- // Must catch fn() to ensure `sleep()` is awaited both for resolve and reject
72
- const task = fn(slotOrEpoch, signal).catch((e) => {
73
- if (!isErrorAborted(e))
74
- this.logger.error("Error on runEvery fn", {}, e);
75
- });
76
- if (timeItem !== TimeItem.Slot || this.opts.skipSlots !== false) {
77
- // await response to only continue with next task if current task finished within slot
78
- await task;
79
- }
80
- try {
81
- await sleep(this.timeUntilNext(timeItem), signal);
82
- // calling getCurrentSlot here may not be correct when we're close to the next slot
83
- // it's safe to call getCurrentSlotAround after we sleep
84
- const nextSlot = getCurrentSlotAround(this.config, this.genesisTime);
85
- if (timeItem === TimeItem.Slot) {
86
- if (nextSlot > slot + 1) {
87
- // It's not very likely that we skip more than one slot as HTTP timeout is set
88
- // to SLOT_DURATION_MS so we will fail task before skipping another slot.
89
- this.logger.warn("Skipped slot due to task taking more than one slot to run", {
90
- skippedSlot: slot + 1,
91
- });
92
- }
93
- slotOrEpoch = nextSlot;
94
- }
95
- else {
96
- slotOrEpoch = computeEpochAtSlot(nextSlot);
97
- }
98
- slot = nextSlot;
99
- }
100
- catch (e) {
101
- if (e instanceof ErrorAborted) {
102
- return;
103
- }
104
- throw e;
105
- }
106
- }
107
- }
108
- timeUntilNext(timeItem) {
109
- const milliSecondsPerSlot = this.config.SLOT_DURATION_MS;
110
- const msFromGenesis = Date.now() - this.genesisTime * 1000;
111
- if (timeItem === TimeItem.Slot) {
112
- if (msFromGenesis >= 0) {
113
- return milliSecondsPerSlot - (msFromGenesis % milliSecondsPerSlot);
114
- }
115
- return Math.abs(msFromGenesis) % milliSecondsPerSlot;
116
- }
117
- const milliSecondsPerEpoch = SLOTS_PER_EPOCH * milliSecondsPerSlot;
118
- if (msFromGenesis >= 0) {
119
- return milliSecondsPerEpoch - (msFromGenesis % milliSecondsPerEpoch);
120
- }
121
- return Math.abs(msFromGenesis) % milliSecondsPerEpoch;
122
- }
123
- }
124
- /**
125
- * Same to the spec but we use Math.round instead of Math.floor.
126
- */
127
- export function getCurrentSlotAround(config, genesisTime) {
128
- const diffInSeconds = Date.now() / 1000 - genesisTime;
129
- const slotsSinceGenesis = Math.round((diffInSeconds * 1000) / config.SLOT_DURATION_MS);
130
- return GENESIS_SLOT + slotsSinceGenesis;
131
- }
132
- // function useEventStream() {
133
- // this.stream = this.events.getEventStream([BeaconEventType.BLOCK, BeaconEventType.HEAD, BeaconEventType.CHAIN_REORG]);
134
- // pipeToEmitter(this.stream, this).catch((e: Error) => {
135
- // this.logger.error("Error on stream pipe", {}, e);
136
- // });
137
- // // On stop
138
- // this.stream.stop();
139
- // this.stream = null;
140
- // }
141
- //# sourceMappingURL=clock.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"clock.js","sourceRoot":"","sources":["../../src/util/clock.ts"],"names":[],"mappings":"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"}