Skip to content
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

Jump to bottom

manually implement Serialize for rest arbitrary fields #9

Merged
merged 3 commits into from
Oct 1, 2024
Merged

manually implement Serialize for rest arbitrary fields #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d5af26
manually implement `Serialize` for `rest` arbitrary fields
iFrostizz Sep 7, 2024
57d1472
remove crap
iFrostizz Oct 1, 2024
85c7c5c
cleanup
iFrostizz Oct 1, 2024
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
210 changes: 188 additions & 22 deletions types/src/block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use crate::primitives::{Address, Bloom, Nonce, U256};
use crate::{TransactionEnvelope, B32};
use rlp_rs::{unpack_rlp, RecursiveBytes, Rlp, RlpError};
use serde::ser::SerializeStruct;
use serde::{de, Deserialize, Serialize};
use sha3::{Digest, Keccak256};

Expand Down Expand Up @@ -112,8 +113,7 @@ macro_rules! define_header {
}
),* $(,)?
) => {
#[derive(Debug, Serialize, PartialEq, Eq, Hash, Clone)]
#[serde(untagged)] // NOTE untagged only works for Serialization
#[derive(Debug, PartialEq, Eq, Hash, Clone)]
pub enum Header {
$(
$name {
Expand All @@ -129,7 +129,6 @@ macro_rules! define_header {
gas_limit: u64,
gas_used: u64,
time: u64,
#[serde(with = "serde_bytes")]
extra: Vec<u8>,
mix_digest: B32,
nonce: Nonce,
Expand Down Expand Up @@ -179,6 +178,180 @@ define_header! {
}
}

impl Header {
fn fields(&self) -> usize {
match self {
Self::Legacy { .. } => 15,
Self::London { .. } => 16,
Self::Shanghai { .. } => 17,
Self::Cancun { .. } => 20,
Self::Unknown { .. } => 16,
}
}
}
iFrostizz marked this conversation as resolved.
Show resolved Hide resolved

impl Serialize for Header {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
{
match self {
Self::Legacy {
parent_hash,
uncle_hash,
coinbase,
state_root,
tx_root,
receipt_hash,
bloom,
difficulty,
number,
gas_limit,
gas_used,
time,
extra,
mix_digest,
nonce,
Comment on lines +198 to +214
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add a macro?

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will need a proc macro here

}
| Self::London {
parent_hash,
uncle_hash,
coinbase,
state_root,
tx_root,
receipt_hash,
bloom,
difficulty,
number,
gas_limit,
gas_used,
time,
extra,
mix_digest,
nonce,
..
}
| Self::Shanghai {
parent_hash,
uncle_hash,
coinbase,
state_root,
tx_root,
receipt_hash,
bloom,
difficulty,
number,
gas_limit,
gas_used,
time,
extra,
mix_digest,
nonce,
..
}
| Self::Cancun {
parent_hash,
uncle_hash,
coinbase,
state_root,
tx_root,
receipt_hash,
bloom,
difficulty,
number,
gas_limit,
gas_used,
time,
extra,
mix_digest,
nonce,
..
}
| Self::Unknown {
parent_hash,
uncle_hash,
coinbase,
state_root,
tx_root,
receipt_hash,
bloom,
difficulty,
number,
gas_limit,
gas_used,
time,
extra,
mix_digest,
nonce,
..
} => {
let mut serializer = serializer.serialize_struct("Header", self.fields())?;
serializer.serialize_field("parent_hash", parent_hash)?;
serializer.serialize_field("uncle_hash", uncle_hash)?;
serializer.serialize_field("coinbase", coinbase)?;
serializer.serialize_field("state_root", state_root)?;
serializer.serialize_field("tx_root", tx_root)?;
serializer.serialize_field("receipt_hash", receipt_hash)?;
serializer.serialize_field("bloom", bloom)?;
serializer.serialize_field("difficulty", difficulty)?;
serializer.serialize_field("number", number)?;
serializer.serialize_field("gas_limit", gas_limit)?;
serializer.serialize_field("gas_used", gas_used)?;
serializer.serialize_field("time", time)?;
serializer.serialize_field("extra", &serde_bytes::Bytes::new(extra))?;
serializer.serialize_field("mix_digest", mix_digest)?;
serializer.serialize_field("nonce", nonce)?;
match self {
Self::Legacy { .. } => serializer.end(),
Self::Unknown { rest, .. } => {
for bytes in rest {
serializer.serialize_field("rest", bytes)?;
}
serializer.end()
}
Self::London { base_fee, .. }
| Self::Shanghai { base_fee, .. }
| Self::Cancun { base_fee, .. } => {
serializer.serialize_field("base_fee", base_fee)?;
match self {
Self::London { .. } => serializer.end(),
Self::Shanghai {
withdrawal_root, ..
}
| Self::Cancun {
withdrawal_root, ..
} => {
serializer.serialize_field("withdrawal_root", withdrawal_root)?;
match self {
Self::Shanghai { .. } => serializer.end(),
Self::Cancun {
blob_gas_used,
excess_blob_gas,
parent_beacon_block_root,
..
} => {
serializer
.serialize_field("blob_gas_used", blob_gas_used)?;
serializer
.serialize_field("excess_blob_gas", excess_blob_gas)?;
serializer.serialize_field(
"parent_beacon_block_root",
parent_beacon_block_root,
)?;
serializer.end()
}
_ => unreachable!(),
}
}
_ => unreachable!(),
}
}
}
}
}
}
}

macro_rules! field_impl {
($field:ident, $ty:ty) => {
pub fn $field(&self) -> &$ty {
Expand Down Expand Up @@ -212,11 +385,11 @@ impl Header {
}

macro_rules! common_impl {
($lit:ident, $common:ident) => {
common_impl!($lit, $common, {})
($name:ident, $common:ident) => {
common_impl!($name, $common, {})
};
($lit:ident, $common:ident, { $($rest:tt)* }) => {
Header::$lit {
($name:ident, $common:ident, { $($rest:tt)* }) => {
Header::$name {
parent_hash: $common.parent_hash,
uncle_hash: $common.uncle_hash,
coinbase: $common.coinbase,
Expand Down Expand Up @@ -275,7 +448,6 @@ impl Header {
.map_err(|_| RlpError::MissingBytes)?;

if fields == london_fields {
// Header::London(LondonHeader { common, base_fee })
common_impl!(London, common, { base_fee })
} else {
let withdrawal_root = <B32>::deserialize(
Expand Down Expand Up @@ -334,21 +506,15 @@ impl Header {

let common = Self::common_from_raw_rlp(&mut rlp)?;

let RecursiveBytes::Nested(rest) = rlp.pop_front().ok_or(RlpError::ExpectedList)? else {
return Err(RlpError::ExpectedList);
};
if rlp.pop_front().is_some() {
return Err(RlpError::InvalidLength);
let mut rest = Vec::new();
while let Some(rec) = rlp.pop_front() {
let bytes = match rec {
RecursiveBytes::Bytes(bytes) => bytes.into(),
_ => return Err(RlpError::ExpectedBytes),
};
rest.push(bytes);
}

let rest = rest
.into_iter()
.map(|rec| match rec {
RecursiveBytes::Bytes(bytes) => Ok(bytes.into()),
_ => Err(RlpError::ExpectedBytes),
})
.collect::<Result<Vec<_>, RlpError>>()?;

Ok(common_impl!(Unknown, common, { rest }))
}
}
Expand Down Expand Up @@ -488,7 +654,7 @@ mod tests {
let mut block_rlp = Rlp::new_unary(rlp.pop_front().unwrap())
.flatten_nested()
.unwrap();
let header_rlp = dbg!(Rlp::new_unary(block_rlp.pop_front().unwrap()));
let header_rlp = Rlp::new_unary(block_rlp.pop_front().unwrap());
let header_bytes = rlp_rs::pack_rlp(header_rlp).unwrap();
let header: Header = rlp_rs::from_bytes(&header_bytes).unwrap();

Expand Down
1 change: 0 additions & 1 deletion types/src/transaction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ impl TransactionEnvelope {
}

pub(crate) fn from_raw_rlp(rlp: &mut Rlp) -> Result<Self, RlpError> {
dbg!(&rlp);
let (tx_type, tx_rlp) = match rlp.pop_front() {
Some(RecursiveBytes::Bytes(bytes)) => {
let tx_type = *bytes.first().ok_or(RlpError::MissingBytes)?;
Expand Down