Use TransactionWaiter

dojoengine · Mar 21, 2024 · fc1cd0f · fc1cd0f
1 parent 43a1f6e
commit fc1cd0f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 37 deletions.
diff --git a/crates/dojo-utils/src/lib.rs b/crates/dojo-utils/src/lib.rs
@@ -48,7 +48,7 @@ pub enum TransactionWaitingError {
 /// let provider = JsonRpcClient::new(HttpTransport::new(Url::parse("http://localhost:5000").unwrap()));
 ///
 /// let tx_hash = FieldElement::from(0xbadbeefu64);
-/// let receipt = TransactionWaiter::new(tx_hash, &provider).with_finality(TransactionFinalityStatus::ACCEPTED_ON_L2).await.unwrap();
+/// let receipt = TransactionWaiter::new(tx_hash, &provider).with_tx_status(TransactionFinalityStatus::AcceptedOnL2).await.unwrap();
 /// ```
 #[must_use = "TransactionWaiter does nothing unless polled"]
 pub struct TransactionWaiter<'a, P: Provider> {

diff --git a/crates/sozo/ops/src/account.rs b/crates/sozo/ops/src/account.rs
@@ -1,15 +1,15 @@
 use std::io::Write;
 use std::path::PathBuf;
-use std::time::Duration;
 
 use anyhow::Result;
 use colored::Colorize;
 use colored_json::{ColorMode, Output};
+use dojo_utils::TransactionWaiter;
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
 use starknet::accounts::{AccountFactory, AccountFactoryError, OpenZeppelinAccountFactory};
 use starknet::core::serde::unsigned_field_element::UfeHex;
-use starknet::core::types::{BlockId, BlockTag, ExecutionResult, StarknetError};
+use starknet::core::types::{BlockId, BlockTag, StarknetError, TransactionFinalityStatus};
 use starknet::core::utils::get_contract_address;
 use starknet::macros::felt;
 use starknet::providers::jsonrpc::HttpTransport;
@@ -302,7 +302,14 @@ pub async fn deploy(
         format!("{:#064x}", account_deployment_tx).bright_yellow(),
         "sozo account fetch".bright_yellow(),
     );
-    watch_tx(&provider, account_deployment_tx, Duration::from_millis(poll_interval)).await?;
+    TransactionWaiter::new(account_deployment_tx, &provider)
+        .with_tx_status(TransactionFinalityStatus::AcceptedOnL2)
+        .with_interval(poll_interval)
+        .await?;
+    eprintln!(
+        "Transaction {} confirmed",
+        format!("{:#064x}", account_deployment_tx).bright_yellow()
+    );
 
     account.deployment = DeploymentStatus::Deployed(DeployedStatus {
         class_hash: undeployed_status.class_hash,
@@ -352,39 +359,6 @@ fn map_starknet_error(err: StarknetError) -> anyhow::Error {
     }
 }
 
-pub async fn watch_tx<P>(
-    provider: P,
-    transaction_hash: FieldElement,
-    poll_interval: Duration,
-) -> Result<()>
-where
-    P: Provider,
-{
-    loop {
-        match provider.get_transaction_receipt(transaction_hash).await {
-            Ok(receipt) => match receipt.execution_result() {
-                ExecutionResult::Succeeded => {
-                    eprintln!(
-                        "Transaction {} confirmed",
-                        format!("{:#064x}", transaction_hash).bright_yellow()
-                    );
-
-                    return Ok(());
-                }
-                ExecutionResult::Reverted { reason } => {
-                    return Err(anyhow::anyhow!("transaction reverted: {}", reason));
-                }
-            },
-            Err(ProviderError::StarknetError(StarknetError::TransactionHashNotFound)) => {
-                eprintln!("Transaction not confirmed yet...");
-            }
-            Err(err) => return Err(err.into()),
-        }
-
-        tokio::time::sleep(poll_interval).await;
-    }
-}
-
 #[derive(Debug)]
 pub enum FeeSetting {
     Manual(FieldElement),