Skip to content

chore(l2): optimize node decoding #4808

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

Closed
wants to merge 2 commits into from
Closed

chore(l2): optimize node decoding #4808

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d1c451
remove bytes cloning when decoding node
xqft Oct 7, 2025
46cbe27
fix decode
xqft Oct 7, 2025
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
28 changes: 15 additions & 13 deletions crates/common/trie/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ use std::{

pub use branch::BranchNode;
use ethrex_rlp::{
decode::{RLPDecode, decode_bytes},
decode::{RLPDecode, decode_bytes, decode_rlp_item, get_item_with_prefix},
encode::RLPEncode,
error::RLPDecodeError,
structs::Decoder,
};
pub use extension::ExtensionNode;
pub use leaf::LeafNode;
Expand Down Expand Up @@ -223,28 +222,31 @@ impl Node {
}

/// Decodes the node
pub fn decode_raw(rlp: &[u8]) -> Result<Self, RLPDecodeError> {
let mut rlp_items = vec![];
let mut decoder = Decoder::new(rlp)?;
let mut item;
pub fn decode_raw(mut rlp: &[u8]) -> Result<Self, RLPDecodeError> {
match decode_rlp_item(rlp)? {
(true, payload, _) => rlp = payload,
(false, _, _) => return Err(RLPDecodeError::UnexpectedString),
}
// Get encoded fields
let mut rlp_items = vec![];
loop {
(item, decoder) = decoder.get_encoded_item()?;
let (item, remaining) = get_item_with_prefix(rlp)?;
rlp_items.push(item);
rlp = remaining;
// Check if we reached the end or if we decoded more items than the ones we need
if decoder.is_done() || rlp_items.len() > 17 {
if rlp.is_empty() || rlp_items.len() > 17 {
break;
}
}
// Deserialize into node depending on the available fields
Ok(match rlp_items.len() {
// Leaf or Extension Node
2 => {
let (path, _) = decode_bytes(&rlp_items[0])?;
let (path, _) = decode_bytes(rlp_items[0])?;
let path = Nibbles::decode_compact(path);
if path.is_leaf() {
// Decode as Leaf
let (value, _) = decode_bytes(&rlp_items[1])?;
let (value, _) = decode_bytes(rlp_items[1])?;
LeafNode {
partial: path,
value: value.to_vec(),
Expand All @@ -254,15 +256,15 @@ impl Node {
// Decode as Extension
ExtensionNode {
prefix: path,
child: decode_child(&rlp_items[1]).into(),
child: decode_child(rlp_items[1]).into(),
}
.into()
}
}
// Branch Node
17 => {
let choices = array::from_fn(|i| decode_child(&rlp_items[i]).into());
let (value, _) = decode_bytes(&rlp_items[16])?;
let choices = array::from_fn(|i| decode_child(rlp_items[i]).into());
let (value, _) = decode_bytes(rlp_items[16])?;
BranchNode {
choices,
value: value.to_vec(),
Expand Down
Loading