gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-09 03:17:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prioritise StatusV2 over StatusV1 RPC protocol (#7912)

Browse Source 
Prioritise `StatusV2` over `StatusV1` RPC protocol.

A bug discovered during devnet-4 testing and extracted from the sync fixes PR #7876.
This commit is contained in:
Jimmy Chen
2025-08-22 09:02:18 +10:00
committed by GitHub
parent cee30d8ca5
commit d24a6d2a45
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/lighthouse_network/src/rpc/protocol.rs
View File

@@ -825,8 +825,8 @@ impl<E: EthSpec> RequestType<E> {
match self { match self {
// add more protocols when versions/encodings are supported // add more protocols when versions/encodings are supported
RequestType::Status(_) => vec![ RequestType::Status(_) => vec![
ProtocolId::new(SupportedProtocol::StatusV1, Encoding::SSZSnappy),
ProtocolId::new(SupportedProtocol::StatusV2, Encoding::SSZSnappy), ProtocolId::new(SupportedProtocol::StatusV2, Encoding::SSZSnappy),
ProtocolId::new(SupportedProtocol::StatusV1, Encoding::SSZSnappy),
], ],
RequestType::Goodbye(_) => vec![ProtocolId::new( RequestType::Goodbye(_) => vec![ProtocolId::new(
SupportedProtocol::GoodbyeV1, SupportedProtocol::GoodbyeV1,

18
beacon_node/lighthouse_network/tests/rpc_tests.rs
View File

@@ -76,21 +76,23 @@ fn test_tcp_status_rpc() {
.await; .await;
// Dummy STATUS RPC message // Dummy STATUS RPC message
let rpc_request = RequestType::Status(StatusMessage::V1(StatusMessageV1 { let rpc_request = RequestType::Status(StatusMessage::V2(StatusMessageV2 {
fork_digest: [0; 4], fork_digest: [0; 4],
finalized_root: Hash256::zero(), finalized_root: Hash256::zero(),
finalized_epoch: Epoch::new(1), finalized_epoch: Epoch::new(1),
head_root: Hash256::zero(), head_root: Hash256::zero(),
head_slot: Slot::new(1), head_slot: Slot::new(1),
earliest_available_slot: Slot::new(0),
})); }));
// Dummy STATUS RPC message // Dummy STATUS RPC message
let rpc_response = Response::Status(StatusMessage::V1(StatusMessageV1 { let rpc_response = Response::Status(StatusMessage::V2(StatusMessageV2 {
fork_digest: [0; 4], fork_digest: [0; 4],
finalized_root: Hash256::zero(), finalized_root: Hash256::zero(),
finalized_epoch: Epoch::new(1), finalized_epoch: Epoch::new(1),
head_root: Hash256::zero(), head_root: Hash256::zero(),
head_slot: Slot::new(1), head_slot: Slot::new(1),
earliest_available_slot: Slot::new(0),
})); }));
// build the sender future // build the sender future
@@ -1205,21 +1207,23 @@ fn test_delayed_rpc_response() {
.await; .await;
// Dummy STATUS RPC message // Dummy STATUS RPC message
let rpc_request = RequestType::Status(StatusMessage::V1(StatusMessageV1 { let rpc_request = RequestType::Status(StatusMessage::V2(StatusMessageV2 {
fork_digest: [0; 4], fork_digest: [0; 4],
finalized_root: Hash256::from_low_u64_be(0), finalized_root: Hash256::from_low_u64_be(0),
finalized_epoch: Epoch::new(1), finalized_epoch: Epoch::new(1),
head_root: Hash256::from_low_u64_be(0), head_root: Hash256::from_low_u64_be(0),
head_slot: Slot::new(1), head_slot: Slot::new(1),
earliest_available_slot: Slot::new(0),
})); }));
// Dummy STATUS RPC message // Dummy STATUS RPC message
let rpc_response = Response::Status(StatusMessage::V1(StatusMessageV1 { let rpc_response = Response::Status(StatusMessage::V2(StatusMessageV2 {
fork_digest: [0; 4], fork_digest: [0; 4],
finalized_root: Hash256::from_low_u64_be(0), finalized_root: Hash256::from_low_u64_be(0),
finalized_epoch: Epoch::new(1), finalized_epoch: Epoch::new(1),
head_root: Hash256::from_low_u64_be(0), head_root: Hash256::from_low_u64_be(0),
head_slot: Slot::new(1), head_slot: Slot::new(1),
earliest_available_slot: Slot::new(0),
})); }));
// build the sender future // build the sender future
@@ -1335,21 +1339,23 @@ fn test_active_requests() {
.await; .await;
// Dummy STATUS RPC request. // Dummy STATUS RPC request.
let rpc_request = RequestType::Status(StatusMessage::V1(StatusMessageV1 { let rpc_request = RequestType::Status(StatusMessage::V2(StatusMessageV2 {
fork_digest: [0; 4], fork_digest: [0; 4],
finalized_root: Hash256::from_low_u64_be(0), finalized_root: Hash256::from_low_u64_be(0),
finalized_epoch: Epoch::new(1), finalized_epoch: Epoch::new(1),
head_root: Hash256::from_low_u64_be(0), head_root: Hash256::from_low_u64_be(0),
head_slot: Slot::new(1), head_slot: Slot::new(1),
earliest_available_slot: Slot::new(0),
})); }));
// Dummy STATUS RPC response. // Dummy STATUS RPC response.
let rpc_response = Response::Status(StatusMessage::V1(StatusMessageV1 { let rpc_response = Response::Status(StatusMessage::V2(StatusMessageV2 {
fork_digest: [0; 4], fork_digest: [0; 4],
finalized_root: Hash256::zero(), finalized_root: Hash256::zero(),
finalized_epoch: Epoch::new(1), finalized_epoch: Epoch::new(1),
head_root: Hash256::zero(), head_root: Hash256::zero(),
head_slot: Slot::new(1), head_slot: Slot::new(1),
earliest_available_slot: Slot::new(0),
})); }));
// Number of requests. // Number of requests.