diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 499047e48..6da824815 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -12,7 +12,7 @@ on: env: CARGO_TERM_COLOR: always SEED: rustethereumethereumrust - TOOL_CHAIN: "1.81" + TOOL_CHAIN: "1.82" concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} diff --git a/Cargo.lock b/Cargo.lock index 357f1b1bf..a305f3b26 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3248,6 +3248,7 @@ dependencies = [ "reth-evm-ethereum", "reth-node-ethereum", "reth-primitives", + "tokio", ] [[package]] diff --git a/crates/optimism/hardforks/src/hardfork.rs b/crates/optimism/hardforks/src/hardfork.rs index 57854ccf9..6fd1bad5f 100644 --- a/crates/optimism/hardforks/src/hardfork.rs +++ b/crates/optimism/hardforks/src/hardfork.rs @@ -235,7 +235,6 @@ impl OptimismHardfork { Self::Ecotone => Some(1708534800), Self::Fjord => Some(1716998400), Self::Granite => Some(1723478400), - Self::Holocene => None, _ => None, }, ) @@ -271,7 +270,6 @@ impl OptimismHardfork { Self::Ecotone => Some(1710374401), Self::Fjord => Some(1720627201), Self::Granite => Some(1726070401), - Self::Holocene => None, _ => None, }, ) diff --git a/examples/custom-beacon-withdrawals/Cargo.toml b/examples/custom-beacon-withdrawals/Cargo.toml index c396ca11d..8364273d2 100644 --- a/examples/custom-beacon-withdrawals/Cargo.toml +++ b/examples/custom-beacon-withdrawals/Cargo.toml @@ -20,6 +20,8 @@ alloy-consensus.workspace = true eyre.workspace = true +tokio = { workspace = true, features = ["sync", "time"] } + [features] optimism = [ "reth-primitives/optimism" diff --git a/examples/custom-beacon-withdrawals/src/main.rs b/examples/custom-beacon-withdrawals/src/main.rs index ad4a04c2f..1d2b3dec0 100644 --- a/examples/custom-beacon-withdrawals/src/main.rs +++ b/examples/custom-beacon-withdrawals/src/main.rs @@ -15,7 +15,7 @@ use reth::{ providers::ProviderError, revm::{ interpreter::Host, - primitives::{Env, TransactTo, TxEnv}, + primitives::{Env, EvmState, TransactTo, TxEnv}, Database, DatabaseCommit, Evm, State, }, }; @@ -33,6 +33,7 @@ use reth_primitives::{ BlockWithSenders, Receipt, }; use std::{fmt::Display, sync::Arc}; +use tokio::sync::mpsc::UnboundedSender; pub const SYSTEM_ADDRESS: Address = address!("fffffffffffffffffffffffffffffffffffffffe"); pub const WITHDRAWALS_ADDRESS: Address = address!("4200000000000000000000000000000000000000"); @@ -277,6 +278,8 @@ fn fill_tx_env_with_system_contract_call( authorization_list: None, #[cfg(feature = "optimism")] optimism: OptimismFields::default(), + #[cfg(feature = "bsc")] + bsc: Default::default(), }; // ensure the block gas limit is >= the tx