-
Notifications
You must be signed in to change notification settings - Fork 957
Avoid attempting to serve blobs after Fulu fork #7756
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
beacon_node/network/src/network_beacon_processor/rpc_methods.rs
Outdated
Show resolved
Hide resolved
beacon_node/network/src/network_beacon_processor/rpc_methods.rs
Outdated
Show resolved
Hide resolved
beacon_node/network/src/network_beacon_processor/rpc_methods.rs
Outdated
Show resolved
Hide resolved
beacon_node/network/src/network_beacon_processor/rpc_methods.rs
Outdated
Show resolved
Hide resolved
beacon_node/network/src/network_beacon_processor/rpc_methods.rs
Outdated
Show resolved
Hide resolved
beacon_node/network/src/network_beacon_processor/rpc_methods.rs
Outdated
Show resolved
Hide resolved
beacon_node/network/src/network_beacon_processor/rpc_methods.rs
Outdated
Show resolved
Hide resolved
beacon_node/network/src/network_beacon_processor/rpc_methods.rs
Outdated
Show resolved
Hide resolved
beacon_node/network/src/network_beacon_processor/rpc_methods.rs
Outdated
Show resolved
Hide resolved
jimmygchen
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @chong-he I've added some comments.
I think it might be worth adding something similar to data columns methods, to avoid block roots retrieval if the slots are before Fulu
lighthouse/beacon_node/network/src/network_beacon_processor/rpc_methods.rs
Lines 1064 to 1085 in befef72
| pub fn handle_data_columns_by_range_request_inner( | |
| &self, | |
| peer_id: PeerId, | |
| inbound_request_id: InboundRequestId, | |
| req: DataColumnsByRangeRequest, | |
| ) -> Result<(), (RpcErrorResponse, &'static str)> { | |
| debug!( | |
| %peer_id, | |
| count = req.count, | |
| start_slot = req.start_slot, | |
| "Received DataColumnsByRange Request" | |
| ); | |
| // Should not send more than max request data columns | |
| if req.max_requested::<T::EthSpec>() > self.chain.spec.max_request_data_column_sidecars { | |
| return Err(( | |
| RpcErrorResponse::InvalidRequest, | |
| "Request exceeded `MAX_REQUEST_BLOBS_SIDECARS`", | |
| )); | |
| } | |
| let request_start_slot = Slot::from(req.start_slot); |
beacon_node/network/src/network_beacon_processor/rpc_methods.rs
Outdated
Show resolved
Hide resolved
beacon_node/network/src/network_beacon_processor/rpc_methods.rs
Outdated
Show resolved
Hide resolved
beacon_node/network/src/network_beacon_processor/rpc_methods.rs
Outdated
Show resolved
Hide resolved
jimmygchen
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great work! Thanks for the patience and thoroughness 🙏
Thanks Jimmy. I was waiting for the CI to pass to only reply, thanks for the thorough review ❤️ |
* sigp#7122 Co-Authored-By: Tan Chee Keong <[email protected]> Co-Authored-By: chonghe <[email protected]>
#7756 introduces a logging issue, where the relevant log: https://github.com/sigp/lighthouse/blob/da5b2317205efc72b98cdc922289acefe3f76a13/beacon_node/network/src/network_beacon_processor/rpc_methods.rs#L380-L385 obtains the `block_root` from `slots_by_block_root.keys()`. If the `block_root` is empty (block not found in the data availability checker), then the log will not show any block root: `DEBUG BlobsByRoot outgoing response processed peer_id: 16Uiu2HAmCBxs1ZFfsbAfhSA98rUUL8Q1egLPb6WpGdKZxX6HqQYX, block_root: [], returned: 4` This PR revises to return the `block_root` in the request as a vector of block root Co-Authored-By: Tan Chee Keong <[email protected]>
Issue Addressed