@lodestar/beacon-node 1.49.0-dev.c9061c6942 → 1.49.0-dev.cd9f3245c9

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 (114) hide show
  1. package/lib/api/impl/beacon/blocks/index.js +2 -2
  2. package/lib/api/impl/beacon/blocks/index.js.map +1 -1
  3. package/lib/api/impl/validator/index.d.ts.map +1 -1
  4. package/lib/api/impl/validator/index.js +9 -7
  5. package/lib/api/impl/validator/index.js.map +1 -1
  6. package/lib/chain/archiveStore/historicalState/metrics.d.ts.map +1 -1
  7. package/lib/chain/archiveStore/historicalState/metrics.js +4 -0
  8. package/lib/chain/archiveStore/historicalState/metrics.js.map +1 -1
  9. package/lib/chain/archiveStore/utils/pruneHistory.d.ts.map +1 -1
  10. package/lib/chain/archiveStore/utils/pruneHistory.js +14 -3
  11. package/lib/chain/archiveStore/utils/pruneHistory.js.map +1 -1
  12. package/lib/chain/blocks/index.js +2 -2
  13. package/lib/chain/blocks/index.js.map +1 -1
  14. package/lib/chain/blocks/payloadEnvelopeInput/types.d.ts +1 -1
  15. package/lib/chain/blocks/payloadEnvelopeInput/types.d.ts.map +1 -1
  16. package/lib/chain/emitter.d.ts +10 -0
  17. package/lib/chain/emitter.d.ts.map +1 -1
  18. package/lib/chain/emitter.js +4 -0
  19. package/lib/chain/emitter.js.map +1 -1
  20. package/lib/chain/errors/attesterSlashingError.d.ts +4 -1
  21. package/lib/chain/errors/attesterSlashingError.d.ts.map +1 -1
  22. package/lib/chain/errors/attesterSlashingError.js +1 -0
  23. package/lib/chain/errors/attesterSlashingError.js.map +1 -1
  24. package/lib/chain/errors/proposerSlashingError.d.ts +4 -1
  25. package/lib/chain/errors/proposerSlashingError.d.ts.map +1 -1
  26. package/lib/chain/errors/proposerSlashingError.js +1 -0
  27. package/lib/chain/errors/proposerSlashingError.js.map +1 -1
  28. package/lib/chain/options.d.ts +0 -4
  29. package/lib/chain/options.d.ts.map +1 -1
  30. package/lib/chain/options.js +0 -1
  31. package/lib/chain/options.js.map +1 -1
  32. package/lib/chain/produceBlock/produceBlockBody.d.ts.map +1 -1
  33. package/lib/chain/produceBlock/produceBlockBody.js +6 -6
  34. package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
  35. package/lib/chain/seenCache/seenPayloadEnvelopeInput.d.ts +2 -1
  36. package/lib/chain/seenCache/seenPayloadEnvelopeInput.d.ts.map +1 -1
  37. package/lib/chain/seenCache/seenPayloadEnvelopeInput.js +3 -2
  38. package/lib/chain/seenCache/seenPayloadEnvelopeInput.js.map +1 -1
  39. package/lib/chain/validation/attesterSlashing.d.ts.map +1 -1
  40. package/lib/chain/validation/attesterSlashing.js +1 -2
  41. package/lib/chain/validation/attesterSlashing.js.map +1 -1
  42. package/lib/chain/validation/proposerSlashing.js +1 -2
  43. package/lib/chain/validation/proposerSlashing.js.map +1 -1
  44. package/lib/chain/validatorMonitor.d.ts.map +1 -1
  45. package/lib/chain/validatorMonitor.js +2 -2
  46. package/lib/chain/validatorMonitor.js.map +1 -1
  47. package/lib/db/repositories/blockArchive.d.ts +5 -0
  48. package/lib/db/repositories/blockArchive.d.ts.map +1 -1
  49. package/lib/db/repositories/blockArchive.js +36 -1
  50. package/lib/db/repositories/blockArchive.js.map +1 -1
  51. package/lib/network/gossip/encoding.d.ts +1 -2
  52. package/lib/network/gossip/encoding.d.ts.map +1 -1
  53. package/lib/network/gossip/encoding.js +5 -10
  54. package/lib/network/gossip/encoding.js.map +1 -1
  55. package/lib/network/gossip/gossipsub.d.ts.map +1 -1
  56. package/lib/network/gossip/gossipsub.js +16 -1
  57. package/lib/network/gossip/gossipsub.js.map +1 -1
  58. package/lib/network/gossip/topic.d.ts +9 -6
  59. package/lib/network/gossip/topic.d.ts.map +1 -1
  60. package/lib/network/gossip/topic.js +23 -8
  61. package/lib/network/gossip/topic.js.map +1 -1
  62. package/lib/network/processor/gossipHandlers.d.ts.map +1 -1
  63. package/lib/network/processor/gossipHandlers.js +16 -5
  64. package/lib/network/processor/gossipHandlers.js.map +1 -1
  65. package/lib/network/processor/gossipValidatorFn.d.ts +2 -0
  66. package/lib/network/processor/gossipValidatorFn.d.ts.map +1 -1
  67. package/lib/network/processor/gossipValidatorFn.js +88 -7
  68. package/lib/network/processor/gossipValidatorFn.js.map +1 -1
  69. package/lib/network/processor/index.d.ts +6 -2
  70. package/lib/network/processor/index.d.ts.map +1 -1
  71. package/lib/network/processor/index.js +62 -24
  72. package/lib/network/processor/index.js.map +1 -1
  73. package/lib/network/reqresp/protocols.d.ts.map +1 -1
  74. package/lib/network/reqresp/protocols.js +19 -5
  75. package/lib/network/reqresp/protocols.js.map +1 -1
  76. package/lib/sync/types.d.ts +4 -0
  77. package/lib/sync/types.d.ts.map +1 -1
  78. package/lib/sync/types.js +4 -0
  79. package/lib/sync/types.js.map +1 -1
  80. package/lib/sync/unknownBlock.d.ts +1 -0
  81. package/lib/sync/unknownBlock.d.ts.map +1 -1
  82. package/lib/sync/unknownBlock.js +15 -0
  83. package/lib/sync/unknownBlock.js.map +1 -1
  84. package/lib/util/sszBytes.d.ts +5 -0
  85. package/lib/util/sszBytes.d.ts.map +1 -1
  86. package/lib/util/sszBytes.js +13 -1
  87. package/lib/util/sszBytes.js.map +1 -1
  88. package/package.json +14 -14
  89. package/src/api/impl/beacon/blocks/index.ts +2 -2
  90. package/src/api/impl/validator/index.ts +9 -7
  91. package/src/chain/archiveStore/historicalState/metrics.ts +4 -0
  92. package/src/chain/archiveStore/utils/pruneHistory.ts +14 -4
  93. package/src/chain/blocks/index.ts +2 -2
  94. package/src/chain/blocks/payloadEnvelopeInput/types.ts +1 -1
  95. package/src/chain/emitter.ts +7 -2
  96. package/src/chain/errors/attesterSlashingError.ts +3 -1
  97. package/src/chain/errors/proposerSlashingError.ts +3 -1
  98. package/src/chain/options.ts +0 -5
  99. package/src/chain/produceBlock/produceBlockBody.ts +17 -6
  100. package/src/chain/seenCache/seenPayloadEnvelopeInput.ts +3 -2
  101. package/src/chain/validation/attesterSlashing.ts +1 -2
  102. package/src/chain/validation/proposerSlashing.ts +1 -2
  103. package/src/chain/validatorMonitor.ts +12 -2
  104. package/src/db/repositories/blockArchive.ts +38 -1
  105. package/src/network/gossip/encoding.ts +5 -8
  106. package/src/network/gossip/gossipsub.ts +19 -2
  107. package/src/network/gossip/topic.ts +25 -7
  108. package/src/network/processor/gossipHandlers.ts +18 -5
  109. package/src/network/processor/gossipValidatorFn.ts +111 -7
  110. package/src/network/processor/index.ts +81 -24
  111. package/src/network/reqresp/protocols.ts +31 -6
  112. package/src/sync/types.ts +6 -3
  113. package/src/sync/unknownBlock.ts +15 -0
  114. package/src/util/sszBytes.ts +18 -0
@@ -1,24 +1,122 @@
1
1
  import {TopicValidatorResult} from "@libp2p/gossipsub";
2
2
  import {ChainForkConfig} from "@lodestar/config";
3
3
  import {Logger} from "@lodestar/utils";
4
- import {AttestationError, GossipAction, GossipActionError} from "../../chain/errors/index.js";
4
+ import {
5
+ AttestationError,
6
+ AttestationErrorCode,
7
+ AttesterSlashingErrorCode,
8
+ BlobSidecarErrorCode,
9
+ BlockErrorCode,
10
+ BlsToExecutionChangeErrorCode,
11
+ DataColumnSidecarErrorCode,
12
+ ExecutionPayloadBidErrorCode,
13
+ ExecutionPayloadEnvelopeErrorCode,
14
+ GossipAction,
15
+ GossipActionError,
16
+ PayloadAttestationErrorCode,
17
+ ProposerPreferencesErrorCode,
18
+ ProposerSlashingErrorCode,
19
+ SyncCommitteeErrorCode,
20
+ VoluntaryExitErrorCode,
21
+ } from "../../chain/errors/index.js";
5
22
  import {Metrics} from "../../metrics/index.js";
23
+ import {INetworkCore} from "../core/index.js";
6
24
  import {
7
25
  BatchGossipHandlerFn,
8
26
  GossipHandlerFn,
9
27
  GossipHandlers,
10
28
  GossipMessageInfo,
29
+ GossipType,
11
30
  GossipValidatorBatchFn,
12
31
  GossipValidatorFn,
13
32
  } from "../gossip/interface.js";
33
+ import {PeerAction} from "../peers/index.js";
14
34
  import {prettyPrintPeerIdStr} from "../util.js";
15
35
 
16
36
  export type ValidatorFnModules = {
17
37
  config: ChainForkConfig;
18
38
  logger: Logger;
19
39
  metrics: Metrics | null;
40
+ core: INetworkCore;
41
+ };
42
+
43
+ type RejectPeerActionRule = {default: PeerAction; byCode?: Record<string, PeerAction>};
44
+
45
+ /**
46
+ * PeerAction mapping based on the topic and specific codes.
47
+ * Invalid signatures are Fatal on every topic.
48
+ */
49
+ const gossipRejectPeerAction: Record<GossipType, RejectPeerActionRule> = {
50
+ [GossipType.beacon_block]: {
51
+ default: PeerAction.LowToleranceError,
52
+ byCode: {[BlockErrorCode.PROPOSAL_SIGNATURE_INVALID]: PeerAction.Fatal},
53
+ },
54
+ [GossipType.blob_sidecar]: {
55
+ default: PeerAction.LowToleranceError,
56
+ byCode: {[BlobSidecarErrorCode.PROPOSAL_SIGNATURE_INVALID]: PeerAction.Fatal},
57
+ },
58
+ [GossipType.data_column_sidecar]: {
59
+ default: PeerAction.LowToleranceError,
60
+ byCode: {[DataColumnSidecarErrorCode.PROPOSAL_SIGNATURE_INVALID]: PeerAction.Fatal},
61
+ },
62
+ [GossipType.execution_payload]: {
63
+ default: PeerAction.LowToleranceError,
64
+ byCode: {[ExecutionPayloadEnvelopeErrorCode.INVALID_SIGNATURE]: PeerAction.Fatal},
65
+ },
66
+ [GossipType.beacon_aggregate_and_proof]: {
67
+ default: PeerAction.MidToleranceError,
68
+ byCode: {[AttestationErrorCode.INVALID_SIGNATURE]: PeerAction.Fatal},
69
+ },
70
+ [GossipType.beacon_attestation]: {
71
+ default: PeerAction.MidToleranceError,
72
+ byCode: {[AttestationErrorCode.INVALID_SIGNATURE]: PeerAction.Fatal},
73
+ },
74
+ [GossipType.sync_committee_contribution_and_proof]: {
75
+ default: PeerAction.MidToleranceError,
76
+ byCode: {[SyncCommitteeErrorCode.INVALID_SIGNATURE]: PeerAction.Fatal},
77
+ },
78
+ [GossipType.sync_committee]: {
79
+ default: PeerAction.MidToleranceError,
80
+ byCode: {[SyncCommitteeErrorCode.INVALID_SIGNATURE]: PeerAction.Fatal},
81
+ },
82
+ [GossipType.payload_attestation_message]: {
83
+ default: PeerAction.MidToleranceError,
84
+ byCode: {[PayloadAttestationErrorCode.INVALID_SIGNATURE]: PeerAction.Fatal},
85
+ },
86
+ [GossipType.execution_payload_bid]: {
87
+ default: PeerAction.HighToleranceError,
88
+ byCode: {[ExecutionPayloadBidErrorCode.INVALID_SIGNATURE]: PeerAction.Fatal},
89
+ },
90
+ [GossipType.proposer_preferences]: {
91
+ default: PeerAction.HighToleranceError,
92
+ byCode: {[ProposerPreferencesErrorCode.INVALID_SIGNATURE]: PeerAction.Fatal},
93
+ },
94
+ [GossipType.voluntary_exit]: {
95
+ default: PeerAction.HighToleranceError,
96
+ byCode: {[VoluntaryExitErrorCode.INVALID_SIGNATURE]: PeerAction.Fatal},
97
+ },
98
+ [GossipType.bls_to_execution_change]: {
99
+ default: PeerAction.HighToleranceError,
100
+ byCode: {[BlsToExecutionChangeErrorCode.INVALID_SIGNATURE]: PeerAction.Fatal},
101
+ },
102
+ [GossipType.proposer_slashing]: {
103
+ default: PeerAction.HighToleranceError,
104
+ byCode: {[ProposerSlashingErrorCode.INVALID_SIGNATURE]: PeerAction.Fatal},
105
+ },
106
+ [GossipType.attester_slashing]: {
107
+ default: PeerAction.HighToleranceError,
108
+ byCode: {[AttesterSlashingErrorCode.INVALID_SIGNATURE]: PeerAction.Fatal},
109
+ },
110
+ // light client validators only throw IGNORE
111
+ [GossipType.light_client_finality_update]: {default: PeerAction.HighToleranceError},
112
+ [GossipType.light_client_optimistic_update]: {default: PeerAction.HighToleranceError},
20
113
  };
21
114
 
115
+ function rejectPeerAction(type: GossipType, code: string): PeerAction {
116
+ const rule = gossipRejectPeerAction[type];
117
+ return rule.byCode?.[code] ?? rule.default;
118
+ }
119
+
22
120
  /**
23
121
  * Similar to getGossipValidatorFn but return a function to accept a batch of beacon_attestation messages
24
122
  * with the same attestation data
@@ -27,7 +125,7 @@ export function getGossipValidatorBatchFn(
27
125
  gossipHandlers: GossipHandlers,
28
126
  modules: ValidatorFnModules
29
127
  ): GossipValidatorBatchFn {
30
- const {logger, metrics} = modules;
128
+ const {logger, metrics, core} = modules;
31
129
 
32
130
  return async function gossipValidatorBatchFn(messageInfos: GossipMessageInfo[]) {
33
131
  // all messageInfos have same topic type
@@ -69,16 +167,19 @@ export function getGossipValidatorBatchFn(
69
167
  // only beacon_attestation topic is validated in batch
70
168
  metrics?.networkProcessor.gossipAttestationIgnoreByReason.inc({reason: e.type.code});
71
169
  return TopicValidatorResult.Ignore;
72
- case GossipAction.REJECT:
170
+ case GossipAction.REJECT: {
73
171
  metrics?.networkProcessor.gossipValidationReject.inc({topic: type});
74
172
  // only beacon_attestation topic is validated in batch
75
173
  metrics?.networkProcessor.gossipAttestationRejectByReason.inc({reason: e.type.code});
174
+ const peerAction = rejectPeerAction(type, e.type.code);
175
+ core.reportPeer(propagationSource, peerAction, e.type.code);
76
176
  logger.debug(
77
177
  `Gossip validation ${type} rejected`,
78
- {peerId: prettyPrintPeerIdStr(propagationSource), clientAgent, clientVersion},
178
+ {peer: propagationSource, clientAgent, clientVersion, peerAction},
79
179
  e
80
180
  );
81
181
  return TopicValidatorResult.Reject;
182
+ }
82
183
  }
83
184
  });
84
185
  } catch (e) {
@@ -108,7 +209,7 @@ export function getGossipValidatorBatchFn(
108
209
  * @see getGossipHandlers for reasoning on why GossipHandlerFn are used for gossip validation.
109
210
  */
110
211
  export function getGossipValidatorFn(gossipHandlers: GossipHandlers, modules: ValidatorFnModules): GossipValidatorFn {
111
- const {logger, metrics} = modules;
212
+ const {logger, metrics, core} = modules;
112
213
 
113
214
  return async function gossipValidatorFn({
114
215
  topic,
@@ -155,14 +256,17 @@ export function getGossipValidatorFn(gossipHandlers: GossipHandlers, modules: Va
155
256
  metrics?.networkProcessor.gossipValidationIgnore.inc({topic: type});
156
257
  return TopicValidatorResult.Ignore;
157
258
 
158
- case GossipAction.REJECT:
259
+ case GossipAction.REJECT: {
159
260
  metrics?.networkProcessor.gossipValidationReject.inc({topic: type});
261
+ const peerAction = rejectPeerAction(type, e.type.code);
262
+ core.reportPeer(propagationSource, peerAction, e.type.code);
160
263
  logger.debug(
161
264
  `Gossip validation ${type} rejected`,
162
- {peerId: prettyPrintPeerIdStr(propagationSource), clientAgent, clientVersion},
265
+ {peer: propagationSource, clientAgent, clientVersion, peerAction},
163
266
  e
164
267
  );
165
268
  return TopicValidatorResult.Reject;
269
+ }
166
270
  }
167
271
  }
168
272
  };
@@ -86,8 +86,13 @@ export const MAX_AWAITING_MESSAGES_PER_ROOT: Partial<Record<GossipType, number>>
86
86
 
87
87
  /**
88
88
  * Track the forwarded peers we already emit to UnknownBlockInput sync.
89
+ * envelopeSlotEmitted: whether the unknownEnvelopeBlockRootSlot event was already emitted for this root.
89
90
  */
90
- type SearchedRootEntry = {blockPeerIds?: Set<PeerIdStr>; envelopePeerIds?: Set<PeerIdStr>};
91
+ type SearchedRootEntry = {
92
+ blockPeerIds?: Set<PeerIdStr>;
93
+ envelopePeerIds?: Set<PeerIdStr>;
94
+ envelopeSlotEmitted?: boolean;
95
+ };
91
96
 
92
97
  /**
93
98
  * This is respective to gossipsub seenTTL (which is 550 * 0.7 = 385s), also it's respective
@@ -192,6 +197,19 @@ type PreprocessResult =
192
197
  | {action: PreprocessAction.AwaitBlock; root: RootHex}
193
198
  | {action: PreprocessAction.AwaitEnvelope; root: RootHex};
194
199
 
200
+ enum SearchTarget {
201
+ Block,
202
+ PayloadEnvelope,
203
+ }
204
+
205
+ type SearchUnknownRootTarget =
206
+ | {target: SearchTarget.Block}
207
+ | {
208
+ target: SearchTarget.PayloadEnvelope;
209
+ /** The message slot is the payload's slot, so it can be used for UnknownBlockInput search */
210
+ slotIsPayloadSlot: boolean;
211
+ };
212
+
195
213
  /**
196
214
  * Network processor handles the gossip queues and throtles processing to not overload the main thread
197
215
  * - Decides when to process work and what to process
@@ -347,12 +365,17 @@ export class NetworkProcessor {
347
365
  }
348
366
 
349
367
  /**
350
- * Search envelope via `ChainEvent.unknownEnvelopeBlockRoot` event
368
+ * Search envelope via `ChainEvent.unknownEnvelopeBlockRoot` / `ChainEvent.unknownEnvelopeBlockRootSlot` event
351
369
  * Slot is the message slot, which is not necessarily the same as the envelope's slot, but it can be used for a good prune strategy.
352
370
  * In the rare case, if 2 messages on 2 slots search for the same root (for example beacon_attestation) we may emit the same root twice but BlockInputSync should handle it well.
353
371
  * Same peer-forwarding + dedup behavior as searchUnknownBlock.
354
372
  */
355
- searchUnknownEnvelope({slot, root}: SlotRootHex, source: BlockInputSource, peer?: PeerIdStr): void {
373
+ searchUnknownEnvelope(
374
+ {slot, root}: SlotRootHex,
375
+ source: BlockInputSource,
376
+ peer?: PeerIdStr,
377
+ slotIsPayloadSlot = false
378
+ ): void {
356
379
  if (this.chain.seenPayloadEnvelope(root)) {
357
380
  return;
358
381
  }
@@ -369,8 +392,17 @@ export class NetworkProcessor {
369
392
  forwardedPeers.add(peer);
370
393
  shouldEmit = true;
371
394
  }
395
+ // the payload-slot seed must reach the sync once, even if a slot-less trigger started the search first
396
+ if (slotIsPayloadSlot && !entry.envelopeSlotEmitted) {
397
+ shouldEmit = true;
398
+ }
372
399
  if (shouldEmit) {
373
- this.chain.emitter.emit(ChainEvent.unknownEnvelopeBlockRoot, {rootHex: root, slot, peer, source});
400
+ if (slotIsPayloadSlot) {
401
+ entry.envelopeSlotEmitted = true;
402
+ this.chain.emitter.emit(ChainEvent.unknownEnvelopeBlockRootSlot, {rootHex: root, slot, peer, source});
403
+ } else {
404
+ this.chain.emitter.emit(ChainEvent.unknownEnvelopeBlockRoot, {rootHex: root, peer, source});
405
+ }
374
406
  }
375
407
  }
376
408
 
@@ -431,7 +463,7 @@ export class NetworkProcessor {
431
463
  // no need to check if root is a descendant of the current finalized block, it will be checked once we validate the message if needed
432
464
  if (root && !this.chain.forkChoice.hasBlockHexUnsafe(root)) {
433
465
  // starting from GLOAS, unknown root from data_column_sidecar also falls into this case
434
- this.searchUnknownRoot({slot, root}, true, false, peerId);
466
+ this.searchUnknownRoot({slot, root}, peerId, {target: SearchTarget.Block});
435
467
  // for beacon_attestation and beacon_aggregate_and_proof messages, this is only temporary.
436
468
  // if "index = 1" we need to await for the Envelope instead
437
469
  preprocessResult = {action: PreprocessAction.AwaitBlock, root};
@@ -446,27 +478,28 @@ export class NetworkProcessor {
446
478
  if (topicType === GossipType.beacon_block) {
447
479
  const parentRoot = getParentRootFromSignedBeaconBlockSerialized(message.msg.data);
448
480
  if (parentRoot) {
449
- let searchParentBlock = false;
450
- let searchParentEnvelope = false;
481
+ let search: SearchUnknownRootTarget | null = null;
451
482
  if (ForkSeq[fork] >= ForkSeq.gloas) {
452
483
  // GLOAS: also check parent envelope, same logic as execution_payload_bid
453
484
  const parentBlockHash = getParentBlockHashFromGloasSignedBeaconBlockSerialized(message.msg.data);
454
485
  if (parentBlockHash && !this.chain.forkChoice.getBlockHexAndBlockHash(parentRoot, parentBlockHash)) {
455
486
  const protoBlock = this.chain.forkChoice.getBlockHexDefaultStatus(parentRoot);
456
487
  if (protoBlock === null) {
457
- searchParentBlock = true;
488
+ search = {target: SearchTarget.Block};
458
489
  } else if (
459
490
  protoBlock.executionPayloadBlockHash &&
460
491
  protoBlock.executionPayloadBlockHash !== parentBlockHash
461
492
  ) {
462
493
  // only search for the envelope by block root if we're sure there is one. Otherwise UnknownBlockSync will penalize the peer.
463
- searchParentEnvelope = true;
494
+ search = {target: SearchTarget.PayloadEnvelope, slotIsPayloadSlot: false};
464
495
  }
465
496
  }
466
497
  } else if (!this.chain.forkChoice.hasBlockHexUnsafe(parentRoot)) {
467
- searchParentBlock = true;
498
+ search = {target: SearchTarget.Block};
499
+ }
500
+ if (search !== null) {
501
+ this.searchUnknownRoot({slot, root: parentRoot}, peerId, search);
468
502
  }
469
- this.searchUnknownRoot({slot, root: parentRoot}, searchParentBlock, searchParentEnvelope, peerId);
470
503
  }
471
504
  preprocessResult = {action: PreprocessAction.PushToQueue};
472
505
  }
@@ -485,7 +518,10 @@ export class NetworkProcessor {
485
518
  : getDataIndexFromSignedAggregateAndProofSerialized(message.msg.data);
486
519
  if (attIndex === 1 && !this.chain.forkChoice.hasPayloadHexUnsafe(root)) {
487
520
  // attestation votes that the payload is available but it is not yet known
488
- this.searchUnknownRoot({slot, root}, false, true, peerId);
521
+ this.searchUnknownRoot({slot, root}, peerId, {
522
+ target: SearchTarget.PayloadEnvelope,
523
+ slotIsPayloadSlot: false,
524
+ });
489
525
  preprocessResult = {action: PreprocessAction.AwaitEnvelope, root};
490
526
  }
491
527
  break;
@@ -494,8 +530,13 @@ export class NetworkProcessor {
494
530
  if (root == null) break;
495
531
  const payloadPresent = getPayloadPresentFromPayloadAttestationMessageSerialized(message.msg.data);
496
532
  if (payloadPresent && !this.chain.forkChoice.hasPayloadHexUnsafe(root)) {
497
- // payload attestation votes that the payload is available but it is not yet known
498
- this.searchUnknownRoot({slot, root}, false, true, peerId);
533
+ // payload attestation votes that the payload is available but it is not yet known.
534
+ // this is optimistic search, the peer may not have the payload (only the ptc committee had).
535
+ // the PTC vote's slot is the payload's slot
536
+ this.searchUnknownRoot({slot, root}, undefined, {
537
+ target: SearchTarget.PayloadEnvelope,
538
+ slotIsPayloadSlot: true,
539
+ });
499
540
  // do not await the envelope, payload attestation processing only requires that the block is known
500
541
  // also do not reset preprocessResult, we may already await for the block
501
542
  }
@@ -504,7 +545,12 @@ export class NetworkProcessor {
504
545
  case GossipType.data_column_sidecar: {
505
546
  if (root == null) break;
506
547
  if (!this.chain.forkChoice.hasPayloadHexUnsafe(root)) {
507
- this.searchUnknownRoot({slot, root}, false, true, peerId);
548
+ // this is optimistic search, the peer may not have the payload.
549
+ // the sidecar's slot is the block's (and so the payload's) slot
550
+ this.searchUnknownRoot({slot, root}, undefined, {
551
+ target: SearchTarget.PayloadEnvelope,
552
+ slotIsPayloadSlot: true,
553
+ });
508
554
  // do not await the envelope, we can do gossip validation
509
555
  // also do not reset preprocessResult, we may already await for the block
510
556
  }
@@ -515,7 +561,7 @@ export class NetworkProcessor {
515
561
  // Extract beacon_block_root directly
516
562
  const blockRoot = getBeaconBlockRootFromExecutionPayloadEnvelopeSerialized(message.msg.data);
517
563
  if (blockRoot && !this.chain.forkChoice.hasBlockHexUnsafe(blockRoot)) {
518
- this.searchUnknownRoot({slot, root: blockRoot}, true, false, peerId);
564
+ this.searchUnknownRoot({slot, root: blockRoot}, peerId, {target: SearchTarget.Block});
519
565
  // We always want to await the block
520
566
  // This allows us to properly forward the payload envelope
521
567
  preprocessResult = {action: PreprocessAction.AwaitBlock, root: blockRoot};
@@ -534,13 +580,16 @@ export class NetworkProcessor {
534
580
  ) {
535
581
  const protoBlock = this.chain.forkChoice.getBlockHexDefaultStatus(parentBlockRoot);
536
582
  if (protoBlock === null) {
537
- this.searchUnknownRoot({slot, root: parentBlockRoot}, true, false, peerId);
583
+ this.searchUnknownRoot({slot, root: parentBlockRoot}, peerId, {target: SearchTarget.Block});
538
584
  preprocessResult = {action: PreprocessAction.AwaitBlock, root: parentBlockRoot};
539
585
  } else if (
540
586
  protoBlock.executionPayloadBlockHash &&
541
587
  protoBlock.executionPayloadBlockHash !== parentBlockHash
542
588
  ) {
543
- this.searchUnknownRoot({slot, root: parentBlockRoot}, false, true, peerId);
589
+ this.searchUnknownRoot({slot, root: parentBlockRoot}, peerId, {
590
+ target: SearchTarget.PayloadEnvelope,
591
+ slotIsPayloadSlot: false,
592
+ });
544
593
  preprocessResult = {action: PreprocessAction.AwaitEnvelope, root: parentBlockRoot};
545
594
  }
546
595
  }
@@ -641,16 +690,24 @@ export class NetworkProcessor {
641
690
  return true;
642
691
  }
643
692
 
693
+ /**
694
+ * Search block/envelope given a SlotRootHex
695
+ * undefined peer id means optimistic search
696
+ */
644
697
  private searchUnknownRoot(
645
698
  slotRoot: SlotRootHex,
646
- searchBlock: boolean,
647
- searchEnvelope: boolean,
648
- peerId: PeerIdStr
699
+ peerId: PeerIdStr | undefined,
700
+ search: SearchUnknownRootTarget
649
701
  ): void {
650
- if (!searchBlock && !searchEnvelope) return;
651
702
  if (this.tooManySearchedRoots(slotRoot.slot, slotRoot.root)) return;
652
- if (searchBlock) this.searchUnknownBlock(slotRoot, BlockInputSource.network_processor, peerId);
653
- if (searchEnvelope) this.searchUnknownEnvelope(slotRoot, BlockInputSource.network_processor, peerId);
703
+ switch (search.target) {
704
+ case SearchTarget.Block:
705
+ this.searchUnknownBlock(slotRoot, BlockInputSource.network_processor, peerId);
706
+ break;
707
+ case SearchTarget.PayloadEnvelope:
708
+ this.searchUnknownEnvelope(slotRoot, BlockInputSource.network_processor, peerId, search.slotIsPayloadSlot);
709
+ break;
710
+ }
654
711
  }
655
712
 
656
713
  private pushPendingGossipsubMessageToQueue(message: PendingGossipsubMessage): void {
@@ -1,6 +1,7 @@
1
1
  import {BeaconConfig} from "@lodestar/config";
2
- import {ForkName} from "@lodestar/params";
2
+ import {ForkName, isForkPostGloas} from "@lodestar/params";
3
3
  import {ContextBytesFactory, ContextBytesType, Encoding, TypeSizes} from "@lodestar/reqresp";
4
+ import {computeMaxGloasDataColumnSidecarSize} from "../../util/sszBytes.js";
4
5
  import {rateLimitQuotas} from "./rateLimit.js";
5
6
  import {ProtocolNoHandler, ReqRespMethod, Version, requestSszTypeByMethod, responseSszTypeByMethod} from "./types.js";
6
7
 
@@ -151,18 +152,42 @@ function toProtocol(protocol: ProtocolSummary) {
151
152
  encoding: Encoding.SSZ_SNAPPY,
152
153
  contextBytes: toContextBytes(protocol.contextBytesType, config),
153
154
  inboundRateLimits: rateLimitQuotas(fork, config)[protocol.method],
154
- requestSizes: requestType === null ? null : clampTypeSizes(requestType, config),
155
- responseSizes: (fork) => clampTypeSizes(responseSszTypeByMethod[protocol.method](fork, protocol.version), config),
155
+ requestSizes: requestType === null ? null : clampTypeSizes(requestType, config.MAX_PAYLOAD_SIZE),
156
+ responseSizes: (fork) =>
157
+ clampResponseTypeSizes(
158
+ responseSszTypeByMethod[protocol.method](fork, protocol.version),
159
+ protocol.method,
160
+ fork,
161
+ config
162
+ ),
156
163
  };
157
164
  };
158
165
  }
159
166
 
167
+ function clampResponseTypeSizes(
168
+ type: TypeSizes,
169
+ method: ReqRespMethod,
170
+ fork: ForkName,
171
+ config: BeaconConfig
172
+ ): TypeSizes {
173
+ let maxPayloadSize = config.MAX_PAYLOAD_SIZE;
174
+ if (isForkPostGloas(fork)) {
175
+ switch (method) {
176
+ case ReqRespMethod.DataColumnSidecarsByRange:
177
+ case ReqRespMethod.DataColumnSidecarsByRoot:
178
+ maxPayloadSize = Math.min(maxPayloadSize, computeMaxGloasDataColumnSidecarSize(config));
179
+ break;
180
+ }
181
+ }
182
+ return clampTypeSizes(type, maxPayloadSize);
183
+ }
184
+
160
185
  /**
161
- * Length-prefix must be within the SSZ type bounds or MAX_PAYLOAD_SIZE, whichever is smaller
186
+ * Length-prefix must be within the SSZ type bounds or the configured payload limit, whichever is smaller.
162
187
  * https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.12/specs/phase0/p2p-interface.md#encoding-strategies
163
188
  */
164
- function clampTypeSizes(type: TypeSizes, config: BeaconConfig): TypeSizes {
165
- return {minSize: type.minSize, maxSize: Math.min(type.maxSize, config.MAX_PAYLOAD_SIZE)};
189
+ function clampTypeSizes(type: TypeSizes, maxPayloadSize: number): TypeSizes {
190
+ return {minSize: type.minSize, maxSize: Math.min(type.maxSize, maxPayloadSize)};
166
191
  }
167
192
 
168
193
  function toContextBytes(type: ContextBytesType, config: BeaconConfig): ContextBytesFactory {
package/src/sync/types.ts CHANGED
@@ -23,6 +23,10 @@ export enum PendingBlockType {
23
23
  * Payload analog of UNKNOWN_BLOCK_ROOT: we have a beacon block root but not its execution payload envelope.
24
24
  */
25
25
  UNKNOWN_PAYLOAD_BLOCK_ROOT = "unknown_payload_block_root",
26
+ /**
27
+ * Same as UNKNOWN_PAYLOAD_BLOCK_ROOT, but the trigger also carries the payload's slot.
28
+ */
29
+ UNKNOWN_PAYLOAD_BLOCK_ROOT_SLOT = "unknown_payload_block_root_slot",
26
30
  /**
27
31
  * Payload analog of INCOMPLETE_BLOCK_INPUT: we have a partial payload input that did not complete in time.
28
32
  */
@@ -130,9 +134,8 @@ export type PendingPayloadInput = {
130
134
  export type PendingPayloadRootHex = {
131
135
  status: PendingPayloadInputStatus.pending | PendingPayloadInputStatus.fetching;
132
136
  rootHex: RootHex;
133
- // Trusted slot only (fork choice / validated data), may be missing until resolved. NOT the gossip
134
- // message slot from ChainEvent.unknownEnvelopeBlockRoot, which is untrusted and not necessarily the
135
- // payload/block slot. See BlockInputSync.resolvePayloadSlot.
137
+ // slot could be via fork choice or ChainEvent.unknownEnvelopeBlockRootSlot
138
+ // while ChainEvent.unknownEnvelopeBlockRoot does not provide one
136
139
  slot?: Slot;
137
140
  timeAddedSec: number;
138
141
  timeSyncedSec?: number;
@@ -152,6 +152,7 @@ export class BlockInputSync {
152
152
  this.logger.verbose("BlockInputSync enabled.");
153
153
  this.chain.emitter.on(ChainEvent.unknownBlockRoot, this.onUnknownBlockRoot);
154
154
  this.chain.emitter.on(ChainEvent.unknownEnvelopeBlockRoot, this.onUnknownEnvelopeBlockRoot);
155
+ this.chain.emitter.on(ChainEvent.unknownEnvelopeBlockRootSlot, this.onUnknownEnvelopeBlockRootSlot);
155
156
  this.chain.emitter.on(ChainEvent.incompleteBlockInput, this.onIncompleteBlockInput);
156
157
  this.chain.emitter.on(ChainEvent.incompletePayloadEnvelope, this.onIncompletePayloadEnvelope);
157
158
  this.chain.emitter.on(ChainEvent.blockUnknownParent, this.onUnknownParent);
@@ -179,6 +180,7 @@ export class BlockInputSync {
179
180
  this.clearRateLimitBackoffTimer();
180
181
  this.chain.emitter.off(ChainEvent.unknownBlockRoot, this.onUnknownBlockRoot);
181
182
  this.chain.emitter.off(ChainEvent.unknownEnvelopeBlockRoot, this.onUnknownEnvelopeBlockRoot);
183
+ this.chain.emitter.off(ChainEvent.unknownEnvelopeBlockRootSlot, this.onUnknownEnvelopeBlockRootSlot);
182
184
  this.chain.emitter.off(ChainEvent.incompleteBlockInput, this.onIncompleteBlockInput);
183
185
  this.chain.emitter.off(ChainEvent.incompletePayloadEnvelope, this.onIncompletePayloadEnvelope);
184
186
  this.chain.emitter.off(ChainEvent.blockUnknownParent, this.onUnknownParent);
@@ -242,6 +244,19 @@ export class BlockInputSync {
242
244
  }
243
245
  };
244
246
 
247
+ private onUnknownEnvelopeBlockRootSlot = (data: ChainEventData[ChainEvent.unknownEnvelopeBlockRootSlot]): void => {
248
+ try {
249
+ const isNewRoot = this.addByPayloadRootHex(data.rootHex, data.peer, data.slot);
250
+ if (isNewRoot) {
251
+ this.triggerUnknownBlockSearch();
252
+ this.metrics?.blockInputSync.requests.inc({type: PendingBlockType.UNKNOWN_PAYLOAD_BLOCK_ROOT_SLOT});
253
+ this.metrics?.blockInputSync.payloadSource.inc({source: data.source});
254
+ }
255
+ } catch (e) {
256
+ this.logger.debug("Error handling unknownEnvelopeBlockRootSlot event", {}, e as Error);
257
+ }
258
+ };
259
+
245
260
  private onIncompletePayloadEnvelope = (data: ChainEventData[ChainEvent.incompletePayloadEnvelope]): void => {
246
261
  try {
247
262
  this.addByPayloadInput(data.payloadInput, data.peer);
@@ -1,6 +1,7 @@
1
1
  import {BitArray, deserializeUint8ArrayBitListFromBytes} from "@chainsafe/ssz";
2
2
  import {ChainForkConfig} from "@lodestar/config";
3
3
  import {
4
+ BYTES_PER_CELL,
4
5
  BYTES_PER_FIELD_ELEMENT,
5
6
  FIELD_ELEMENTS_PER_BLOB,
6
7
  ForkName,
@@ -551,6 +552,23 @@ export function getBeaconBlockRootFromDataColumnSidecarSerialized(data: Uint8Arr
551
552
  return "0x" + blockRootBuf.toString("hex");
552
553
  }
553
554
 
555
+ // beaconBlockRoot is the last fixed field in the Gloas layout
556
+ const DATA_COLUMN_SIDECAR_GLOAS_FIXED_SIZE = BEACON_BLOCK_ROOT_POSITION_IN_GLOAS_DATA_COLUMN_SIDECAR + ROOT_SIZE; // 56 bytes
557
+ const KZG_PROOF_SIZE = 48; // Bytes48
558
+ const DATA_COLUMN_SIDECAR_GLOAS_PER_BLOB_SIZE = BYTES_PER_CELL + KZG_PROOF_SIZE; // 2048 + 48 = 2096 bytes
559
+
560
+ /**
561
+ * Gloas sidecar size bound uses the largest blob limit across the entire schedule, including future entries.
562
+ * https://github.com/ethereum/consensus-specs/pull/5613
563
+ */
564
+ export function computeMaxGloasDataColumnSidecarSize(config: ChainForkConfig): number {
565
+ const maxBlobs = config.BLOB_SCHEDULE.reduce(
566
+ (max, entry) => Math.max(max, entry.MAX_BLOBS_PER_BLOCK),
567
+ config.MAX_BLOBS_PER_BLOCK_ELECTRA
568
+ );
569
+ return DATA_COLUMN_SIDECAR_GLOAS_FIXED_SIZE + maxBlobs * DATA_COLUMN_SIDECAR_GLOAS_PER_BLOB_SIZE;
570
+ }
571
+
554
572
  /**
555
573
  * SignedExecutionPayloadEnvelope SSZ Layout:
556
574
  * ├─ 4 bytes: message offset (points to byte 100)