Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-12-24 23:19:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Watch the blockchain during Bitcoin refund

Browse Source
This commit is contained in:
Lucas Soriano del Pino 2020-10-16 14:16:06 +11:00
parent 969ca63081
commit 9d64f3fd29
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xmr-btc/src/bitcoin/transactions.rs
View File

@ -260,6 +260,10 @@ impl TxCancel {
} }
} }
pub fn txid(&self) -> Txid {
self.inner.txid()
}
pub fn digest(&self) -> SigHash { pub fn digest(&self) -> SigHash {
self.digest self.digest
} }

13
xmr-btc/src/lib.rs
View File

@ -248,6 +248,7 @@ where
if let Err(SwapFailed::AfterBtcLock(_)) = swap_result { if let Err(SwapFailed::AfterBtcLock(_)) = swap_result {
let tx_cancel = let tx_cancel =
bitcoin::TxCancel::new(&tx_lock, refund_timelock, A.clone(), b.public()); bitcoin::TxCancel::new(&tx_lock, refund_timelock, A.clone(), b.public());
let tx_cancel_txid = tx_cancel.txid();
let signed_tx_cancel = { let signed_tx_cancel = {
let sig_a = tx_cancel_sig_a.clone(); let sig_a = tx_cancel_sig_a.clone();
let sig_b = b.sign(tx_cancel.digest()); let sig_b = b.sign(tx_cancel.digest());
@ -260,9 +261,13 @@ where
co.yield_(Action::CancelBitcoin(signed_tx_cancel)).await; co.yield_(Action::CancelBitcoin(signed_tx_cancel)).await;
let signed_tx_refund = { let _ = bitcoin_ledger
let tx_refund = bitcoin::TxRefund::new(&tx_cancel, &refund_address); .watch_for_raw_transaction(tx_cancel_txid)
.await;
let tx_refund = bitcoin::TxRefund::new(&tx_cancel, &refund_address);
let tx_refund_txid = tx_refund.txid();
let signed_tx_refund = {
let adaptor = Adaptor::<Sha256, Deterministic<Sha256>>::default(); let adaptor = Adaptor::<Sha256, Deterministic<Sha256>>::default();
let sig_a = let sig_a =
@ -275,6 +280,10 @@ where
}; };
co.yield_(Action::RefundBitcoin(signed_tx_refund)).await; co.yield_(Action::RefundBitcoin(signed_tx_refund)).await;
let _ = bitcoin_ledger
.watch_for_raw_transaction(tx_refund_txid)
.await;
} }
}) })
} }