@lodestar/beacon-node 1.49.0-dev.b27f498c2c → 1.49.0-dev.c9d60c8080

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 (57) hide show
  1. package/lib/api/impl/validator/index.d.ts.map +1 -1
  2. package/lib/api/impl/validator/index.js +3 -1
  3. package/lib/api/impl/validator/index.js.map +1 -1
  4. package/lib/chain/archiveStore/historicalState/metrics.d.ts.map +1 -1
  5. package/lib/chain/archiveStore/historicalState/metrics.js +4 -0
  6. package/lib/chain/archiveStore/historicalState/metrics.js.map +1 -1
  7. package/lib/chain/archiveStore/utils/pruneHistory.d.ts.map +1 -1
  8. package/lib/chain/archiveStore/utils/pruneHistory.js +5 -1
  9. package/lib/chain/archiveStore/utils/pruneHistory.js.map +1 -1
  10. package/lib/chain/emitter.d.ts +10 -0
  11. package/lib/chain/emitter.d.ts.map +1 -1
  12. package/lib/chain/emitter.js +4 -0
  13. package/lib/chain/emitter.js.map +1 -1
  14. package/lib/chain/errors/payloadAttestation.d.ts +4 -0
  15. package/lib/chain/errors/payloadAttestation.d.ts.map +1 -1
  16. package/lib/chain/errors/payloadAttestation.js +1 -0
  17. package/lib/chain/errors/payloadAttestation.js.map +1 -1
  18. package/lib/chain/options.d.ts +0 -4
  19. package/lib/chain/options.d.ts.map +1 -1
  20. package/lib/chain/options.js +0 -1
  21. package/lib/chain/options.js.map +1 -1
  22. package/lib/chain/validation/payloadAttestationMessage.d.ts.map +1 -1
  23. package/lib/chain/validation/payloadAttestationMessage.js +8 -1
  24. package/lib/chain/validation/payloadAttestationMessage.js.map +1 -1
  25. package/lib/db/repositories/blockArchive.d.ts +5 -0
  26. package/lib/db/repositories/blockArchive.d.ts.map +1 -1
  27. package/lib/db/repositories/blockArchive.js +36 -1
  28. package/lib/db/repositories/blockArchive.js.map +1 -1
  29. package/lib/metrics/metrics/lodestar.d.ts +5 -1
  30. package/lib/metrics/metrics/lodestar.d.ts.map +1 -1
  31. package/lib/metrics/metrics/lodestar.js +10 -0
  32. package/lib/metrics/metrics/lodestar.js.map +1 -1
  33. package/lib/network/processor/index.d.ts +6 -2
  34. package/lib/network/processor/index.d.ts.map +1 -1
  35. package/lib/network/processor/index.js +62 -24
  36. package/lib/network/processor/index.js.map +1 -1
  37. package/lib/sync/types.d.ts +21 -0
  38. package/lib/sync/types.d.ts.map +1 -1
  39. package/lib/sync/types.js +22 -0
  40. package/lib/sync/types.js.map +1 -1
  41. package/lib/sync/unknownBlock.d.ts +20 -0
  42. package/lib/sync/unknownBlock.d.ts.map +1 -1
  43. package/lib/sync/unknownBlock.js +158 -2
  44. package/lib/sync/unknownBlock.js.map +1 -1
  45. package/package.json +14 -14
  46. package/src/api/impl/validator/index.ts +3 -1
  47. package/src/chain/archiveStore/historicalState/metrics.ts +4 -0
  48. package/src/chain/archiveStore/utils/pruneHistory.ts +5 -2
  49. package/src/chain/emitter.ts +7 -2
  50. package/src/chain/errors/payloadAttestation.ts +2 -0
  51. package/src/chain/options.ts +0 -5
  52. package/src/chain/validation/payloadAttestationMessage.ts +9 -0
  53. package/src/db/repositories/blockArchive.ts +38 -1
  54. package/src/metrics/metrics/lodestar.ts +17 -1
  55. package/src/network/processor/index.ts +81 -24
  56. package/src/sync/types.ts +24 -3
  57. package/src/sync/unknownBlock.ts +166 -1
@@ -5,7 +5,7 @@ import {ForkSeq, SLOTS_PER_EPOCH, isForkPostGloas} from "@lodestar/params";
5
5
  import {RequestError, RequestErrorCode} from "@lodestar/reqresp";
6
6
  import {computeTimeAtSlot} from "@lodestar/state-transition";
7
7
  import {RootHex, Slot, gloas} from "@lodestar/types";
8
- import {Logger, fromHex, prettyPrintIndices, pruneSetToMax, sleep, toRootHex} from "@lodestar/utils";
8
+ import {Logger, fromHex, isErrorAborted, prettyPrintIndices, pruneSetToMax, sleep, toRootHex} from "@lodestar/utils";
9
9
  import {isBlockInputBlobs, isBlockInputColumns} from "../chain/blocks/blockInput/blockInput.js";
10
10
  import {BlockInputSource, IBlockInput} from "../chain/blocks/blockInput/types.js";
11
11
  import {PayloadError, PayloadErrorCode} from "../chain/blocks/importExecutionPayload.js";
@@ -18,6 +18,7 @@ import {Metrics} from "../metrics/index.js";
18
18
  import {INetwork, NetworkEvent, NetworkEventData, prettyPrintPeerIdStr} from "../network/index.js";
19
19
  import {PeerSyncMeta} from "../network/peers/peersData.js";
20
20
  import {MAX_PEERS_PER_ROOT} from "../network/processor/constants.js";
21
+ import {ClockEvent} from "../util/clock.js";
21
22
  import {PeerIdStr} from "../util/peerId.js";
22
23
  import {shuffle} from "../util/shuffle.js";
23
24
  import {sortBy} from "../util/sortBy.js";
@@ -26,6 +27,7 @@ import {MAX_CONCURRENT_REQUESTS} from "./constants.js";
26
27
  import {SyncOptions} from "./options.js";
27
28
  import {
28
29
  BlockInputSyncCacheItem,
30
+ DeferredPayloadResult,
29
31
  DownloadResult,
30
32
  DroppedItemReason,
31
33
  FetchResult,
@@ -57,6 +59,11 @@ const MAX_PENDING_BLOCKS = 100;
57
59
  */
58
60
  const PRUNE_UNRESOLVED_SLOT_EPOCHS = 2;
59
61
 
62
+ /**
63
+ * Poll pending payloads of the current slot this often, between PAYLOAD_DUE and the end of the slot.
64
+ */
65
+ export const PAYLOAD_POLL_INTERVAL_MS = 1_000;
66
+
60
67
  type AdvancePendingBlockResult =
61
68
  | "ready"
62
69
  | "queued_block"
@@ -116,6 +123,11 @@ export class BlockInputSync {
116
123
  private subscribedToNetworkEvents = false;
117
124
  private peerBalancer: UnknownBlockPeerBalancer;
118
125
  private rateLimitBackoffTimeout: NodeJS.Timeout | undefined;
126
+ /**
127
+ * Search unknown payload starting at PAYLOAD_DUE_BPS.
128
+ */
129
+ private readonly deferredPayloadRoots = new Map<RootHex, {slot: Slot; source: BlockInputSource; peer?: PeerIdStr}>();
130
+ private payloadPollAbortController: AbortController | undefined;
119
131
 
120
132
  constructor(
121
133
  private readonly config: ChainForkConfig,
@@ -152,6 +164,7 @@ export class BlockInputSync {
152
164
  this.logger.verbose("BlockInputSync enabled.");
153
165
  this.chain.emitter.on(ChainEvent.unknownBlockRoot, this.onUnknownBlockRoot);
154
166
  this.chain.emitter.on(ChainEvent.unknownEnvelopeBlockRoot, this.onUnknownEnvelopeBlockRoot);
167
+ this.chain.emitter.on(ChainEvent.unknownEnvelopeBlockRootSlot, this.onUnknownEnvelopeBlockRootSlot);
155
168
  this.chain.emitter.on(ChainEvent.incompleteBlockInput, this.onIncompleteBlockInput);
156
169
  this.chain.emitter.on(ChainEvent.incompletePayloadEnvelope, this.onIncompletePayloadEnvelope);
157
170
  this.chain.emitter.on(ChainEvent.blockUnknownParent, this.onUnknownParent);
@@ -160,6 +173,7 @@ export class BlockInputSync {
160
173
  this.chain.emitter.on(routes.events.EventType.executionPayload, this.onPayloadImported);
161
174
  this.network.events.on(NetworkEvent.peerConnected, this.onPeerConnected);
162
175
  this.network.events.on(NetworkEvent.peerDisconnected, this.onPeerDisconnected);
176
+ this.chain.clock.on(ClockEvent.slot, this.startPayloadPollAtSlot);
163
177
 
164
178
  // Seed the balancer with peers that connected before we subscribed
165
179
  for (const peerId of this.network.getConnectedPeers()) {
@@ -171,14 +185,22 @@ export class BlockInputSync {
171
185
  }
172
186
 
173
187
  this.subscribedToNetworkEvents = true;
188
+ // we subscribe mid-slot, and a root can be deferred at any point in the slot, so start this
189
+ // slot's loop now instead of waiting for the next ClockEvent.slot
190
+ this.startPayloadPollAtSlot(this.chain.clock.currentSlot);
174
191
  }
175
192
  }
176
193
 
177
194
  unsubscribeFromNetwork(): void {
178
195
  this.logger.verbose("BlockInputSync disabled.");
179
196
  this.clearRateLimitBackoffTimer();
197
+ this.chain.clock.off(ClockEvent.slot, this.startPayloadPollAtSlot);
198
+ this.payloadPollAbortController?.abort();
199
+ this.payloadPollAbortController = undefined;
200
+ this.deferredPayloadRoots.clear();
180
201
  this.chain.emitter.off(ChainEvent.unknownBlockRoot, this.onUnknownBlockRoot);
181
202
  this.chain.emitter.off(ChainEvent.unknownEnvelopeBlockRoot, this.onUnknownEnvelopeBlockRoot);
203
+ this.chain.emitter.off(ChainEvent.unknownEnvelopeBlockRootSlot, this.onUnknownEnvelopeBlockRootSlot);
182
204
  this.chain.emitter.off(ChainEvent.incompleteBlockInput, this.onIncompleteBlockInput);
183
205
  this.chain.emitter.off(ChainEvent.incompletePayloadEnvelope, this.onIncompletePayloadEnvelope);
184
206
  this.chain.emitter.off(ChainEvent.blockUnknownParent, this.onUnknownParent);
@@ -242,6 +264,33 @@ export class BlockInputSync {
242
264
  }
243
265
  };
244
266
 
267
+ private onUnknownEnvelopeBlockRootSlot = (data: ChainEventData[ChainEvent.unknownEnvelopeBlockRootSlot]): void => {
268
+ try {
269
+ if (data.slot === this.chain.clock.currentSlot) {
270
+ // we receive the optimistic search, the poll loop searches it at PAYLOAD_DUE or on its next
271
+ // tick. If that loop already returned - every root it watched was imported - this root waits
272
+ // for the next slot, where startPayloadPollAtSlot moves it to pendingPayloads. That is not the normal
273
+ // scenario, and in a forking condition it only delays the search of the extra root
274
+ const deferred = this.deferredPayloadRoots.get(data.rootHex);
275
+ if (deferred === undefined) {
276
+ this.deferredPayloadRoots.set(data.rootHex, {slot: data.slot, source: data.source, peer: data.peer});
277
+ } else if (deferred.peer === undefined) {
278
+ deferred.peer = data.peer;
279
+ }
280
+ return;
281
+ }
282
+
283
+ const isNewRoot = this.addByPayloadRootHex(data.rootHex, data.peer, data.slot);
284
+ if (isNewRoot) {
285
+ this.triggerUnknownBlockSearch();
286
+ this.metrics?.blockInputSync.requests.inc({type: PendingBlockType.UNKNOWN_PAYLOAD_BLOCK_ROOT_SLOT});
287
+ this.metrics?.blockInputSync.payloadSource.inc({source: data.source});
288
+ }
289
+ } catch (e) {
290
+ this.logger.debug("Error handling unknownEnvelopeBlockRootSlot event", {}, e as Error);
291
+ }
292
+ };
293
+
245
294
  private onIncompletePayloadEnvelope = (data: ChainEventData[ChainEvent.incompletePayloadEnvelope]): void => {
246
295
  try {
247
296
  this.addByPayloadInput(data.payloadInput, data.peer);
@@ -785,6 +834,122 @@ export class BlockInputSync {
785
834
  }
786
835
  }
787
836
 
837
+ /**
838
+ * Start this slot's payload poll: end the previous slot's loop, move roots it never got to
839
+ * into pendingPayloads, then poll from PAYLOAD_DUE to the end of the slot.
840
+ */
841
+ private startPayloadPollAtSlot = (slot: Slot): void => {
842
+ if (!isForkPostGloas(this.config.getForkName(slot))) {
843
+ return;
844
+ }
845
+ // end the previous slot's loop, wherever it is: its sleep is bound to this same controller
846
+ this.payloadPollAbortController?.abort();
847
+ this.payloadPollAbortController = new AbortController();
848
+ // entries from an earlier slot is not polled
849
+ for (const [rootHex, {slot: deferredSlot, source, peer}] of this.deferredPayloadRoots) {
850
+ if (deferredSlot < slot) {
851
+ if (!this.chain.forkChoice.hasPayloadHexUnsafe(rootHex)) {
852
+ this.addDeferredPayloadRoot(rootHex, deferredSlot, source, peer);
853
+ }
854
+ this.deferredPayloadRoots.delete(rootHex);
855
+ }
856
+ }
857
+ this.pollPayloadsAtSlot(slot, this.payloadPollAbortController.signal).catch((e) => {
858
+ if (!isErrorAborted(e)) {
859
+ this.logger.debug("Error polling payloads", {slot}, e as Error);
860
+ }
861
+ });
862
+ };
863
+
864
+ /**
865
+ * Poll unknown payloads of the current slot.
866
+ */
867
+ private async pollPayloadsAtSlot(slot: Slot, signal: AbortSignal): Promise<void> {
868
+ // fixed tick count so the loop cannot outlive its slot: for mainnet, it's 6 ticks
869
+ const tickCount = Math.floor(
870
+ (this.config.SLOT_DURATION_MS - this.config.getPayloadDueMs()) / PAYLOAD_POLL_INTERVAL_MS
871
+ );
872
+ // a root still missing on several ticks is searched on each of them, recorded once
873
+ const searchedRoots = new Set<RootHex>();
874
+ let polls = 0;
875
+
876
+ try {
877
+ await sleep(Math.max(0, this.config.getPayloadDueMs() - this.chain.clock.msFromSlot(slot)), signal);
878
+
879
+ for (polls = 0; polls < tickCount; polls++) {
880
+ let importedCount = 0;
881
+ for (const [rootHex, {slot: deferredSlot, source, peer}] of this.deferredPayloadRoots) {
882
+ if (this.chain.forkChoice.hasPayloadHexUnsafe(rootHex)) {
883
+ importedCount++;
884
+ continue;
885
+ }
886
+ // copy to the regular pendingPayloads so that we can search
887
+ this.addDeferredPayloadRoot(rootHex, deferredSlot, source, peer);
888
+ searchedRoots.add(rootHex);
889
+ }
890
+
891
+ // an empty deferredPayloadRoots means there is no optimistic search comes before PAYLOAD_DUE
892
+ // we have to poll until the payload of current slot is imported or slot end
893
+ if (this.deferredPayloadRoots.size > 0 && importedCount === this.deferredPayloadRoots.size) {
894
+ if (searchedRoots.size > 0) {
895
+ // the backup search was needed
896
+ this.metrics?.blockInputSync.deferredPayloadResult.inc({
897
+ result: DeferredPayloadResult.ImportedAfterSearch,
898
+ });
899
+ this.metrics?.blockInputSync.deferredPayloadPolls.observe(polls);
900
+ this.logger.verbose("Payload imported after unknown sync search", {
901
+ slot,
902
+ roots: Array.from(searchedRoots).join(","),
903
+ polls,
904
+ });
905
+ } else {
906
+ // this happens most of the time on devnet
907
+ // gossip delivered everything before PAYLOAD_DUE
908
+ this.metrics?.blockInputSync.deferredPayloadResult.inc({
909
+ result: DeferredPayloadResult.ImportedBeforeSearch,
910
+ });
911
+ }
912
+ return;
913
+ }
914
+
915
+ this.triggerUnknownBlockSearch();
916
+ if (polls < tickCount - 1) {
917
+ // no sleep after the last tick: the loop would otherwise end right at the slot boundary,
918
+ // where startPayloadPollAtSlot aborts it
919
+ await sleep(PAYLOAD_POLL_INTERVAL_MS, signal);
920
+ }
921
+ }
922
+
923
+ // reaching here means the early return never fired
924
+ if (this.deferredPayloadRoots.size > 0) {
925
+ this.metrics?.blockInputSync.deferredPayloadResult.inc({result: DeferredPayloadResult.Unresolved});
926
+ this.logger.debug("Deferred payloads still missing at end of slot", {
927
+ slot,
928
+ roots: Array.from(this.deferredPayloadRoots.keys()).join(","),
929
+ });
930
+ } else {
931
+ // no optimistic search and no payload import ended the loop, eg a skipped slot
932
+ this.metrics?.blockInputSync.deferredPayloadResult.inc({result: DeferredPayloadResult.ResolvedNoRoot});
933
+ this.logger.debug("No deferred payloads at slot", {
934
+ slot,
935
+ });
936
+ }
937
+ } catch (e) {
938
+ if (!isErrorAborted(e)) {
939
+ throw e;
940
+ }
941
+ this.logger.verbose("Payload poll aborted", {slot, polls, msIntoSlot: this.chain.clock.msFromSlot(slot)});
942
+ }
943
+ }
944
+
945
+ private addDeferredPayloadRoot(rootHex: RootHex, slot: Slot, source: BlockInputSource, peer?: PeerIdStr): void {
946
+ const isNewRoot = this.addByPayloadRootHex(rootHex, peer, slot);
947
+ if (isNewRoot) {
948
+ this.metrics?.blockInputSync.requests.inc({type: PendingBlockType.DEFERRED_PAYLOAD_BLOCK_ROOT});
949
+ this.metrics?.blockInputSync.payloadSource.inc({source});
950
+ }
951
+ }
952
+
788
953
  private async downloadBlock(block: BlockInputSyncCacheItem): Promise<void> {
789
954
  if (block.status !== PendingBlockInputStatus.pending) {
790
955
  return;