show progress for etching

src/subcommand/wallet/resume.rs

@@ -1,4 +1,4 @@
-use super::*;
+use {super::*, crate::wallet::Maturity};
 
 #[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
 pub struct ResumeOutput {
@@ -18,7 +18,7 @@ impl Resume {
         break;
       }
 
-      for (rune, entry) in wallet.pending_etchings()? {
+      for (i, (rune, entry)) in wallet.pending_etchings()?.iter().enumerate() {
         if self.dry_run {
           etchings.push(batch::Output {
             reveal_broadcast: false,
@@ -27,8 +27,13 @@ impl Resume {
           continue;
         };
 
-        if wallet.is_mature(rune, &entry.commit)? {
-          etchings.push(wallet.send_etching(rune, &entry)?);
+        match wallet.is_mature(*rune, &entry.commit)? {
+          Maturity::Mature => etchings.push(wallet.send_etching(*rune, entry)?),
+          Maturity::CommitmentSpent(txid) => {
+            eprintln!("Commitment for rune etching {rune} spent in {txid}");
+            etchings.remove(i);
+          }
+          _ => continue,
         }
       }
 

src/wallet.rs

@@ -47,6 +47,15 @@ impl From<Statistic> for u64 {
   }
 }
 
+#[derive(Debug, PartialEq)]
+pub(crate) enum Maturity {
+  Mature,
+  Immature,
+  BelowMinimumHeight(u64),
+  ConfirmationsPending(u16),
+  CommitmentSpent(Txid),
+}
+
 pub(crate) struct Wallet {
   bitcoin_client: Client,
   database: Database,
@@ -280,37 +289,42 @@ impl Wallet {
     self.settings.integration_test()
   }
 
-  pub(crate) fn is_mature(&self, rune: Rune, commit: &Transaction) -> Result<bool> {
-    let transaction = self
-      .bitcoin_client()
-      .get_transaction(&commit.txid(), Some(true))
-      .into_option()?;
+  fn is_after_minimum_height(&self, rune: Rune) -> bool {
+    rune
+      >= Rune::minimum_at_height(
+        self.chain().network(),
+        Height(u32::try_from(self.bitcoin_client().get_block_count().unwrap() + 1).unwrap()),
+      )
+  }
 
-    if let Some(transaction) = transaction {
-      if u32::try_from(transaction.info.confirmations).unwrap() + 1
-        >= Runestone::COMMIT_CONFIRMATIONS.into()
-        && rune
-          >= Rune::minimum_at_height(
-            self.chain().network(),
-            Height(u32::try_from(self.bitcoin_client().get_block_count()? + 1).unwrap()),
-          )
+  pub(crate) fn is_mature(&self, rune: Rune, commit: &Transaction) -> Result<Maturity> {
+    Ok(
+      if let Some(commit_tx) = self
+        .bitcoin_client()
+        .get_transaction(&commit.txid(), Some(true))
+        .into_option()?
       {
-        let tx_out = self
-          .bitcoin_client()
-          .get_tx_out(&commit.txid(), 0, Some(true))?;
+        let current_confirmations = u16::try_from(commit_tx.info.confirmations).unwrap();
 
-        if let Some(tx_out) = tx_out {
-          if tx_out.confirmations + 1 >= Runestone::COMMIT_CONFIRMATIONS.into() {
-            return Ok(true);
-          }
+        if self
+          .bitcoin_client()
+          .get_tx_out(&commit.txid(), 0, Some(true))?
+          .is_none()
+        {
+          Maturity::CommitmentSpent(commit_tx.info.txid)
+        } else if !self.is_after_minimum_height(rune) {
+          Maturity::BelowMinimumHeight(self.bitcoin_client().get_block_count()? + 1)
+        } else if current_confirmations + 1 < Runestone::COMMIT_CONFIRMATIONS {
+          Maturity::ConfirmationsPending(
+            Runestone::COMMIT_CONFIRMATIONS - current_confirmations - 1,
+          )
         } else {
-          self.clear_etching(rune)?;
-          bail!("rune commitment spent, can't send reveal tx");
+          Maturity::Mature
         }
-      }
-    }
-
-    Ok(false)
+      } else {
+        Maturity::Immature
+      },
+    )
   }
 
   pub(crate) fn wait_for_maturation(&self, rune: Rune) -> Result<batch::Output> {
@@ -324,14 +338,37 @@ impl Wallet {
       entry.commit.txid()
     );
 
+    let mut pending_confirmations = Runestone::COMMIT_CONFIRMATIONS;
+
+    let pb = ProgressBar::new(pending_confirmations.into()).with_style(
+      ProgressStyle::default_bar()
+        .template("Maturing in...[{eta}] {spinner:.green} [{bar:40.cyan/blue}] {pos}/{len}")
+        .unwrap()
+        .progress_chars("#>-"),
+    );
+
     loop {
       if SHUTTING_DOWN.load(atomic::Ordering::Relaxed) {
         eprintln!("Suspending batch. Run `ord wallet resume` to continue.");
         return Ok(entry.output);
       }
 
-      if self.is_mature(rune, &entry.commit)? {
-        break;
+      match self.is_mature(rune, &entry.commit)? {
+        Maturity::Mature => {
+          pb.finish_with_message("Rune matured, submitting...");
+          break;
+        }
+        Maturity::ConfirmationsPending(remaining) => {
+          if remaining < pending_confirmations {
+            pending_confirmations = remaining;
+            pb.inc(1);
+          }
+        }
+        Maturity::CommitmentSpent(txid) => {
+          self.clear_etching(rune)?;
+          bail!("rune commitment {} spent, can't send reveal tx", txid);
+        }
+        _ => {}
       }
 
       if !self.integration_test() {