diff --git a/Cargo.lock b/Cargo.lock index a243ad0c80..c91026d0fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4600,7 +4600,6 @@ dependencies = [ "async-trait", "auto_impl", "hash-db", - "hashbrown 0.13.2", "plain_hasher", "reth-db", "reth-interfaces", diff --git a/crates/executor/Cargo.toml b/crates/executor/Cargo.toml index 41e42af20a..095aa06084 100644 --- a/crates/executor/Cargo.toml +++ b/crates/executor/Cargo.toml @@ -16,9 +16,8 @@ reth-rlp = { path = "../rlp" } reth-db = { path = "../storage/db" } reth-provider = { path = "../storage/provider" } +# revm revm = { version = "3.0.0"} -# remove from reth and reexport from revm -hashbrown = "0.13" # common async-trait = "0.1.57" diff --git a/crates/executor/src/executor.rs b/crates/executor/src/executor.rs index ab27c6c639..9ce50bc0a1 100644 --- a/crates/executor/src/executor.rs +++ b/crates/executor/src/executor.rs @@ -1,14 +1,14 @@ -use crate::execution_result::{ - AccountChangeSet, AccountInfoChangeSet, ExecutionResult, TransactionChangeSet, -}; - -use hashbrown::hash_map::Entry; use reth_interfaces::executor::{BlockExecutor, Error}; use reth_primitives::{ bloom::logs_bloom, Account, Address, Block, Bloom, ChainSpec, Hardfork, Header, Log, Receipt, TransactionSigned, H256, U256, }; -use reth_provider::StateProvider; +use reth_provider::{ + execution_result::{ + AccountChangeSet, AccountInfoChangeSet, ExecutionResult, TransactionChangeSet, + }, + StateProvider, +}; use reth_revm::{ config::{WEI_2ETH, WEI_3ETH, WEI_5ETH}, database::SubState, @@ -18,7 +18,10 @@ use reth_revm::{ use reth_revm_inspectors::stack::{InspectorStack, InspectorStackConfig}; use revm::{ db::AccountState, - primitives::{Account as RevmAccount, AccountInfo, Bytecode, ResultAndState}, + primitives::{ + hash_map::{self, Entry}, + Account as RevmAccount, AccountInfo, Bytecode, ResultAndState, + }, EVM, }; use std::{ @@ -123,7 +126,7 @@ where /// BTreeMap is used to have sorted values fn commit_changes( &mut self, - changes: hashbrown::HashMap, + changes: hash_map::HashMap, ) -> (BTreeMap, BTreeMap) { let db = self.db();