reslove dirty cache issue

crates/blockchain-tree/src/blockchain_tree.rs

@@ -1,7 +1,7 @@
 //! Implementation of [`BlockchainTree`]
 
 use crate::{
-    canonical_cache::{apply_bundle_state, clear_accounts_and_storages},
+    canonical_cache::apply_bundle_state,
     metrics::{MakeCanonicalAction, MakeCanonicalDurationsRecorder, TreeMetrics},
     state::{BlockchainId, TreeState},
     AppendableChain, BlockIndices, BlockchainTreeConfig, ExecutionData, TreeExternals,
@@ -1344,9 +1344,6 @@ where
 
         provider_rw.commit()?;
 
-        // clear global canonical cache
-        clear_accounts_and_storages();
-
         if blocks_and_execution.is_empty() {
             Ok(None)
         } else {

crates/blockchain-tree/src/chain.rs

@@ -4,7 +4,10 @@
 //! blocks, as well as a list of the blocks the chain is composed of.
 
 use super::externals::TreeExternals;
-use crate::{canonical_cache::CachedBundleStateProvider, BundleStateDataRef};
+use crate::{
+    canonical_cache::{clear_accounts_and_storages, CachedBundleStateProvider},
+    BundleStateDataRef,
+};
 use reth_blockchain_tree_api::{
     error::{BlockchainTreeError, InsertBlockErrorKind},
     BlockAttachment, BlockValidationKind,
@@ -81,6 +84,12 @@ impl AppendableChain {
         let execution_outcome = ExecutionOutcome::default();
         let empty = BTreeMap::new();
 
+        if block_attachment == BlockAttachment::HistoricalFork {
+            // The fork is a historical fork, the global canonical cache could be dirty.
+            // The case should be rare for bsc & op.
+            clear_accounts_and_storages();
+        }
+
         let state_provider = BundleStateDataRef {
             execution_outcome: &execution_outcome,
             sidechain_block_hashes: &empty,