Skip to content

fix(evm): custom blob params #15598

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
merged 6 commits into from
Apr 18, 2025
Merged

fix(evm): custom blob params #15598

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ad44c02
fix(evm): custom blob params
rkrasiuk Apr 8, 2025
cda1931
change types to u64
rkrasiuk Apr 8, 2025
d826ad6
chore
rkrasiuk Apr 18, 2025
330d5fc
address pr comment
rkrasiuk Apr 18, 2025
9843b9e
Update crates/ethereum/consensus/src/lib.rs
mattsse Apr 18, 2025
bdc57e2
fix import
rkrasiuk Apr 18, 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
24 changes: 20 additions & 4 deletions crates/ethereum/evm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

extern crate alloc;

use alloc::{borrow::Cow, sync::Arc};
use alloc::{borrow::Cow, sync::Arc, vec::Vec};
use alloy_consensus::{BlockHeader, Header};
pub use alloy_evm::EthEvm;
use alloy_evm::{
Expand All @@ -26,7 +26,7 @@ use alloy_evm::{
};
use alloy_primitives::{Bytes, U256};
use core::{convert::Infallible, fmt::Debug};
use reth_chainspec::{ChainSpec, EthChainSpec, MAINNET};
use reth_chainspec::{ChainSpec, EthChainSpec, HardforkBlobParams, MAINNET};
use reth_ethereum_primitives::{Block, EthPrimitives, TransactionSigned};
use reth_evm::{ConfigureEvm, EvmEnv, EvmFactory, NextBlockEnvAttributes, TransactionEnv};
use reth_primitives_traits::{SealedBlock, SealedHeader};
Expand Down Expand Up @@ -93,6 +93,16 @@ impl<EvmFactory> EthEvmConfig<EvmFactory> {
self.executor_factory.spec()
}

/// Returns blob params by hard fork as specified in chain spec.
/// Blob params are in format `(spec id, target blob count, max blob count)`.
pub fn blob_max_and_target_count_by_hardfork(&self) -> Vec<(SpecId, u64, u64)> {
let HardforkBlobParams { cancun, prague } = self.chain_spec().blob_params;
Vec::from([
(SpecId::CANCUN, cancun.target_blob_count, cancun.max_blob_count),
(SpecId::PRAGUE, prague.target_blob_count, prague.max_blob_count),
])
}

/// Sets the extra data for the block assembler.
pub fn with_extra_data(mut self, extra_data: Bytes) -> Self {
self.block_assembler.extra_data = extra_data;
Expand Down Expand Up @@ -132,7 +142,10 @@ where
let spec = config::revm_spec(self.chain_spec(), header);

// configure evm env based on parent block
let cfg_env = CfgEnv::new().with_chain_id(self.chain_spec().chain().id()).with_spec(spec);
let cfg_env = CfgEnv::new()
.with_chain_id(self.chain_spec().chain().id())
.with_spec(spec)
.with_blob_max_and_target_count(self.blob_max_and_target_count_by_hardfork());

// derive the EIP-4844 blob fees from the header's `excess_blob_gas` and the current
// blobparams
Expand Down Expand Up @@ -171,7 +184,10 @@ where
);

// configure evm env based on parent block
let cfg = CfgEnv::new().with_chain_id(self.chain_spec().chain().id()).with_spec(spec_id);
let cfg = CfgEnv::new()
.with_chain_id(self.chain_spec().chain().id())
.with_spec(spec_id)
.with_blob_max_and_target_count(self.blob_max_and_target_count_by_hardfork());

let blob_params = self.chain_spec().blob_params_at_timestamp(attributes.timestamp);
// if the parent block did not have excess blob gas (i.e. it was pre-cancun), but it is
Expand Down
Loading