chore: fix upstream merge issues

greged93 · greged93 · commit b8eca3e6a3f9 · 2025-09-15T17:50:17.000+02:00
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
@@ -490,7 +490,7 @@ revm-context = { git = "https://github.com/scroll-tech/revm", default-features =
 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-scroll = { git = "https://github.com/scroll-tech/scroll-revm", branch = "feat/v86", default-features = false }
 revm-inspectors = "0.29.0"
 
 # eth
diff --git a/crates/e2e-test-utils/src/testsuite/setup.rs b/crates/e2e-test-utils/src/testsuite/setup.rs
@@ -163,6 +163,7 @@ where
         LocalPayloadAttributesBuilder<N::ChainSpec>: PayloadAttributesBuilder<
             <<N as NodeTypes>::Payload as PayloadTypes>::PayloadAttributes,
         >,
+        TmpNodeAddOnsHandle<N>: RpcHandleProvider<Adapter<N>, TmpNodeEthApi<N>>,
     {
         // Create nodes with imported chain data
         let import_result = self.create_nodes_with_import::<N>(rlp_path).await?;
@@ -207,6 +208,7 @@ where
         LocalPayloadAttributesBuilder<N::ChainSpec>: PayloadAttributesBuilder<
             <<N as NodeTypes>::Payload as PayloadTypes>::PayloadAttributes,
         >,
+        TmpNodeAddOnsHandle<N>: RpcHandleProvider<Adapter<N>, TmpNodeEthApi<N>>,
     {
         // If import_rlp_path is set, use apply_with_import instead
         if let Some(rlp_path) = self.import_rlp_path.take() {
diff --git a/crates/prune/types/src/segment.rs b/crates/prune/types/src/segment.rs
@@ -8,10 +8,8 @@ use thiserror::Error;
 #[cfg_attr(any(test, feature = "reth-codec"), derive(reth_codecs::Compact))]
 #[cfg_attr(any(test, feature = "reth-codec"), reth_codecs::add_arbitrary_tests(compact))]
 #[cfg_attr(any(test, feature = "serde"), derive(serde::Serialize, serde::Deserialize))]
-#[cfg_attr(test, derive(Default))]
 pub enum PruneSegment {
     /// Prune segment responsible for the `TransactionSenders` table.
-    #[cfg_attr(test, default)]
     SenderRecovery,
     /// Prune segment responsible for the `TransactionHashNumbers` table.
     TransactionLookup,
diff --git a/crates/rpc/rpc-eth-types/src/gas_oracle.rs b/crates/rpc/rpc-eth-types/src/gas_oracle.rs
@@ -117,6 +117,7 @@ where
                 price: oracle_config
                     .default_suggested_fee
                     .unwrap_or_else(|| GasPriceOracleResult::default().price),
+                is_at_capacity: false,
             },
             lowest_effective_tip_cache: EffectiveTipLruCache(LruMap::new(ByLength::new(
                 cached_values,
diff --git a/crates/scroll/alloy/evm/src/lib.rs b/crates/scroll/alloy/evm/src/lib.rs
@@ -139,7 +139,7 @@ where
         contract: Address,
         data: Bytes,
     ) -> Result<ResultAndState<Self::HaltReason>, Self::Error> {
-        self.inner.transact_system_call_with_caller_finalize(caller, contract, data)
+        self.inner.system_call_with_caller(caller, contract, data)
     }
 
     fn db_mut(&mut self) -> &mut Self::DB {
diff --git a/crates/scroll/alloy/provider/src/engine/provider.rs b/crates/scroll/alloy/provider/src/engine/provider.rs
@@ -129,7 +129,7 @@ mod tests {
     use alloy_rpc_types_engine::{
         ClientCode, ClientVersionV1, ExecutionPayloadV1, ForkchoiceState, PayloadId,
     };
-    use reth_engine_primitives::BeaconConsensusEngineHandle;
+    use reth_engine_primitives::ConsensusEngineHandle;
     use reth_payload_builder::{PayloadBuilderHandle, PayloadBuilderService};
     use reth_payload_primitives::PayloadTypes;
     use reth_primitives::{Block, TransactionSigned};
@@ -169,7 +169,7 @@ mod tests {
             .socket_addr(SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0)))
             .build();
         let (tx, _rx) = unbounded_channel();
-        let beacon_engine_handle = BeaconConsensusEngineHandle::<ScrollEngineTypes>::new(tx);
+        let beacon_engine_handle = ConsensusEngineHandle::<ScrollEngineTypes>::new(tx);
         let client = ClientVersionV1 {
             code: ClientCode::RH,
             name: "Reth".to_string(),
diff --git a/crates/scroll/chainspec/src/lib.rs b/crates/scroll/chainspec/src/lib.rs
@@ -248,10 +248,6 @@ impl EthChainSpec for ScrollChainSpec {
         self.inner.chain()
     }
 
-    fn base_fee_params_at_block(&self, block_number: u64) -> BaseFeeParams {
-        self.inner.base_fee_params_at_block(block_number)
-    }
-
     fn base_fee_params_at_timestamp(&self, timestamp: u64) -> BaseFeeParams {
         self.inner.base_fee_params_at_timestamp(timestamp)
     }
diff --git a/crates/scroll/cli/src/app.rs b/crates/scroll/cli/src/app.rs
@@ -68,7 +68,10 @@ where
         let _ = install_prometheus_recorder();
 
         let components = |spec: Arc<ScrollChainSpec>| {
-            (ScrollExecutorProvider::scroll(spec.clone()), ScrollBeaconConsensus::new(spec))
+            (
+                ScrollExecutorProvider::scroll(spec.clone()),
+                Arc::new(ScrollBeaconConsensus::new(spec)),
+            )
         };
 
         match self.cli.command {
diff --git a/crates/scroll/cli/src/lib.rs b/crates/scroll/cli/src/lib.rs
@@ -15,18 +15,15 @@ use reth_cli_commands::{launcher::FnLauncher, node::NoArgs};
 use reth_cli_runner::CliRunner;
 use reth_db::DatabaseEnv;
 use reth_node_builder::{NodeBuilder, WithLaunchContext};
-use reth_node_core::{
-    args::LogArgs,
-    version::{LONG_VERSION, SHORT_VERSION},
-};
+use reth_node_core::{args::LogArgs, version::version_metadata};
 use reth_scroll_chainspec::ScrollChainSpec;
 use std::{ffi::OsString, fmt, future::Future, sync::Arc};
 
 /// The main scroll cli interface.
 ///
 /// This is the entrypoint to the executable.
 #[derive(Debug, Parser)]
-#[command(author, version = SHORT_VERSION, long_version = LONG_VERSION, about = "Scroll Reth", long_about = None
+#[command(author, version = version_metadata().short_version.as_ref(), long_version = version_metadata().long_version.as_ref(), about = "Scroll Reth", long_about = None
 )]
 pub struct Cli<Spec: ChainSpecParser = ScrollChainSpecParser, Ext: clap::Args + fmt::Debug = NoArgs>
 {
diff --git a/crates/scroll/node/src/node.rs b/crates/scroll/node/src/node.rs
@@ -15,7 +15,6 @@ use reth_node_builder::{
 use reth_scroll_chainspec::ScrollChainSpec;
 use reth_scroll_engine_primitives::ScrollEngineTypes;
 use reth_scroll_primitives::ScrollPrimitives;
-use reth_trie_db::MerklePatriciaTrie;
 use scroll_alloy_network::Scroll;
 use std::sync::Arc;
 
@@ -113,7 +112,6 @@ where
 impl NodeTypes for ScrollNode {
     type Primitives = ScrollPrimitives;
     type ChainSpec = ScrollChainSpec;
-    type StateCommitment = MerklePatriciaTrie;
     type Storage = ScrollStorage;
     type Payload = ScrollEngineTypes;
 }
diff --git a/crates/scroll/rpc/src/error.rs b/crates/scroll/rpc/src/error.rs
@@ -9,6 +9,7 @@ use reth_rpc_convert::transaction::EthTxEnvError;
 use reth_rpc_eth_api::{AsEthApiError, TransactionConversionError};
 use reth_rpc_eth_types::{error::api::FromEvmHalt, EthApiError};
 use revm::context::result::{EVMError, HaltReason};
+use std::convert::Infallible;
 
 /// Scroll specific errors, that extend [`EthApiError`].
 #[derive(Debug, thiserror::Error)]
@@ -51,11 +52,11 @@ impl From<BlockError> for ScrollEthApiError {
     }
 }
 
-impl<DB> From<EVMError<DB>> for ScrollEthApiError
+impl<T> From<EVMError<T>> for ScrollEthApiError
 where
-    EthApiError: From<EVMError<DB>>,
+    T: Into<EthApiError>,
 {
-    fn from(error: EVMError<DB>) -> Self {
+    fn from(error: EVMError<T>) -> Self {
         Self::Eth(error.into())
     }
 }
@@ -78,6 +79,12 @@ impl From<ProviderError> for ScrollEthApiError {
     }
 }
 
+impl From<Infallible> for ScrollEthApiError {
+    fn from(value: Infallible) -> Self {
+        match value {}
+    }
+}
+
 /// Error type when interacting with the Sequencer
 #[derive(Debug, thiserror::Error)]
 pub enum SequencerClientError {
diff --git a/crates/scroll/rpc/src/eth/call.rs b/crates/scroll/rpc/src/eth/call.rs
@@ -1,6 +1,6 @@
 use crate::{ScrollEthApi, ScrollEthApiError};
 
-use reth_evm::TxEnvFor;
+use reth_evm::{SpecFor, TxEnvFor};
 use reth_rpc_eth_api::{
     helpers::{estimate::EstimateCall, Call, EthCall},
     RpcConvert, RpcNodeCore,
@@ -11,26 +11,38 @@ impl<N, Rpc> EthCall for ScrollEthApi<N, Rpc>
 where
     N: RpcNodeCore,
     ScrollEthApiError: FromEvmError<N::Evm>,
-    Rpc:
-        RpcConvert<Primitives = N::Primitives, Error = ScrollEthApiError, TxEnv = TxEnvFor<N::Evm>>,
+    Rpc: RpcConvert<
+        Primitives = N::Primitives,
+        Error = ScrollEthApiError,
+        TxEnv = TxEnvFor<N::Evm>,
+        Spec = SpecFor<N::Evm>,
+    >,
 {
 }
 
 impl<N, Rpc> EstimateCall for ScrollEthApi<N, Rpc>
 where
     N: RpcNodeCore,
     ScrollEthApiError: FromEvmError<N::Evm>,
-    Rpc:
-        RpcConvert<Primitives = N::Primitives, Error = ScrollEthApiError, TxEnv = TxEnvFor<N::Evm>>,
+    Rpc: RpcConvert<
+        Primitives = N::Primitives,
+        Error = ScrollEthApiError,
+        TxEnv = TxEnvFor<N::Evm>,
+        Spec = SpecFor<N::Evm>,
+    >,
 {
 }
 
 impl<N, Rpc> Call for ScrollEthApi<N, Rpc>
 where
     N: RpcNodeCore,
     ScrollEthApiError: FromEvmError<N::Evm>,
-    Rpc:
-        RpcConvert<Primitives = N::Primitives, Error = ScrollEthApiError, TxEnv = TxEnvFor<N::Evm>>,
+    Rpc: RpcConvert<
+        Primitives = N::Primitives,
+        Error = ScrollEthApiError,
+        TxEnv = TxEnvFor<N::Evm>,
+        Spec = SpecFor<N::Evm>,
+    >,
 {
     #[inline]
     fn call_gas_limit(&self) -> u64 {
diff --git a/crates/scroll/rpc/src/eth/mod.rs b/crates/scroll/rpc/src/eth/mod.rs
@@ -16,7 +16,7 @@ use reth_rpc_convert::{RpcConvert, RpcConverter, RpcTypes, SignableTxRequest};
 use reth_rpc_eth_api::{
     helpers::{
         pending_block::BuildPendingEnv, spec::SignersForApi, AddDevSigners, EthApiSpec, EthState,
-        LoadFee, LoadState, SpawnBlocking, Trace,
+        LoadFee, LoadPendingBlock, LoadState, SpawnBlocking, Trace,
     },
     EthApiTypes, FullEthApiServer, RpcNodeCore, RpcNodeCoreExt,
 };
@@ -227,13 +227,15 @@ impl<N, Rpc> LoadState for ScrollEthApi<N, Rpc>
 where
     N: RpcNodeCore,
     Rpc: RpcConvert<Primitives = N::Primitives>,
+    Self: LoadPendingBlock,
 {
 }
 
 impl<N, Rpc> EthState for ScrollEthApi<N, Rpc>
 where
     N: RpcNodeCore,
     Rpc: RpcConvert<Primitives = N::Primitives>,
+    Self: LoadPendingBlock,
 {
     #[inline]
     fn max_proof_window(&self) -> u64 {
diff --git a/crates/scroll/rpc/src/eth/pending_block.rs b/crates/scroll/rpc/src/eth/pending_block.rs
@@ -5,7 +5,7 @@ use reth_rpc_eth_api::{
     helpers::{pending_block::PendingEnvBuilder, LoadPendingBlock},
     RpcConvert, RpcNodeCore,
 };
-use reth_rpc_eth_types::{error::FromEvmError, PendingBlock};
+use reth_rpc_eth_types::{builder::config::PendingBlockKind, error::FromEvmError, PendingBlock};
 
 impl<N, Rpc> LoadPendingBlock for ScrollEthApi<N, Rpc>
 where
@@ -22,4 +22,8 @@ where
     fn pending_env_builder(&self) -> &dyn PendingEnvBuilder<Self::Evm> {
         self.inner.eth_api.pending_env_builder()
     }
+
+    fn pending_block_kind(&self) -> PendingBlockKind {
+        self.inner.eth_api.pending_block_kind()
+    }
 }
diff --git a/crates/scroll/rpc/src/eth/transaction.rs b/crates/scroll/rpc/src/eth/transaction.rs
@@ -119,7 +119,7 @@ impl<Provider> ScrollTxInfoMapper<Provider> {
     }
 }
 
-impl<Provider> TxInfoMapper<&ScrollTxEnvelope> for ScrollTxInfoMapper<Provider>
+impl<Provider> TxInfoMapper<ScrollTxEnvelope> for ScrollTxInfoMapper<Provider>
 where
     Provider: ReceiptProvider<Receipt = ScrollReceipt>,
 {
diff --git a/crates/scroll/txpool/src/validator.rs b/crates/scroll/txpool/src/validator.rs
@@ -35,7 +35,7 @@ pub struct ScrollL1BlockInfo {
 }
 
 /// Validator for Scroll transactions.
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub struct ScrollTransactionValidator<Client, Tx> {
     /// The type that performs the actual validation.
     inner: EthTransactionValidator<Client, Tx>,
@@ -56,7 +56,7 @@ impl<Client, Tx> ScrollTransactionValidator<Client, Tx> {
     }
 
     /// Returns the configured client
-    pub fn client(&self) -> &Client {
+    pub const fn client(&self) -> &Client {
         self.inner.client()
     }
 
diff --git a/examples/custom-node/Cargo.toml b/examples/custom-node/Cargo.toml
@@ -45,6 +45,7 @@ op-revm.workspace = true
 
 # misc
 async-trait.workspace = true
+derive_more.workspace = true
 eyre.workspace = true
 jsonrpsee.workspace = true
 serde.workspace = true

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ where`
`139`	`139`	`contract: Address,`
`140`	`140`	`data: Bytes,`
`141`	`141`	`) -> Result<ResultAndState<Self::HaltReason>, Self::Error> {`
`142`		`- self.inner.transact_system_call_with_caller_finalize(caller, contract, data)`
	`142`	`+ self.inner.system_call_with_caller(caller, contract, data)`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`fn db_mut(&mut self) -> &mut Self::DB {`
Original file line number	Diff line number	Diff line change
`@@ -248,10 +248,6 @@ impl EthChainSpec for ScrollChainSpec {`
`248`	`248`	`self.inner.chain()`
`249`	`249`	`}`
`250`	`250`
`251`		`- fn base_fee_params_at_block(&self, block_number: u64) -> BaseFeeParams {`
`252`		`- self.inner.base_fee_params_at_block(block_number)`
`253`		`- }`
`254`		`-`
`255`	`251`	`fn base_fee_params_at_timestamp(&self, timestamp: u64) -> BaseFeeParams {`
`256`	`252`	`self.inner.base_fee_params_at_timestamp(timestamp)`
`257`	`253`	`}`