integrate pending provider

Author: kariy

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

@@ -26,7 +26,7 @@ impl<P: StateFactoryProvider + Debug> PendingBlockProvider for PreconfStateFacto
                     number: 0,
                     parent_hash: Felt::ZERO,
                 },
-                body: preconf_block
+                transactions: preconf_block
                     .transactions
                     .clone()
                     .into_iter()

crates/oracle/gas/src/lib.rs

@@ -17,7 +17,7 @@ pub use sampled::{SampledPriceOracle, Sampler};
 
 use crate::sampled::starknet::{StarknetGatewaySampler, StarknetJsonRpcSampler};
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub enum GasPriceOracle {
     Fixed(fixed::FixedPriceOracle),
     Sampled(sampled::SampledPriceOracle<Box<dyn Sampler + 'static>>),

crates/oracle/gas/src/sampled/mod.rs

@@ -23,11 +23,17 @@ pub trait Sampler: Debug + Send + Sync {
     fn sample(&self) -> BoxFuture<'_, anyhow::Result<SampledPrices>>;
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub struct SampledPriceOracle<S: Sampler> {
     inner: Arc<SampledPriceOracleInner<S>>,
 }
 
+impl<S: Sampler> Clone for SampledPriceOracle<S> {
+    fn clone(&self) -> Self {
+        Self { inner: self.inner.clone() }
+    }
+}
+
 #[derive(Debug)]
 struct SampledPriceOracleInner<S> {
     samples: Mutex<Samples>,

crates/primitives/src/block.rs

@@ -8,6 +8,7 @@ use starknet::macros::short_string;
 
 use crate::contract::ContractAddress;
 use crate::da::L1DataAvailabilityMode;
+use crate::receipt::Receipt;
 use crate::transaction::{ExecutableTxWithHash, TxHash, TxWithHash};
 use crate::version::StarknetVersion;
 use crate::Felt;
@@ -121,7 +122,8 @@ pub struct PartialHeader {
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct PendingBlock {
     pub header: PartialHeader,
-    pub body: Vec<TxWithHash>,
+    pub transactions: Vec<TxWithHash>,
+    pub receipts: Vec<Receipt>,
 }
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]

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

@@ -48,11 +48,14 @@ use katana_rpc_types::trie::{
     ClassesProof, ContractLeafData, ContractStorageKeys, ContractStorageProofs, ContractsProof,
     GetStorageProofResponse, GlobalRoots, Nodes,
 };
-use katana_rpc_types::{FeeEstimate, TxStatus};
+use katana_rpc_types::{
+    FeeEstimate, PreConfirmedBlockWithReceipts, PreConfirmedBlockWithTxs, TxStatus,
+};
 use katana_rpc_types_builder::{BlockBuilder, ReceiptBuilder};
 use katana_tasks::{Result as TaskResult, TaskSpawner};
 
 use crate::permit::Permits;
+use crate::starknet::pending::PendingBlockProvider2;
 use crate::utils::events::{Cursor, EventBlockId};
 use crate::{utils, DEFAULT_ESTIMATE_FEE_MAX_CONCURRENT_REQUESTS};
 
@@ -341,7 +344,13 @@ where
                 else {
                     let num = provider.latest_number()?;
                     let mut env = provider.block_env_at(num.into())?.expect("missing block env");
-                    self.inner.backend.update_block_env(&mut env);
+
+                    env.number += 1;
+                    env.timestamp = get_current_timestamp().as_secs() as u64;
+                    env.l2_gas_prices = self.inner.gas_oracle.l2_gas_prices();
+                    env.l1_gas_prices = self.inner.gas_oracle.l1_gas_prices();
+                    env.l1_data_gas_prices = self.inner.gas_oracle.l1_data_gas_prices();
+
                     Some(env)
                 }
             }
@@ -680,9 +689,11 @@ where
                         .build()?
                         .map(MaybePreConfirmedBlock::Confirmed);
 
-                    StarknetApiResult::Ok(block)
-                } else {
-                    StarknetApiResult::Ok(None)
+                            StarknetApiResult::Ok(block)
+                        } else {
+                            StarknetApiResult::Ok(None)
+                        }
+                    }
                 }
             })
             .await??;
@@ -717,9 +728,11 @@ where
                         .build_with_receipts()?
                         .map(GetBlockWithReceiptsResponse::Block);
 
-                    StarknetApiResult::Ok(block)
-                } else {
-                    StarknetApiResult::Ok(None)
+                            StarknetApiResult::Ok(block)
+                        } else {
+                            StarknetApiResult::Ok(None)
+                        }
+                    }
                 }
             })
             .await??;
@@ -754,9 +767,11 @@ where
                         .build_with_tx_hash()?
                         .map(GetBlockWithTxHashesResponse::Block);
 
-                    StarknetApiResult::Ok(block)
-                } else {
-                    StarknetApiResult::Ok(None)
+                            StarknetApiResult::Ok(block)
+                        } else {
+                            StarknetApiResult::Ok(None)
+                        }
+                    }
                 }
             })
             .await??;