feat: short address for journal cold/warm check

crates/context/Cargo.toml

@@ -28,6 +28,7 @@ bytecode.workspace = true
 # misc
 derive-where.workspace = true
 cfg-if.workspace = true
+bitvec.workspace = true
 
 # Optional
 serde = { workspace = true, features = ["derive", "rc"], optional = true }
@@ -45,6 +46,7 @@ std = [
 	"database-interface/std",
 	"primitives/std",
 	"state/std",
+	"bitvec/std",
 ]
 serde = [
 	"dep:serde",
@@ -55,6 +57,7 @@ serde = [
 	"database/serde",
 	"database-interface/serde",
 	"derive-where/serde",
+	"bitvec/serde",
 ]
 dev = [
 	"memory_limit",

crates/context/interface/src/journaled_state.rs

@@ -66,9 +66,6 @@ pub trait JournalTr {
         storage_keys: impl IntoIterator<Item = StorageKey>,
     ) -> Result<(), <Self::Database as Database>::Error>;
 
-    /// Warms the account.
-    fn warm_account(&mut self, address: Address);
-
     /// Warms the coinbase account.
     fn warm_coinbase_account(&mut self, address: Address);
 

crates/context/src/journal.rs

@@ -4,6 +4,7 @@
 //! and inner submodule contains [`JournalInner`] struct that contains state.
 pub mod entry;
 pub mod inner;
+pub mod warm_addresses;
 
 pub use entry::{JournalEntry, JournalEntryTr};
 pub use inner::JournalInner;
@@ -140,24 +141,19 @@ impl<DB: Database, ENTRY: JournalEntryTr> JournalTr for Journal<DB, ENTRY> {
         self.inner.selfdestruct(&mut self.database, address, target)
     }
 
-    fn warm_account(&mut self, address: Address) {
-        self.inner.warm_preloaded_addresses.insert(address);
-    }
-
     fn warm_coinbase_account(&mut self, address: Address) {
-        self.inner.warm_coinbase_address = Some(address);
+        self.inner.warm_addresses.set_coinbase(address);
     }
 
     fn warm_precompiles(&mut self, precompiles: HashSet<Address>) {
-        self.inner.precompiles = precompiles;
         self.inner
-            .warm_preloaded_addresses
-            .clone_from(&self.inner.precompiles);
+            .warm_addresses
+            .set_precompile_addresses(precompiles);
     }
 
     #[inline]
     fn precompile_addresses(&self) -> &HashSet<Address> {
-        &self.inner.precompiles
+        self.inner.warm_addresses.precompiles()
     }
 
     /// Returns call depth.

crates/context/src/journal/inner.rs

@@ -1,5 +1,5 @@
 //! Module containing the [`JournalInner`] that is part of [`crate::Journal`].
-use crate::entry::SelfdestructionRevertStatus;
+use crate::{entry::SelfdestructionRevertStatus, warm_addresses::WarmAddresses};
 
 use super::JournalEntryTr;
 use bytecode::Bytecode;
@@ -12,7 +12,7 @@ use database_interface::Database;
 use primitives::{
     hardfork::SpecId::{self, *},
     hash_map::Entry,
-    Address, HashMap, HashSet, Log, StorageKey, StorageValue, B256, KECCAK_EMPTY, U256,
+    Address, HashMap, Log, StorageKey, StorageValue, B256, KECCAK_EMPTY, U256,
 };
 use state::{Account, EvmState, EvmStorageSlot, TransientStorage};
 use std::vec::Vec;
@@ -53,17 +53,8 @@ pub struct JournalInner<ENTRY> {
     /// [EIP-161]: https://eips.ethereum.org/EIPS/eip-161
     /// [EIP-6780]: https://eips.ethereum.org/EIPS/eip-6780
     pub spec: SpecId,
-    /// Warm loaded addresses are used to check if loaded address
-    /// should be considered cold or warm loaded when the account
-    /// is first accessed.
-    ///
-    /// Note that this not include newly loaded accounts, account and storage
-    /// is considered warm if it is found in the `State`.
-    pub warm_preloaded_addresses: HashSet<Address>,
-    /// Warm coinbase address, stored separately to avoid cloning preloaded addresses.
-    pub warm_coinbase_address: Option<Address>,
-    /// Precompile addresses
-    pub precompiles: HashSet<Address>,
+    /// Warm addresses containing both coinbase and current precompiles.
+    pub warm_addresses: WarmAddresses,
 }
 
 impl<ENTRY: JournalEntryTr> Default for JournalInner<ENTRY> {
@@ -86,9 +77,7 @@ impl<ENTRY: JournalEntryTr> JournalInner<ENTRY> {
             transaction_id: 0,
             depth: 0,
             spec: SpecId::default(),
-            warm_preloaded_addresses: HashSet::default(),
-            precompiles: HashSet::default(),
-            warm_coinbase_address: None,
+            warm_addresses: WarmAddresses::new(),
         }
     }
 
@@ -116,13 +105,10 @@ impl<ENTRY: JournalEntryTr> JournalInner<ENTRY> {
             journal,
             transaction_id,
             spec,
-            warm_preloaded_addresses,
-            precompiles,
-            warm_coinbase_address,
+            warm_addresses,
         } = self;
         // Spec precompiles and state are not changed. It is always set again execution.
         let _ = spec;
-        let _ = precompiles;
         let _ = state;
         transient_storage.clear();
         *depth = 0;
@@ -131,11 +117,7 @@ impl<ENTRY: JournalEntryTr> JournalInner<ENTRY> {
         journal.clear();
 
         // Clear coinbase address warming for next tx
-        *warm_coinbase_address = None;
-        // Load precompiles into warm_preloaded_addresses.
-        // TODO for precompiles we can use max transaction_id so they are always touched warm loaded.
-        // at least after state clear EIP.
-        reset_preloaded_addresses(warm_preloaded_addresses, precompiles);
+        warm_addresses.clear_coinbase();
         // increment transaction id.
         *transaction_id += 1;
         logs.clear();
@@ -152,11 +134,8 @@ impl<ENTRY: JournalEntryTr> JournalInner<ENTRY> {
             journal,
             transaction_id,
             spec,
-            warm_preloaded_addresses,
-            warm_coinbase_address,
-            precompiles,
+            warm_addresses,
         } = self;
-
         let is_spurious_dragon_enabled = spec.is_enabled_in(SPURIOUS_DRAGON);
         // iterate over all journals entries and revert our global state
         journal.drain(..).rev().for_each(|entry| {
@@ -166,9 +145,9 @@ impl<ENTRY: JournalEntryTr> JournalInner<ENTRY> {
         *depth = 0;
         logs.clear();
         *transaction_id += 1;
+
         // Clear coinbase address warming for next tx
-        *warm_coinbase_address = None;
-        reset_preloaded_addresses(warm_preloaded_addresses, precompiles);
+        warm_addresses.clear_coinbase();
     }
 
     /// Take the [`EvmState`] and clears the journal by resetting it to initial state.
@@ -187,16 +166,12 @@ impl<ENTRY: JournalEntryTr> JournalInner<ENTRY> {
             journal,
             transaction_id,
             spec,
-            warm_preloaded_addresses,
-            warm_coinbase_address,
-            precompiles,
+            warm_addresses,
         } = self;
         // Spec is not changed. And it is always set again in execution.
         let _ = spec;
         // Clear coinbase address warming for next tx
-        *warm_coinbase_address = None;
-        // Load precompiles into warm_preloaded_addresses.
-        reset_preloaded_addresses(warm_preloaded_addresses, precompiles);
+        warm_addresses.clear_coinbase();
 
         let state = mem::take(state);
         logs.clear();
@@ -679,8 +654,7 @@ impl<ENTRY: JournalEntryTr> JournalInner<ENTRY> {
                 };
 
                 // Precompiles among some other account(coinbase included) are warm loaded so we need to take that into account
-                let is_cold = !self.warm_preloaded_addresses.contains(&address)
-                    && self.warm_coinbase_address.as_ref() != Some(&address);
+                let is_cold = self.warm_addresses.is_cold(&address);
 
                 StateLoad {
                     data: vac.insert(account),
@@ -881,16 +855,3 @@ pub fn sload_with_account<DB: Database, ENTRY: JournalEntryTr>(
 
     Ok(StateLoad::new(value, is_cold))
 }
-
-fn reset_preloaded_addresses(
-    warm_preloaded_addresses: &mut HashSet<Address>,
-    precompiles: &HashSet<Address>,
-) {
-    // `warm_preloaded_addresses` is append-only, and is initialized with `precompiles`.
-    // Avoid unnecessarily cloning if it hasn't changed.
-    if warm_preloaded_addresses.len() == precompiles.len() {
-        debug_assert_eq!(warm_preloaded_addresses, precompiles);
-        return;
-    }
-    warm_preloaded_addresses.clone_from(precompiles);
-}