feat: ongoing upstream merge

greged93 · greged93 · commit c67c132ef634 · 2025-11-11T20:16:59.000Z
Signed-off-by: Gregory Edison &lt;gregory.edison1993@gmail.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -485,18 +485,18 @@ reth-ress-protocol = { path = "crates/ress/protocol" }
 reth-ress-provider = { path = "crates/ress/provider" }
 
 # revm
-revm = { git = "https://github.com/scroll-tech/revm", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
-revm-bytecode = { git = "https://github.com/scroll-tech/revm", default-features = false }
-revm-database = { git = "https://github.com/scroll-tech/revm", default-features = false }
-revm-state = { git = "https://github.com/scroll-tech/revm", default-features = false }
-revm-primitives = { git = "https://github.com/scroll-tech/revm", default-features = false }
-revm-interpreter = { git = "https://github.com/scroll-tech/revm", default-features = false }
-revm-inspector = { git = "https://github.com/scroll-tech/revm", default-features = false }
-revm-context = { git = "https://github.com/scroll-tech/revm", default-features = false }
-revm-context-interface = { git = "https://github.com/scroll-tech/revm", default-features = false }
-revm-database-interface = { git = "https://github.com/scroll-tech/revm", default-features = false }
-op-revm = { git = "https://github.com/scroll-tech/revm", default-features = false }
-revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", default-features = false }
+revm = { git = "https://github.com/scroll-tech/revm", branch = "feat/v97", default-features = false, features = ["enable_eip7702", "enable_eip7623"] }
+revm-bytecode = { git = "https://github.com/scroll-tech/revm", branch = "feat/v97", default-features = false }
+revm-database = { git = "https://github.com/scroll-tech/revm", branch = "feat/v97", default-features = false }
+revm-state = { git = "https://github.com/scroll-tech/revm", branch = "feat/v97", default-features = false }
+revm-primitives = { git = "https://github.com/scroll-tech/revm", branch = "feat/v97", default-features = false }
+revm-interpreter = { git = "https://github.com/scroll-tech/revm", branch = "feat/v97", default-features = false }
+revm-inspector = { git = "https://github.com/scroll-tech/revm", branch = "feat/v97", default-features = false }
+revm-context = { git = "https://github.com/scroll-tech/revm", branch = "feat/v97", default-features = false }
+revm-context-interface = { git = "https://github.com/scroll-tech/revm", branch = "feat/v97", default-features = false }
+revm-database-interface = { git = "https://github.com/scroll-tech/revm", branch = "feat/v97", default-features = false }
+op-revm = { git = "https://github.com/scroll-tech/revm", branch = "feat/v97", default-features = false }
+revm-scroll = { git = "https://github.com/scroll-tech/scroll-revm", branch = "feat/v97", default-features = false }
 revm-inspectors = "0.32.0"
 
 # eth
@@ -771,8 +771,8 @@ walkdir = "2.3.3"
 vergen-git2 = "1.0.5"
 
 [patch.crates-io]
-revm = { git = "https://github.com/scroll-tech/revm" }
-op-revm = { git = "https://github.com/scroll-tech/revm" }
+revm = { git = "https://github.com/scroll-tech/revm", branch = "feat/v97" }
+op-revm = { git = "https://github.com/scroll-tech/revm", branch = "feat/v97" }
 # alloy-consensus = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
 # alloy-contract = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
 # alloy-eips = { git = "https://github.com/alloy-rs/alloy", rev = "cfb13aa" }
diff --git a/crates/engine/tree/src/tree/payload_validator.rs b/crates/engine/tree/src/tree/payload_validator.rs
@@ -15,9 +15,7 @@ use alloy_consensus::transaction::Either;
 use alloy_eips::{eip1898::BlockWithParent, NumHash};
 use alloy_evm::Evm;
 use alloy_primitives::B256;
-use reth_chain_state::{
-    CanonicalInMemoryState, ExecutedBlock, ExecutedBlockWithTrieUpdates, ExecutedTrieUpdates,
-};
+use reth_chain_state::{CanonicalInMemoryState, ExecutedBlock};
 use reth_consensus::{ConsensusError, FullConsensus, HeaderValidator};
 use reth_engine_primitives::{
     ConfigureEngineEvm, ExecutableTxIterator, ExecutionPayload, InvalidBlockHook, PayloadValidator,
diff --git a/crates/node/builder/src/components/pool.rs b/crates/node/builder/src/components/pool.rs
@@ -4,8 +4,8 @@ use crate::{BuilderContext, FullNodeTypes};
 
 use alloy_primitives::Address;
 use reth_chain_state::CanonStateSubscriptions;
-use reth_chainspec::ChainSpecProvider;
-use reth_node_api::TxTy;
+use reth_chainspec::{ChainSpecProvider, EthereumHardforks};
+use reth_node_api::{NodeTypes, TxTy};
 use reth_transaction_pool::{
     blobstore::DiskFileBlobStore, CoinbaseTipOrdering, PoolConfig, PoolTransaction, SubPoolLimit,
     TransactionPool, TransactionValidationTaskExecutor, TransactionValidator,
diff --git a/crates/scroll/alloy/evm/src/block/mod.rs b/crates/scroll/alloy/evm/src/block/mod.rs
@@ -28,7 +28,7 @@ use alloy_primitives::{B256, U256};
 use revm::{
     context::{
         result::{InvalidTransaction, ResultAndState},
-        TxEnv,
+        Block, TxEnv,
     },
     database::State,
     handler::PrecompileProvider,
@@ -154,7 +154,7 @@ where
     fn apply_pre_execution_changes(&mut self) -> Result<(), BlockExecutionError> {
         // set state clear flag if the block is after the Spurious Dragon hardfork.
         let state_clear_flag =
-            self.spec.is_spurious_dragon_active_at_block(self.evm.block().number.to());
+            self.spec.is_spurious_dragon_active_at_block(self.evm.block().number().to());
         self.evm.db_mut().set_state_clear_flag(state_clear_flag);
 
         // load the l1 gas oracle contract in cache.
@@ -169,7 +169,7 @@ where
         if self
             .spec
             .scroll_fork_activation(ScrollHardfork::Curie)
-            .transitions_at_block(self.evm.block().number.to())
+            .transitions_at_block(self.evm.block().number().to())
         {
             if let Err(err) = apply_curie_hard_fork(self.evm.db_mut()) {
                 return Err(BlockExecutionError::msg(format!(
@@ -183,7 +183,7 @@ where
         if self
             .spec
             .scroll_fork_activation(ScrollHardfork::Feynman)
-            .active_at_timestamp(self.evm.block().timestamp.to())
+            .active_at_timestamp(self.evm.block().timestamp().to())
         {
             if let Err(err) = apply_feynman_hard_fork(self.evm.db_mut()) {
                 return Err(BlockExecutionError::msg(format!(
@@ -206,7 +206,7 @@ where
         let is_l1_message = tx.tx().ty() == L1_MESSAGE_TRANSACTION_TYPE;
         // The sum of the transaction’s gas limit and the gas utilized in this block prior,
         // must be no greater than the block’s gasLimit.
-        let block_available_gas = self.evm.block().gas_limit - self.gas_used;
+        let block_available_gas = self.evm.block().gas_limit() - self.gas_used;
         if tx.tx().gas_limit() > block_available_gas {
             return Err(BlockValidationError::TransactionGasLimitMoreThanAvailableBlockGas {
                 transaction_gas_limit: tx.tx().gas_limit(),
@@ -219,14 +219,14 @@ where
 
         let block = self.evm.block();
         // verify the transaction type is accepted by the current fork.
-        if tx.tx().is_eip2930() && !chain_spec.is_curie_active_at_block(block.number.to()) {
+        if tx.tx().is_eip2930() && !chain_spec.is_curie_active_at_block(block.number().to()) {
             return Err(BlockValidationError::InvalidTx {
                 hash,
                 error: Box::new(InvalidTransaction::Eip2930NotSupported),
             }
             .into())
         }
-        if tx.tx().is_eip1559() && !chain_spec.is_curie_active_at_block(block.number.to()) {
+        if tx.tx().is_eip1559() && !chain_spec.is_curie_active_at_block(block.number().to()) {
             return Err(BlockValidationError::InvalidTx {
                 hash,
                 error: Box::new(InvalidTransaction::Eip1559NotSupported),
@@ -241,7 +241,7 @@ where
             .into())
         }
         if tx.tx().is_eip7702() &&
-            !chain_spec.is_euclid_v2_active_at_timestamp(block.timestamp.to())
+            !chain_spec.is_euclid_v2_active_at_timestamp(block.timestamp().to())
         {
             return Err(BlockValidationError::InvalidTx {
                 hash,
@@ -296,6 +296,7 @@ where
                 receipts: self.receipts,
                 requests: Default::default(),
                 gas_used: self.gas_used,
+                blob_gas_used: 0,
             },
         ))
     }
diff --git a/crates/scroll/alloy/evm/src/lib.rs b/crates/scroll/alloy/evm/src/lib.rs
@@ -112,6 +112,7 @@ where
     type Error = EVMError<DB::Error>;
     type HaltReason = HaltReason;
     type Spec = ScrollSpecId;
+    type BlockEnv = BlockEnv;
     type Precompiles = P;
     type Inspector = I;
 
@@ -207,6 +208,7 @@ impl<P: ScrollPrecompilesFactory> EvmFactory for ScrollEvmFactory<P> {
     type Error<DBError: core::error::Error + Send + Sync + 'static> = EVMError<DBError>;
     type HaltReason = HaltReason;
     type Spec = ScrollSpecId;
+    type BlockEnv = BlockEnv;
     type Precompiles = PrecompilesMap;
 
     fn create_evm<DB: Database>(
diff --git a/crates/scroll/alloy/evm/src/system_caller.rs b/crates/scroll/alloy/evm/src/system_caller.rs
@@ -6,7 +6,10 @@ use alloy_evm::{
     Evm,
 };
 use alloy_primitives::B256;
-use revm::{context::result::ResultAndState, DatabaseCommit};
+use revm::{
+    context::{result::ResultAndState, Block},
+    DatabaseCommit,
+};
 use scroll_alloy_hardforks::ScrollHardforks;
 
 /// An ephemeral helper type for executing system calls.
@@ -62,13 +65,13 @@ fn transact_blockhashes_contract_call<Halt>(
     evm: &mut impl Evm<HaltReason = Halt>,
 ) -> Result<Option<ResultAndState<Halt>>, BlockExecutionError> {
     // if Feynman is not active at timestamp then no system transaction occurs.
-    if !spec.is_feynman_active_at_timestamp(evm.block().timestamp.to()) {
+    if !spec.is_feynman_active_at_timestamp(evm.block().timestamp().to()) {
         return Ok(None);
     }
 
     // if the block number is zero (genesis block) then no system transaction may occur as per
     // EIP-2935
-    if evm.block().number.to::<u64>() == 0u64 {
+    if evm.block().number().to::<u64>() == 0u64 {
         return Ok(None);
     }
 
diff --git a/crates/scroll/engine-primitives/src/payload/built.rs b/crates/scroll/engine-primitives/src/payload/built.rs
@@ -10,8 +10,7 @@ use alloy_rpc_types_engine::{
     ExecutionPayloadEnvelopeV4, ExecutionPayloadFieldV2, ExecutionPayloadV1, ExecutionPayloadV3,
     PayloadId,
 };
-use reth_chain_state::ExecutedBlockWithTrieUpdates;
-use reth_payload_primitives::BuiltPayload;
+use reth_payload_primitives::{BuiltPayload, BuiltPayloadExecutedBlock};
 use reth_primitives_traits::SealedBlock;
 use reth_scroll_primitives::{ScrollBlock, ScrollPrimitives};
 
@@ -23,7 +22,7 @@ pub struct ScrollBuiltPayload {
     /// Sealed block
     pub(crate) block: Arc<SealedBlock<ScrollBlock>>,
     /// Block execution data for the payload
-    pub(crate) executed_block: Option<ExecutedBlockWithTrieUpdates<ScrollPrimitives>>,
+    pub(crate) executed_block: Option<BuiltPayloadExecutedBlock<ScrollPrimitives>>,
     /// The fees of the block
     pub(crate) fees: U256,
 }
@@ -33,7 +32,7 @@ impl ScrollBuiltPayload {
     pub const fn new(
         id: PayloadId,
         block: Arc<SealedBlock<ScrollBlock>>,
-        executed_block: Option<ExecutedBlockWithTrieUpdates<ScrollPrimitives>>,
+        executed_block: Option<BuiltPayloadExecutedBlock<ScrollPrimitives>>,
         fees: U256,
     ) -> Self {
         Self { id, block, executed_block, fees }
@@ -71,7 +70,7 @@ impl BuiltPayload for ScrollBuiltPayload {
         self.fees
     }
 
-    fn executed_block(&self) -> Option<ExecutedBlockWithTrieUpdates<Self::Primitives>> {
+    fn executed_block(&self) -> Option<BuiltPayloadExecutedBlock<Self::Primitives>> {
         self.executed_block.clone()
     }
 
diff --git a/crates/scroll/evm/src/build.rs b/crates/scroll/evm/src/build.rs
@@ -7,6 +7,7 @@ use reth_evm::execute::{BlockAssembler, BlockAssemblerInput};
 use reth_execution_types::BlockExecutionResult;
 use reth_primitives_traits::SignedTransaction;
 use reth_scroll_primitives::ScrollReceipt;
+use revm::context::Block;
 use scroll_alloy_evm::ScrollBlockExecutionCtx;
 use scroll_alloy_hardforks::ScrollHardforks;
 
@@ -53,7 +54,7 @@ where
             ..
         } = input;
 
-        let timestamp = evm_env.block_env.timestamp;
+        let timestamp = evm_env.block_env.timestamp();
 
         let transactions_root = proofs::calculate_transaction_root(&transactions);
         let receipts_root = ScrollReceipt::calculate_receipt_root_no_memo(receipts);
@@ -69,15 +70,15 @@ where
             withdrawals_root: None,
             logs_bloom,
             timestamp: timestamp.to(),
-            mix_hash: evm_env.block_env.prevrandao.unwrap_or_default(),
+            mix_hash: evm_env.block_env.prevrandao().unwrap_or_default(),
             nonce: BEACON_NONCE.into(),
             base_fee_per_gas: self
                 .chain_spec
-                .is_curie_active_at_block(evm_env.block_env.number.to())
-                .then_some(evm_env.block_env.basefee),
-            number: evm_env.block_env.number.to(),
-            gas_limit: evm_env.block_env.gas_limit,
-            difficulty: evm_env.block_env.difficulty,
+                .is_curie_active_at_block(evm_env.block_env.number().to())
+                .then_some(evm_env.block_env.basefee()),
+            number: evm_env.block_env.number().to(),
+            gas_limit: evm_env.block_env.gas_limit(),
+            difficulty: evm_env.block_env.difficulty(),
             gas_used: *gas_used,
             extra_data: Default::default(),
             parent_beacon_block_root: None,
diff --git a/crates/scroll/openvm-compat/Cargo.toml b/crates/scroll/openvm-compat/Cargo.toml
@@ -28,4 +28,4 @@ scroll-alloy-consensus = { path = "../alloy/consensus", default-features = false
 scroll-alloy-rpc-types = { path = "../alloy/rpc-types", default-features = false }
 
 [patch.crates-io]
-revm = { git = "https://github.com/scroll-tech/revm" }
+revm = { git = "https://github.com/scroll-tech/revm", branch = "feat/v97" }
diff --git a/crates/scroll/payload/src/builder.rs b/crates/scroll/payload/src/builder.rs
@@ -3,15 +3,14 @@
 use super::ScrollPayloadBuilderError;
 use crate::config::{PayloadBuildingBreaker, ScrollBuilderConfig};
 
-use alloy_consensus::{Transaction, Typed2718};
+use alloy_consensus::{BlockHeader, Transaction, Typed2718};
 use alloy_primitives::U256;
 use alloy_rlp::Encodable;
 use core::fmt::Debug;
 use reth_basic_payload_builder::{
     is_better_payload, BuildArguments, BuildOutcome, BuildOutcomeKind, MissingPayloadBehaviour,
     PayloadBuilder, PayloadConfig,
 };
-use reth_chain_state::{ExecutedBlock, ExecutedBlockWithTrieUpdates, ExecutedTrieUpdates};
 use reth_chainspec::{ChainSpecProvider, EthChainSpec};
 use reth_evm::{
     block::{BlockExecutionError, BlockValidationError},
@@ -20,17 +19,21 @@ use reth_evm::{
 };
 use reth_execution_types::ExecutionOutcome;
 use reth_payload_builder::PayloadId;
-use reth_payload_primitives::{PayloadBuilderAttributes, PayloadBuilderError};
+use reth_payload_primitives::{
+    BuiltPayloadExecutedBlock, PayloadBuilderAttributes, PayloadBuilderError,
+};
 use reth_payload_util::{BestPayloadTransactions, NoopPayloadTransactions, PayloadTransactions};
 use reth_primitives_traits::{RecoveredBlock, SealedHeader, SignedTransaction, TxTy};
-use reth_revm::{cancelled::CancelOnDrop, database::StateProviderDatabase, db::State};
+use reth_revm::{
+    cancelled::CancelOnDrop, context::either, database::StateProviderDatabase, db::State,
+};
 use reth_scroll_chainspec::{ChainConfig, ScrollChainConfig};
 use reth_scroll_engine_primitives::{ScrollBuiltPayload, ScrollPayloadBuilderAttributes};
 use reth_scroll_evm::{ScrollBaseFeeProvider, ScrollNextBlockEnvAttributes};
 use reth_scroll_primitives::{ScrollPrimitives, ScrollTransactionSigned};
 use reth_storage_api::{BaseFeeProvider, StateProvider, StateProviderFactory};
 use reth_transaction_pool::{BestTransactionsAttributes, PoolTransaction, TransactionPool};
-use revm::context::{Block, BlockEnv};
+use revm::context::Block;
 use scroll_alloy_hardforks::ScrollHardforks;
 use std::{boxed::Box, sync::Arc, vec, vec::Vec};
 
@@ -308,20 +311,17 @@ impl<Txs> ScrollBuilder<'_, Txs> {
         let execution_outcome = ExecutionOutcome::new(
             db.take_bundle(),
             vec![execution_result.receipts],
-            block.number,
+            block.number(),
             Vec::new(),
         );
 
         // create the executed block data
-        let executed: ExecutedBlockWithTrieUpdates<ScrollPrimitives> =
-            ExecutedBlockWithTrieUpdates {
-                block: ExecutedBlock {
-                    recovered_block: Arc::new(block),
-                    execution_output: Arc::new(execution_outcome),
-                    hashed_state: Arc::new(hashed_state),
-                },
-                trie: ExecutedTrieUpdates::Present(Arc::new(trie_updates)),
-            };
+        let executed: BuiltPayloadExecutedBlock<ScrollPrimitives> = BuiltPayloadExecutedBlock {
+            recovered_block: Arc::new(block),
+            execution_output: Arc::new(execution_outcome),
+            hashed_state: either::Either::Left(Arc::new(hashed_state)),
+            trie_updates: either::Either::Left(Arc::new(trie_updates)),
+        };
 
         let no_tx_pool = ctx.attributes().no_tx_pool;
 
@@ -376,9 +376,9 @@ where
     }
 
     /// Returns the current fee settings for transactions from the mempool
-    pub fn best_transaction_attributes(&self, block_env: &BlockEnv) -> BestTransactionsAttributes {
+    pub fn best_transaction_attributes(&self, block_env: impl Block) -> BestTransactionsAttributes {
         BestTransactionsAttributes::new(
-            block_env.basefee,
+            block_env.basefee(),
             block_env.blob_gasprice().map(|p| p as u64),
         )
     }
@@ -435,7 +435,7 @@ where
         builder: &mut impl BlockBuilder<Primitives = Evm::Primitives>,
     ) -> Result<ExecutionInfo, PayloadBuilderError> {
         let mut info = ExecutionInfo::new();
-        let block_gas_limit = builder.evm().block().gas_limit;
+        let block_gas_limit = builder.evm().block().gas_limit();
         let mut gas_spent_by_transactions = Vec::new();
 
         for sequencer_tx in &self.attributes().transactions {
@@ -506,8 +506,8 @@ where
         builder_config: &ScrollBuilderConfig,
         breaker: PayloadBuildingBreaker,
     ) -> Result<Option<()>, PayloadBuilderError> {
-        let block_gas_limit = builder.evm_mut().block().gas_limit;
-        let base_fee = builder.evm_mut().block().basefee;
+        let block_gas_limit = builder.evm_mut().block().gas_limit();
+        let base_fee = builder.evm_mut().block().basefee();
 
         while let Some(tx) = best_txs.next(()) {
             let tx = tx.into_consensus();
diff --git a/crates/scroll/rpc/src/eth/mod.rs b/crates/scroll/rpc/src/eth/mod.rs
@@ -16,8 +16,8 @@ use reth_rpc::eth::{core::EthApiInner, DevSigner};
 use reth_rpc_convert::{RpcConvert, RpcConverter, RpcTypes, SignableTxRequest};
 use reth_rpc_eth_api::{
     helpers::{
-        pending_block::BuildPendingEnv, AddDevSigners, EthApiSpec, EthState, LoadFee,
-        LoadPendingBlock, LoadState, SpawnBlocking, Trace,
+        pending_block::BuildPendingEnv, EthApiSpec, EthState, LoadFee, LoadPendingBlock, LoadState,
+        SpawnBlocking, Trace,
     },
     EthApiTypes, FullEthApiServer, RpcNodeCore, RpcNodeCoreExt,
 };
diff --git a/crates/stages/stages/src/sets.rs b/crates/stages/stages/src/sets.rs
@@ -404,7 +404,7 @@ where
 /// - [`StorageHashingStage`]
 /// - [`MerkleStage`] (execute)
 /// - [`MerkleChangeSets`]
-#[derive(Debug, Default)]
+#[derive(Debug)]
 #[non_exhaustive]
 pub struct HashingStages<P: NodePrimitives> {
     /// Configuration for each stage in the pipeline
