chore: update revm and alloy primitives

paradigmxyz · Sep 26, 2024 · f9fcbae · f9fcbae
1 parent ece0944
commit f9fcbae
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -408,20 +408,20 @@ reth-trie-db = { path = "crates/trie/db" }
 reth-trie-parallel = { path = "crates/trie/parallel" }
 
 # revm
-revm = { version = "14.0.2", features = [
+revm = { version = "14.0.3", features = [
     "std",
     "secp256k1",
     "blst",
 ], default-features = false }
 revm-inspectors = "0.7.6"
-revm-primitives = { version = "9.0.2", features = [
+revm-primitives = { version = "10.0.0", features = [
     "std",
 ], default-features = false }
 
 # eth
 alloy-chains = "0.1.32"
 alloy-dyn-abi = "0.8.0"
-alloy-primitives = { version = "0.8.3", default-features = false }
+alloy-primitives = { version = "0.8.4", default-features = false }
 alloy-rlp = "0.3.4"
 alloy-sol-types = "0.8.0"
 alloy-trie = { version = "0.5", default-features = false }

diff --git a/crates/revm/Cargo.toml b/crates/revm/Cargo.toml
@@ -22,6 +22,8 @@ reth-prune-types.workspace = true
 reth-storage-api.workspace = true
 reth-trie = { workspace = true, optional = true }
 
+alloy-primitives.workspace = true
+
 # revm
 revm.workspace = true
 

diff --git a/crates/revm/src/batch.rs b/crates/revm/src/batch.rs
@@ -1,10 +1,7 @@
 //! Helper for handling execution of multiple blocks.
 
-use crate::{
-    precompile::{Address, HashSet},
-    primitives::alloy_primitives::BlockNumber,
-};
 use alloc::vec::Vec;
+use alloy_primitives::{map::HashSet, Address, BlockNumber};
 use reth_execution_errors::{BlockExecutionError, InternalBlockExecutionError};
 use reth_primitives::{Receipt, Receipts, Request, Requests};
 use reth_prune_types::{PruneMode, PruneModes, PruneSegmentError, MINIMUM_PRUNING_DISTANCE};
@@ -152,7 +149,7 @@ impl BlockBatchRecord {
 
         if !contract_log_pruner.is_empty() {
             let (prev_block, filter) =
-                self.pruning_address_filter.get_or_insert_with(|| (0, HashSet::new()));
+                self.pruning_address_filter.get_or_insert_with(|| (0, Default::default()));
             for (_, addresses) in contract_log_pruner.range(*prev_block..=block_number) {
                 filter.extend(addresses.iter().copied());
             }

diff --git a/crates/revm/src/state_change.rs b/crates/revm/src/state_change.rs
@@ -1,4 +1,4 @@
-use crate::precompile::HashMap;
+use alloy_primitives::map::HashMap;
 use reth_chainspec::{ChainSpec, EthereumHardforks};
 use reth_consensus_common::calc;
 use reth_primitives::{Address, Block, Withdrawal, Withdrawals, U256};

diff --git a/crates/storage/provider/src/test_utils/blocks.rs b/crates/storage/provider/src/test_utils/blocks.rs
@@ -1,7 +1,7 @@
 //! Dummy blocks and data for tests
 use crate::{DatabaseProviderRW, ExecutionOutcome};
 use alloy_consensus::TxLegacy;
-use alloy_primitives::{Log, Parity, Sealable, TxKind};
+use alloy_primitives::{map::HashMap, Log, Parity, Sealable, TxKind};
 use once_cell::sync::Lazy;
 use reth_db::tables;
 use reth_db_api::{database::Database, models::StoredBlockBodyIndices};
@@ -11,10 +11,7 @@ use reth_primitives::{
     TransactionSigned, TxType, Withdrawal, Withdrawals, B256, U256,
 };
 use reth_trie::root::{state_root_unhashed, storage_root_unhashed};
-use revm::{
-    db::BundleState,
-    primitives::{AccountInfo, HashMap},
-};
+use revm::{db::BundleState, primitives::AccountInfo};
 use std::str::FromStr;
 
 /// Assert genesis block