From 8ba95a16671f57f4f1002951371ee70f7fb326ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20Anda=20Estensen?= Date: Thu, 19 Sep 2024 15:54:07 +0200 Subject: [PATCH] chain-state: replace primitive imports with alloy-eips (#11038) --- Cargo.lock | 1 + crates/chain-state/Cargo.toml | 3 ++- crates/chain-state/src/chain_info.rs | 3 ++- crates/chain-state/src/in_memory.rs | 5 +++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f6d0c78011..7e950dc0ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6424,6 +6424,7 @@ dependencies = [ name = "reth-chain-state" version = "1.0.7" dependencies = [ + "alloy-eips", "alloy-primitives", "alloy-signer", "alloy-signer-local", diff --git a/crates/chain-state/Cargo.toml b/crates/chain-state/Cargo.toml index 078fe7d0c0..91f68b7615 100644 --- a/crates/chain-state/Cargo.toml +++ b/crates/chain-state/Cargo.toml @@ -21,7 +21,8 @@ reth-primitives.workspace = true reth-storage-api.workspace = true reth-trie.workspace = true -# alloy +# ethereum +alloy-eips.workspace = true alloy-primitives.workspace = true # async diff --git a/crates/chain-state/src/chain_info.rs b/crates/chain-state/src/chain_info.rs index 8e8c095a81..f01d472719 100644 --- a/crates/chain-state/src/chain_info.rs +++ b/crates/chain-state/src/chain_info.rs @@ -1,7 +1,8 @@ +use alloy_eips::BlockNumHash; use alloy_primitives::BlockNumber; use parking_lot::RwLock; use reth_chainspec::ChainInfo; -use reth_primitives::{BlockNumHash, SealedHeader}; +use reth_primitives::SealedHeader; use std::{ sync::{ atomic::{AtomicU64, Ordering}, diff --git a/crates/chain-state/src/in_memory.rs b/crates/chain-state/src/in_memory.rs index 3ce079b4f3..c78baf4dd5 100644 --- a/crates/chain-state/src/in_memory.rs +++ b/crates/chain-state/src/in_memory.rs @@ -4,14 +4,15 @@ use crate::{ CanonStateNotification, CanonStateNotificationSender, CanonStateNotifications, ChainInfoTracker, MemoryOverlayStateProvider, }; +use alloy_eips::BlockNumHash; use alloy_primitives::{Address, TxHash, B256}; use parking_lot::RwLock; use reth_chainspec::ChainInfo; use reth_execution_types::{Chain, ExecutionOutcome}; use reth_metrics::{metrics::Gauge, Metrics}; use reth_primitives::{ - BlockNumHash, Header, Receipt, Receipts, SealedBlock, SealedBlockWithSenders, SealedHeader, - TransactionMeta, TransactionSigned, + Header, Receipt, Receipts, SealedBlock, SealedBlockWithSenders, SealedHeader, TransactionMeta, + TransactionSigned, }; use reth_storage_api::StateProviderBox; use reth_trie::{updates::TrieUpdates, HashedPostState};