Share all Cancel transactions' signatures with the watchtowers

Author: darosior

src/commands/mod.rs

@@ -559,20 +559,39 @@ impl DaemonControl {
         let emer_tx = db_emer_transaction(&db_path, db_vault.id)
             .expect("Database must be available")
             .ok_or(CommandError::Race)?;
-        let cancel_tx = db_cancel_transaction(&db_path, db_vault.id)
-            .expect("Database must be available")
-            .ok_or(CommandError::Race)?;
+        let (_, cancel_batch) = transaction_chain_manager(
+            db_vault.deposit_outpoint,
+            db_vault.amount,
+            &revaultd.deposit_descriptor,
+            &revaultd.unvault_descriptor,
+            &revaultd.cpfp_descriptor,
+            db_vault.derivation_index,
+            &revaultd.secp_ctx,
+        )
+        .expect("We wouldn't have put a vault with an invalid chain in DB");
+        let cancel_txs = cancel_batch
+            .feerates_map()
+            .into_iter()
+            .map(|(amount, cancel_tx)| {
+                db_cancel_transaction_by_txid(&db_path, &cancel_tx.txid())
+                    .expect("Database must be available")
+                    .ok_or(CommandError::Race)
+                    .map(|tx| (amount, tx))
+            })
+            .collect::<Result<BTreeMap<_, _>, CommandError>>()?;
         let unemer_tx = db_unvault_emer_transaction(&db_path, db_vault.id)
             .expect("Database must be available")
             .ok_or(CommandError::Race)?;
         let all_rev_fully_signed = emer_tx
             .psbt
             .unwrap_emer()
             .is_finalizable(&revaultd.secp_ctx)
-            && cancel_tx
-                .psbt
-                .unwrap_cancel()
-                .is_finalizable(&revaultd.secp_ctx)
+            && cancel_txs.iter().all(|(_, cancel_tx)| {
+                cancel_tx
+                    .psbt
+                    .unwrap_cancel()
+                    .is_finalizable(&revaultd.secp_ctx)
+            })
             && unemer_tx
                 .psbt
                 .unwrap_unvault_emer()
@@ -587,7 +606,7 @@ impl DaemonControl {
                     db_vault.deposit_outpoint,
                     db_vault.derivation_index,
                     &emer_tx,
-                    &cancel_tx,
+                    &cancel_txs,
                     &unemer_tx,
                 )?;
             }

src/communication.rs

@@ -95,16 +95,13 @@ fn send_wt_sigs_msg(
     deposit_outpoint: OutPoint,
     derivation_index: ChildNumber,
     emer_tx: &DbTransaction,
-    cancel_tx: &DbTransaction,
+    cancel_txs: &BTreeMap<Amount, DbTransaction>,
     unemer_tx: &DbTransaction,
 ) -> Result<(), CommunicationError> {
-    let cancel_sigs = [(
-        watchtower::CancelFeerate(Amount::from_sat(22)),
-        cancel_tx.psbt.signatures(),
-    )]
-    .iter()
-    .cloned()
-    .collect();
+    let cancel_sigs = cancel_txs
+        .iter()
+        .map(|(amount, tx)| (watchtower::CancelFeerate(*amount), tx.psbt.signatures()))
+        .collect();
     let signatures = watchtower::Signatures {
         emergency: emer_tx.psbt.signatures(),
         cancel: cancel_sigs,
@@ -169,7 +166,7 @@ pub fn wts_share_rev_signatures(
     deposit_outpoint: OutPoint,
     derivation_index: ChildNumber,
     emer_tx: &DbTransaction,
-    cancel_tx: &DbTransaction,
+    cancel_txs: &BTreeMap<Amount, DbTransaction>,
     unemer_tx: &DbTransaction,
 ) -> Result<(), CommunicationError> {
     for (wt_host, wt_noisekey) in watchtowers {
@@ -180,7 +177,7 @@ pub fn wts_share_rev_signatures(
             deposit_outpoint,
             derivation_index,
             emer_tx,
-            cancel_tx,
+            &cancel_txs,
             unemer_tx,
         )?;
     }

src/sigfetcher.rs

@@ -7,7 +7,8 @@ use crate::{
         actions::{db_update_presigned_txs, db_update_vault_status},
         bitcointx::RevaultTx,
         interface::{
-            db_cancel_transaction, db_emer_transaction, db_sig_missing, db_unvault_emer_transaction,
+            db_cancel_transaction_by_txid, db_emer_transaction, db_sig_missing,
+            db_unvault_emer_transaction,
         },
         schema::{DbTransaction, DbVault},
         DatabaseError,
@@ -18,7 +19,7 @@ use crate::{
 use revault_net::transport::KKTransport;
 use revault_tx::{
     bitcoin::{secp256k1, PublicKey as BitcoinPubKey},
-    transactions::RevaultTransaction,
+    transactions::{transaction_chain_manager, RevaultTransaction},
 };
 
 use std::{
@@ -156,7 +157,7 @@ fn maybe_wt_share_signatures(
         None => return Ok(()),
     };
 
-    // They should always be there, apart from a very edgy race condition.
+    // The revocation txs should always be there, apart from a very edgy race condition.
     let emer_tx = db_emer_transaction(db_path, db_vault.id)?
         .ok_or(SignatureFetcherError::MissingTransaction)?;
     if !emer_tx
@@ -166,15 +167,32 @@ fn maybe_wt_share_signatures(
     {
         return Ok(());
     }
-    let cancel_tx = db_cancel_transaction(db_path, db_vault.id)?
-        .ok_or(SignatureFetcherError::MissingTransaction)?;
-    if !cancel_tx
-        .psbt
-        .unwrap_cancel()
-        .is_finalizable(&revaultd.secp_ctx)
-    {
-        return Ok(());
+
+    let (_, cancel_batch) = transaction_chain_manager(
+        db_vault.deposit_outpoint,
+        db_vault.amount,
+        &revaultd.deposit_descriptor,
+        &revaultd.unvault_descriptor,
+        &revaultd.cpfp_descriptor,
+        db_vault.derivation_index,
+        &revaultd.secp_ctx,
+    )
+    .expect("We wouldn't have put a vault with an invalid chain in DB");
+    let mut cancel_txs = BTreeMap::new();
+    for (amount, cancel_tx) in cancel_batch.feerates_map() {
+        let cancel_tx = db_cancel_transaction_by_txid(db_path, &cancel_tx.txid())
+            .expect("Database must always be available")
+            .ok_or(SignatureFetcherError::MissingTransaction)?;
+        if !cancel_tx
+            .psbt
+            .unwrap_cancel()
+            .is_finalizable(&revaultd.secp_ctx)
+        {
+            return Ok(());
+        }
+        cancel_txs.insert(amount, cancel_tx);
     }
+
     let unemer_tx = db_unvault_emer_transaction(db_path, db_vault.id)?
         .ok_or(SignatureFetcherError::MissingTransaction)?;
     if !unemer_tx
@@ -195,7 +213,7 @@ fn maybe_wt_share_signatures(
         db_vault.deposit_outpoint,
         db_vault.derivation_index,
         &emer_tx,
-        &cancel_tx,
+        &cancel_txs,
         &unemer_tx,
     )?;