fix: update executor type in commands for bsc

bin/reth/src/commands/debug_cmd/build_block.rs

@@ -120,6 +120,9 @@ impl Command {
         let consensus: Arc<dyn Consensus> =
             Arc::new(EthBeaconConsensus::new(provider_factory.chain_spec()));
 
+        #[cfg(feature = "bsc")]
+        let executor = block_executor!(provider_factory.chain_spec(), provider_factory.clone());
+        #[cfg(not(feature = "bsc"))]
         let executor = block_executor!(provider_factory.chain_spec());
 
         // configure blockchain tree
@@ -268,6 +271,11 @@ impl Command {
                     SealedBlockWithSenders::new(block.clone(), senders).unwrap();
 
                 let db = StateProviderDatabase::new(blockchain_db.latest()?);
+                #[cfg(feature = "bsc")]
+                let executor =
+                    block_executor!(provider_factory.chain_spec(), provider_factory.clone())
+                        .executor(db);
+                #[cfg(not(feature = "bsc"))]
                 let executor = block_executor!(provider_factory.chain_spec()).executor(db);
 
                 let BlockExecutionOutput { state, receipts, requests, .. } =

bin/reth/src/commands/debug_cmd/execution.rs

@@ -84,6 +84,9 @@ impl Command {
         let prune_modes = config.prune.clone().map(|prune| prune.segments).unwrap_or_default();
 
         let (tip_tx, tip_rx) = watch::channel(B256::ZERO);
+        #[cfg(feature = "bsc")]
+        let executor = block_executor!(provider_factory.chain_spec(), provider_factory.clone());
+        #[cfg(not(feature = "bsc"))]
         let executor = block_executor!(provider_factory.chain_spec());
 
         let pipeline = Pipeline::builder()

bin/reth/src/commands/debug_cmd/in_memory_merkle.rs

@@ -132,6 +132,10 @@ impl Command {
             provider_factory.static_file_provider(),
         ));
 
+        #[cfg(feature = "bsc")]
+        let executor =
+            block_executor!(provider_factory.chain_spec(), provider_factory.clone()).executor(db);
+        #[cfg(not(feature = "bsc"))]
         let executor = block_executor!(provider_factory.chain_spec()).executor(db);
 
         let merkle_block_td =

bin/reth/src/commands/debug_cmd/merkle.rs

@@ -101,6 +101,10 @@ impl Command {
             )
             .await?;
 
+        #[cfg(feature = "bsc")]
+        let executor_provider =
+            block_executor!(provider_factory.chain_spec(), provider_factory.clone());
+        #[cfg(not(feature = "bsc"))]
         let executor_provider = block_executor!(provider_factory.chain_spec());
 
         // Initialize the fetch client

bin/reth/src/commands/debug_cmd/replay_engine.rs

@@ -85,6 +85,9 @@ impl Command {
         let consensus: Arc<dyn Consensus> =
             Arc::new(EthBeaconConsensus::new(provider_factory.chain_spec()));
 
+        #[cfg(feature = "bsc")]
+        let executor = block_executor!(provider_factory.chain_spec(), provider_factory.clone());
+        #[cfg(not(feature = "bsc"))]
         let executor = block_executor!(provider_factory.chain_spec());
 
         // Configure blockchain tree

bin/reth/src/commands/import.rs

@@ -197,6 +197,9 @@ where
         .expect("failed to set download range");
 
     let (tip_tx, tip_rx) = watch::channel(B256::ZERO);
+    #[cfg(feature = "bsc")]
+    let executor = block_executor!(provider_factory.chain_spec(), provider_factory.clone());
+    #[cfg(not(feature = "bsc"))]
     let executor = block_executor!(provider_factory.chain_spec());
 
     let max_block = file_client.max_block().unwrap_or(0);

bin/reth/src/commands/stage/dump/execution.rs

@@ -150,13 +150,17 @@ async fn unwind_and_copy<DB: Database>(
 }
 
 /// Try to re-execute the stage without committing
-async fn dry_run<DB: Database>(
+async fn dry_run<DB: Database + 'static>(
     output_provider_factory: ProviderFactory<DB>,
     to: u64,
     from: u64,
 ) -> eyre::Result<()> {
     info!(target: "reth::cli", "Executing stage. [dry-run]");
 
+    #[cfg(feature = "bsc")]
+    let executor =
+        block_executor!(output_provider_factory.chain_spec(), output_provider_factory.clone());
+    #[cfg(not(feature = "bsc"))]
     let executor = block_executor!(output_provider_factory.chain_spec());
     let mut exec_stage = ExecutionStage::new_with_executor(executor);
 

bin/reth/src/commands/stage/run.rs

@@ -168,6 +168,10 @@ impl Command {
                     None,
                 ),
                 StageEnum::Execution => {
+                    #[cfg(feature = "bsc")]
+                    let executor =
+                        block_executor!(provider_factory.chain_spec(), provider_factory.clone());
+                    #[cfg(not(feature = "bsc"))]
                     let executor = block_executor!(provider_factory.chain_spec());
                     (
                         Box::new(ExecutionStage::new(

bin/reth/src/macros.rs

@@ -3,7 +3,7 @@
 /// Creates the block executor type based on the configured feature.
 ///
 /// Note(mattsse): This is incredibly horrible and will be replaced
-#[cfg(not(feature = "optimism"))]
+#[cfg(all(not(feature = "optimism"), not(feature = "bsc")))]
 macro_rules! block_executor {
     ($chain_spec:expr) => {
         reth_node_ethereum::EthExecutorProvider::ethereum($chain_spec)
@@ -17,4 +17,16 @@ macro_rules! block_executor {
     };
 }
 
+#[cfg(feature = "bsc")]
+macro_rules! block_executor {
+    ($chain_spec:expr) => {
+        // In some cases provider is not available
+        // And we don't really need a bsc executor provider
+        reth_node_ethereum::EthExecutorProvider::ethereum($chain_spec)
+    };
+    ($chain_spec:expr, $provider:expr) => {
+        reth_node_bsc::BscExecutorProvider::bsc($chain_spec, $provider)
+    };
+}
+
 pub(crate) use block_executor;

crates/bsc/consensus/src/lib.rs

@@ -791,7 +791,6 @@ mod tests {
         assert_eq!(storage.headers.get(&block.number), Some(&block));
         assert_eq!(storage.hash_to_number.get(&block.hash()), Some(&block.number));
         assert_eq!(storage.bodies.get(&block.hash()), Some(&BlockBody::default()));
-        assert_eq!(storage.block_hash(block.number), Some(block.hash()));
         assert_eq!(
             storage.header_by_hash_or_number(BlockHashOrNumber::Hash(block.hash())),
             Some(block.clone())

crates/bsc/node/src/node.rs

@@ -14,7 +14,6 @@ use reth_node_builder::{
     BuilderContext, Node, PayloadBuilderConfig,
 };
 use reth_payload_builder::{PayloadBuilderHandle, PayloadBuilderService};
-use reth_primitives::parlia::ParliaConfig;
 use reth_provider::CanonStateSubscriptions;
 use reth_tracing::tracing::{debug, info};
 use reth_transaction_pool::{
@@ -92,11 +91,10 @@ where
     ) -> eyre::Result<(Self::EVM, Self::Executor)> {
         let chain_spec = ctx.chain_spec();
         let evm_config = BscEvmConfig::default();
-        //  TODO: parlia config
         let executor = BscExecutorProvider::new(
             chain_spec,
             evm_config,
-            ParliaConfig::default(),
+            ctx.reth_config().parlia.clone(),
             ctx.provider().clone(),
         );