From 4f5fafc8f3e74e92932be13cf6701139cb5c4e91 Mon Sep 17 00:00:00 2001 From: Georgios Konstantopoulos Date: Thu, 12 Feb 2026 10:53:11 -0500 Subject: [PATCH] fix(net): correct EthMessageID::max for eth70 and later versions (#22076) Co-authored-by: Amp --- crates/net/eth-wire-types/src/message.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/crates/net/eth-wire-types/src/message.rs b/crates/net/eth-wire-types/src/message.rs index ee36986db8..5ef5947548 100644 --- a/crates/net/eth-wire-types/src/message.rs +++ b/crates/net/eth-wire-types/src/message.rs @@ -589,7 +589,7 @@ impl EthMessageID { /// Returns the max value for the given version. pub const fn max(version: EthVersion) -> u8 { - if version.is_eth69() { + if version as u8 >= EthVersion::Eth69 as u8 { Self::BlockRangeUpdate.to_u8() } else { Self::Receipts.to_u8() @@ -937,6 +937,13 @@ mod tests { assert!(matches!(decoded, StatusMessage::Legacy(s) if s == status)); } + #[test] + fn eth_message_id_max_includes_block_range_update() { + assert_eq!(EthMessageID::max(EthVersion::Eth69), EthMessageID::BlockRangeUpdate.to_u8(),); + assert_eq!(EthMessageID::max(EthVersion::Eth70), EthMessageID::BlockRangeUpdate.to_u8(),); + assert_eq!(EthMessageID::max(EthVersion::Eth68), EthMessageID::Receipts.to_u8()); + } + #[test] fn decode_status_rejects_non_status() { let msg = EthMessage::::GetBlockBodies(RequestPair {