wip

Author: kariy

crates/pool/pool-api/src/lib.rs

@@ -30,7 +30,7 @@ pub enum PoolError {
 pub type PoolResult<T> = Result<T, PoolError>;
 
 /// Represents a complete transaction pool.
-pub trait TransactionPool {
+pub trait TransactionPool: Send + Sync + 'static {
     /// The pool's transaction type.
     type Transaction: PoolTransaction;
 

crates/rpc/rpc/src/starknet/mod.rs

@@ -17,6 +17,7 @@ use katana_primitives::Felt;
 use katana_provider::api::block::{BlockHashProvider, BlockIdReader, BlockNumberProvider};
 use katana_provider::api::contract::ContractClassProvider;
 use katana_provider::api::env::BlockEnvProvider;
+use katana_provider::api::pending::PendingBlockProvider;
 use katana_provider::api::state::{StateFactoryProvider, StateProvider, StateRootProvider};
 use katana_provider::api::transaction::{
     ReceiptProvider, TransactionProvider, TransactionStatusProvider, TransactionsProviderExt,
@@ -79,8 +80,9 @@ pub struct StarknetApi<P: TransactionPool> {
 
 #[derive(Debug)]
 struct StarknetApiInner<P: TransactionPool> {
-    pool: P,
     chain_spec: Arc<ChainSpec>,
+    pool: P,
+    pending_provider: Arc<dyn PendingBlockProvider>,
     storage: BlockchainProvider<Box<dyn Database>>,
     forked_client: Option<ForkedClient>,
     task_spawner: TaskSpawner,
@@ -110,10 +112,7 @@ impl<P: TransactionPool> StarknetApi<P> {
     }
 }
 
-impl<P> StarknetApi<P>
-where
-    P: TransactionPool + Send + Sync + 'static,
-{
+impl<P: TransactionPool> StarknetApi<P> {
     pub fn new(
         chain_spec: Arc<ChainSpec>,
         storage: BlockchainProvider<Box<dyn Database>>,
@@ -1027,10 +1026,7 @@ where
 // `StarknetApiExt` Implementations
 /////////////////////////////////////////////////////
 
-impl<P> StarknetApi<P>
-where
-    P: TransactionPool + Send + Sync + 'static,
-{
+impl<P: TransactionPool> StarknetApi<P> {
     async fn blocks(&self, request: GetBlocksRequest) -> StarknetApiResult<GetBlocksResponse> {
         self.on_io_blocking_task(move |this| {
             let provider = &this.inner.storage;

crates/storage/provider/provider-api/src/pending.rs

@@ -1,27 +1,21 @@
 use katana_primitives::block::PartialHeader;
 use katana_primitives::env::BlockEnv;
 use katana_primitives::receipt::Receipt;
+use katana_primitives::state::StateUpdates;
 use katana_primitives::transaction::{TxHash, TxWithHash};
 
 use crate::state::StateProvider;
 use crate::ProviderResult;
 
 #[auto_impl::auto_impl(&, Box, Arc)]
-pub trait PendingDataProvider: Send + Sync {
-    fn state(&self) -> ProviderResult<Option<Box<dyn StateProvider>>>;
-
-    // returns block header, transactions, and receipts
+pub trait PendingBlockProvider: Send + Sync {
     fn block_header(&self) -> ProviderResult<Option<PartialHeader>>;
 
     fn block_env(&self) -> ProviderResult<Option<BlockEnv>>;
 
-    fn block_transaction_count(&self) -> ProviderResult<Option<u64>>;
-
-    fn transaction_by_block_id_and_index(&self) -> ProviderResult<Option<TxWithHash>>;
-
     fn transaction(&self, hash: TxHash) -> ProviderResult<Option<TxWithHash>>;
 
     fn receipt(&self, hash: TxHash) -> ProviderResult<Option<Receipt>>;
 
-    fn state_update(&self) -> ProviderResult<Option<()>>;
+    fn state_update(&self) -> ProviderResult<Option<StateUpdates>>;
 }