Skip to content

chore: remove from_ssz_bytes_compat for devnet-3 serialization compatibility #127

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.

Sign up for GitHub

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

Merged
pablodeymo merged 1 commit into from
Feb 12, 2026
Merged

chore: remove from_ssz_bytes_compat for devnet-3 serialization compatibility #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions crates/net/p2p/src/req_resp/codec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ use tracing::{debug, trace};
use super::{
encoding::{decode_payload, write_payload},
messages::{
BLOCKS_BY_ROOT_PROTOCOL_V1, BlocksByRootRequest, ErrorMessage, Request, Response,
ResponseCode, ResponsePayload, STATUS_PROTOCOL_V1, Status,
BLOCKS_BY_ROOT_PROTOCOL_V1, ErrorMessage, Request, Response, ResponseCode, ResponsePayload,
STATUS_PROTOCOL_V1, Status,
},
};

use ethlambda_types::block::SignedBlockWithAttestation;
use ethlambda_types::primitives::ssz::Decode as SszDecode;

#[derive(Debug, Clone, Default)]
pub struct Codec;
Expand Down Expand Up @@ -41,10 +42,9 @@ impl libp2p::request_response::Codec for Codec {
Ok(Request::Status(status))
}
BLOCKS_BY_ROOT_PROTOCOL_V1 => {
let request =
BlocksByRootRequest::from_ssz_bytes_compat(&payload).map_err(|err| {
io::Error::new(io::ErrorKind::InvalidData, format!("{err:?}"))
})?;
let request = SszDecode::from_ssz_bytes(&payload).map_err(|err| {
io::Error::new(io::ErrorKind::InvalidData, format!("{err:?}"))
})?;
Ok(Request::BlocksByRoot(request))
}
_ => Err(io::Error::new(
Expand Down
54 changes: 1 addition & 53 deletions crates/net/p2p/src/req_resp/messages.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use ethlambda_types::{
block::SignedBlockWithAttestation,
primitives::{
H256,
ssz::{Decode, Decode as SszDecode, Encode},
ssz::{Decode, Encode},
},
state::Checkpoint,
};
Expand Down Expand Up @@ -139,55 +139,3 @@ pub fn error_message(msg: impl AsRef<str>) -> ErrorMessage {
pub struct BlocksByRootRequest {
pub roots: RequestedBlockRoots,
}

impl BlocksByRootRequest {
/// Decode from SSZ bytes with backward compatibility.
///
/// Tries to decode as new format (container with `roots` field) first.
/// Falls back to old format (transparent - direct list of roots) if that fails.
pub fn from_ssz_bytes_compat(bytes: &[u8]) -> Result<Self, ssz::DecodeError> {
// Try new format (container) first
SszDecode::from_ssz_bytes(bytes).or_else(|_| {
// Fall back to old format (transparent/direct list)
SszDecode::from_ssz_bytes(bytes).map(|roots| Self { roots })
})
}
}

#[cfg(test)]
mod tests {
use super::*;
use ssz::Encode as SszEncode;

#[test]
fn test_blocks_by_root_backward_compatibility() {
// Create some test roots
let root1 = H256::from_slice(&[1u8; 32]);
let root2 = H256::from_slice(&[2u8; 32]);
let roots_list =
RequestedBlockRoots::new(vec![root1, root2]).expect("Failed to create roots list");

// Encode as old format (direct list, similar to transparent)
let old_format_bytes = roots_list.as_ssz_bytes();

// Encode as new format (container)
let new_request = BlocksByRootRequest {
roots: roots_list.clone(),
};
let new_format_bytes = new_request.as_ssz_bytes();

// Both formats should decode successfully
let decoded_from_old = BlocksByRootRequest::from_ssz_bytes_compat(&old_format_bytes)
.expect("Failed to decode old format");
let decoded_from_new = BlocksByRootRequest::from_ssz_bytes_compat(&new_format_bytes)
.expect("Failed to decode new format");

// Both should have the same roots
assert_eq!(decoded_from_old.roots.len(), 2);
assert_eq!(decoded_from_new.roots.len(), 2);
assert_eq!(decoded_from_old.roots[0], root1);
assert_eq!(decoded_from_old.roots[1], root2);
assert_eq!(decoded_from_new.roots[0], root1);
assert_eq!(decoded_from_new.roots[1], root2);
}
}
Loading