chore: remove reth-primitives dep db crates (#14968)

Cargo.lock

@@ -7115,8 +7115,8 @@ dependencies = [
  "reth-libmdbx",
  "reth-metrics",
  "reth-nippy-jar",
- "reth-primitives",
  "reth-primitives-traits",
+ "reth-static-file-types",
  "reth-storage-errors",
  "reth-tracing",
  "rustc-hash 2.1.1",
@@ -7146,8 +7146,8 @@ dependencies = [
  "rand 0.8.5",
  "reth-codecs",
  "reth-db-models",
+ "reth-ethereum-primitives",
  "reth-optimism-primitives",
- "reth-primitives",
  "reth-primitives-traits",
  "reth-prune-types",
  "reth-stages-types",
@@ -7175,10 +7175,10 @@ dependencies = [
  "reth-etl",
  "reth-fs-util",
  "reth-node-types",
- "reth-primitives",
  "reth-primitives-traits",
  "reth-provider",
  "reth-stages-types",
+ "reth-static-file-types",
  "reth-trie",
  "reth-trie-db",
  "serde",

crates/storage/db-api/Cargo.toml

@@ -15,7 +15,7 @@ workspace = true
 # reth
 reth-codecs.workspace = true
 reth-db-models = { workspace = true, features = ["reth-codec"] }
-reth-primitives = { workspace = true, features = ["reth-codec"] }
+reth-ethereum-primitives = { workspace = true, features = ["reth-codec"] }
 reth-primitives-traits = { workspace = true, features = ["serde", "reth-codec"] }
 reth-stages-types = { workspace = true, features = ["serde", "reth-codec"] }
 reth-prune-types = { workspace = true, features = ["serde", "reth-codec"] }
@@ -49,7 +49,6 @@ proptest = { workspace = true, optional = true }
 
 [dev-dependencies]
 # reth libs with arbitrary
-reth-primitives = { workspace = true, features = ["arbitrary"] }
 reth-codecs = { workspace = true, features = ["test-utils"] }
 
 rand.workspace = true
@@ -63,16 +62,15 @@ proptest-arbitrary-interop.workspace = true
 [features]
 test-utils = [
     "arbitrary",
-    "reth-primitives/test-utils",
     "reth-primitives-traits/test-utils",
     "reth-codecs/test-utils",
     "reth-db-models/test-utils",
     "reth-trie-common/test-utils",
     "reth-prune-types/test-utils",
     "reth-stages-types/test-utils",
+    "reth-ethereum-primitives/test-utils",
 ]
 arbitrary = [
-    "reth-primitives/arbitrary",
     "reth-db-models/arbitrary",
     "dep:arbitrary",
     "dep:proptest",
@@ -85,6 +83,7 @@ arbitrary = [
     "reth-stages-types/arbitrary",
     "alloy-consensus/arbitrary",
     "reth-optimism-primitives?/arbitrary",
+    "reth-ethereum-primitives/arbitrary",
 ]
 op = [
     "dep:reth-optimism-primitives",

crates/storage/db-api/src/models/mod.rs

@@ -8,8 +8,8 @@ use alloy_consensus::Header;
 use alloy_genesis::GenesisAccount;
 use alloy_primitives::{Address, Bytes, Log, B256, U256};
 use reth_codecs::{add_arbitrary_tests, Compact};
-use reth_primitives::{Receipt, StorageEntry, TransactionSigned, TxType};
-use reth_primitives_traits::{Account, Bytecode};
+use reth_ethereum_primitives::{Receipt, TransactionSigned, TxType};
+use reth_primitives_traits::{Account, Bytecode, StorageEntry};
 use reth_prune_types::{PruneCheckpoint, PruneSegment};
 use reth_stages_types::StageCheckpoint;
 use reth_trie_common::{StoredNibbles, StoredNibblesSubKey, *};
@@ -323,7 +323,7 @@ mod tests {
     fn test_ensure_backwards_compatibility() {
         use super::*;
         use reth_codecs::{test_utils::UnusedBits, validate_bitflag_backwards_compat};
-        use reth_primitives::{Account, Receipt};
+        use reth_primitives_traits::Account;
         use reth_prune_types::{PruneCheckpoint, PruneMode, PruneSegment};
         use reth_stages_types::{
             AccountHashingCheckpoint, CheckpointBlockRange, EntitiesCheckpoint,

crates/storage/db-api/src/tables/mod.rs

@@ -28,8 +28,8 @@ use crate::{
 };
 use alloy_consensus::Header;
 use alloy_primitives::{Address, BlockHash, BlockNumber, TxHash, TxNumber, B256};
-use reth_primitives::{Receipt, StorageEntry, TransactionSigned};
-use reth_primitives_traits::{Account, Bytecode};
+use reth_ethereum_primitives::{Receipt, TransactionSigned};
+use reth_primitives_traits::{Account, Bytecode, StorageEntry};
 use reth_prune_types::{PruneCheckpoint, PruneSegment};
 use reth_stages_types::StageCheckpoint;
 use reth_trie_common::{BranchNodeCompact, StorageTrieEntry, StoredNibbles, StoredNibblesSubKey};

crates/storage/db-common/Cargo.toml

@@ -10,9 +10,9 @@ repository.workspace = true
 [dependencies]
 # reth
 reth-chainspec.workspace = true
-reth-primitives.workspace = true
 reth-db-api.workspace = true
 reth-provider.workspace = true
+reth-primitives-traits.workspace = true
 reth-config.workspace = true
 reth-trie.workspace = true
 reth-trie-db.workspace = true
@@ -21,6 +21,7 @@ reth-codecs.workspace = true
 reth-stages-types.workspace = true
 reth-fs-util.workspace = true
 reth-node-types.workspace = true
+reth-static-file-types.workspace = true
 
 # eth
 alloy-consensus.workspace = true
@@ -41,7 +42,6 @@ tracing.workspace = true
 
 [dev-dependencies]
 reth-db = { workspace = true, features = ["mdbx"] }
-reth-primitives-traits.workspace = true
 reth-provider = { workspace = true, features = ["test-utils"] }
 alloy-consensus.workspace = true
 

crates/storage/db-common/src/init.rs

@@ -8,9 +8,7 @@ use reth_codecs::Compact;
 use reth_config::config::EtlConfig;
 use reth_db_api::{tables, transaction::DbTxMut, DatabaseError};
 use reth_etl::Collector;
-use reth_primitives::{
-    Account, Bytecode, GotExpected, NodePrimitives, StaticFileSegment, StorageEntry,
-};
+use reth_primitives_traits::{Account, Bytecode, GotExpected, NodePrimitives, StorageEntry};
 use reth_provider::{
     errors::provider::ProviderResult, providers::StaticFileWriter, writer::UnifiedStorageWriter,
     BlockHashReader, BlockNumReader, BundleStateInit, ChainSpecProvider, DBProvider,
@@ -19,6 +17,7 @@ use reth_provider::{
     StateWriter, StaticFileProviderFactory, StorageLocation, TrieWriter,
 };
 use reth_stages_types::{StageCheckpoint, StageId};
+use reth_static_file_types::StaticFileSegment;
 use reth_trie::{IntermediateStateRootState, StateRoot as StateRootComputer, StateRootProgress};
 use reth_trie_db::DatabaseStateRoot;
 use serde::{Deserialize, Serialize};

crates/storage/db/Cargo.toml

@@ -14,11 +14,11 @@ workspace = true
 [dependencies]
 # reth
 reth-db-api.workspace = true
-reth-primitives = { workspace = true, features = ["reth-codec"] }
 reth-fs-util.workspace = true
 reth-storage-errors.workspace = true
 reth-nippy-jar.workspace = true
 reth-tracing.workspace = true
+reth-static-file-types.workspace = true
 
 # ethereum
 alloy-primitives.workspace = true
@@ -36,7 +36,7 @@ page_size = { workspace = true, optional = true }
 thiserror.workspace = true
 tempfile = { workspace = true, optional = true }
 derive_more.workspace = true
-rustc-hash = { workspace = true, optional = true }
+rustc-hash = { workspace = true, optional = true, features = ["std"] }
 sysinfo = { workspace = true, features = ["system"] }
 parking_lot = { workspace = true, optional = true }
 
@@ -45,13 +45,15 @@ strum = { workspace = true, features = ["derive"], optional = true }
 
 [dev-dependencies]
 # reth libs with arbitrary
-reth-primitives = { workspace = true, features = ["arbitrary"] }
 reth-primitives-traits = { workspace = true, features = ["reth-codec"] }
+
+alloy-primitives = { workspace = true, features = ["getrandom"] }
+alloy-consensus.workspace = true
+
 serde_json.workspace = true
 tempfile.workspace = true
 parking_lot.workspace = true
 
-alloy-consensus.workspace = true
 serde.workspace = true
 pprof = { workspace = true, features = ["flamegraph", "frame-pointer", "criterion"] }
 criterion.workspace = true
@@ -77,14 +79,12 @@ test-utils = [
     "mdbx",
     "arbitrary",
     "parking_lot",
-    "reth-primitives/test-utils",
     "reth-db-api/test-utils",
     "reth-nippy-jar/test-utils",
     "reth-primitives-traits/test-utils",
 ]
 bench = ["reth-db-api/bench"]
 arbitrary = [
-    "reth-primitives/arbitrary",
     "reth-db-api/arbitrary",
     "alloy-primitives/arbitrary",
     "alloy-consensus/arbitrary",

crates/storage/db/src/static_file/cursor.rs

@@ -3,7 +3,7 @@ use alloy_primitives::B256;
 use derive_more::{Deref, DerefMut};
 use reth_db_api::table::Decompress;
 use reth_nippy_jar::{DataReader, NippyJar, NippyJarCursor};
-use reth_primitives::static_file::SegmentHeader;
+use reth_static_file_types::SegmentHeader;
 use reth_storage_errors::provider::{ProviderError, ProviderResult};
 use std::sync::Arc;
 

crates/storage/db/src/static_file/mod.rs

@@ -11,13 +11,10 @@ pub use cursor::StaticFileCursor;
 mod mask;
 pub use mask::*;
 use reth_nippy_jar::{NippyJar, NippyJarError};
-use reth_primitives::{
-    static_file::{SegmentHeader, SegmentRangeInclusive},
-    StaticFileSegment,
-};
 
 mod masks;
 pub use masks::*;
+use reth_static_file_types::{SegmentHeader, SegmentRangeInclusive, StaticFileSegment};
 
 /// Alias type for a map of [`StaticFileSegment`] and sorted lists of existing static file ranges.
 type SortedStaticFiles =