Skip to content

chore: bump alloy to 2.0.0 #23407

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
mattsse merged 10 commits into from
Apr 13, 2026
Merged

chore: bump alloy to 2.0.0 #23407

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
234a0b2
chore: bump alloy to 2.0.0-rc.1
stevencartavia Apr 8, 2026
cb69676
fix: enable jwt-aws-lc-rs for jsonwebtoken 10.x crypto provider
stevencartavia Apr 8, 2026
a8c0f18
fix: address clippy warnings and pooled transaction test failures
stevencartavia Apr 9, 2026
c7af041
fix: remove const from deprioritize_background_threads
stevencartavia Apr 9, 2026
fb01204
undo config changes
stevencartavia Apr 9, 2026
8fc2a42
update
stevencartavia Apr 9, 2026
256beb0
use alloy-evm txenv
stevencartavia Apr 10, 2026
dac27cc
chore: switch alloy bump to released crates
mattsse Apr 13, 2026
5fb10ce
Merge main into alloy-2.0
mattsse Apr 13, 2026
552d896
refactor(evm): mirror alloy-evm block builder closures
mattsse Apr 13, 2026
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
940 changes: 559 additions & 381 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

142 changes: 73 additions & 69 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ revm-state = { version = "10.0.0", default-features = false }
revm-primitives = { version = "22.1.0", default-features = false }
revm-interpreter = { version = "34.0.0", default-features = false }
revm-database-interface = { version = "10.0.0", default-features = false }
revm-inspectors = "0.36.0"
revm-inspectors = "=0.36.1"

# eth
alloy-dyn-abi = "1.5.6"
Expand All @@ -454,35 +454,35 @@ alloy-evm = { version = "0.30.0", default-features = false }
alloy-rlp = { version = "0.3.13", default-features = false, features = ["core-net"] }
alloy-trie = { version = "0.9.4", default-features = false }

alloy-hardforks = "0.4.5"

alloy-consensus = { version = "1.8.2", default-features = false }
alloy-contract = { version = "1.8.2", default-features = false }
alloy-eips = { version = "1.8.2", default-features = false }
alloy-genesis = { version = "1.8.2", default-features = false }
alloy-json-rpc = { version = "1.8.2", default-features = false }
alloy-network = { version = "1.8.2", default-features = false }
alloy-network-primitives = { version = "1.8.2", default-features = false }
alloy-provider = { version = "1.8.2", features = ["reqwest", "debug-api"], default-features = false }
alloy-pubsub = { version = "1.8.2", default-features = false }
alloy-rpc-client = { version = "1.8.2", default-features = false }
alloy-rpc-types = { version = "1.8.2", features = ["eth"], default-features = false }
alloy-rpc-types-admin = { version = "1.8.2", default-features = false }
alloy-rpc-types-anvil = { version = "1.8.2", default-features = false }
alloy-rpc-types-beacon = { version = "1.8.2", default-features = false }
alloy-rpc-types-debug = { version = "1.8.2", default-features = false }
alloy-rpc-types-engine = { version = "1.8.2", default-features = false }
alloy-rpc-types-eth = { version = "1.8.2", default-features = false }
alloy-rpc-types-mev = { version = "1.8.2", default-features = false }
alloy-rpc-types-trace = { version = "1.8.2", default-features = false }
alloy-rpc-types-txpool = { version = "1.8.2", default-features = false }
alloy-serde = { version = "1.8.2", default-features = false }
alloy-signer = { version = "1.8.2", default-features = false }
alloy-signer-local = { version = "1.8.2", default-features = false }
alloy-transport = { version = "1.8.2" }
alloy-transport-http = { version = "1.8.2", features = ["reqwest-rustls-tls"], default-features = false }
alloy-transport-ipc = { version = "1.8.2", default-features = false }
alloy-transport-ws = { version = "1.8.2", default-features = false }
alloy-hardforks = "0.4.7"

alloy-consensus = { version = "2.0.0-rc.1", default-features = false }
alloy-contract = { version = "2.0.0-rc.1", default-features = false }
alloy-eips = { version = "2.0.0-rc.1", default-features = false }
alloy-genesis = { version = "2.0.0-rc.1", default-features = false }
alloy-json-rpc = { version = "2.0.0-rc.1", default-features = false }
alloy-network = { version = "2.0.0-rc.1", default-features = false }
alloy-network-primitives = { version = "2.0.0-rc.1", default-features = false }
alloy-provider = { version = "2.0.0-rc.1", features = ["reqwest", "debug-api"], default-features = false }
alloy-pubsub = { version = "2.0.0-rc.1", default-features = false }
alloy-rpc-client = { version = "2.0.0-rc.1", default-features = false }
alloy-rpc-types = { version = "2.0.0-rc.1", features = ["eth"], default-features = false }
alloy-rpc-types-admin = { version = "2.0.0-rc.1", default-features = false }
alloy-rpc-types-anvil = { version = "2.0.0-rc.1", default-features = false }
alloy-rpc-types-beacon = { version = "2.0.0-rc.1", default-features = false }
alloy-rpc-types-debug = { version = "2.0.0-rc.1", default-features = false }
alloy-rpc-types-engine = { version = "2.0.0-rc.1", default-features = false }
alloy-rpc-types-eth = { version = "2.0.0-rc.1", default-features = false }
alloy-rpc-types-mev = { version = "2.0.0-rc.1", default-features = false }
alloy-rpc-types-trace = { version = "2.0.0-rc.1", default-features = false }
alloy-rpc-types-txpool = { version = "2.0.0-rc.1", default-features = false }
alloy-serde = { version = "2.0.0-rc.1", default-features = false }
alloy-signer = { version = "2.0.0-rc.1", default-features = false }
alloy-signer-local = { version = "2.0.0-rc.1", default-features = false }
alloy-transport = { version = "2.0.0-rc.1" }
alloy-transport-http = { version = "2.0.0-rc.1", features = ["reqwest-rustls-tls"], default-features = false }
alloy-transport-ipc = { version = "2.0.0-rc.1", default-features = false }
alloy-transport-ws = { version = "2.0.0-rc.1", default-features = false }

# misc
either = { version = "1.15.0", default-features = false }
Expand Down Expand Up @@ -702,42 +702,46 @@ vergen-git2 = "9.1.0"
ipnet = "2.11"

[patch.crates-io]
# alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-genesis = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-network = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-network-primitives = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-provider = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-rpc-types-admin = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-rpc-types-anvil = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-rpc-types-debug = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-rpc-types-eth = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-rpc-types-mev = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-rpc-types-txpool = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-serde = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-signer-local = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-transport = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }
# alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "3049f232fbb44d1909883e154eb38ec5962f53a3" }

# revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors", rev = "1207e33" }
#
# jsonrpsee = { git = "https://github.com/paradigmxyz/jsonrpsee", branch = "matt/make-rpc-service-pub" }
# jsonrpsee-core = { git = "https://github.com/paradigmxyz/jsonrpsee", branch = "matt/make-rpc-service-pub" }
# jsonrpsee-server = { git = "https://github.com/paradigmxyz/jsonrpsee", branch = "matt/make-rpc-service-pub" }
# jsonrpsee-http-client = { git = "https://github.com/paradigmxyz/jsonrpsee", branch = "matt/make-rpc-service-pub" }
# jsonrpsee-types = { git = "https://github.com/paradigmxyz/jsonrpsee", branch = "matt/make-rpc-service-pub" }

# alloy-evm = { git = "https://github.com/alloy-rs/evm", rev = "9bc2dba" }

# revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors", rev = "3020ea8" }
# alloy
alloy-consensus = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-consensus-any = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-contract = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-eips = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-genesis = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-network = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-network-primitives = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-provider = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-pubsub = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-rpc-types-admin = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-rpc-types-anvil = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-rpc-types-beacon = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-rpc-types-debug = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-rpc-types-eth = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-rpc-types-mev = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-rpc-types-trace = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-rpc-types-txpool = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-serde = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-signer = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-signer-local = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-transport = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }
alloy-tx-macros = { git = "https://github.com/alloy-rs/alloy", branch = "release/2.0.0-rc.1" }

# alloy-evm
alloy-evm = { git = "https://github.com/stevencartavia/evm", branch = "alloy-2.0-rc1" }

# revm-inspectors
revm-inspectors = { git = "https://github.com/stevencartavia/revm-inspectors", branch = "alloy-2.0-rc1" }

# reth-core (reth-primitives-traits, reth-codecs, etc.)
reth-primitives-traits = { git = "https://github.com/stevencartavia/reth-core", branch = "alloy-2.0" }
reth-codecs = { git = "https://github.com/stevencartavia/reth-core", branch = "alloy-2.0" }
reth-codecs-derive = { git = "https://github.com/stevencartavia/reth-core", branch = "alloy-2.0" }
reth-rpc-traits = { git = "https://github.com/stevencartavia/reth-core", branch = "alloy-2.0" }
reth-zstd-compressors = { git = "https://github.com/stevencartavia/reth-core", branch = "alloy-2.0" }
7 changes: 7 additions & 0 deletions bin/reth-bench/src/bench/send_invalid_payload/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ impl Command {
ExecutionPayload::V1(p) => config.apply_to_payload_v1(p),
ExecutionPayload::V2(p) => config.apply_to_payload_v2(p),
ExecutionPayload::V3(p) => config.apply_to_payload_v3(p),
ExecutionPayload::V4(p) => config.apply_to_payload_v3(&mut p.payload_inner),
};

let skip_recalc = self.skip_hash_recalc || config.should_skip_hash_recalc();
Expand All @@ -256,6 +257,9 @@ impl Command {
ExecutionPayload::V1(p) => p.block_hash,
ExecutionPayload::V2(p) => p.payload_inner.block_hash,
ExecutionPayload::V3(p) => p.payload_inner.payload_inner.block_hash,
ExecutionPayload::V4(p) => {
p.payload_inner.payload_inner.payload_inner.block_hash
}
}
}
};
Expand All @@ -264,6 +268,9 @@ impl Command {
ExecutionPayload::V1(p) => p.block_hash = new_hash,
ExecutionPayload::V2(p) => p.payload_inner.block_hash = new_hash,
ExecutionPayload::V3(p) => p.payload_inner.payload_inner.block_hash = new_hash,
ExecutionPayload::V4(p) => {
p.payload_inner.payload_inner.payload_inner.block_hash = new_hash
}
}
}

Expand Down
16 changes: 16 additions & 0 deletions bin/reth-bench/src/valid_payload.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,22 @@ pub(crate) fn payload_to_new_payload(
ExecutionPayload::V1(payload) => {
(EngineApiMessageVersion::V1, serde_json::to_value((payload,))?)
}
ExecutionPayload::V4(payload) => {
let cancun = sidecar
.cancun()
.ok_or_else(|| eyre::eyre!("missing cancun sidecar for V4 payload"))?;
let version = target_version.unwrap_or(EngineApiMessageVersion::V4);
let requests = sidecar.prague().map(|p| p.requests.clone()).unwrap_or_default();
(
version,
serde_json::to_value((
payload,
cancun.versioned_hashes.clone(),
cancun.parent_beacon_block_root,
requests,
))?,
)
}
};

Ok((version, params, execution_data))
Expand Down
5 changes: 0 additions & 5 deletions crates/chainspec/src/spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,6 @@ pub fn create_chain_config(
// Check if DAO fork is supported (it has an activation block)
let dao_fork_support = hardforks.fork(EthereumHardfork::Dao) != ForkCondition::Never;

#[expect(clippy::needless_update)]
ChainConfig {
chain_id: chain.map(|c| c.id()).unwrap_or(0),
homestead_block: block_num(EthereumHardfork::Homestead),
Expand Down Expand Up @@ -305,10 +304,6 @@ pub fn create_chain_config(
bpo5_time: timestamp(EthereumHardfork::Bpo5),
terminal_total_difficulty,
terminal_total_difficulty_passed,
ethash: None,
clique: None,
parlia: None,
extra_fields: Default::default(),
deposit_contract_address,
blob_schedule,
..Default::default()
Expand Down
2 changes: 2 additions & 0 deletions crates/e2e-test-utils/src/test_rlp_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ pub fn generate_test_blocks(chain_spec: &ChainSpec, count: u64) -> Vec<SealedBlo
excess_blob_gas: None,
parent_beacon_block_root: None,
requests_hash: None,
block_access_list_hash: None,
slot_number: None,
};

// Set required fields based on chain spec
Expand Down
2 changes: 2 additions & 0 deletions crates/e2e-test-utils/src/testsuite/actions/produce_blocks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ where
suggested_fee_recipient: alloy_primitives::Address::random(),
withdrawals: Some(vec![]),
parent_beacon_block_root: Some(B256::ZERO),
slot_number: None,
};

env.active_node_state_mut()?
Expand Down Expand Up @@ -299,6 +300,7 @@ where
suggested_fee_recipient: alloy_primitives::Address::random(),
withdrawals: Some(vec![]),
parent_beacon_block_root: Some(B256::ZERO),
slot_number: None,
};

let fresh_fcu_result = EngineApiClient::<Engine>::fork_choice_updated_v3(
Expand Down
2 changes: 2 additions & 0 deletions crates/e2e-test-utils/src/testsuite/setup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ where
suggested_fee_recipient: alloy_primitives::Address::ZERO,
withdrawals: Some(vec![]),
parent_beacon_block_root: Some(B256::ZERO),
slot_number: None,
};

crate::setup_import::setup_engine_with_chain_import(
Expand All @@ -295,6 +296,7 @@ where
suggested_fee_recipient: alloy_primitives::Address::ZERO,
withdrawals: Some(vec![]),
parent_beacon_block_root: Some(B256::ZERO),
slot_number: None,
}
.into()
}
Expand Down
12 changes: 8 additions & 4 deletions crates/e2e-test-utils/src/transaction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ use alloy_consensus::{
};
use alloy_eips::{eip7594::BlobTransactionSidecarVariant, eip7702::SignedAuthorization};
use alloy_network::{
eip2718::Encodable2718, Ethereum, EthereumWallet, TransactionBuilder, TransactionBuilder4844,
eip2718::Encodable2718, Ethereum, EthereumWallet, NetworkTransactionBuilder,
TransactionBuilder4844,
};
use alloy_primitives::{hex, Address, Bytes, TxKind, B256, U256};
use alloy_rpc_types_eth::{Authorization, TransactionInput, TransactionRequest};
Expand Down Expand Up @@ -117,7 +118,8 @@ impl TransactionTestContext {

let mut builder = SidecarBuilder::<SimpleCoder>::new();
builder.ingest(b"dummy blob");
tx.set_blob_sidecar(builder.build()?);
let sidecar: alloy_consensus::BlobTransactionSidecar = builder.build()?;
tx.set_blob_sidecar(alloy_eips::eip7594::BlobTransactionSidecarVariant::Eip4844(sidecar));
tx.set_max_fee_per_blob_gas(15e9 as u128);

let signed = Self::sign_tx(wallet, tx).await;
Expand All @@ -127,7 +129,9 @@ impl TransactionTestContext {
/// Signs an arbitrary [`TransactionRequest`] using the provided wallet
pub async fn sign_tx(wallet: PrivateKeySigner, tx: TransactionRequest) -> TxEnvelope {
let signer = EthereumWallet::from(wallet);
<TransactionRequest as TransactionBuilder<Ethereum>>::build(tx, &signer).await.unwrap()
<TransactionRequest as NetworkTransactionBuilder<Ethereum>>::build(tx, &signer)
.await
.unwrap()
}

/// Creates a tx with blob sidecar and sign it, returning bytes
Expand All @@ -151,7 +155,7 @@ impl TransactionTestContext {
));
let tx = tx(chain_id, 210000, Some(l1_block_info), None, nonce, Some(20e9 as u128));
let signer = EthereumWallet::from(wallet);
<TransactionRequest as TransactionBuilder<Ethereum>>::build(tx, &signer)
<TransactionRequest as NetworkTransactionBuilder<Ethereum>>::build(tx, &signer)
.await
.unwrap()
.encoded_2718()
Expand Down
1 change: 1 addition & 0 deletions crates/e2e-test-utils/tests/e2e-testsuite/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ async fn test_testsuite_assert_mine_block() -> Result<()> {
suggested_fee_recipient: Address::random(),
withdrawals: None,
parent_beacon_block_root: None,
slot_number: None,
},
));

Expand Down
1 change: 1 addition & 0 deletions crates/e2e-test-utils/tests/rocksdb/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ const fn test_attributes_generator(timestamp: u64) -> PayloadAttributes {
suggested_fee_recipient: alloy_primitives::Address::ZERO,
withdrawals: Some(vec![]),
parent_beacon_block_root: Some(B256::ZERO),
slot_number: None,
}
}

Expand Down
1 change: 1 addition & 0 deletions crates/engine/local/src/payload.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ where
.chain_spec
.is_cancun_active_at_timestamp(timestamp)
.then(B256::random),
slot_number: None,
}
}
}
Loading
Loading