wip

Author: kariy

Cargo.lock

@@ -1,14 +1,10 @@
 use std::fmt::Debug;
 
 use katana_gateway_types::TxTryFromError;
-use katana_primitives::block::{GasPrices, PartialHeader, PendingBlock};
-use katana_primitives::transaction::{TxHash, TxWithHash};
-use katana_primitives::Felt;
+use katana_primitives::transaction::{TxHash, TxNumber, TxWithHash};
 use katana_provider::api::state::{StateFactoryProvider, StateProvider};
 use katana_rpc::starknet::{PendingBlockProvider, StarknetApiResult};
-use katana_rpc_types::PreConfirmedBlockWithTxs;
-use num_traits::ToPrimitive;
-use starknet::core::types::ResourcePrice;
+use katana_rpc_types::RpcTxWithHash;
 
 use crate::full::pending::PreconfStateFactory;
 
@@ -21,17 +17,17 @@ impl<P: StateFactoryProvider + Debug> PendingBlockProvider for PreconfStateFacto
                 .transactions
                 .clone()
                 .into_iter()
-                .map(TxWithHash::try_from)
+                .map(|tx| Ok(RpcTxWithHash::from(TxWithHash::try_from(tx)?)))
                 .collect::<Result<Vec<_>, TxTryFromError>>()
                 .unwrap();
 
             Ok(Some(katana_rpc_types::PreConfirmedBlockWithTxs {
                 transactions,
                 block_number: 0,
                 l1_da_mode: block.l1_da_mode,
-                l1_gas_price: to_gas_prices(block.l1_gas_price),
-                l2_gas_price: to_gas_prices(block.l2_gas_price),
-                l1_data_gas_price: to_gas_prices(block.l1_data_gas_price),
+                l1_gas_price: block.l1_gas_price,
+                l2_gas_price: block.l2_gas_price,
+                l1_data_gas_price: block.l1_data_gas_price,
                 sequencer_address: block.sequencer_address,
                 starknet_version: block.starknet_version,
                 timestamp: block.timestamp,
@@ -49,9 +45,9 @@ impl<P: StateFactoryProvider + Debug> PendingBlockProvider for PreconfStateFacto
                 transactions: Vec::new(),
                 block_number: 0,
                 l1_da_mode: block.l1_da_mode,
-                l1_gas_price: to_gas_prices(block.l1_gas_price),
-                l2_gas_price: to_gas_prices(block.l2_gas_price),
-                l1_data_gas_price: to_gas_prices(block.l1_data_gas_price),
+                l1_gas_price: block.l1_gas_price,
+                l2_gas_price: block.l2_gas_price,
+                l1_data_gas_price: block.l1_data_gas_price,
                 sequencer_address: block.sequencer_address,
                 starknet_version: block.starknet_version,
                 timestamp: block.timestamp,
@@ -76,9 +72,9 @@ impl<P: StateFactoryProvider + Debug> PendingBlockProvider for PreconfStateFacto
                 transactions,
                 block_number: 0,
                 l1_da_mode: block.l1_da_mode,
-                l1_gas_price: to_gas_prices(block.l1_gas_price),
-                l2_gas_price: to_gas_prices(block.l2_gas_price),
-                l1_data_gas_price: to_gas_prices(block.l1_data_gas_price),
+                l1_gas_price: block.l1_gas_price,
+                l2_gas_price: block.l2_gas_price,
+                l1_data_gas_price: block.l1_data_gas_price,
                 sequencer_address: block.sequencer_address,
                 starknet_version: block.starknet_version,
                 timestamp: block.timestamp,
@@ -110,23 +106,12 @@ impl<P: StateFactoryProvider + Debug> PendingBlockProvider for PreconfStateFacto
 
     fn get_pending_transaction_by_index(
         &self,
-        hash: TxHash,
+        index: TxNumber,
     ) -> StarknetApiResult<Option<katana_rpc_types::RpcTxWithHash>> {
         Ok(None)
     }
 
     fn pending_state(&self) -> StarknetApiResult<Option<Box<dyn StateProvider>>> {
-        Some(Box::new(self.state()))
+        Ok(Some(Box::new(self.state())))
     }
 }
-
-fn to_gas_prices(prices: ResourcePrice) -> GasPrices {
-    let eth = prices.price_in_wei.to_u128().expect("valid u128");
-    let strk = prices.price_in_fri.to_u128().expect("valid u128");
-    // older blocks might have zero gas prices (recent Starknet upgrade has made the minimum gas
-    // prices to 1) we may need to handle this case if we want to be able to compute the
-    // block hash correctly
-    let eth = if eth == 0 { 1 } else { eth };
-    let strk = if strk == 0 { 1 } else { strk };
-    unsafe { GasPrices::new_unchecked(eth, strk) }
-}

crates/node/src/full/pending/provider.rs

@@ -33,6 +33,7 @@ strum_macros.workspace = true
 
 [dev-dependencies]
 assert_matches.workspace = true
+bincode = "1.3"
 postcard.workspace = true
 rstest.workspace = true
 similar-asserts.workspace = true

crates/primitives/Cargo.toml

@@ -7,7 +7,6 @@ use katana_primitives::da::L1DataAvailabilityMode;
 use katana_primitives::execution::TypedTransactionExecutionInfo;
 use katana_primitives::transaction::{TxHash, TxNumber};
 use katana_primitives::version::CURRENT_STARKNET_VERSION;
-use katana_primitives::{block::PartialHeader, transaction::TxNumber};
 use katana_provider::api::state::StateProvider;
 use katana_rpc_types::{
     FinalityStatus, PreConfirmedBlockWithReceipts, PreConfirmedBlockWithTxHashes,