refactor(paymaster): paymaster component as a tower layer

Cargo.toml

@@ -11,10 +11,10 @@ members = [
 	"crates/core",
 	"crates/executor",
 	"crates/explorer",
-	"crates/genesis",
-	"crates/gateway/gateway-types",
 	"crates/gateway/gateway-client",
 	"crates/gateway/gateway-server",
+	"crates/gateway/gateway-types",
+	"crates/genesis",
 	"crates/grpc",
 	"crates/messaging",
 	"crates/metrics",
@@ -25,9 +25,9 @@ members = [
 	"crates/pool/pool-api",
 	"crates/primitives",
 	"crates/primitives/macro",
-	"crates/rpc/rpc-server",
 	"crates/rpc/rpc-api",
 	"crates/rpc/rpc-client",
+	"crates/rpc/rpc-server",
 	"crates/rpc/rpc-types",
 	"crates/rpc/rpc-types-builder",
 	"crates/runner",
@@ -82,11 +82,11 @@ katana-core = { path = "crates/core" }
 katana-db = { path = "crates/storage/db" }
 katana-executor = { path = "crates/executor" }
 katana-explorer = { path = "crates/explorer" }
-katana-gateway-types = { path = "crates/gateway/gateway-types" }
-katana-gateway-client = { path = "crates/gateway/gateway-client" }
-katana-gateway-server = { path = "crates/gateway/gateway-server" }
 katana-fork = { path = "crates/storage/fork" }
 katana-gas-price-oracle = { path = "crates/oracle/gas" }
+katana-gateway-client = { path = "crates/gateway/gateway-client" }
+katana-gateway-server = { path = "crates/gateway/gateway-server" }
+katana-gateway-types = { path = "crates/gateway/gateway-types" }
 katana-genesis = { path = "crates/genesis" }
 katana-grpc = { path = "crates/grpc" }
 katana-messaging = { path = "crates/messaging" }
@@ -100,9 +100,9 @@ katana-primitives = { path = "crates/primitives" }
 katana-primitives-macro = { path = "crates/primitives/macro" }
 katana-provider = { path = "crates/storage/provider/provider" }
 katana-provider-api = { path = "crates/storage/provider/provider-api" }
-katana-rpc-server = { path = "crates/rpc/rpc-server" }
 katana-rpc-api = { path = "crates/rpc/rpc-api" }
 katana-rpc-client = { path = "crates/rpc/rpc-client" }
+katana-rpc-server = { path = "crates/rpc/rpc-server" }
 katana-rpc-types = { path = "crates/rpc/rpc-types" }
 katana-rpc-types-builder = { path = "crates/rpc/rpc-types-builder" }
 katana-runner = { path = "crates/runner" }
@@ -161,7 +161,7 @@ regex = "1.10.3"
 reqwest = { version = "0.12.15", features = [ "json", "rustls-tls" ], default-features = false }
 rstest = "0.18.2"
 rstest_reuse = "0.6.0"
-sev-snp = { git = "https://github.com/automata-network/amd-sev-snp-attestation-sdk", branch = "main", default-features = false, features = ["legacy", "configfs"] }
+sev-snp = { git = "https://github.com/automata-network/amd-sev-snp-attestation-sdk", branch = "main", default-features = false, features = [ "configfs", "legacy" ] }
 similar-asserts = "1.5.0"
 slot = { git = "https://github.com/cartridge-gg/slot", rev = "1298a30" }
 spinoff = "0.8.0"
@@ -188,7 +188,7 @@ hyper = "0.14.27"
 jsonrpsee = { version = "0.26", default-features = false }
 rustls = "0.23"
 tower = "0.5"
-tower-http = { version = "0.6", features = [ "trace", "cors", "timeout" ] }
+tower-http = { version = "0.6", features = [ "cors", "timeout", "trace" ] }
 tower-service = "0.3"
 
 # gRPC

bin/katana/src/cli/rpc/starknet.rs

@@ -635,9 +635,7 @@ fn parse_contract_storage_keys(storages: &[String]) -> Result<Vec<ContractStorag
 
         if parts.len() != 2 {
             anyhow::bail!(
-                "invalid storage format at position {}: '{}'. Expected 'address,key'",
-                i,
-                pair
+                "invalid storage format at position {i}: '{pair}'. Expected 'address,key'",
             );
         }
 

crates/cartridge/Cargo.toml

@@ -1,14 +1,26 @@
 [package]
+build = "build.rs"
 edition.workspace = true
 license.workspace = true
 name = "cartridge"
 repository.workspace = true
 version.workspace = true
-build = "build.rs"
 
 [dependencies]
 katana-contracts.workspace = true
+katana-core.workspace = true
+katana-executor.workspace = true
+katana-genesis.workspace = true
+katana-pool.workspace = true
+katana-pool-api.workspace = true
 katana-primitives.workspace = true
+katana-provider.workspace = true
+katana-rpc-api.workspace = true
+katana-rpc-server.workspace = true
+katana-rpc-types.workspace = true
+katana-tasks.workspace = true
+
+starknet-types-core.workspace = true
 
 anyhow.workspace = true
 ark-ec = "0.4"
@@ -22,3 +34,21 @@ tracing.workspace = true
 url.workspace = true
 # Use a specific revision of stark-vrf to avoid unwanted breaking changes.
 stark-vrf = { git = "https://github.com/dojoengine/stark-vrf.git", rev = "96d6d2a" }
+
+cainome.workspace = true
+cainome-cairo-serde.workspace = true
+futures.workspace = true
+jsonrpsee.workspace = true
+starknet.workspace = true
+tokio.workspace = true
+tower.workspace = true
+
+[dev-dependencies]
+assert_matches.workspace = true
+cairo-lang-starknet-classes.workspace = true
+katana-db.workspace = true
+katana-gas-price-oracle.workspace = true
+katana-node.workspace = true
+katana-utils = { workspace = true, features = [ "node" ] }
+mockito = "1.7.0"
+similar-asserts.workspace = true

crates/cartridge/src/client.rs

@@ -58,6 +58,7 @@ impl Client {
         }
     }
 }
+
 /// Response from the Cartridge API to fetch the calldata for the constructor of the given
 /// controller address.
 #[derive(Debug, Clone, Deserialize)]

crates/cartridge/src/lib.rs

@@ -1,6 +1,9 @@
 #![cfg_attr(not(test), warn(unused_crate_dependencies))]
 
 pub mod client;
+pub mod paymaster;
+pub mod rpc;
+pub mod utils;
 pub mod vrf;
 
 pub use client::Client;