wip

Author: kariy

Cargo.lock

@@ -8,9 +8,9 @@ version.workspace = true
 [dependencies]
 katana-primitives.workspace = true
 
-jsonrpsee = { workspace = true, features = ["macros", "server", "client"], optional = true }
-paymaster-rpc = { workspace = true, optional = true }
-reqwest.workspace = true
+http.workspace = true
+jsonrpsee = { workspace = true, features = ["macros", "server", "client", "http-client"] }
+paymaster-rpc.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 starknet.workspace = true
@@ -22,7 +22,3 @@ url.workspace = true
 [dev-dependencies]
 katana-genesis.workspace = true
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
-
-[features]
-default = []
-rpc = ["dep:jsonrpsee", "dep:paymaster-rpc"]

crates/paymaster/Cargo.toml

@@ -7,7 +7,6 @@
 //!
 //! This crate uses the starknet crate's account abstraction for transaction handling.
 
-#[cfg(feature = "rpc")]
 pub mod api;
 
 use std::path::{Path, PathBuf};
@@ -34,6 +33,8 @@ use tokio::time::sleep;
 use tracing::{debug, info, warn};
 use url::Url;
 
+use crate::api::PaymasterApiClient;
+
 const FORWARDER_SALT: u64 = 0x12345;
 const BOOTSTRAP_TIMEOUT: Duration = Duration::from_secs(10);
 const DEFAULT_AVNU_PRICE_MAINNET_ENDPOINT: &str = "https://starknet.impulse.avnu.fi/v3/";
@@ -864,39 +865,29 @@ pub async fn wait_for_paymaster_ready(
     api_key: Option<&str>,
     timeout: Duration,
 ) -> Result<()> {
-    let client = reqwest::Client::new();
-    let start = Instant::now();
+    use http::HeaderValue;
+    use jsonrpsee::http_client::HttpClientBuilder;
 
-    let payload = serde_json::json!({
-        "jsonrpc": "2.0",
-        "id": 1,
-        "method": "paymaster_health",
-        "params": [],
-    });
+    let start = Instant::now();
 
-    loop {
-        let mut request = client.post(url.as_str()).json(&payload);
+    let client = {
+        let mut builder = HttpClientBuilder::default();
         if let Some(key) = api_key {
-            request = request.header("x-paymaster-api-key", key);
+            let mut headers = http::HeaderMap::new();
+            headers.insert(
+                "x-paymaster-api-key",
+                HeaderValue::from_str(key).expect("valid header value"),
+            );
+            builder = builder.set_headers(headers);
         }
+        builder.build(url.as_str()).expect("valid url")
+    };
 
-        match request.send().await {
-            Ok(resp) if resp.status().is_success() => {
-                match resp.json::<serde_json::Value>().await {
-                    Ok(body) => {
-                        if body.get("error").is_none() {
-                            info!(target: "sidecar", name = "paymaster health", "sidecar ready");
-                            return Ok(());
-                        }
-                        debug!(target: "sidecar", name = "paymaster health", "paymaster not ready yet");
-                    }
-                    Err(err) => {
-                        debug!(target: "sidecar", name = "paymaster health", error = %err, "waiting for sidecar");
-                    }
-                }
-            }
-            Ok(resp) => {
-                debug!(target: "sidecar", name = "paymaster health", status = %resp.status(), "waiting for sidecar");
+    loop {
+        match client.health().await {
+            Ok(_) => {
+                info!(target: "sidecar", name = "paymaster health", "sidecar ready");
+                return Ok(());
             }
             Err(err) => {
                 debug!(target: "sidecar", name = "paymaster health", error = %err, "waiting for sidecar");

crates/paymaster/src/lib.rs

@@ -7,7 +7,7 @@ version.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-katana-paymaster = { workspace = true, optional = true, features = ["rpc"] }
+katana-paymaster = { workspace = true, optional = true }
 katana-pool-api.workspace = true
 katana-primitives.workspace = true
 katana-provider-api.workspace = true