Merge Katana dev branch

Cargo.toml

@@ -15,7 +15,8 @@ members = [
   "crates/katana/core",
   "crates/katana/executor",
   "crates/katana/primitives",
-  "crates/katana/rpc",
+  "crates/katana/rpc/rpc",
+  "crates/katana/rpc/rpc-api",
   "crates/katana/rpc/rpc-types",
   "crates/katana/rpc/rpc-types-builder",
   "crates/katana/runner",
@@ -89,6 +90,7 @@ futures = "0.3.28"
 hex = "0.4.3"
 indoc = "1.0.7"
 itertools = "0.10.3"
+jsonrpsee = { version = "0.16.2", default-features = false }
 lazy_static = "1.4.0"
 metrics-process = "1.0.9"
 num-bigint = "0.4"

crates/dojo-test-utils/Cargo.toml

@@ -19,7 +19,8 @@ dojo-world = { path = "../dojo-world", features = [ "manifest", "migration" ] }
 jsonrpsee = { version = "0.16.2", features = [ "server" ] }
 katana-core = { path = "../katana/core" }
 katana-primitives = { path = "../katana/primitives" }
-katana-rpc = { path = "../katana/rpc" }
+katana-rpc = { path = "../katana/rpc/rpc" }
+katana-rpc-api = { path = "../katana/rpc/rpc-api" }
 scarb-ui.workspace = true
 scarb.workspace = true
 serde.workspace = true

crates/dojo-test-utils/src/sequencer.rs

@@ -5,9 +5,9 @@ pub use katana_core::backend::config::{Environment, StarknetConfig};
 use katana_core::sequencer::KatanaSequencer;
 pub use katana_core::sequencer::SequencerConfig;
 use katana_primitives::chain::ChainId;
-use katana_rpc::api::ApiKind;
 use katana_rpc::config::ServerConfig;
 use katana_rpc::{spawn, NodeHandle};
+use katana_rpc_api::ApiKind;
 use starknet::accounts::{ExecutionEncoding, SingleOwnerAccount};
 use starknet::core::chain_id;
 use starknet::core::types::FieldElement;

crates/katana/Cargo.toml

@@ -12,7 +12,8 @@ clap_complete.workspace = true
 console.workspace = true
 katana-core = { path = "core" }
 katana-primitives = { path = "primitives" }
-katana-rpc = { path = "rpc" }
+katana-rpc = { path = "rpc/rpc" }
+katana-rpc-api = { path = "rpc/rpc-api" }
 metrics = { path = "../metrics" }
 metrics-process.workspace = true
 serde_json.workspace = true

crates/katana/core/src/accounts.rs

@@ -6,7 +6,7 @@ use katana_primitives::FieldElement;
 use katana_provider::traits::state::StateWriter;
 use rand::rngs::SmallRng;
 use rand::{RngCore, SeedableRng};
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
 use starknet::core::serde::unsigned_field_element::UfeHex;
 use starknet::core::utils::{get_contract_address, get_storage_var_address};
@@ -15,7 +15,7 @@ use starknet::signers::SigningKey;
 use crate::constants::{FEE_TOKEN_ADDRESS, OZ_V1_ACCOUNT_CONTRACT_CLASS_HASH};
 
 #[serde_as]
-#[derive(Debug, Clone, Serialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Account {
     #[serde_as(as = "UfeHex")]
     pub balance: FieldElement,

crates/katana/core/src/sequencer.rs

@@ -267,8 +267,9 @@ impl KatanaSequencer {
         self.backend.chain_id
     }
 
-    pub fn block_number(&self) -> BlockNumber {
-        BlockNumberProvider::latest_number(&self.backend.blockchain.provider()).unwrap()
+    pub fn block_number(&self) -> SequencerResult<BlockNumber> {
+        let num = BlockNumberProvider::latest_number(&self.backend.blockchain.provider())?;
+        Ok(num)
     }
 
     pub fn block_tx_count(&self, block_id: BlockIdOrTag) -> SequencerResult<Option<u64>> {
@@ -300,7 +301,7 @@ impl KatanaSequencer {
         Ok(count)
     }
 
-    pub async fn nonce_at(
+    pub fn nonce_at(
         &self,
         block_id: BlockIdOrTag,
         contract_address: ContractAddress,
@@ -352,7 +353,7 @@ impl KatanaSequencer {
         Ok(tx)
     }
 
-    pub async fn events(
+    pub fn events(
         &self,
         from_block: BlockIdOrTag,
         to_block: BlockIdOrTag,

crates/katana/rpc/rpc-api/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+description = "Katana RPC APIs"
+edition.workspace = true
+name = "katana-rpc-api"
+version.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+katana-core = { path = "../../core" }
+katana-primitives = { path = "../../primitives" }
+katana-rpc-types = { path = "../rpc-types" }
+
+jsonrpsee = { workspace = true, features = [ "macros", "server" ] }
+starknet.workspace = true
+
+[features]
+client = [ "jsonrpsee/client" ]