chore(storage-api): reduce dependence on reth-db (#14539)

Cargo.lock

@@ -9490,7 +9490,6 @@ dependencies = [
  "reth-chainspec",
  "reth-db",
  "reth-db-api",
- "reth-db-models",
  "reth-ethereum-primitives",
  "reth-execution-types",
  "reth-primitives-traits",

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

@@ -25,7 +25,7 @@ pub use accounts::*;
 pub use blocks::*;
 pub use integer_list::IntegerList;
 pub use reth_db_models::{
-    blocks::StaticFileBlockWithdrawals, AccountBeforeTx, ClientVersion, StoredBlockBodyIndices,
+    AccountBeforeTx, ClientVersion, StaticFileBlockWithdrawals, StoredBlockBodyIndices,
     StoredBlockWithdrawals,
 };
 pub use sharded_key::ShardedKey;

crates/storage/storage-api/Cargo.toml

@@ -14,7 +14,6 @@ workspace = true
 [dependencies]
 # reth
 reth-chainspec.workspace = true
-reth-db-models.workspace = true
 reth-db-api.workspace = true
 reth-execution-types.workspace = true
 reth-primitives-traits.workspace = true

crates/storage/storage-api/src/account.rs

@@ -5,7 +5,7 @@ use alloc::{
 use alloy_primitives::{Address, BlockNumber};
 use auto_impl::auto_impl;
 use core::ops::{RangeBounds, RangeInclusive};
-use reth_db_models::AccountBeforeTx;
+use reth_db_api::models::AccountBeforeTx;
 use reth_primitives_traits::Account;
 use reth_storage_errors::provider::ProviderResult;
 

crates/storage/storage-api/src/block_indices.rs

@@ -1,7 +1,7 @@
 use alloc::vec::Vec;
 use alloy_primitives::BlockNumber;
 use core::ops::RangeInclusive;
-use reth_db_models::StoredBlockBodyIndices;
+use reth_db_api::models::StoredBlockBodyIndices;
 use reth_storage_errors::provider::ProviderResult;
 
 ///  Client trait for fetching block body indices related data.

crates/storage/storage-api/src/chain.rs

@@ -4,10 +4,10 @@ use alloy_consensus::Header;
 use alloy_primitives::BlockNumber;
 use core::marker::PhantomData;
 use reth_chainspec::{ChainSpecProvider, EthereumHardforks};
-use reth_db::{
+use reth_db::tables;
+use reth_db_api::{
     cursor::{DbCursorRO, DbCursorRW},
     models::{StoredBlockOmmers, StoredBlockWithdrawals},
-    tables,
     transaction::{DbTx, DbTxMut},
     DbTxUnwindExt,
 };

crates/storage/storage-api/src/hashing.rs

@@ -2,7 +2,7 @@ use alloc::collections::{BTreeMap, BTreeSet};
 use alloy_primitives::{map::HashMap, Address, BlockNumber, B256};
 use auto_impl::auto_impl;
 use core::ops::{RangeBounds, RangeInclusive};
-use reth_db::models::{AccountBeforeTx, BlockNumberAddress};
+use reth_db_api::models::{AccountBeforeTx, BlockNumberAddress};
 use reth_primitives_traits::{Account, StorageEntry};
 use reth_storage_errors::provider::ProviderResult;
 
@@ -29,7 +29,7 @@ pub trait HashingWriter: Send + Sync {
         range: impl RangeBounds<BlockNumber>,
     ) -> ProviderResult<BTreeMap<B256, Option<Account>>>;
 
-    /// Inserts all accounts into [reth_db::tables::AccountsHistory] table.
+    /// Inserts all accounts into the `AccountsHistory` table.
     ///
     /// # Returns
     ///
@@ -39,7 +39,7 @@ pub trait HashingWriter: Send + Sync {
         accounts: impl IntoIterator<Item = (Address, Option<Account>)>,
     ) -> ProviderResult<BTreeMap<B256, Option<Account>>>;
 
-    /// Unwind and clear storage hashing
+    /// Unwind and clear storage hashing.
     ///
     /// # Returns
     ///

crates/storage/storage-api/src/history.rs

@@ -1,7 +1,7 @@
 use alloy_primitives::{Address, BlockNumber, B256};
 use auto_impl::auto_impl;
 use core::ops::{RangeBounds, RangeInclusive};
-use reth_db::models::{AccountBeforeTx, BlockNumberAddress};
+use reth_db_api::models::{AccountBeforeTx, BlockNumberAddress};
 use reth_primitives_traits::StorageEntry;
 use reth_storage_errors::provider::ProviderResult;
 

crates/storage/storage-api/src/noop.rs

@@ -20,7 +20,7 @@ use core::{
     ops::{RangeBounds, RangeInclusive},
 };
 use reth_chainspec::{ChainInfo, ChainSpecProvider, EthChainSpec, MAINNET};
-use reth_db_models::{AccountBeforeTx, StoredBlockBodyIndices};
+use reth_db_api::models::{AccountBeforeTx, StoredBlockBodyIndices};
 use reth_ethereum_primitives::EthPrimitives;
 use reth_primitives_traits::{
     Account, Bytecode, NodePrimitives, RecoveredBlock, SealedBlock, SealedHeader,