Skip to content

feat: add support for 7594 blobs to anvil #12404

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

feat: add support for 7594 blobs to anvil #12404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b548b5
feat: add support for 7594 blobs to anvil
stevencartavia Oct 31, 2025
a4fbde4
Merge branch 'master' into eip7594-anvil
stevencartavia Nov 4, 2025
794290e
Merge branch 'master' into eip7594-anvil
stevencartavia Nov 5, 2025
4e3b16f
use alloy conversions
stevencartavia Nov 5, 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
102 changes: 93 additions & 9 deletions crates/anvil/core/src/eth/transaction/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ use alloy_consensus::{
},
};

use alloy_eips::eip2718::{Decodable2718, Eip2718Error, Encodable2718};
use alloy_eips::{
eip2718::{Decodable2718, Eip2718Error, Encodable2718},
eip7594::BlobTransactionSidecarVariant,
};
use alloy_network::{AnyReceiptEnvelope, AnyRpcTransaction, AnyTransactionReceipt, AnyTxEnvelope};
use alloy_primitives::{Address, B256, Bloom, Bytes, Signature, TxHash, TxKind, U64, U256};
use alloy_rlp::{Decodable, Encodable, Header};
Expand Down Expand Up @@ -590,7 +593,7 @@ pub enum TypedTransaction {
/// EIP-1559 transaction
EIP1559(Signed<TxEip1559>),
/// EIP-4844 transaction
EIP4844(Signed<TxEip4844Variant>),
EIP4844(Signed<TxEip4844Variant<BlobTransactionSidecarVariant>>),
/// EIP-7702 transaction
EIP7702(Signed<TxEip7702>),
/// op-stack deposit transaction
Expand All @@ -608,7 +611,11 @@ impl TryFrom<AnyRpcTransaction> for TypedTransaction {
TxEnvelope::Legacy(tx) => Ok(Self::Legacy(tx)),
TxEnvelope::Eip2930(tx) => Ok(Self::EIP2930(tx)),
TxEnvelope::Eip1559(tx) => Ok(Self::EIP1559(tx)),
TxEnvelope::Eip4844(tx) => Ok(Self::EIP4844(tx)),
TxEnvelope::Eip4844(tx) => {
let (variant, sig, hash) = tx.into_parts();
let blob_variant = variant.into();
Ok(Self::EIP4844(Signed::new_unchecked(blob_variant, sig, hash)))
}
TxEnvelope::Eip7702(tx) => Ok(Self::EIP7702(tx)),
},
AnyTxEnvelope::Unknown(mut tx) => {
Expand Down Expand Up @@ -641,7 +648,30 @@ impl TypedTransaction {
Self::Legacy(tx) => Ok(TxEnvelope::Legacy(tx)),
Self::EIP2930(tx) => Ok(TxEnvelope::Eip2930(tx)),
Self::EIP1559(tx) => Ok(TxEnvelope::Eip1559(tx)),
Self::EIP4844(tx) => Ok(TxEnvelope::Eip4844(tx)),
Self::EIP4844(tx) => {
// Convert BlobTransactionSidecarVariant back to standard TxEip4844Variant
let (variant, sig, hash) = tx.into_parts();
let standard_variant = match variant {
TxEip4844Variant::TxEip4844(tx) => TxEip4844Variant::TxEip4844(tx),
TxEip4844Variant::TxEip4844WithSidecar(tx_with_sidecar) => {
match tx_with_sidecar.sidecar() {
BlobTransactionSidecarVariant::Eip4844(sidecar) => {
TxEip4844Variant::TxEip4844WithSidecar(
TxEip4844WithSidecar::from_tx_and_sidecar(
tx_with_sidecar.tx().clone(),
sidecar.clone(),
),
)
}
BlobTransactionSidecarVariant::Eip7594(_) => {
// For now, convert to Eip4844 variant without sidecar
TxEip4844Variant::TxEip4844(tx_with_sidecar.tx().clone())
}
}
}
};
Ok(TxEnvelope::Eip4844(Signed::new_unchecked(standard_variant, sig, hash)))
}
Self::EIP7702(tx) => Ok(TxEnvelope::Eip7702(tx)),
Self::Deposit(_) => Err(self),
}
Expand Down Expand Up @@ -734,7 +764,7 @@ impl TypedTransaction {
}
}

pub fn sidecar(&self) -> Option<&TxEip4844WithSidecar> {
pub fn sidecar(&self) -> Option<&TxEip4844WithSidecar<BlobTransactionSidecarVariant>> {
match self {
Self::EIP4844(signed_variant) => match signed_variant.tx() {
TxEip4844Variant::TxEip4844WithSidecar(with_sidecar) => Some(with_sidecar),
Expand Down Expand Up @@ -1009,7 +1039,30 @@ impl Encodable2718 for TypedTransaction {
Self::Legacy(tx) => TxEnvelope::from(tx.clone()).encode_2718_len(),
Self::EIP2930(tx) => TxEnvelope::from(tx.clone()).encode_2718_len(),
Self::EIP1559(tx) => TxEnvelope::from(tx.clone()).encode_2718_len(),
Self::EIP4844(tx) => TxEnvelope::from(tx.clone()).encode_2718_len(),
Self::EIP4844(tx) => {
// Convert BlobTransactionSidecarVariant back to standard TxEip4844Variant
let (variant, sig, hash) = tx.clone().into_parts();
let standard_variant = match variant {
TxEip4844Variant::TxEip4844(tx) => TxEip4844Variant::TxEip4844(tx),
TxEip4844Variant::TxEip4844WithSidecar(tx_with_sidecar) => {
match tx_with_sidecar.sidecar() {
BlobTransactionSidecarVariant::Eip4844(sidecar) => {
TxEip4844Variant::TxEip4844WithSidecar(
TxEip4844WithSidecar::from_tx_and_sidecar(
tx_with_sidecar.tx().clone(),
sidecar.clone(),
),
)
}
BlobTransactionSidecarVariant::Eip7594(_) => {
TxEip4844Variant::TxEip4844(tx_with_sidecar.tx().clone())
}
}
}
};
TxEnvelope::from(Signed::new_unchecked(standard_variant, sig, hash))
.encode_2718_len()
}
Self::EIP7702(tx) => TxEnvelope::from(tx.clone()).encode_2718_len(),
Self::Deposit(tx) => 1 + tx.length(),
}
Expand All @@ -1020,7 +1073,30 @@ impl Encodable2718 for TypedTransaction {
Self::Legacy(tx) => TxEnvelope::from(tx.clone()).encode_2718(out),
Self::EIP2930(tx) => TxEnvelope::from(tx.clone()).encode_2718(out),
Self::EIP1559(tx) => TxEnvelope::from(tx.clone()).encode_2718(out),
Self::EIP4844(tx) => TxEnvelope::from(tx.clone()).encode_2718(out),
Self::EIP4844(tx) => {
// Convert BlobTransactionSidecarVariant back to standard TxEip4844Variant
let (variant, sig, hash) = tx.clone().into_parts();
let standard_variant = match variant {
TxEip4844Variant::TxEip4844(tx) => TxEip4844Variant::TxEip4844(tx),
TxEip4844Variant::TxEip4844WithSidecar(tx_with_sidecar) => {
match tx_with_sidecar.sidecar() {
BlobTransactionSidecarVariant::Eip4844(sidecar) => {
TxEip4844Variant::TxEip4844WithSidecar(
TxEip4844WithSidecar::from_tx_and_sidecar(
tx_with_sidecar.tx().clone(),
sidecar.clone(),
),
)
}
BlobTransactionSidecarVariant::Eip7594(_) => {
TxEip4844Variant::TxEip4844(tx_with_sidecar.tx().clone())
}
}
}
};
TxEnvelope::from(Signed::new_unchecked(standard_variant, sig, hash))
.encode_2718(out)
}
Self::EIP7702(tx) => TxEnvelope::from(tx.clone()).encode_2718(out),
Self::Deposit(tx) => {
tx.encode_2718(out);
Expand All @@ -1037,7 +1113,11 @@ impl Decodable2718 for TypedTransaction {
match TxEnvelope::typed_decode(ty, buf)? {
TxEnvelope::Eip2930(tx) => Ok(Self::EIP2930(tx)),
TxEnvelope::Eip1559(tx) => Ok(Self::EIP1559(tx)),
TxEnvelope::Eip4844(tx) => Ok(Self::EIP4844(tx)),
TxEnvelope::Eip4844(tx) => {
let (variant, sig, hash) = tx.into_parts();
let blob_variant = variant.into();
Ok(Self::EIP4844(Signed::new_unchecked(blob_variant, sig, hash)))
}
TxEnvelope::Eip7702(tx) => Ok(Self::EIP7702(tx)),
_ => Err(Eip2718Error::RlpError(alloy_rlp::Error::Custom("unexpected tx type"))),
}
Expand All @@ -1057,7 +1137,11 @@ impl From<TxEnvelope> for TypedTransaction {
TxEnvelope::Legacy(tx) => Self::Legacy(tx),
TxEnvelope::Eip2930(tx) => Self::EIP2930(tx),
TxEnvelope::Eip1559(tx) => Self::EIP1559(tx),
TxEnvelope::Eip4844(tx) => Self::EIP4844(tx),
TxEnvelope::Eip4844(tx) => {
let (variant, sig, hash) = tx.into_parts();
let blob_variant = variant.into();
Self::EIP4844(Signed::new_unchecked(blob_variant, sig, hash))
}
TxEnvelope::Eip7702(tx) => Self::EIP7702(tx),
}
}
Expand Down
20 changes: 13 additions & 7 deletions crates/anvil/src/eth/backend/mem/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ use alloy_eips::{
Encodable2718,
eip1559::BaseFeeParams,
eip4844::{BlobTransactionSidecar, kzg_to_versioned_hash},
eip7594::BlobTransactionSidecarVariant,
eip7840::BlobParams,
eip7910::SystemContract,
};
Expand Down Expand Up @@ -3340,7 +3341,7 @@ impl Backend {
&& let Ok(typed_tx) = TypedTransaction::try_from(tx)
&& let Some(sidecar) = typed_tx.sidecar()
{
return Ok(Some(sidecar.sidecar.blobs.clone()));
return Ok(Some(sidecar.sidecar().blobs().to_vec()));
}

Ok(None)
Expand All @@ -3357,7 +3358,7 @@ impl Backend {
.iter()
.filter_map(|tx| tx.as_ref().sidecar())
.flat_map(|sidecar| {
sidecar.sidecar.blobs.iter().zip(sidecar.sidecar.commitments.iter())
sidecar.sidecar().blobs().iter().zip(sidecar.sidecar().commitments().iter())
})
.filter(|(_, commitment)| {
// Filter blobs by versioned_hashes if provided
Expand All @@ -3381,9 +3382,14 @@ impl Backend {
typed_tx_result.ok()?.sidecar().map(|sidecar| sidecar.sidecar().clone())
})
.fold(BlobTransactionSidecar::default(), |mut acc, sidecar| {
acc.blobs.extend(sidecar.blobs);
acc.commitments.extend(sidecar.commitments);
acc.proofs.extend(sidecar.proofs);
acc.blobs.extend(sidecar.blobs());
acc.commitments.extend(sidecar.commitments());
match &sidecar {
BlobTransactionSidecarVariant::Eip4844(eip4844_sidecar) => {
acc.proofs.extend(eip4844_sidecar.proofs.clone());
}
BlobTransactionSidecarVariant::Eip7594(_) => {}
}
acc
});
Ok(Some(sidecar))
Expand All @@ -3401,10 +3407,10 @@ impl Backend {
for versioned_hash in sidecar.sidecar.versioned_hashes() {
if versioned_hash == hash
&& let Some(index) =
sidecar.sidecar.commitments.iter().position(|commitment| {
sidecar.sidecar().commitments().iter().position(|commitment| {
kzg_to_versioned_hash(commitment.as_slice()) == *hash
})
&& let Some(blob) = sidecar.sidecar.blobs.get(index)
&& let Some(blob) = sidecar.sidecar().blobs().get(index)
{
return Ok(Some(*blob));
}
Expand Down
8 changes: 6 additions & 2 deletions crates/anvil/src/eth/sign.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::eth::error::BlockchainError;
use alloy_consensus::SignableTransaction;
use alloy_consensus::{SignableTransaction, Signed};
use alloy_dyn_abi::TypedData;
use alloy_network::TxSignerSync;
use alloy_primitives::{Address, B256, Signature, map::AddressHashMap};
Expand Down Expand Up @@ -131,7 +131,11 @@ pub fn build_typed_transaction(
TypedTransaction::EIP7702(tx.into_signed(signature))
}
TypedTransactionRequest::EIP4844(tx) => {
TypedTransaction::EIP4844(tx.into_signed(signature))
let signed = tx.into_signed(signature);
// Convert from standard TxEip4844Variant to BlobTransactionSidecarVariant
let (variant, sig, hash) = signed.into_parts();
let blob_variant = variant.into();
TypedTransaction::EIP4844(Signed::new_unchecked(blob_variant, sig, hash))
}
TypedTransactionRequest::Deposit(tx) => TypedTransaction::Deposit(tx),
};
Expand Down
Loading