fix(isolate): do not mark cold accounts with arbitrary storage (#9945)

foundry-rs · Feb 24, 2025 · 879154c · 879154c
1 parent bf9bd30
commit 879154c
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/crates/evm/evm/src/inspectors/stack.rs b/crates/evm/evm/src/inspectors/stack.rs
@@ -868,6 +868,13 @@ impl Inspector<&mut dyn DatabaseExt> for InspectorStackRefMut<'_> {
                     let JournaledState { state, warm_preloaded_addresses, .. } =
                         &mut ecx.journaled_state;
                     for (addr, acc_mut) in state {
+                        // Do not mark accounts and storage cold accounts with arbitrary storage.
+                        if let Some(cheatcodes) = &self.cheatcodes {
+                            if cheatcodes.has_arbitrary_storage(addr) {
+                                continue;
+                            }
+                        }
+
                         if !warm_preloaded_addresses.contains(addr) {
                             acc_mut.mark_cold();
                         }