fix ut

Author: nekomoto911

Cargo.lock

@@ -559,7 +559,7 @@ alloy-transport-ipc = { version = "1.0.23", default-features = false }
 alloy-transport-ws = { version = "1.0.23", default-features = false }
 
 # op
-alloy-op-evm = { version = "0.15", default-features = false }
+alloy-op-evm = { package = "alloy-op-evm", git = "https://github.com/Galxe/alloy-evm", branch = "v0.15.0-gravity" , default-features = false }
 alloy-op-hardforks = "0.2.2"
 op-alloy-rpc-types = { version = "0.18.12", default-features = false }
 op-alloy-rpc-types-engine = { version = "0.18.12", default-features = false }

Cargo.toml

@@ -627,6 +627,7 @@ fn test_tree_state_on_new_head_deep_fork() {
                 hashed_state: Arc::new(HashedPostState::default()),
             },
             trie: ExecutedTrieUpdates::empty(),
+            triev2: Default::default(),
         });
     }
     test_harness.tree.state.tree_state.set_canonical_head(chain_a.last().unwrap().num_hash());
@@ -639,6 +640,7 @@ fn test_tree_state_on_new_head_deep_fork() {
                 hashed_state: Arc::new(HashedPostState::default()),
             },
             trie: ExecutedTrieUpdates::empty(),
+            triev2: Default::default(),
         });
     }
 

crates/engine/tree/src/tree/tests.rs

@@ -11,7 +11,7 @@
 
 extern crate alloc;
 
-use alloc::sync::Arc;
+use alloc::{boxed::Box, sync::Arc};
 use alloy_consensus::{BlockHeader, Header};
 use alloy_evm::{FromRecoveredTx, FromTxWithEncoded};
 use alloy_op_evm::{block::receipt_builder::OpReceiptBuilder, OpBlockExecutionCtx};
@@ -216,6 +216,18 @@ where
             extra_data: attributes.extra_data,
         }
     }
+
+    fn parallel_executor<'a, DB: reth_evm::ParallelDatabase + 'a>(
+        &self,
+        _db: DB,
+    ) -> Box<
+        dyn reth_evm::parallel_execute::ParallelExecutor<
+                Primitives = Self::Primitives,
+                Error = reth_execution_errors::BlockExecutionError,
+            > + 'a,
+    > {
+        todo!()
+    }
 }
 #[cfg(test)]
 mod tests {

crates/optimism/evm/src/lib.rs

@@ -342,6 +342,7 @@ impl<Txs> OpBuilder<'_, Txs> {
                 hashed_state: Arc::new(hashed_state),
             },
             trie: ExecutedTrieUpdates::Present(Arc::new(trie_updates)),
+            triev2: Default::default(),
         };
 
         let no_tx_pool = ctx.attributes().no_tx_pool;

crates/optimism/payload/src/builder.rs

@@ -27,6 +27,7 @@ reth-primitives-traits.workspace = true
 reth-chain-state.workspace = true
 reth-storage-api.workspace = true
 reth-transaction-pool.workspace = true
+gravity-storage.workspace = true
 
 # revm
 op-revm.workspace = true

crates/optimism/txpool/Cargo.toml

@@ -1,5 +1,6 @@
 use crate::{supervisor::SupervisorClient, InvalidCrossTx, OpPooledTx};
 use alloy_consensus::{BlockHeader, Transaction};
+use gravity_storage::block_view_storage::BlockViewProvider;
 use op_revm::L1BlockInfo;
 use parking_lot::RwLock;
 use reth_chainspec::ChainSpecProvider;
@@ -8,7 +9,7 @@ use reth_optimism_forks::OpHardforks;
 use reth_primitives_traits::{
     transaction::error::InvalidTransactionError, Block, BlockBody, GotExpected, SealedBlock,
 };
-use reth_storage_api::{AccountInfoReader, BlockReaderIdExt, StateProviderFactory};
+use reth_storage_api::{BlockReaderIdExt, StateProviderFactory};
 use reth_transaction_pool::{
     error::InvalidPoolTransactionError, EthPoolTransaction, EthTransactionValidator,
     TransactionOrigin, TransactionValidationOutcome, TransactionValidator,
@@ -181,7 +182,7 @@ where
         &self,
         origin: TransactionOrigin,
         transaction: Tx,
-        state: &mut Option<Box<dyn AccountInfoReader>>,
+        state: &mut Option<BlockViewProvider>,
     ) -> TransactionValidationOutcome<Tx> {
         if transaction.is_eip4844() {
             return TransactionValidationOutcome::Invalid(

crates/optimism/txpool/src/validator.rs

@@ -84,6 +84,7 @@ reth-trie = { workspace = true, features = ["test-utils"] }
 reth-provider = { workspace = true, features = ["test-utils"] }
 reth-network-peers.workspace = true
 reth-tracing.workspace = true
+reth-trie-db.workspace = true
 
 alloy-primitives = { workspace = true, features = ["getrandom", "rand"] }
 alloy-rlp.workspace = true
@@ -116,6 +117,7 @@ test-utils = [
     "reth-revm/test-utils",
     "reth-codecs/test-utils",
     "reth-db-api/test-utils",
+    "reth-trie-db/test-utils",
     "reth-trie-parallel/test-utils",
     "reth-trie/test-utils",
     "reth-prune-types/test-utils",

crates/stages/stages/Cargo.toml

@@ -336,6 +336,8 @@ mod tests {
         self, random_block, random_block_range, random_changeset_range,
         random_contract_account_range, BlockParams, BlockRangeParams,
     };
+    use reth_trie::StateRoot;
+    use reth_trie_db::DatabaseStateRoot;
     use reth_trie::test_utils::{state_root, state_root_prehashed};
     use std::collections::BTreeMap;
 

crates/stages/stages/src/stages/merkle.rs

@@ -24,6 +24,7 @@ pub struct ParallelTxRO {
     env: Environment,
     metrics: Option<Arc<DatabaseEnvMetrics>>,
     max_txs: usize,
+    disable_long_read_transaction_safety: bool,
 }
 
 #[derive(Debug)]
@@ -59,6 +60,7 @@ impl ParallelTxRO {
             max_txs: 8,
             env,
             metrics,
+            disable_long_read_transaction_safety: false,
         })
     }
 
@@ -69,7 +71,10 @@ impl ParallelTxRO {
         inner.num_txs += 1;
         drop(inner);
         match create_tx(&self.env, self.metrics.clone()) {
-            Ok(tx) => {
+            Ok(mut tx) => {
+                if self.disable_long_read_transaction_safety {
+                    tx.disable_long_read_transaction_safety();
+                }
                 let tx = Arc::new(tx);
                 let tx_clone: Arc<Tx<RO>> = tx.clone();
                 let mut inner = self.inner.lock().unwrap();
@@ -232,7 +237,8 @@ impl DbTx for ParallelTxRO {
     }
 
     fn disable_long_read_transaction_safety(&mut self) {
-        // Do nothing.
+        self.tx.disable_long_read_transaction_safety();
+        self.disable_long_read_transaction_safety = true;
     }
 }