Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion beacon_node/network/src/sync/network_context/custody.rs
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,16 @@ impl<T: BeaconChainTypes> ActiveCustodyRequest<T> {
// must have its columns in custody. In that case, set `true = enforce max_requests`
// and downscore if data_columns_by_root does not return the expected custody
// columns. For the rest of peers, don't downscore if columns are missing.
lookup_peers.contains(&peer_id),
//
// Post-Gloas, blocks and payload envelopes are decoupled. A peer may
// have the block but not yet imported the envelope and data columns.
// Don't enforce max_responses in this case.
lookup_peers.contains(&peer_id)
&& !cx
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can do
!cx.fork_context.current_fork_name().gloas_enabled()

This is not strictly correct because we should be checking the block's slot and not current slot clock. But given that #9155 is overhauling the entire thing, i'm fine with this to help with the devnet.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.chain
.spec
.fork_name_at_epoch(cx.chain.epoch().unwrap_or_default())
.gloas_enabled(),
)
.map_err(Error::SendFailed)?;

Expand Down
Loading