avoid block in tokio async context

Author: nekomoto911

src/scheduler.rs

@@ -305,13 +305,18 @@ where
         }
 
         let start = Instant::now();
-        GREVM_RUNTIME.block_on(async {
-            let mut tasks = vec![];
-            for executor in &self.partition_executors {
-                let executor = executor.clone();
-                tasks.push(GREVM_RUNTIME.spawn(async move { executor.write().unwrap().execute() }));
-            }
-            futures::future::join_all(tasks).await;
+        // Do not block tokio runtime if we are in async context
+        tokio::task::block_in_place(|| {
+            GREVM_RUNTIME.block_on(async {
+                let mut tasks = vec![];
+                for executor in &self.partition_executors {
+                    let executor = executor.clone();
+                    tasks.push(
+                        GREVM_RUNTIME.spawn(async move { executor.write().unwrap().execute() }),
+                    );
+                }
+                futures::future::join_all(tasks).await;
+            })
         });
         self.metrics.parallel_execute_time.increment(start.elapsed().as_nanos() as u64);
 

src/storage.rs

@@ -158,7 +158,7 @@ impl ParallelBundleState for BundleState {
     }
 }
 
-#[derive(Debug, Default)]
+#[derive(Debug)]
 pub struct State {
     /// Cache the committed data of finality txns and the read-only data during execution after
     /// each round of execution. Used as the initial state for the next round of partition
@@ -183,6 +183,17 @@ pub struct State {
     pub block_hashes: BTreeMap<u64, B256>,
 }
 
+impl Default for State {
+    fn default() -> Self {
+        Self {
+            cache: CacheState::new(false),
+            transition_state: Some(TransitionState::default()),
+            bundle_state: BundleState::default(),
+            block_hashes: BTreeMap::new(),
+        }
+    }
+}
+
 impl State {
     /// Takes the current bundle state.
     /// It is typically called after the bundle state has been finalized.

tests/mainnet.rs

@@ -8,7 +8,10 @@ use alloy_rpc_types::{Block, BlockTransactions};
 use common::{compat, storage::InMemoryDB};
 use grevm::GrevmScheduler;
 use metrics_util::debugging::DebuggingRecorder;
-use revm::primitives::{Env, TxEnv};
+use revm::{
+    db::states::bundle_state::BundleRetention,
+    primitives::{Env, TxEnv},
+};
 
 fn test_execute_alloy(block: Block, db: InMemoryDB) {
     let spec_id = compat::get_block_spec(&block.header);
@@ -38,7 +41,10 @@ fn test_execute_alloy(block: Block, db: InMemoryDB) {
         for (key, _, _, value) in snapshot.into_vec() {
             println!("metrics: {} => value: {:?}", key.key().name(), value);
         }
-        (parallel_result, Arc::get_mut(&mut executor.database).unwrap().state.take_bundle())
+
+        let database = Arc::get_mut(&mut executor.database).unwrap();
+        database.state.merge_transitions(BundleRetention::Reverts);
+        (parallel_result, database.state.take_bundle())
     });
 
     common::compare_execution_result(&reth_result.0.results, &parallel_result.0.results);