wip

Author: kariy

crates/node/src/full/mod.rs

@@ -236,7 +236,6 @@ impl Node {
         self.task_manager
             .task_spawner()
             .build_task()
-            .graceful_shutdown()
             .name("Pipeline")
             .spawn(self.pipeline.into_future());
 

crates/node/src/full/pending.rs

@@ -7,7 +7,7 @@ use katana_primitives::Felt;
 use katana_provider::api::contract::ContractClassProvider;
 use katana_provider::api::state::{StateProofProvider, StateProvider, StateRootProvider};
 use katana_provider::{ProviderError, ProviderResult};
-use katana_trie::MultiProof;
+use katana_rpc_types::ConversionError;
 use tokio::runtime;
 
 pub struct PendingStateProvider {
@@ -65,11 +65,13 @@ impl ContractClassProvider for PendingStateProvider {
         let result = runtime::Builder::new_current_thread()
             .build()
             .unwrap()
-            .block_on(self.gateway.get_class(hash, block_id));
+            .block_on(self.gateway.get_class(hash, katana_gateway::types::BlockId::Pending));
 
         match result {
             Ok(class) => {
-                let class = class.try_into().map_err(|e| ProviderError::Other(e.to_string()))?;
+                let class = class
+                    .try_into()
+                    .map_err(|e: ConversionError| ProviderError::Other(e.to_string()))?;
                 Ok(Some(class))
             }
 
@@ -99,3 +101,7 @@ impl ContractClassProvider for PendingStateProvider {
         self.base.compiled_class_hash_of_class_hash(hash)
     }
 }
+
+impl StateRootProvider for PendingStateProvider {}
+
+impl StateProofProvider for PendingStateProvider {}

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

@@ -82,7 +82,7 @@ pub struct StarknetApi<P: TransactionPool> {
 struct StarknetApiInner<P: TransactionPool> {
     chain_spec: Arc<ChainSpec>,
     pool: P,
-    pending_provider: Arc<dyn PendingBlockProvider>,
+    // pending_provider: Arc<dyn PendingBlockProvider>,
     storage: BlockchainProvider<Box<dyn Database>>,
     forked_client: Option<ForkedClient>,
     task_spawner: TaskSpawner,

crates/sync/stage/src/trie.rs

@@ -45,17 +45,24 @@ where
                 let span = info_span!("state_trie.compute_state_root", %block_number);
                 let _enter = span.enter();
 
-                let expected_state_root = self
+                let header = self
                     .provider
                     .header(block_number.into())?
-                    .map(|header| header.state_root)
                     .ok_or(Error::MissingBlockHeader(block_number))?;
 
+                dbg!(&header);
+
+                let expected_state_root = header.state_root;
+
                 let state_update = self
                     .provider
                     .state_update(block_number.into())?
                     .ok_or(Error::MissingStateUpdate(block_number))?;
 
+                if header.number >= 12400 {
+                    println!("{:#?}", state_update);
+                }
+
                 let computed_contract_trie_root =
                     self.provider.trie_insert_contract_updates(block_number, &state_update)?;
 
@@ -75,7 +82,7 @@ where
                     "Computed classes trie root."
                 );
 
-                let computed_state_root = if computed_class_trie_root == Felt::ZERO {
+                let computed_state_root = if dbg!(computed_class_trie_root == Felt::ZERO) {
                     computed_contract_trie_root
                 } else {
                     Poseidon::hash_array(&[