fix: reflect changes from SatoshiPortal/boltz-rust@db045fb

breez · Jan 21, 2025 · af7f5d0 · af7f5d0
1 parent 9599801
commit af7f5d0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/lib/Cargo.lock b/lib/Cargo.lock
diff --git a/lib/core/src/swapper/boltz/bitcoin.rs b/lib/core/src/swapper/boltz/bitcoin.rs
@@ -3,6 +3,7 @@ use std::str::FromStr;
 use boltz_client::{
     bitcoin::{address::Address, Transaction},
     boltz::SwapTxKind,
+    fees::Fee,
     util::secrets::Preimage,
     BtcSwapTx,
 };
@@ -94,7 +95,11 @@ impl BoltzSwapper {
             false => None,
         };
 
-        let signed_tx = refund_tx.sign_refund(&refund_keypair, broadcast_fees_sat, cooperative)?;
+        let signed_tx = refund_tx.sign_refund(
+            &refund_keypair,
+            Fee::Absolute(broadcast_fees_sat),
+            cooperative,
+        )?;
         Ok(signed_tx)
     }
 
@@ -118,7 +123,7 @@ impl BoltzSwapper {
         let signed_tx = claim_tx_wrapper.sign_claim(
             &claim_keypair,
             &Preimage::from_str(&swap.preimage)?,
-            swap.claim_fees_sat,
+            Fee::Absolute(swap.claim_fees_sat),
             self.get_cooperative_details(swap.id.clone(), Some(pub_nonce), Some(partial_sig)),
         )?;
 

diff --git a/lib/core/src/swapper/boltz/liquid.rs b/lib/core/src/swapper/boltz/liquid.rs
@@ -3,8 +3,9 @@ use std::str::FromStr;
 use boltz_client::{
     boltz::SwapTxKind,
     elements::Transaction,
+    fees::Fee,
     util::{liquid_genesis_hash, secrets::Preimage},
-    Amount, ElementsAddress as Address, LBtcSwapTx,
+    ElementsAddress as Address, LBtcSwapTx,
 };
 use log::info;
 
@@ -47,8 +48,9 @@ impl BoltzSwapper {
         let signed_tx = claim_tx_wrapper.sign_claim(
             &swap.get_claim_keypair()?,
             &Preimage::from_str(&swap.preimage)?,
-            Amount::from_sat(swap.claim_fees_sat),
+            Fee::Absolute(swap.claim_fees_sat),
             self.get_cooperative_details(swap.id.clone(), None, None),
+            true,
         )?;
 
         Ok(signed_tx)
@@ -74,8 +76,9 @@ impl BoltzSwapper {
         let signed_tx = claim_tx_wrapper.sign_claim(
             &claim_keypair,
             &Preimage::from_str(&swap.preimage)?,
-            Amount::from_sat(swap.claim_fees_sat),
+            Fee::Absolute(swap.claim_fees_sat),
             self.get_cooperative_details(swap.id.clone(), Some(pub_nonce), Some(partial_sig)),
+            true,
         )?;
 
         Ok(signed_tx)
@@ -192,8 +195,9 @@ impl BoltzSwapper {
 
         let signed_tx = refund_tx.sign_refund(
             &refund_keypair,
-            Amount::from_sat(broadcast_fees_sat),
+            Fee::Absolute(broadcast_fees_sat),
             cooperative,
+            true,
         )?;
         Ok(signed_tx)
     }