wip

Author: kariy

Cargo.lock

@@ -12,6 +12,7 @@ katana-db.workspace = true
 katana-executor.workspace = true
 katana-gateway-server.workspace = true
 katana-gateway-client.workspace = true
+katana-gateway-types.workspace = true
 katana-gas-price-oracle.workspace = true
 katana-messaging.workspace = true
 katana-metrics.workspace = true

crates/node/Cargo.toml

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 use std::time::Duration;
 
-use katana_gateway::client::Client;
-use katana_gateway::types::{ConfirmedTransaction, ErrorCode, PreConfirmedBlock, StateDiff};
+use katana_gateway_client::Client;
+use katana_gateway_types::{ConfirmedTransaction, ErrorCode, PreConfirmedBlock, StateDiff};
 use katana_pipeline::PipelineBlockSubscription;
 use katana_primitives::block::BlockNumber;
 use katana_primitives::state::StateUpdates;
@@ -162,7 +162,7 @@ impl PreconfBlockWatcher {
                     // this could either be because the latest block is still not synced to the
                     // chain's tip, in which case we just skip to the next
                     // iteration.
-                    Err(katana_gateway::client::Error::Sequencer(error))
+                    Err(katana_gateway_client::Error::Sequencer(error))
                         if error.code == ErrorCode::BlockNotFound =>
                     {
                         continue

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

@@ -1,6 +1,6 @@
 use std::fmt::Debug;
 
-use katana_gateway::types::TxTryFromError;
+use katana_gateway_types::TxTryFromError;
 use katana_primitives::block::{GasPrices, PartialHeader, PendingBlock};
 use katana_primitives::transaction::TxWithHash;
 use katana_primitives::Felt;

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

@@ -1,4 +1,4 @@
-use katana_gateway::types::{ErrorCode, GatewayError};
+use katana_gateway_types::{ErrorCode, GatewayError};
 use katana_primitives::block::BlockNumber;
 use katana_primitives::class::{ClassHash, CompiledClassHash, ContractClass};
 use katana_primitives::contract::{ContractAddress, Nonce, StorageKey, StorageValue};
@@ -13,7 +13,7 @@ pub struct PreconfStateProvider {
     pub base: Box<dyn StateProvider>,
     pub preconf_block_id: Option<BlockNumber>,
     pub preconf_state_updates: Option<StateUpdates>,
-    pub gateway: katana_gateway::client::Client,
+    pub gateway: katana_gateway_client::Client,
 }
 
 impl StateProvider for PreconfStateProvider {
@@ -80,7 +80,7 @@ impl ContractClassProvider for PreconfStateProvider {
         let result = runtime::Builder::new_current_thread()
             .build()
             .unwrap()
-            .block_on(self.gateway.get_class(hash, katana_gateway::types::BlockId::Pending));
+            .block_on(self.gateway.get_class(hash, katana_gateway_types::BlockId::Pending));
 
         match result {
             Ok(class) => {
@@ -91,7 +91,7 @@ impl ContractClassProvider for PreconfStateProvider {
             }
 
             Err(error) => {
-                if let katana_gateway::client::Error::Sequencer(GatewayError {
+                if let katana_gateway_client::Error::Sequencer(GatewayError {
                     code: ErrorCode::UndeclaredClass,
                     ..
                 }) = error

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

@@ -15,11 +15,11 @@ pub type FullNodePool =
 /// Any transaction validation is performed by the Starknet sequencer.
 #[derive(Debug)]
 pub struct GatewayProxyValidator {
-    gateway_client: katana_gateway::client::Client,
+    gateway_client: katana_gateway_client::Client,
 }
 
 impl GatewayProxyValidator {
-    pub fn new(gateway_client: katana_gateway::client::Client) -> Self {
+    pub fn new(gateway_client: katana_gateway_client::Client) -> Self {
         Self { gateway_client }
     }
 }