@lodestar/beacon-node 1.49.0-dev.161265afaf → 1.49.0-dev.19171711b6

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 (145) hide show
  1. package/lib/api/impl/beacon/pool/index.d.ts.map +1 -1
  2. package/lib/api/impl/beacon/pool/index.js +4 -2
  3. package/lib/api/impl/beacon/pool/index.js.map +1 -1
  4. package/lib/api/impl/validator/index.d.ts.map +1 -1
  5. package/lib/api/impl/validator/index.js +3 -1
  6. package/lib/api/impl/validator/index.js.map +1 -1
  7. package/lib/chain/archiveStore/archiveStore.d.ts +1 -2
  8. package/lib/chain/archiveStore/archiveStore.d.ts.map +1 -1
  9. package/lib/chain/archiveStore/archiveStore.js +4 -7
  10. package/lib/chain/archiveStore/archiveStore.js.map +1 -1
  11. package/lib/chain/archiveStore/historicalState/metrics.d.ts.map +1 -1
  12. package/lib/chain/archiveStore/historicalState/metrics.js +5 -6
  13. package/lib/chain/archiveStore/historicalState/metrics.js.map +1 -1
  14. package/lib/chain/archiveStore/utils/pruneHistory.d.ts +2 -2
  15. package/lib/chain/archiveStore/utils/pruneHistory.d.ts.map +1 -1
  16. package/lib/chain/archiveStore/utils/pruneHistory.js +1 -0
  17. package/lib/chain/archiveStore/utils/pruneHistory.js.map +1 -1
  18. package/lib/chain/blocks/importExecutionPayload.d.ts.map +1 -1
  19. package/lib/chain/blocks/importExecutionPayload.js +13 -0
  20. package/lib/chain/blocks/importExecutionPayload.js.map +1 -1
  21. package/lib/chain/errors/payloadAttestation.d.ts +4 -0
  22. package/lib/chain/errors/payloadAttestation.d.ts.map +1 -1
  23. package/lib/chain/errors/payloadAttestation.js +1 -0
  24. package/lib/chain/errors/payloadAttestation.js.map +1 -1
  25. package/lib/chain/interface.d.ts +1 -1
  26. package/lib/chain/interface.d.ts.map +1 -1
  27. package/lib/chain/options.d.ts +0 -4
  28. package/lib/chain/options.d.ts.map +1 -1
  29. package/lib/chain/options.js +0 -1
  30. package/lib/chain/options.js.map +1 -1
  31. package/lib/chain/produceBlock/computeNewStateRoot.d.ts.map +1 -1
  32. package/lib/chain/produceBlock/computeNewStateRoot.js +4 -2
  33. package/lib/chain/produceBlock/computeNewStateRoot.js.map +1 -1
  34. package/lib/chain/validation/payloadAttestationMessage.d.ts.map +1 -1
  35. package/lib/chain/validation/payloadAttestationMessage.js +8 -1
  36. package/lib/chain/validation/payloadAttestationMessage.js.map +1 -1
  37. package/lib/db/beacon.d.ts +1 -2
  38. package/lib/db/beacon.d.ts.map +1 -1
  39. package/lib/db/beacon.js +1 -3
  40. package/lib/db/beacon.js.map +1 -1
  41. package/lib/db/buckets.d.ts +0 -1
  42. package/lib/db/buckets.d.ts.map +1 -1
  43. package/lib/db/buckets.js +1 -1
  44. package/lib/db/buckets.js.map +1 -1
  45. package/lib/db/interface.d.ts +1 -2
  46. package/lib/db/interface.d.ts.map +1 -1
  47. package/lib/db/repositories/blockArchiveIndex.d.ts +2 -2
  48. package/lib/db/repositories/blockArchiveIndex.d.ts.map +1 -1
  49. package/lib/db/repositories/index.d.ts +0 -1
  50. package/lib/db/repositories/index.d.ts.map +1 -1
  51. package/lib/db/repositories/index.js +0 -1
  52. package/lib/db/repositories/index.js.map +1 -1
  53. package/lib/metrics/metrics/lodestar.d.ts +21 -11
  54. package/lib/metrics/metrics/lodestar.d.ts.map +1 -1
  55. package/lib/metrics/metrics/lodestar.js +48 -23
  56. package/lib/metrics/metrics/lodestar.js.map +1 -1
  57. package/lib/metrics/metrics.d.ts +3 -1
  58. package/lib/metrics/metrics.d.ts.map +1 -1
  59. package/lib/metrics/metrics.js +2 -2
  60. package/lib/metrics/metrics.js.map +1 -1
  61. package/lib/network/processor/index.d.ts +1 -1
  62. package/lib/network/processor/index.d.ts.map +1 -1
  63. package/lib/network/processor/index.js +42 -21
  64. package/lib/network/processor/index.js.map +1 -1
  65. package/lib/network/reqresp/handlers/index.d.ts.map +1 -1
  66. package/lib/network/reqresp/handlers/index.js +20 -4
  67. package/lib/network/reqresp/handlers/index.js.map +1 -1
  68. package/lib/node/nodejs.d.ts +2 -7
  69. package/lib/node/nodejs.d.ts.map +1 -1
  70. package/lib/node/nodejs.js +2 -22
  71. package/lib/node/nodejs.js.map +1 -1
  72. package/lib/sync/interface.d.ts +1 -2
  73. package/lib/sync/interface.d.ts.map +1 -1
  74. package/lib/sync/options.d.ts +0 -6
  75. package/lib/sync/options.d.ts.map +1 -1
  76. package/lib/sync/options.js +0 -2
  77. package/lib/sync/options.js.map +1 -1
  78. package/lib/sync/types.d.ts +18 -3
  79. package/lib/sync/types.d.ts.map +1 -1
  80. package/lib/sync/types.js +19 -3
  81. package/lib/sync/types.js.map +1 -1
  82. package/lib/sync/unknownBlock.d.ts +19 -0
  83. package/lib/sync/unknownBlock.d.ts.map +1 -1
  84. package/lib/sync/unknownBlock.js +184 -15
  85. package/lib/sync/unknownBlock.js.map +1 -1
  86. package/lib/util/shuffle.d.ts +0 -4
  87. package/lib/util/shuffle.d.ts.map +1 -1
  88. package/lib/util/shuffle.js +0 -8
  89. package/lib/util/shuffle.js.map +1 -1
  90. package/package.json +16 -16
  91. package/src/api/impl/beacon/pool/index.ts +6 -2
  92. package/src/api/impl/validator/index.ts +3 -1
  93. package/src/chain/archiveStore/archiveStore.ts +4 -8
  94. package/src/chain/archiveStore/historicalState/metrics.ts +5 -7
  95. package/src/chain/archiveStore/utils/pruneHistory.ts +4 -2
  96. package/src/chain/blocks/importExecutionPayload.ts +14 -0
  97. package/src/chain/errors/payloadAttestation.ts +2 -0
  98. package/src/chain/interface.ts +1 -1
  99. package/src/chain/options.ts +0 -5
  100. package/src/chain/produceBlock/computeNewStateRoot.ts +9 -2
  101. package/src/chain/validation/payloadAttestationMessage.ts +9 -0
  102. package/src/db/beacon.ts +0 -5
  103. package/src/db/buckets.ts +1 -1
  104. package/src/db/interface.ts +0 -3
  105. package/src/db/repositories/index.ts +0 -1
  106. package/src/metrics/metrics/lodestar.ts +58 -26
  107. package/src/metrics/metrics.ts +7 -2
  108. package/src/network/processor/index.ts +51 -22
  109. package/src/network/reqresp/handlers/index.ts +49 -5
  110. package/src/node/nodejs.ts +0 -27
  111. package/src/sync/interface.ts +1 -2
  112. package/src/sync/options.ts +0 -8
  113. package/src/sync/types.ts +19 -3
  114. package/src/sync/unknownBlock.ts +192 -14
  115. package/src/util/shuffle.ts +0 -9
  116. package/lib/chain/archiveStore/utils/updateBackfillRange.d.ts +0 -20
  117. package/lib/chain/archiveStore/utils/updateBackfillRange.d.ts.map +0 -1
  118. package/lib/chain/archiveStore/utils/updateBackfillRange.js +0 -40
  119. package/lib/chain/archiveStore/utils/updateBackfillRange.js.map +0 -1
  120. package/lib/db/repositories/backfilledRanges.d.ts +0 -18
  121. package/lib/db/repositories/backfilledRanges.d.ts.map +0 -1
  122. package/lib/db/repositories/backfilledRanges.js +0 -26
  123. package/lib/db/repositories/backfilledRanges.js.map +0 -1
  124. package/lib/sync/backfill/backfill.d.ts +0 -169
  125. package/lib/sync/backfill/backfill.d.ts.map +0 -1
  126. package/lib/sync/backfill/backfill.js +0 -686
  127. package/lib/sync/backfill/backfill.js.map +0 -1
  128. package/lib/sync/backfill/errors.d.ts +0 -30
  129. package/lib/sync/backfill/errors.d.ts.map +0 -1
  130. package/lib/sync/backfill/errors.js +0 -15
  131. package/lib/sync/backfill/errors.js.map +0 -1
  132. package/lib/sync/backfill/index.d.ts +0 -2
  133. package/lib/sync/backfill/index.d.ts.map +0 -1
  134. package/lib/sync/backfill/index.js +0 -2
  135. package/lib/sync/backfill/index.js.map +0 -1
  136. package/lib/sync/backfill/verify.d.ts +0 -18
  137. package/lib/sync/backfill/verify.d.ts.map +0 -1
  138. package/lib/sync/backfill/verify.js +0 -36
  139. package/lib/sync/backfill/verify.js.map +0 -1
  140. package/src/chain/archiveStore/utils/updateBackfillRange.ts +0 -50
  141. package/src/db/repositories/backfilledRanges.ts +0 -29
  142. package/src/sync/backfill/backfill.ts +0 -916
  143. package/src/sync/backfill/errors.ts +0 -23
  144. package/src/sync/backfill/index.ts +0 -1
  145. package/src/sync/backfill/verify.ts +0 -58
@@ -1 +1 @@
1
- {"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/sync/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAsCjD,MAAM,CAAC,MAAM,kBAAkB,GAAgB;IAC7C,YAAY,EAAE,KAAK;IACnB,4BAA4B,EAAE,KAAK;IACnC,wCAAwC;IACxC,iBAAiB,EAAE,CAAC;IACpB,mBAAmB,EAAE,eAAe;CACrC,CAAC"}
1
+ {"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/sync/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAgCjD,MAAM,CAAC,MAAM,kBAAkB,GAAgB;IAC7C,YAAY,EAAE,KAAK;IACnB,4BAA4B,EAAE,KAAK;IACnC,mBAAmB,EAAE,eAAe;CACrC,CAAC"}
@@ -21,9 +21,13 @@ export declare enum PendingBlockType {
21
21
  */
22
22
  UNKNOWN_PAYLOAD_BLOCK_ROOT = "unknown_payload_block_root",
23
23
  /**
24
- * Same as UNKNOWN_PAYLOAD_BLOCK_ROOT, but the trigger also carries the payload's slot.
24
+ * Same as UNKNOWN_PAYLOAD_BLOCK_ROOT, but the trigger also carries the payload's slot
25
25
  */
26
26
  UNKNOWN_PAYLOAD_BLOCK_ROOT_SLOT = "unknown_payload_block_root_slot",
27
+ /**
28
+ * Same as UNKNOWN_PAYLOAD_BLOCK_ROOT_SLOT for the current slot
29
+ */
30
+ DEFERRED_PAYLOAD_BLOCK_ROOT = "deferred_payload_block_root",
27
31
  /**
28
32
  * Payload analog of INCOMPLETE_BLOCK_INPUT: we have a partial payload input that did not complete in time.
29
33
  */
@@ -47,6 +51,19 @@ export declare enum FetchResult {
47
51
  FailureTriedAllPeers = "failure_tried_all_peers",
48
52
  FailureMaxAttempts = "failure_max_attempts"
49
53
  }
54
+ /**
55
+ * Outcome of a slot's deferred optimistic payload searches, recorded once when its poll loop ends.
56
+ */
57
+ export declare enum DeferredPayloadResult {
58
+ /** gossip delivered every watched payload before PAYLOAD_DUE, no search was needed */
59
+ ImportedBeforeSearch = "imported_before_search",
60
+ /** at least one was missing at PAYLOAD_DUE, we searched, and all were imported afterwards */
61
+ ImportedAfterSearch = "imported_after_search",
62
+ /** something was still not in fork choice when the slot ended */
63
+ Unresolved = "unresolved",
64
+ /** the slot had no optimistic search and no payload import at all, eg a skipped slot */
65
+ ResolvedNoRoot = "resolved_no_root"
66
+ }
50
67
  export declare enum PendingBlockInputStatus {
51
68
  pending = "pending",
52
69
  fetching = "fetching",
@@ -80,8 +97,6 @@ export declare enum DroppedItemReason {
80
97
  invalidEnvelope = "invalid_envelope",
81
98
  /** a payload had an invalid signature (INVALID_SIGNATURE) */
82
99
  invalidSignature = "invalid_signature",
83
- /** a block root was given up on after exhausting download attempts (data could not be fetched) */
84
- unavailable = "unavailable",
85
100
  /** an unexpected / unhandled error code led to removal */
86
101
  unknown = "unknown"
87
102
  }
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/sync/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/sync/types.ts"],"names":[],"mappings":"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"}
package/lib/sync/types.js CHANGED
@@ -19,9 +19,13 @@ export var PendingBlockType;
19
19
  */
20
20
  PendingBlockType["UNKNOWN_PAYLOAD_BLOCK_ROOT"] = "unknown_payload_block_root";
21
21
  /**
22
- * Same as UNKNOWN_PAYLOAD_BLOCK_ROOT, but the trigger also carries the payload's slot.
22
+ * Same as UNKNOWN_PAYLOAD_BLOCK_ROOT, but the trigger also carries the payload's slot
23
23
  */
24
24
  PendingBlockType["UNKNOWN_PAYLOAD_BLOCK_ROOT_SLOT"] = "unknown_payload_block_root_slot";
25
+ /**
26
+ * Same as UNKNOWN_PAYLOAD_BLOCK_ROOT_SLOT for the current slot
27
+ */
28
+ PendingBlockType["DEFERRED_PAYLOAD_BLOCK_ROOT"] = "deferred_payload_block_root";
25
29
  /**
26
30
  * Payload analog of INCOMPLETE_BLOCK_INPUT: we have a partial payload input that did not complete in time.
27
31
  */
@@ -47,6 +51,20 @@ export var FetchResult;
47
51
  FetchResult["FailureTriedAllPeers"] = "failure_tried_all_peers";
48
52
  FetchResult["FailureMaxAttempts"] = "failure_max_attempts";
49
53
  })(FetchResult || (FetchResult = {}));
54
+ /**
55
+ * Outcome of a slot's deferred optimistic payload searches, recorded once when its poll loop ends.
56
+ */
57
+ export var DeferredPayloadResult;
58
+ (function (DeferredPayloadResult) {
59
+ /** gossip delivered every watched payload before PAYLOAD_DUE, no search was needed */
60
+ DeferredPayloadResult["ImportedBeforeSearch"] = "imported_before_search";
61
+ /** at least one was missing at PAYLOAD_DUE, we searched, and all were imported afterwards */
62
+ DeferredPayloadResult["ImportedAfterSearch"] = "imported_after_search";
63
+ /** something was still not in fork choice when the slot ended */
64
+ DeferredPayloadResult["Unresolved"] = "unresolved";
65
+ /** the slot had no optimistic search and no payload import at all, eg a skipped slot */
66
+ DeferredPayloadResult["ResolvedNoRoot"] = "resolved_no_root";
67
+ })(DeferredPayloadResult || (DeferredPayloadResult = {}));
50
68
  export var PendingBlockInputStatus;
51
69
  (function (PendingBlockInputStatus) {
52
70
  PendingBlockInputStatus["pending"] = "pending";
@@ -82,8 +100,6 @@ export var DroppedItemReason;
82
100
  DroppedItemReason["invalidEnvelope"] = "invalid_envelope";
83
101
  /** a payload had an invalid signature (INVALID_SIGNATURE) */
84
102
  DroppedItemReason["invalidSignature"] = "invalid_signature";
85
- /** a block root was given up on after exhausting download attempts (data could not be fetched) */
86
- DroppedItemReason["unavailable"] = "unavailable";
87
103
  /** an unexpected / unhandled error code led to removal */
88
104
  DroppedItemReason["unknown"] = "unknown";
89
105
  })(DroppedItemReason || (DroppedItemReason = {}));
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/sync/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/sync/types.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,10 @@ import { INetwork } from "../network/index.js";
6
6
  import { PeerSyncMeta } from "../network/peers/peersData.js";
7
7
  import { PeerIdStr } from "../util/peerId.js";
8
8
  import { SyncOptions } from "./options.js";
9
+ /**
10
+ * Poll pending payloads of the current slot this often, between PAYLOAD_DUE and the end of the slot.
11
+ */
12
+ export declare const PAYLOAD_POLL_INTERVAL_MS = 1000;
9
13
  /**
10
14
  * BlockInputSync is a class that handles ReqResp to find blocks and data related to a specific blockRoot. The
11
15
  * blockRoot may have been found via object gossip, or the API. Gossip objects that can trigger a search are block,
@@ -55,6 +59,11 @@ export declare class BlockInputSync {
55
59
  private subscribedToNetworkEvents;
56
60
  private peerBalancer;
57
61
  private rateLimitBackoffTimeout;
62
+ /**
63
+ * Search unknown payload starting at PAYLOAD_DUE_BPS.
64
+ */
65
+ private readonly deferredPayloadRoots;
66
+ private payloadPollAbortController;
58
67
  constructor(config: ChainForkConfig, network: INetwork, chain: IBeaconChain, logger: Logger, metrics: Metrics | null, opts?: SyncOptions | undefined);
59
68
  subscribeToNetwork(): void;
60
69
  unsubscribeFromNetwork(): void;
@@ -105,6 +114,16 @@ export declare class BlockInputSync {
105
114
  private triggerUnknownBlockSearch;
106
115
  private scheduleRateLimitBackoffRetry;
107
116
  private clearRateLimitBackoffTimer;
117
+ /**
118
+ * Start this slot's payload poll: end the previous slot's loop, move roots it never got to
119
+ * into pendingPayloads, then poll from PAYLOAD_DUE to the end of the slot.
120
+ */
121
+ private startPayloadPollAtSlot;
122
+ /**
123
+ * Poll unknown payloads of the current slot.
124
+ */
125
+ private pollPayloadsAtSlot;
126
+ private addDeferredPayloadRoot;
108
127
  private downloadBlock;
109
128
  /**
110
129
  * Import a block that has already passed the local dependency checks in BlockInputSync.
@@ -1 +1 @@
1
- {"version":3,"file":"unknownBlock.d.ts","sourceRoot":"","sources":["../../src/sync/unknownBlock.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAMjD,OAAO,EAAC,MAAM,EAA+D,MAAM,iBAAiB,CAAC;AAMrG,OAAO,EAA6B,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAG3E,OAAO,EAAC,OAAO,EAAC,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAC,QAAQ,EAAuD,MAAM,qBAAqB,CAAC;AACnG,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAC,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAK5C,OAAO,EAAC,WAAW,EAAC,MAAM,cAAc,CAAC;AAiDzC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,qBAAa,cAAc;IAcvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;IAlBxB;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA+C;IAE7E,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA4C;IAC5E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAsB;IACrD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC;IAClC,OAAO,CAAC,yBAAyB,CAAS;IAC1C,OAAO,CAAC,YAAY,CAA2B;IAC/C,OAAO,CAAC,uBAAuB,CAA6B;IAE5D,YACmB,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,GAAG,IAAI,EACvB,IAAI,CAAC,EAAE,WAAW,YAAA,EAgBpC;IAED,kBAAkB,IAAI,IAAI,CAgCzB;IAED,sBAAsB,IAAI,IAAI,CAgB7B;IAED,KAAK,IAAI,IAAI,CAEZ;IAED,qBAAqB,IAAI,OAAO,CAE/B;IAED;;OAEG;IACH,OAAO,CAAC,kBAAkB,CAWxB;IAEF;;OAEG;IACH,OAAO,CAAC,sBAAsB,CAS5B;IAEF,OAAO,CAAC,0BAA0B,CAWhC;IAEF,OAAO,CAAC,8BAA8B,CAWpC;IAEF,OAAO,CAAC,2BAA2B,CASjC;IAEF;;OAEG;IACH,OAAO,CAAC,eAAe,CA+BrB;IAEF,OAAO,CAAC,eAAe,CAIrB;IAEF,OAAO,CAAC,iBAAiB,CAKvB;IAEF;;;OAGG;IACH,OAAO,CAAC,cAAc,CAoEpB;IAEF,OAAO,CAAC,YAAY,CAiClB;IAEF,OAAO,CAAC,eAAe,CAkCrB;IAEF,OAAO,CAAC,mBAAmB,CAuCzB;IAEF;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAoB1B,OAAO,CAAC,iBAAiB,CA4BvB;IAEF,OAAO,CAAC,eAAe,CASrB;IAEF,OAAO,CAAC,kBAAkB,CAIxB;IAEF;;;OAGG;IACH,OAAO,CAAC,yBAAyB;IAmCjC,OAAO,CAAC,mBAAmB;IAuC3B,OAAO,CAAC,qBAAqB;IA0B7B;;OAEG;IACH,OAAO,CAAC,yBAAyB,CAwF/B;IAEF,OAAO,CAAC,6BAA6B;IAuBrC,OAAO,CAAC,0BAA0B;YAOpB,aAAa;IA0F3B;;;OAGG;YACW,iBAAiB;IA4H/B;;;;OAIG;YACW,wBAAwB;YAqExB,eAAe;YAmEf,cAAc;IA0F5B;;;;OAIG;YACW,iBAAiB;YAkLjB,6BAA6B;YAmB7B,mBAAmB;IAwCjC;;;;;;;;OAQG;YACW,eAAe;IAqK7B;;;;;OAKG;IACH,OAAO,CAAC,gCAAgC;IA6BxC,OAAO,CAAC,kCAAkC;IAyB1C,OAAO,CAAC,oBAAoB;IA+B5B,OAAO,CAAC,sBAAsB;CAY/B;AAED;;GAEG;AACH,qBAAa,wBAAwB;IACnC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACjD,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAChD,QAAQ,CAAC,sBAAsB,EAAE,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAExD,cAIC;IAED,qCAAqC;IACrC,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI,CAM/D;IAED,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAI1C;IAED,4FAA4F;IAC5F,KAAK,IAAI,IAAI,CAIZ;IAED,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAEjE;IAED,uBAAuB,CAAC,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG,MAAM,GAAG,IAAI,CA4BnG;IAED;;;;;;OAMG;IACH,yBAAyB,CACvB,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,EAC3B,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,EAC7B,cAAc,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,GAC9B,YAAY,GAAG,IAAI,CAiBrB;IAED;;;OAGG;IACH,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAEjC;IAED;;OAEG;IACH,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAE1C;IAED,sBAAsB,IAAI,MAAM,CAM/B;IAED,OAAO,CAAC,WAAW;IA8DnB,OAAO,CAAC,qBAAqB;CAO9B"}
1
+ {"version":3,"file":"unknownBlock.d.ts","sourceRoot":"","sources":["../../src/sync/unknownBlock.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@ import { routes } from "@lodestar/api";
2
2
  import { ForkSeq, SLOTS_PER_EPOCH, isForkPostGloas } from "@lodestar/params";
3
3
  import { RequestError, RequestErrorCode } from "@lodestar/reqresp";
4
4
  import { computeTimeAtSlot } from "@lodestar/state-transition";
5
- import { fromHex, prettyPrintIndices, pruneSetToMax, sleep, toRootHex } from "@lodestar/utils";
5
+ import { fromHex, isErrorAborted, prettyPrintIndices, pruneSetToMax, sleep, toRootHex } from "@lodestar/utils";
6
6
  import { isBlockInputBlobs, isBlockInputColumns } from "../chain/blocks/blockInput/blockInput.js";
7
7
  import { BlockInputSource } from "../chain/blocks/blockInput/types.js";
8
8
  import { PayloadError, PayloadErrorCode } from "../chain/blocks/importExecutionPayload.js";
@@ -13,11 +13,12 @@ import { validateGloasBlockDataColumnSidecars } from "../chain/validation/dataCo
13
13
  import { validateGossipExecutionPayloadEnvelope } from "../chain/validation/executionPayloadEnvelope.js";
14
14
  import { NetworkEvent, prettyPrintPeerIdStr } from "../network/index.js";
15
15
  import { MAX_PEERS_PER_ROOT } from "../network/processor/constants.js";
16
+ import { ClockEvent } from "../util/clock.js";
16
17
  import { shuffle } from "../util/shuffle.js";
17
18
  import { sortBy } from "../util/sortBy.js";
18
19
  import { wrapError } from "../util/wrapError.js";
19
20
  import { MAX_CONCURRENT_REQUESTS } from "./constants.js";
20
- import { DownloadResult, DroppedItemReason, FetchResult, PendingBlockInputStatus, PendingBlockType, PendingPayloadInputStatus, getBlockInputSyncCacheItemRootHex, getBlockInputSyncCacheItemSlot, getPayloadSyncCacheItemRootHex, getPayloadSyncCacheItemSlot, isPendingBlockInput, isPendingPayloadEnvelope, isPendingPayloadInput, } from "./types.js";
21
+ import { DeferredPayloadResult, DownloadResult, DroppedItemReason, FetchResult, PendingBlockInputStatus, PendingBlockType, PendingPayloadInputStatus, getBlockInputSyncCacheItemRootHex, getBlockInputSyncCacheItemSlot, getPayloadSyncCacheItemRootHex, getPayloadSyncCacheItemSlot, isPendingBlockInput, isPendingPayloadEnvelope, isPendingPayloadInput, } from "./types.js";
21
22
  import { DownloadByRootError, downloadByRoot } from "./utils/downloadByRoot.js";
22
23
  import { getAllDescendantBlocks, getUnknownAndAncestorBlocks } from "./utils/pendingBlocksTree.js";
23
24
  import { getRateLimitedUntilMs } from "./utils/rateLimit.js";
@@ -28,6 +29,10 @@ const MAX_PENDING_BLOCKS = 100;
28
29
  * A pending payload without slot can only stay at most 2 epochs.
29
30
  */
30
31
  const PRUNE_UNRESOLVED_SLOT_EPOCHS = 2;
32
+ /**
33
+ * Poll pending payloads of the current slot this often, between PAYLOAD_DUE and the end of the slot.
34
+ */
35
+ export const PAYLOAD_POLL_INTERVAL_MS = 1_000;
31
36
  class UnknownBlockRateLimitedError extends Error {
32
37
  constructor(message) {
33
38
  super(message);
@@ -84,6 +89,11 @@ export class BlockInputSync {
84
89
  subscribedToNetworkEvents = false;
85
90
  peerBalancer;
86
91
  rateLimitBackoffTimeout;
92
+ /**
93
+ * Search unknown payload starting at PAYLOAD_DUE_BPS.
94
+ */
95
+ deferredPayloadRoots = new Map();
96
+ payloadPollAbortController;
87
97
  constructor(config, network, chain, logger, metrics, opts) {
88
98
  this.config = config;
89
99
  this.network = network;
@@ -118,6 +128,7 @@ export class BlockInputSync {
118
128
  this.chain.emitter.on(routes.events.EventType.executionPayload, this.onPayloadImported);
119
129
  this.network.events.on(NetworkEvent.peerConnected, this.onPeerConnected);
120
130
  this.network.events.on(NetworkEvent.peerDisconnected, this.onPeerDisconnected);
131
+ this.chain.clock.on(ClockEvent.slot, this.startPayloadPollAtSlot);
121
132
  // Seed the balancer with peers that connected before we subscribed
122
133
  for (const peerId of this.network.getConnectedPeers()) {
123
134
  try {
@@ -128,11 +139,18 @@ export class BlockInputSync {
128
139
  }
129
140
  }
130
141
  this.subscribedToNetworkEvents = true;
142
+ // we subscribe mid-slot, and a root can be deferred at any point in the slot, so start this
143
+ // slot's loop now instead of waiting for the next ClockEvent.slot
144
+ this.startPayloadPollAtSlot(this.chain.clock.currentSlot);
131
145
  }
132
146
  }
133
147
  unsubscribeFromNetwork() {
134
148
  this.logger.verbose("BlockInputSync disabled.");
135
149
  this.clearRateLimitBackoffTimer();
150
+ this.chain.clock.off(ClockEvent.slot, this.startPayloadPollAtSlot);
151
+ this.payloadPollAbortController?.abort();
152
+ this.payloadPollAbortController = undefined;
153
+ this.deferredPayloadRoots.clear();
136
154
  this.chain.emitter.off(ChainEvent.unknownBlockRoot, this.onUnknownBlockRoot);
137
155
  this.chain.emitter.off(ChainEvent.unknownEnvelopeBlockRoot, this.onUnknownEnvelopeBlockRoot);
138
156
  this.chain.emitter.off(ChainEvent.unknownEnvelopeBlockRootSlot, this.onUnknownEnvelopeBlockRootSlot);
@@ -159,8 +177,11 @@ export class BlockInputSync {
159
177
  onUnknownBlockRoot = (data) => {
160
178
  try {
161
179
  const isNewRoot = this.addByRootHex(data.rootHex, data.peer);
162
- if (isNewRoot) {
180
+ // A retained entry (an earlier download failed, #10018) is not new but still needs a retry pass.
181
+ if (this.pendingBlocks.get(data.rootHex)?.status === PendingBlockInputStatus.pending) {
163
182
  this.triggerUnknownBlockSearch();
183
+ }
184
+ if (isNewRoot) {
164
185
  this.metrics?.blockInputSync.requests.inc({ type: PendingBlockType.UNKNOWN_BLOCK_ROOT });
165
186
  this.metrics?.blockInputSync.source.inc({ source: data.source });
166
187
  }
@@ -198,6 +219,20 @@ export class BlockInputSync {
198
219
  };
199
220
  onUnknownEnvelopeBlockRootSlot = (data) => {
200
221
  try {
222
+ if (data.slot === this.chain.clock.currentSlot) {
223
+ // we receive the optimistic search, the poll loop searches it at PAYLOAD_DUE or on its next
224
+ // tick. If that loop already returned - every root it watched was imported - this root waits
225
+ // for the next slot, where startPayloadPollAtSlot moves it to pendingPayloads. That is not the normal
226
+ // scenario, and in a forking condition it only delays the search of the extra root
227
+ const deferred = this.deferredPayloadRoots.get(data.rootHex);
228
+ if (deferred === undefined) {
229
+ this.deferredPayloadRoots.set(data.rootHex, { slot: data.slot, source: data.source, peer: data.peer });
230
+ }
231
+ else if (deferred.peer === undefined) {
232
+ deferred.peer = data.peer;
233
+ }
234
+ return;
235
+ }
201
236
  const isNewRoot = this.addByPayloadRootHex(data.rootHex, data.peer, data.slot);
202
237
  if (isNewRoot) {
203
238
  this.triggerUnknownBlockSearch();
@@ -303,12 +338,21 @@ export class BlockInputSync {
303
338
  belowFinalizedPayloads++;
304
339
  }
305
340
  }
306
- let deletedBlocks = 0;
341
+ let belowFinalizedBlocks = 0;
342
+ let agedOutBlocks = 0;
307
343
  for (const [rootHex, block] of this.pendingBlocks) {
308
344
  const slot = getBlockInputSyncCacheItemSlot(block);
309
- if (typeof slot === "number" && slot < finalizedSlot) {
345
+ if (typeof slot !== "number") {
346
+ // we may not be able to download a root, hence there is no slot for it
347
+ if (nowSec - block.timeAddedSec > maxSecInCache) {
348
+ this.pendingBlocks.delete(rootHex);
349
+ agedOutBlocks++;
350
+ }
351
+ continue;
352
+ }
353
+ if (slot < finalizedSlot) {
310
354
  this.pendingBlocks.delete(rootHex);
311
- deletedBlocks++;
355
+ belowFinalizedBlocks++;
312
356
  }
313
357
  }
314
358
  if (belowFinalizedPayloads > 0) {
@@ -317,15 +361,19 @@ export class BlockInputSync {
317
361
  if (agedOutPayloads > 0) {
318
362
  this.metrics?.blockInputSync.removedPayloads.inc({ reason: DroppedItemReason.agedOut }, agedOutPayloads);
319
363
  }
320
- if (deletedBlocks > 0) {
321
- this.metrics?.blockInputSync.removedBlocks.inc({ reason: DroppedItemReason.belowFinalized }, deletedBlocks);
364
+ if (belowFinalizedBlocks > 0) {
365
+ this.metrics?.blockInputSync.removedBlocks.inc({ reason: DroppedItemReason.belowFinalized }, belowFinalizedBlocks);
366
+ }
367
+ if (agedOutBlocks > 0) {
368
+ this.metrics?.blockInputSync.removedBlocks.inc({ reason: DroppedItemReason.agedOut }, agedOutBlocks);
322
369
  }
323
- this.logger.debug("BlockInputSync.pruneFinalized dropped pre-finalized pending items", {
370
+ this.logger.debug("BlockInputSync.pruneFinalized dropped stale pending items", {
324
371
  finalizedSlot,
325
372
  finalizedRoot: checkpoint.rootHex,
326
373
  belowFinalizedPayloads,
327
374
  agedOutPayloads,
328
- deletedBlocks,
375
+ belowFinalizedBlocks,
376
+ agedOutBlocks,
329
377
  unresolvedSlotPayloads,
330
378
  });
331
379
  };
@@ -667,6 +715,115 @@ export class BlockInputSync {
667
715
  this.rateLimitBackoffTimeout = undefined;
668
716
  }
669
717
  }
718
+ /**
719
+ * Start this slot's payload poll: end the previous slot's loop, move roots it never got to
720
+ * into pendingPayloads, then poll from PAYLOAD_DUE to the end of the slot.
721
+ */
722
+ startPayloadPollAtSlot = (slot) => {
723
+ if (!isForkPostGloas(this.config.getForkName(slot))) {
724
+ return;
725
+ }
726
+ // end the previous slot's loop, wherever it is: its sleep is bound to this same controller
727
+ this.payloadPollAbortController?.abort();
728
+ this.payloadPollAbortController = new AbortController();
729
+ // entries from an earlier slot is not polled
730
+ for (const [rootHex, { slot: deferredSlot, source, peer }] of this.deferredPayloadRoots) {
731
+ if (deferredSlot < slot) {
732
+ if (!this.chain.forkChoice.hasPayloadHexUnsafe(rootHex)) {
733
+ this.addDeferredPayloadRoot(rootHex, deferredSlot, source, peer);
734
+ }
735
+ this.deferredPayloadRoots.delete(rootHex);
736
+ }
737
+ }
738
+ this.pollPayloadsAtSlot(slot, this.payloadPollAbortController.signal).catch((e) => {
739
+ if (!isErrorAborted(e)) {
740
+ this.logger.debug("Error polling payloads", { slot }, e);
741
+ }
742
+ });
743
+ };
744
+ /**
745
+ * Poll unknown payloads of the current slot.
746
+ */
747
+ async pollPayloadsAtSlot(slot, signal) {
748
+ // fixed tick count so the loop cannot outlive its slot: for mainnet, it's 6 ticks
749
+ const tickCount = Math.floor((this.config.SLOT_DURATION_MS - this.config.getPayloadDueMs()) / PAYLOAD_POLL_INTERVAL_MS);
750
+ // a root still missing on several ticks is searched on each of them, recorded once
751
+ const searchedRoots = new Set();
752
+ let polls = 0;
753
+ try {
754
+ await sleep(Math.max(0, this.config.getPayloadDueMs() - this.chain.clock.msFromSlot(slot)), signal);
755
+ for (polls = 0; polls < tickCount; polls++) {
756
+ let importedCount = 0;
757
+ for (const [rootHex, { slot: deferredSlot, source, peer }] of this.deferredPayloadRoots) {
758
+ if (this.chain.forkChoice.hasPayloadHexUnsafe(rootHex)) {
759
+ importedCount++;
760
+ continue;
761
+ }
762
+ // copy to the regular pendingPayloads so that we can search
763
+ this.addDeferredPayloadRoot(rootHex, deferredSlot, source, peer);
764
+ searchedRoots.add(rootHex);
765
+ }
766
+ // an empty deferredPayloadRoots means there is no optimistic search comes before PAYLOAD_DUE
767
+ // we have to poll until the payload of current slot is imported or slot end
768
+ if (this.deferredPayloadRoots.size > 0 && importedCount === this.deferredPayloadRoots.size) {
769
+ if (searchedRoots.size > 0) {
770
+ // the backup search was needed
771
+ this.metrics?.blockInputSync.deferredPayloadResult.inc({
772
+ result: DeferredPayloadResult.ImportedAfterSearch,
773
+ });
774
+ this.metrics?.blockInputSync.deferredPayloadPolls.observe(polls);
775
+ this.logger.verbose("Payload imported after unknown sync search", {
776
+ slot,
777
+ roots: Array.from(searchedRoots).join(","),
778
+ polls,
779
+ });
780
+ }
781
+ else {
782
+ // this happens most of the time on devnet
783
+ // gossip delivered everything before PAYLOAD_DUE
784
+ this.metrics?.blockInputSync.deferredPayloadResult.inc({
785
+ result: DeferredPayloadResult.ImportedBeforeSearch,
786
+ });
787
+ }
788
+ return;
789
+ }
790
+ this.triggerUnknownBlockSearch();
791
+ if (polls < tickCount - 1) {
792
+ // no sleep after the last tick: the loop would otherwise end right at the slot boundary,
793
+ // where startPayloadPollAtSlot aborts it
794
+ await sleep(PAYLOAD_POLL_INTERVAL_MS, signal);
795
+ }
796
+ }
797
+ // reaching here means the early return never fired
798
+ if (this.deferredPayloadRoots.size > 0) {
799
+ this.metrics?.blockInputSync.deferredPayloadResult.inc({ result: DeferredPayloadResult.Unresolved });
800
+ this.logger.debug("Deferred payloads still missing at end of slot", {
801
+ slot,
802
+ roots: Array.from(this.deferredPayloadRoots.keys()).join(","),
803
+ });
804
+ }
805
+ else {
806
+ // no optimistic search and no payload import ended the loop, eg a skipped slot
807
+ this.metrics?.blockInputSync.deferredPayloadResult.inc({ result: DeferredPayloadResult.ResolvedNoRoot });
808
+ this.logger.debug("No deferred payloads at slot", {
809
+ slot,
810
+ });
811
+ }
812
+ }
813
+ catch (e) {
814
+ if (!isErrorAborted(e)) {
815
+ throw e;
816
+ }
817
+ this.logger.verbose("Payload poll aborted", { slot, polls, msIntoSlot: this.chain.clock.msFromSlot(slot) });
818
+ }
819
+ }
820
+ addDeferredPayloadRoot(rootHex, slot, source, peer) {
821
+ const isNewRoot = this.addByPayloadRootHex(rootHex, peer, slot);
822
+ if (isNewRoot) {
823
+ this.metrics?.blockInputSync.requests.inc({ type: PendingBlockType.DEFERRED_PAYLOAD_BLOCK_ROOT });
824
+ this.metrics?.blockInputSync.payloadSource.inc({ source });
825
+ }
826
+ }
670
827
  async downloadBlock(block) {
671
828
  if (block.status !== PendingBlockInputStatus.pending) {
672
829
  return;
@@ -685,7 +842,12 @@ export class BlockInputSync {
685
842
  if (!res.err) {
686
843
  this.metrics?.blockInputSync.downloadedBlocksSuccess.inc();
687
844
  const pending = res.result;
688
- this.pendingBlocks.set(pending.blockInput.blockRootHex, pending);
845
+ // pruning may have deleted this entry while we were awaiting the network, do not resurrect it via the set below
846
+ if (!this.pendingBlocks.has(rootHex)) {
847
+ this.logger.verbose("Dropping downloaded block, entry pruned during fetch", logCtx);
848
+ return;
849
+ }
850
+ this.pendingBlocks.set(rootHex, pending);
689
851
  const blockSlot = pending.blockInput.slot;
690
852
  const finalizedSlot = this.chain.forkChoice.getFinalizedBlock().slot;
691
853
  const delaySec = Date.now() / 1000 - computeTimeAtSlot(this.config, blockSlot, this.chain.genesisTime);
@@ -745,8 +907,11 @@ export class BlockInputSync {
745
907
  return;
746
908
  }
747
909
  this.metrics?.blockInputSync.downloadedBlocksError.inc();
748
- this.logger.debug("Ignoring unknown block root after many failed downloads", logCtx, res.err);
749
- this.removeAndDownScoreAllDescendants(block, DroppedItemReason.unavailable);
910
+ this.logger.debug("Failed to download unknown block root, retained for retry", logCtx, res.err);
911
+ const pendingBlock = this.pendingBlocks.get(rootHex);
912
+ if (pendingBlock && pendingBlock.status === PendingBlockInputStatus.fetching) {
913
+ pendingBlock.status = PendingBlockInputStatus.pending;
914
+ }
750
915
  }
751
916
  }
752
917
  /**
@@ -969,7 +1134,7 @@ export class BlockInputSync {
969
1134
  return;
970
1135
  }
971
1136
  this.metrics?.blockInputSync.downloadedPayloadsResult.inc({ result: DownloadResult.Failed });
972
- this.logger.debug("Ignoring unknown payload root after failed download", logCtx, res.err);
1137
+ this.logger.debug("Failed to download unknown payload root, retained for retry", logCtx, res.err);
973
1138
  if (!isPendingPayloadEnvelope(payload)) {
974
1139
  payload.status = PendingPayloadInputStatus.pending;
975
1140
  }
@@ -1337,7 +1502,11 @@ export class BlockInputSync {
1337
1502
  finally {
1338
1503
  this.peerBalancer.onRequestCompleted(peerId);
1339
1504
  }
1340
- this.pendingBlocks.set(getBlockInputSyncCacheItemRootHex(cacheItem), cacheItem);
1505
+ const cacheItemRootHex = getBlockInputSyncCacheItemRootHex(cacheItem);
1506
+ // pruning may have dropped it mid-fetch
1507
+ if (this.pendingBlocks.has(cacheItemRootHex)) {
1508
+ this.pendingBlocks.set(cacheItemRootHex, cacheItem);
1509
+ }
1341
1510
  if (cacheItem.status === PendingBlockInputStatus.downloaded) {
1342
1511
  // download was successful, no need to go with another peer, return
1343
1512
  const result = this.chain.forkChoice.hasBlockHex(cacheItem.blockInput.blockRootHex)