Switch hot EVM and mempool HashMaps to FxHashMap for faster hashing

Author: ilitteri

crates/blockchain/mempool.rs

@@ -1,8 +1,10 @@
 use std::{
-    collections::{BTreeMap, HashMap, VecDeque},
+    collections::{BTreeMap, VecDeque},
     sync::RwLock,
 };
 
+use rustc_hash::FxHashMap;
+
 use crate::{
     constants::{
         TX_ACCESS_LIST_ADDRESS_GAS, TX_ACCESS_LIST_STORAGE_KEY_GAS, TX_CREATE_GAS_COST,
@@ -22,8 +24,8 @@ use tracing::warn;
 #[derive(Debug, Default)]
 struct MempoolInner {
     broadcast_pool: HashSet<H256>,
-    transaction_pool: HashMap<H256, MempoolTransaction>,
-    blobs_bundle_pool: HashMap<H256, BlobsBundle>,
+    transaction_pool: FxHashMap<H256, MempoolTransaction>,
+    blobs_bundle_pool: FxHashMap<H256, BlobsBundle>,
     txs_by_sender_nonce: BTreeMap<(H160, u64), H256>,
     txs_order: VecDeque<H256>,
     max_mempool_size: usize,
@@ -35,7 +37,7 @@ impl MempoolInner {
     fn new(max_mempool_size: usize) -> Self {
         MempoolInner {
             txs_order: VecDeque::with_capacity(max_mempool_size * 2),
-            transaction_pool: HashMap::with_capacity(max_mempool_size),
+            transaction_pool: FxHashMap::with_capacity_and_hasher(max_mempool_size, Default::default()),
             max_mempool_size,
             mempool_prune_threshold: max_mempool_size + max_mempool_size / 2,
             ..Default::default()
@@ -191,7 +193,7 @@ impl Mempool {
     pub fn filter_transactions(
         &self,
         filter: &PendingTxFilter,
-    ) -> Result<HashMap<Address, Vec<MempoolTransaction>>, StoreError> {
+    ) -> Result<FxHashMap<Address, Vec<MempoolTransaction>>, StoreError> {
         let filter_tx = |tx: &Transaction| -> bool {
             // Filter by tx type
             let is_blob_tx = matches!(tx, Transaction::EIP4844Transaction(_));
@@ -229,9 +231,9 @@ impl Mempool {
     /// Gets all the transactions in the mempool
     pub fn get_all_txs_by_sender(
         &self,
-    ) -> Result<HashMap<Address, Vec<MempoolTransaction>>, StoreError> {
-        let mut txs_by_sender: HashMap<Address, Vec<MempoolTransaction>> =
-            HashMap::with_capacity(128);
+    ) -> Result<FxHashMap<Address, Vec<MempoolTransaction>>, StoreError> {
+        let mut txs_by_sender: FxHashMap<Address, Vec<MempoolTransaction>> =
+            FxHashMap::with_capacity_and_hasher(128, Default::default());
         let tx_pool = &self.read()?.transaction_pool;
 
         for (_, tx) in tx_pool.iter() {
@@ -250,9 +252,9 @@ impl Mempool {
     pub fn filter_transactions_with_filter_fn(
         &self,
         filter: &dyn Fn(&Transaction) -> bool,
-    ) -> Result<HashMap<Address, Vec<MempoolTransaction>>, StoreError> {
-        let mut txs_by_sender: HashMap<Address, Vec<MempoolTransaction>> =
-            HashMap::with_capacity(128);
+    ) -> Result<FxHashMap<Address, Vec<MempoolTransaction>>, StoreError> {
+        let mut txs_by_sender: FxHashMap<Address, Vec<MempoolTransaction>> =
+            FxHashMap::with_capacity_and_hasher(128, Default::default());
         let tx_pool = &self.read()?.transaction_pool;
 
         for (_, tx) in tx_pool.iter() {

crates/blockchain/payload.rs

@@ -1,11 +1,12 @@
 use std::{
     cmp::{Ordering, max},
-    collections::HashMap,
     ops::Div,
     sync::Arc,
     time::{Duration, Instant},
 };
 
+use rustc_hash::FxHashMap;
+
 use ethrex_common::{
     Address, Bloom, Bytes, H256, U256,
     constants::{DEFAULT_OMMERS_HASH, DEFAULT_REQUESTS_HASH, GAS_PER_BLOB, MAX_RLP_BLOCK_SIZE},
@@ -764,7 +765,7 @@ pub struct TransactionQueue {
     // The first transaction for each account along with its tip, sorted by highest tip
     heads: Vec<HeadTransaction>,
     // The remaining txs grouped by account and sorted by nonce
-    txs: HashMap<Address, Vec<MempoolTransaction>>,
+    txs: FxHashMap<Address, Vec<MempoolTransaction>>,
     // Base Fee stored for tip calculations
     base_fee: Option<u64>,
 }
@@ -792,7 +793,7 @@ impl From<HeadTransaction> for Transaction {
 impl TransactionQueue {
     /// Creates a new TransactionQueue from a set of transactions grouped by sender and sorted by nonce
     fn new(
-        mut txs: HashMap<Address, Vec<MempoolTransaction>>,
+        mut txs: FxHashMap<Address, Vec<MempoolTransaction>>,
         base_fee: Option<u64>,
     ) -> Result<Self, ChainError> {
         let mut heads = Vec::with_capacity(100);

crates/vm/levm/src/call_frame.rs

@@ -10,7 +10,8 @@ use bytes::Bytes;
 use ethrex_common::types::block_access_list::BlockAccessListCheckpoint;
 use ethrex_common::{Address, U256};
 use ethrex_common::{H256, types::Code};
-use std::{collections::HashMap, fmt, hint::assert_unchecked};
+use rustc_hash::FxHashMap;
+use std::{fmt, hint::assert_unchecked};
 
 /// [`u64`]s that make up a [`U256`]
 const U64_PER_U256: usize = U256::MAX.0.len();
@@ -273,8 +274,8 @@ pub struct CallFrame {
 
 #[derive(Debug, Clone, Eq, PartialEq, Default)]
 pub struct CallFrameBackup {
-    pub original_accounts_info: HashMap<Address, LevmAccount>,
-    pub original_account_storage_slots: HashMap<Address, HashMap<H256, U256>>,
+    pub original_accounts_info: FxHashMap<Address, LevmAccount>,
+    pub original_account_storage_slots: FxHashMap<Address, FxHashMap<H256, U256>>,
     /// BAL checkpoint for EIP-7928 - used to restore state changes on revert
     /// while preserving touched_addresses.
     pub bal_checkpoint: Option<BlockAccessListCheckpoint>,

crates/vm/levm/src/environment.rs

@@ -8,9 +8,9 @@ use crate::constants::{
     MAX_BLOB_COUNT_ELECTRA, TARGET_BLOB_GAS_PER_BLOCK, TARGET_BLOB_GAS_PER_BLOCK_PECTRA,
 };
 
-use std::collections::HashMap;
+use rustc_hash::FxHashMap;
 /// [EIP-1153]: https://eips.ethereum.org/EIPS/eip-1153#reference-implementation
-pub type TransientStorage = HashMap<(Address, U256), U256>;
+pub type TransientStorage = FxHashMap<(Address, U256), U256>;
 
 #[derive(Debug, Default, Clone)]
 /// Environmental information that the execution agent must provide.

crates/vm/levm/src/utils.rs

@@ -24,8 +24,8 @@ use ethrex_common::{
 };
 use ethrex_common::{types::TxKind, utils::u256_from_big_endian_const};
 use ethrex_rlp;
-use std::collections::HashMap;
-pub type Storage = HashMap<U256, H256>;
+use rustc_hash::FxHashMap;
+pub type Storage = FxHashMap<U256, H256>;
 
 // ================== Address related functions ======================
 /// Converts address (H160) to word (U256)

crates/vm/levm/src/vm.rs

@@ -25,13 +25,13 @@ use ethrex_common::{
 use rustc_hash::{FxHashMap, FxHashSet};
 use std::{
     cell::RefCell,
-    collections::{BTreeMap, BTreeSet, HashMap},
+    collections::{BTreeMap, BTreeSet},
     mem,
     rc::Rc,
 };
 
 /// Storage mapping from slot key to value.
-pub type Storage = HashMap<U256, H256>;
+pub type Storage = FxHashMap<U256, H256>;
 
 /// Specifies whether the VM operates in L1 or L2 mode.
 #[derive(Debug, Clone, Copy, Default)]