wip

Author: kariy

crates/gateway/gateway-client/src/lib.rs

@@ -132,21 +132,21 @@ impl Client {
 
     pub async fn add_invoke_transaction(
         &self,
-        transaction: katana_rpc_types::broadcasted::BroadcastedInvokeTx,
+        transaction: BroadcastedInvokeTx,
     ) -> Result<AddInvokeTransactionResponse, Error> {
         self.gateway("add_transaction").json(&transaction).send().await
     }
 
     pub async fn add_declare_transaction(
         &self,
-        transaction: katana_rpc_types::broadcasted::BroadcastedDeclareTx,
+        transaction: BroadcastedDeclareTx,
     ) -> Result<AddDeclareTransactionResponse, Error> {
         self.gateway("add_transaction").json(&transaction).send().await
     }
 
     pub async fn add_deploy_account_transaction(
         &self,
-        transaction: katana_rpc_types::broadcasted::BroadcastedDeployAccountTx,
+        transaction: BroadcastedDeployAccountTx,
     ) -> Result<AddDeployAccountTransactionResponse, Error> {
         self.gateway("add_transaction").json(&transaction).send().await
     }

crates/gateway/gateway-types/Cargo.toml

@@ -16,7 +16,6 @@ cairo-lang-starknet-classes.workspace = true
 flate2.workspace = true
 serde_json.workspace = true
 serde.workspace = true
-serde_json.workspace = true
 starknet.workspace = true
 thiserror.workspace = true
 

crates/node/src/optimistic/mod.rs

@@ -21,14 +21,12 @@ use katana_optimistic::pool::{PoolValidator, TxPool};
 use katana_pool::ordering::FiFo;
 use katana_primitives::block::BlockIdOrTag;
 use katana_primitives::env::{CfgEnv, FeeTokenAddressses};
-use katana_provider::api::block::BlockNumberProvider;
-use katana_provider::api::env::BlockEnvProvider;
 use katana_provider::providers::fork::ForkedProvider;
-use katana_rpc::cors::Cors;
-use katana_rpc::starknet::forking::ForkedClient;
-use katana_rpc::starknet::{OptimisticPendingBlockProvider, StarknetApi, StarknetApiConfig};
-use katana_rpc::{RpcServer, RpcServerHandle};
 use katana_rpc_api::starknet::{StarknetApiServer, StarknetTraceApiServer, StarknetWriteApiServer};
+use katana_rpc_server::cors::Cors;
+use katana_rpc_server::starknet::forking::ForkedClient;
+use katana_rpc_server::starknet::{OptimisticPendingBlockProvider, StarknetApi, StarknetApiConfig};
+use katana_rpc_server::{RpcServer, RpcServerHandle};
 use katana_tasks::{JoinHandle, TaskManager};
 use tracing::info;
 

crates/optimistic/src/pool.rs

@@ -38,22 +38,17 @@ impl Validator for PoolValidator {
         // Forward the transaction to the remote node
         let result = match &tx.tx {
             BroadcastedTx::Invoke(invoke_tx) => {
-                self.gateway_client.add_invoke_transaction(invoke_tx.clone()).await.map(|_| ())
-                // self.client.add_invoke_transaction(invoke_tx.clone()).await.map(|_| ())
+                let gateway_tx = invoke_tx.clone().into();
+                self.gateway_client.add_invoke_transaction(gateway_tx).await.map(|_| ())
             }
             BroadcastedTx::Declare(declare_tx) => {
-                self.gateway_client.add_declare_transaction(declare_tx.clone()).await.map(|_| ())
-                // self.client.add_declare_transaction(declare_tx.clone()).await.map(|_| ())
+                let gateway_tx = declare_tx.clone().into();
+                self.gateway_client.add_declare_transaction(gateway_tx).await.map(|_| ())
+            }
+            BroadcastedTx::DeployAccount(deploy_account_tx) => {
+                let gateway_tx = deploy_account_tx.clone().into();
+                self.gateway_client.add_deploy_account_transaction(gateway_tx).await.map(|_| ())
             }
-            BroadcastedTx::DeployAccount(deploy_account_tx) => self
-                .gateway_client
-                .add_deploy_account_transaction(deploy_account_tx.clone())
-                .await
-                .map(|_| ()), /* self
-                               * .client
-                               * .add_deploy_account_transaction(deploy_account_tx.clone())
-                               * .await
-                               * .map(|_| ()), */
         };
 
         match result {

crates/rpc/rpc-types/src/broadcasted.rs

@@ -716,7 +716,7 @@ impl From<BroadcastedTxWithChainId> for crate::transaction::RpcTxWithHash {
                 fee_data_availability_mode: tx.fee_data_availability_mode,
             })),
             BroadcastedTx::Declare(tx) => {
-                let class_hash = tx.contract_class.hash().expect("failed to compute class hash");
+                let class_hash = tx.contract_class.hash();
                 RpcTx::Declare(RpcDeclareTx::V3(RpcDeclareTxV3 {
                     sender_address: tx.sender_address,
                     compiled_class_hash: tx.compiled_class_hash,