feat: pull block from peers after a cutoff if corresponding gossip blobs are seen #6534
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## unstable #6534 +/- ##
============================================
- Coverage 61.53% 61.39% -0.14%
============================================
Files 556 556
Lines 58647 58751 +104
Branches 1847 1848 +1
============================================
- Hits 36087 36073 -14
- Misses 22520 22638 +118
Partials 40 40 |
Performance Report✔️ no performance regression detected 🚀🚀 Significant benchmark improvement detected
Full benchmark results
|
twoeths
reviewed
Mar 13, 2024
twoeths
reviewed
Mar 13, 2024
twoeths
reviewed
Mar 13, 2024
twoeths
reviewed
Mar 13, 2024
packages/beacon-node/src/chain/seenCache/seenGossipBlockInput.ts
Outdated
Show resolved
Hide resolved
twoeths
reviewed
Mar 13, 2024
| resolveAvailability | ||
| ); | ||
|
|
||
| resolveBlock(blockInput); |
There was a problem hiding this comment.
in this case there are not enough blobs showing up, why do we resolveBlock() here? if it's needed in both if and else then let's put in common place
There was a problem hiding this comment.
so that the waiting handler for blob can resolve and emit event to pull blobs (and add its peer over there)
For code cleanliness its ok to be replicated as the return follows this statement
twoeths
reviewed
Mar 13, 2024
| // however we can emit the event which will atleast add the peer to the list of peers to pull | ||
| // data from | ||
| if (normalBlockInput.type === BlockInputType.blobsPromise) { | ||
| events.emit(NetworkEvent.unknownBlockInput, {blockInput: normalBlockInput, peer: peerIdStr}); |
There was a problem hiding this comment.
after block comes and there are not enough blobs, we already emit this event in handleValidBeaconBlock(), then we also emit it here. Is this a duplicate?
There was a problem hiding this comment.
yes, this is a duplicate aimed to add this peer to the peers for unknown blobs pull
twoeths
reviewed
Mar 13, 2024
| // resolve the block if thats unavailable | ||
| let block, blobsCache, blockBytes, resolveAvailability; | ||
| if (unavailableBlockInput.block === null) { | ||
| const allBlocks = await network.sendBeaconBlocksByRoot(peerId, [fromHexString(unavailableBlockInput.blockRootHex)]); |
There was a problem hiding this comment.
now the block source lodestar_import_block_by_source_total is very tricky, it could be wrong for now
for block, we want to know if it comes from gossip, or this function, or the above beaconBlocksMaybeBlobsByRoot() function
same for blobs, we want to know % of them coming from 3 different places as above
if it's too much for this PR please have a follow up PR or track in another issue @g11tech
There was a problem hiding this comment.
yes lets do a followup on this
|
🎉 This PR is included in v1.18.0 🎉 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
generally we now start block import as soon as we see a block and pull blobs if not all blobs seen.
However in edgecases, even block might arrive too late
This PR starts pulling the block (and remaining blobs) from peers if we don't see a block past a certain cutoff