chore: moved optimism_receiptfn and its tests

crates/blockchain-tree/src/blockchain_tree.rs

@@ -1386,14 +1386,10 @@ mod tests {
     use reth_db_api::transaction::DbTxMut;
     use reth_evm::test_utils::MockExecutorProvider;
     use reth_evm_ethereum::execute::EthExecutorProvider;
-    #[cfg(not(feature = "optimism"))]
-    use reth_primitives::proofs::calculate_receipt_root;
-    #[cfg(feature = "optimism")]
-    use reth_primitives::proofs::calculate_receipt_root_optimism;
     use reth_primitives::{
         constants::{EIP1559_INITIAL_BASE_FEE, EMPTY_ROOT_HASH},
         keccak256,
-        proofs::calculate_transaction_root,
+        proofs::{calculate_receipt_root, calculate_transaction_root},
         revm_primitives::AccountInfo,
         Account, Address, Header, Signature, Transaction, TransactionSigned,
         TransactionSignedEcRecovered, TxEip1559, Withdrawals, B256,
@@ -1598,12 +1594,9 @@ mod tests {
                 })
                 .collect::<Vec<_>>();
 
-            #[cfg(not(feature = "optimism"))]
+            // receipts root computation is different for OP
             let receipts_root = calculate_receipt_root(&receipts);
 
-            #[cfg(feature = "optimism")]
-            let receipts_root = calculate_receipt_root_optimism(&receipts, &chain_spec, 0);
-
             SealedBlockWithSenders::new(
                 SealedBlock {
                     header: Header {

crates/ethereum-forks/src/hardfork/optimism.rs

@@ -16,7 +16,8 @@ use crate::{hardfork, ChainHardforks, EthereumHardfork, ForkCondition, Hardfork}
 hardfork!(
     /// The name of an optimism hardfork.
     ///
-    /// When building a list of hardforks for a chain, it's still expected to mix with [`EthereumHardfork`].
+    /// When building a list of hardforks for a chain, it's still expected to mix with
+    /// [`EthereumHardfork`].
     OptimismHardfork {
         /// Bedrock: <https://blog.oplabs.co/introducing-optimism-bedrock>.
         Bedrock,

crates/optimism/consensus/Cargo.toml

@@ -13,12 +13,18 @@ workspace = true
 
 [dependencies]
 # reth
-reth-consensus-common.workspace = true
 reth-chainspec.workspace = true
-reth-primitives.workspace = true
+reth-consensus-common.workspace = true
 reth-consensus.workspace = true
+reth-primitives.workspace = true
+reth-trie-common.workspace = true
 
 tracing.workspace = true
 
+[dev-dependencies]
+alloy-primitives.workspace = true
+reth-optimism-chainspec.workspace = true
+
+
 [features]
-optimism = ["reth-primitives/optimism"]
+optimism = ["reth-primitives/optimism"]

crates/optimism/consensus/src/lib.rs

@@ -22,6 +22,7 @@ use reth_primitives::{
 };
 use std::{sync::Arc, time::SystemTime};
 
+mod proof;
 mod validation;
 pub use validation::validate_block_post_execution;
 

crates/optimism/consensus/src/validation.rs

@@ -1,8 +1,8 @@
+use crate::proof::calculate_receipt_root_optimism;
 use reth_chainspec::{ChainSpec, EthereumHardforks};
 use reth_consensus::ConsensusError;
 use reth_primitives::{
-    gas_spent_by_transactions, proofs::calculate_receipt_root_optimism, BlockWithSenders, Bloom,
-    GotExpected, Receipt, B256,
+    gas_spent_by_transactions, BlockWithSenders, Bloom, GotExpected, Receipt, B256,
 };
 
 /// Validate a block with regard to execution results:

crates/optimism/primitives/Cargo.toml

@@ -9,4 +9,4 @@ repository.workspace = true
 description = "OP primitive types"
 
 [lints]
-workspace = true
+workspace = true