refactor: remove BscEthApi

Author: klkvr

Cargo.lock

@@ -12,44 +12,44 @@ name = "reth-bsc"
 path = "src/main.rs"
 
 [dependencies]
-reth = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-cli = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-engine-local = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-discv4 = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b", features = ["test-utils"] }
-reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-ethereum-forks = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b", features = ["serde"] }
-reth-ethereum-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-eth-wire = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-node-core = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-network = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b", features = ["test-utils"] }
-reth-network-p2p = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-network-api = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b", features = ["test-utils"] }
-reth-network-peers = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b", features = ["test-utils"] }
-reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-rpc-engine-api = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-trie-common = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
-reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "8e0ff926b" }
+reth = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-cli = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-engine-local = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-discv4 = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3", features = ["test-utils"] }
+reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-ethereum-forks = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3", features = ["serde"] }
+reth-ethereum-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-eth-wire = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-node-core = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-network = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3", features = ["test-utils"] }
+reth-network-p2p = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-network-api = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3", features = ["test-utils"] }
+reth-network-peers = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3", features = ["test-utils"] }
+reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-rpc-engine-api = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-trie-common = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
+reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "c0246e3" }
 revm = "27.0.2"
 
 # alloy dependencies
-alloy-evm = "0.14"
+alloy-evm = "0.15"
 
 alloy-genesis = "1.0.17"
 alloy-consensus = "1.0.17"

Cargo.toml

@@ -400,7 +400,7 @@ mod tests {
 
         // Test mainnet chain spec
         let mainnet_spec = crate::chainspec::BscChainSpec::from(bsc_mainnet());
-        
+
         // Test blocks around the critical transition points
         // Block 23846000: Should be Moran (before Gibbs activation)
         assert_eq!(
@@ -444,7 +444,7 @@ mod tests {
 
         // Test testnet chain spec
         let testnet_spec = crate::chainspec::BscChainSpec::from(bsc_testnet());
-        
+
         // Test blocks around the critical transition points for testnet
         // Block 23603939: Should be Nano (before Moran activation)
         assert_eq!(

src/hardforks/bsc.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use crate::{
-    node::{rpc::engine_api::payload::BscPayloadTypes, BscNode},
+    node::{engine_api::payload::BscPayloadTypes, BscNode},
     BscBlock, BscPrimitives,
 };
 use alloy_eips::eip7685::Requests;

src/node/engine.rs

@@ -1,4 +1,4 @@
-use crate::node::{engine::BscBuiltPayload, rpc::engine_api::validator::BscExecutionData};
+use crate::node::{engine::BscBuiltPayload, engine_api::validator::BscExecutionData};
 use reth::{
     payload::EthPayloadBuilderAttributes,
     primitives::{NodePrimitives, SealedBlock},

src/node/rpc/engine_api/builder.rs src/node/engine_api/builder.rssrc/node/rpc/engine_api/builder.rs renamed to src/node/engine_api/builder.rs

@@ -1,4 +1,6 @@
-use super::patch::{patch_mainnet_after_tx, patch_mainnet_before_tx, patch_chapel_after_tx, patch_chapel_before_tx};
+use super::patch::{
+    patch_chapel_after_tx, patch_chapel_before_tx, patch_mainnet_after_tx, patch_mainnet_before_tx,
+};
 use crate::{
     consensus::{MAX_SYSTEM_REWARD, SYSTEM_ADDRESS, SYSTEM_REWARD_PERCENT},
     evm::transaction::BscTxEnv,
@@ -272,9 +274,12 @@ where
         Ok(())
     }
 
-     /// Handle update validatorsetv2 system tx.
-     /// Activated by <https://github.com/bnb-chain/BEPs/pull/294>
-    fn handle_update_validator_set_v2_tx(&mut self, tx: &TransactionSigned) -> Result<(), BlockExecutionError> {
+    /// Handle update validatorsetv2 system tx.
+    /// Activated by <https://github.com/bnb-chain/BEPs/pull/294>
+    fn handle_update_validator_set_v2_tx(
+        &mut self,
+        tx: &TransactionSigned,
+    ) -> Result<(), BlockExecutionError> {
         sol!(
             function updateValidatorSetV2(
                 address[] _consensusAddrs,

src/node/rpc/engine_api/mod.rs src/node/engine_api/mod.rssrc/node/rpc/engine_api/mod.rs renamed to src/node/engine_api/mod.rs

@@ -88,10 +88,6 @@ where
         unimplemented!()
     }
 
-    fn db_mut(&mut self) -> &mut Self::DB {
-        &mut self.journaled_state.database
-    }
-
     fn finish(self) -> (Self::DB, EvmEnv<Self::Spec>) {
         let Context { block: block_env, cfg: cfg_env, journaled_state, .. } = self.inner.ctx;
 
@@ -102,20 +98,16 @@ where
         self.inspect = enabled;
     }
 
-    fn precompiles_mut(&mut self) -> &mut Self::Precompiles {
-        &mut self.inner.precompiles
-    }
-
-    fn inspector_mut(&mut self) -> &mut Self::Inspector {
-        &mut self.inner.inspector
-    }
-
-    fn precompiles(&self) -> &Self::Precompiles {
-        &self.inner.precompiles
+    fn components(&self) -> (&Self::DB, &Self::Inspector, &Self::Precompiles) {
+        (&self.journaled_state.database, &self.inner.inspector, &self.inner.precompiles)
     }
 
-    fn inspector(&self) -> &Self::Inspector {
-        &self.inner.inspector
+    fn components_mut(&mut self) -> (&mut Self::DB, &mut Self::Inspector, &mut Self::Precompiles) {
+        (
+            &mut self.inner.ctx.journaled_state.database,
+            &mut self.inner.inspector,
+            &mut self.inner.precompiles,
+        )
     }
 }