Use an older flow with overrides based on polkadot-evm 1425 PR

Author: dmitrylavrenov

Cargo.lock

@@ -13,6 +13,7 @@ ethereum = { workspace = true }
 fc-db = { workspace = true }
 fc-rpc = { workspace = true }
 fc-rpc-core = { workspace = true }
+fc-storage = { workspace = true }
 fp-rpc = { workspace = true }
 frame-support = { workspace = true }
 futures = { workspace = true }

crates/evm-tracing-rpc/Cargo.toml

@@ -20,7 +20,7 @@ use evm_tracing_client::{
         single::{self, TransactionTrace},
     },
 };
-use fc_rpc::{frontier_backend_client, internal_err, StorageOverride};
+use fc_rpc::{frontier_backend_client, internal_err, OverrideHandle};
 use fp_rpc::EthereumRuntimeRPCApi;
 use futures::StreamExt;
 use jsonrpsee::core::RpcResult;
@@ -67,7 +67,7 @@ where
         backend: Arc<BE>,
         frontier_backend: Arc<dyn fc_db::BackendReader<B> + Send + Sync>,
         permit_pool: Arc<Semaphore>,
-        overrides: Arc<dyn StorageOverride<B>>,
+        overrides: Arc<OverrideHandle<B>>,
         raw_max_memory_usage: usize,
     ) -> (impl Future<Output = ()>, DebugRequester) {
         let (tx, mut rx): (DebugRequester, _) =
@@ -244,7 +244,7 @@ where
         frontier_backend: Arc<dyn fc_db::BackendReader<B> + Send + Sync>,
         request_block_id: RequestBlockId,
         params: Option<TraceParams>,
-        overrides: Arc<dyn StorageOverride<B>>,
+        overrides: Arc<OverrideHandle<B>>,
     ) -> RpcResult<Response> {
         let (tracer_input, trace_type) = Self::handle_params(params)?;
 
@@ -290,6 +290,7 @@ where
         let parent_block_hash = *header.parent_hash();
 
         let statuses = overrides
+            .fallback
             .current_transaction_statuses(hash)
             .unwrap_or_default();
 
@@ -461,7 +462,7 @@ where
         frontier_backend: Arc<dyn fc_db::BackendReader<B> + Send + Sync>,
         transaction_hash: H256,
         params: Option<TraceParams>,
-        overrides: Arc<dyn StorageOverride<B>>,
+        overrides: Arc<OverrideHandle<B>>,
         raw_max_memory_usage: usize,
     ) -> RpcResult<Response> {
         let (tracer_input, trace_type) = Self::handle_params(params)?;
@@ -510,7 +511,14 @@ where
             .map_err(|e| internal_err(format!("Fail to read blockchain db: {:?}", e)))?
             .unwrap_or_default();
 
-        let reference_block = overrides.current_block(reference_hash);
+        let reference_block = overrides
+            .schemas
+            .get(&fc_storage::onchain_storage_schema(
+                client.as_ref(),
+                reference_hash,
+            ))
+            .unwrap_or(&overrides.fallback)
+            .current_block(reference_hash);
 
         // Get the actual ethereum transaction.
         if let Some(block) = reference_block {

crates/evm-tracing-rpc/src/debug/handler.rs

@@ -8,7 +8,7 @@ use evm_tracing_client::{
     formatters::ResponseFormatter,
     types::block::{self, TransactionTrace},
 };
-use fc_rpc::StorageOverride;
+use fc_rpc::OverrideHandle;
 use fp_rpc::EthereumRuntimeRPCApi;
 use futures::stream::FuturesUnordered;
 use futures::{select, FutureExt, StreamExt};
@@ -138,7 +138,7 @@ where
         backend: Arc<BE>,
         cache_duration: Duration,
         blocking_permits: Arc<Semaphore>,
-        overrides: Arc<dyn StorageOverride<B>>,
+        overrides: Arc<OverrideHandle<B>>,
         prometheus: Option<PrometheusRegistry>,
     ) -> (impl Future<Output = ()>, CacheRequester) {
         // Communication with the outside world :
@@ -231,7 +231,7 @@ where
         blocking_tx: &mpsc::Sender<BlockingTaskMessage>,
         sender: oneshot::Sender<CacheBatchId>,
         blocks: Vec<H256>,
-        overrides: Arc<dyn StorageOverride<B>>,
+        overrides: Arc<OverrideHandle<B>>,
     ) {
         tracing::trace!("Starting batch {}", self.next_batch_id);
         self.batches.insert(self.next_batch_id, blocks.clone());
@@ -488,7 +488,7 @@ where
         client: Arc<C>,
         backend: Arc<BE>,
         substrate_hash: H256,
-        overrides: Arc<dyn StorageOverride<B>>,
+        overrides: Arc<OverrideHandle<B>>,
     ) -> TxsTraceRes {
         let api = client.runtime_api();
         let block_header = client
@@ -506,8 +506,17 @@ where
 
         // Get Ethereum block data.
         let (eth_block, eth_transactions) = match (
-            overrides.current_block(substrate_hash),
-            overrides.current_transaction_statuses(substrate_hash),
+            overrides
+                .schemas
+                .get(&fc_storage::onchain_storage_schema(
+                    client.as_ref(),
+                    substrate_hash,
+                ))
+                .unwrap_or(&overrides.fallback)
+                .current_block(substrate_hash),
+            overrides
+                .fallback
+                .current_transaction_statuses(substrate_hash),
         ) {
             (Some(a), Some(b)) => (a, b),
             _ => {