primitives: rm alloy_eips::eip1559::calc_next_block_base_fee reexpo…

…rt (#11177)
paradigmxyz · Sep 24, 2024 · c434e52 · c434e52
1 parent ae3d279
commit c434e52
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/primitives/src/basefee.rs b/crates/primitives/src/basefee.rs
diff --git a/crates/primitives/src/lib.rs b/crates/primitives/src/lib.rs
@@ -23,7 +23,6 @@ extern crate alloc;
 
 #[cfg(feature = "alloy-compat")]
 mod alloy_compat;
-pub mod basefee;
 mod block;
 #[cfg(feature = "reth-codec")]
 mod compression;

diff --git a/crates/rpc/rpc-eth-api/Cargo.toml b/crates/rpc/rpc-eth-api/Cargo.toml
@@ -40,6 +40,7 @@ alloy-primitives.workspace = true
 alloy-rpc-types-eth.workspace = true
 alloy-rpc-types.workspace = true
 alloy-rpc-types-mev.workspace = true
+alloy-eips.workspace = true
 
 # rpc
 jsonrpsee = { workspace = true, features = ["server", "macros"] }

diff --git a/crates/rpc/rpc-eth-api/src/helpers/call.rs b/crates/rpc/rpc-eth-api/src/helpers/call.rs
@@ -4,6 +4,7 @@
 use crate::{
     AsEthApiError, FromEthApiError, FromEvmError, FullEthApiTypes, IntoEthApiError, RpcBlock,
 };
+use alloy_eips::eip1559::calc_next_block_base_fee;
 use alloy_primitives::{Bytes, TxKind, B256, U256};
 use alloy_rpc_types::{
     simulate::{SimBlock, SimulatePayload, SimulatedBlock},
@@ -15,7 +16,6 @@ use futures::Future;
 use reth_chainspec::{EthChainSpec, MIN_TRANSACTION_GAS};
 use reth_evm::{ConfigureEvm, ConfigureEvmEnv};
 use reth_primitives::{
-    basefee::calc_next_block_base_fee,
     revm_primitives::{
         BlockEnv, CfgEnvWithHandlerCfg, EnvWithHandlerCfg, ExecutionResult, HaltReason,
         ResultAndState, TransactTo, TxEnv,

diff --git a/crates/rpc/rpc-eth-types/Cargo.toml b/crates/rpc/rpc-eth-types/Cargo.toml
@@ -38,6 +38,7 @@ revm-inspectors.workspace = true
 revm-primitives = { workspace = true, features = ["dev"] }
 alloy-rpc-types.workspace = true
 alloy-serde.workspace = true
+alloy-eips.workspace = true
 
 # rpc
 jsonrpsee-core.workspace = true

diff --git a/crates/rpc/rpc-eth-types/src/fee_history.rs b/crates/rpc/rpc-eth-types/src/fee_history.rs
@@ -6,6 +6,7 @@ use std::{
     sync::{atomic::Ordering::SeqCst, Arc},
 };
 
+use alloy_eips::eip1559::calc_next_block_base_fee;
 use alloy_primitives::B256;
 use alloy_rpc_types::TxGasAndReward;
 use futures::{
@@ -16,7 +17,6 @@ use metrics::atomics::AtomicU64;
 use reth_chain_state::CanonStateNotification;
 use reth_chainspec::{ChainSpecProvider, EthChainSpec};
 use reth_primitives::{
-    basefee::calc_next_block_base_fee,
     eip4844::{calc_blob_gasprice, calculate_excess_blob_gas},
     Receipt, SealedBlock, TransactionSigned,
 };