wip

Author: kariy

Cargo.lock

@@ -168,6 +168,7 @@ pub async fn bootstrap_vrf(
             .expect("fail to declare class");
 
         assert_eq!(result.class_hash, vrf_account_class_hash, "Class hash mismatch");
+        wait_for_class(&provider, vrf_account_class_hash, BOOTSTRAP_TIMEOUT).await?;
     }
 
     // Deploy VRF account if not already deployed
@@ -192,11 +193,13 @@ pub async fn bootstrap_vrf(
             calldata: vec![vrf_account_address.into(), amount, Felt::ZERO],
         };
 
-        account
+        let result = account
             .execute_v3(vec![transfer_call])
             .send()
             .await
             .map_err(|e| anyhow!("failed to fund VRF account: {e}"))?;
+
+        wait_for_tx(&provider, result.transaction_hash, BOOTSTRAP_TIMEOUT).await?;
     }
 
     // Set VRF public key on the deployed account
@@ -218,12 +221,14 @@ pub async fn bootstrap_vrf(
         calldata: vec![derived.vrf_public_key_x, derived.vrf_public_key_y],
     };
 
-    vrf_account
+    let result = vrf_account
         .execute_v3(vec![set_vrf_key_call])
         .send()
         .await
         .map_err(|e| anyhow!("failed to set VRF public key: {e}"))?;
 
+    wait_for_tx(&provider, result.transaction_hash, BOOTSTRAP_TIMEOUT).await?;
+
     // Deploy VRF consumer
     let vrf_consumer_class_hash = katana_contracts::vrf::CartridgeVrfConsumer::HASH;
     // When using UDC with unique=0 (non-unique deployment), the deployer_address
@@ -304,6 +309,42 @@ async fn wait_for_contract(
     }
 }
 
+async fn wait_for_class(
+    provider: &JsonRpcClient<HttpTransport>,
+    class_hash: ClassHash,
+    timeout: Duration,
+) -> Result<()> {
+    let start = Instant::now();
+    loop {
+        if is_declared(provider, class_hash).await? {
+            return Ok(());
+        }
+        if start.elapsed() > timeout {
+            return Err(anyhow!("class {class_hash:#x} not declared before timeout"));
+        }
+        sleep(Duration::from_millis(200)).await;
+    }
+}
+
+async fn wait_for_tx(
+    provider: &JsonRpcClient<HttpTransport>,
+    tx_hash: Felt,
+    timeout: Duration,
+) -> Result<()> {
+    let start = Instant::now();
+    loop {
+        match provider.get_transaction_receipt(tx_hash).await {
+            Ok(_) => return Ok(()),
+            Err(ProviderError::StarknetError(StarknetError::TransactionHashNotFound)) => {}
+            Err(e) => return Err(anyhow!("failed to get transaction receipt: {e}")),
+        }
+        if start.elapsed() > timeout {
+            return Err(anyhow!("transaction {tx_hash:#x} not confirmed before timeout"));
+        }
+        sleep(Duration::from_millis(200)).await;
+    }
+}
+
 fn scalar_from_felt(value: Felt) -> ScalarField {
     let bytes = value.to_bytes_be();
     ScalarField::from_be_bytes_mod_order(&bytes)

crates/cartridge/src/vrf/bootstrap.rs

@@ -15,7 +15,7 @@ use super::client::VrfClient;
 const LOG_TARGET: &str = "katana::cartridge::vrf::sidecar";
 
 pub const VRF_SERVER_PORT: u16 = 3000;
-const DEFAULT_VRF_SERVICE_PATH: &str = "vrf-service";
+const DEFAULT_VRF_SERVICE_PATH: &str = "vrf-server";
 pub const SIDECAR_TIMEOUT: Duration = Duration::from_secs(10);
 
 #[derive(Debug, thiserror::Error)]

crates/cartridge/src/vrf/sidecar.rs

@@ -206,7 +206,7 @@ impl SequencerNodeArgs {
                 let paymaster = bootstrap_paymaster(
                     &self.paymaster,
                     config.paymaster.unwrap().url.clone(),
-                    handle.rpc().addr().clone(),
+                    *handle.rpc().addr(),
                     &handle.node().config().chain,
                 )
                 .await?
@@ -224,7 +224,7 @@ impl SequencerNodeArgs {
 
                 let vrf = bootstrap_vrf(
                     &self.cartridge.vrf,
-                    handle.rpc().addr().clone(),
+                    *handle.rpc().addr(),
                     &handle.node().config().chain,
                 )
                 .await?

crates/cli/src/args.rs

@@ -537,7 +537,7 @@ pub struct GasPriceOracleOptions {
 }
 
 #[cfg(feature = "paymaster")]
-#[derive(Debug, Args, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Default, Args, Clone, Serialize, Deserialize, PartialEq)]
 #[command(next_help_heading = "Paymaster options")]
 pub struct PaymasterOptions {
     /// Enable the paymaster service.
@@ -734,13 +734,6 @@ impl VrfOptions {
     }
 }
 
-#[cfg(feature = "paymaster")]
-impl Default for PaymasterOptions {
-    fn default() -> Self {
-        Self { enabled: false, url: None, api_key: None, bin: None, price_api_key: None }
-    }
-}
-
 #[cfg(feature = "explorer")]
 #[derive(Debug, Default, Args, Clone, Serialize, Deserialize, PartialEq)]
 #[command(next_help_heading = "Explorer options")]