Merge pull request #97 from anton-rs/clabby/bw

crates/payload/builder/src/error.rs

@@ -1,9 +1,12 @@
 //! Error types emitted by types or implementations of this crate.
 
 use reth_primitives::H256;
-use revm_primitives::{EVMError, B160};
+use revm_primitives::EVMError;
 use tokio::sync::oneshot;
 
+#[cfg(feature = "optimism")]
+use revm_primitives::B160;
+
 /// Possible error variants during payload building.
 #[derive(Debug, thiserror::Error)]
 pub enum PayloadBuilderError {

crates/primitives/src/transaction/mod.rs

@@ -11,7 +11,6 @@ use once_cell::sync::Lazy;
 use rayon::prelude::{IntoParallelIterator, ParallelIterator};
 use reth_codecs::{add_arbitrary_tests, derive_arbitrary, Compact};
 use reth_rlp::{Decodable, DecodeError, Encodable, Header, EMPTY_LIST_CODE, EMPTY_STRING_CODE};
-use revm_primitives::U256;
 use serde::{Deserialize, Serialize};
 pub use signature::Signature;
 use std::mem;
@@ -44,6 +43,8 @@ mod optimism;
 #[cfg(feature = "optimism")]
 pub use optimism::TxDeposit;
 #[cfg(feature = "optimism")]
+use revm_primitives::U256;
+#[cfg(feature = "optimism")]
 pub use tx_type::DEPOSIT_TX_TYPE_ID;
 
 // Expected number of transactions where we can expect a speed-up by recovering the senders in

crates/revm/src/executor.rs

@@ -28,8 +28,6 @@ use std::{
 #[cfg(not(feature = "optimism"))]
 use crate::into_reth_log;
 #[cfg(not(feature = "optimism"))]
-use reth_primitives::bytes::BytesMut;
-#[cfg(not(feature = "optimism"))]
 use reth_provider::BlockExecutor;
 
 #[cfg(feature = "optimism")]
@@ -181,6 +179,7 @@ where
     }
 
     /// Decrement the balance for the given account in the [PostState].
+    #[cfg(feature = "optimism")]
     pub(crate) fn decrement_account_balance(
         &mut self,
         block_number: BlockNumber,

crates/rpc/rpc/src/eth/api/block.rs

@@ -7,7 +7,6 @@ use crate::{
     },
     EthApi,
 };
-use bytes::BytesMut;
 use reth_network_api::NetworkInfo;
 use reth_primitives::{BlockId, BlockNumberOrTag, TransactionMeta};
 
@@ -17,6 +16,8 @@ use reth_rpc_types::{Index, RichBlock, TransactionReceipt};
 use reth_rpc_types_compat::block::{from_block, uncle_block_from_header};
 use reth_transaction_pool::TransactionPool;
 
+#[cfg(feature = "optimism")]
+use bytes::BytesMut;
 #[cfg(feature = "optimism")]
 use reth_revm::optimism::L1BlockInfo;
 

crates/transaction-pool/src/noop.rs

@@ -13,10 +13,13 @@ use crate::{
     PropagatedTransactions, TransactionEvents, TransactionOrigin, TransactionPool,
     TransactionValidationOutcome, TransactionValidator, ValidPoolTransaction,
 };
-use reth_primitives::{Address, BlobTransactionSidecar, InvalidTransactionError, TxHash};
+use reth_primitives::{Address, BlobTransactionSidecar, TxHash};
 use std::{collections::HashSet, marker::PhantomData, sync::Arc};
 use tokio::sync::{mpsc, mpsc::Receiver};
 
+#[cfg(feature = "optimism")]
+use reth_primitives::InvalidTransactionError;
+
 /// A [`TransactionPool`] implementation that does nothing.
 ///
 /// All transactions are rejected and no events are emitted.

crates/transaction-pool/src/validate/eth.rs

@@ -9,7 +9,6 @@ use crate::{
     TransactionValidationTaskExecutor, TransactionValidator,
 };
 use reth_primitives::{
-    bytes::BytesMut,
     constants::{eip4844::KZG_TRUSTED_SETUP, ETHEREUM_BLOCK_GAS_LIMIT},
     kzg::KzgSettings,
     ChainSpec, InvalidTransactionError, SealedBlock, EIP1559_TX_TYPE_ID, EIP2930_TX_TYPE_ID,
@@ -24,10 +23,11 @@ use std::{
 use tokio::sync::Mutex;
 
 #[cfg(feature = "optimism")]
-use reth_revm::optimism::L1BlockInfo;
-
+use reth_primitives::bytes::BytesMut;
 #[cfg(feature = "optimism")]
 use reth_primitives::BlockNumberOrTag;
+#[cfg(feature = "optimism")]
+use reth_revm::optimism::L1BlockInfo;
 
 /// Validator for Ethereum transactions.
 #[derive(Debug, Clone)]