Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-11-30 04:26:33 -05:00
Code Issues Projects Releases Packages Wiki Activity

Wait for Bob's refund finality

Browse source 
For Alice we ensure to wait for redeem/punish finality, so it should be the same for Bob.
This commit is contained in:
Daniel Karzel 2021-01-19 12:43:20 +11:00
parent d6bf66c1f4
commit 8a7d746e96
6 changed files with 54 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

51
swap/src/protocol/bob/state.rs
View file

@ -15,6 +15,7 @@ use crate::{
BroadcastSignedTransaction, BuildTxLockPsbt, GetBlockHeight, GetNetwork, GetRawTransaction,
Transaction, TransactionBlockHeight, TxCancel, Txid, WatchForRawTransaction,
},
config::Config,
monero,
monero::monero_private_key,
protocol::{alice, bob},
@ -550,46 +551,34 @@ impl State4 {
.await
}
pub async fn refund_btc<W: bitcoin::BroadcastSignedTransaction>(
&self,
bitcoin_wallet: &W,
) -> Result<()> {
pub async fn refund_btc<W>(&self, bitcoin_wallet: &W, config: Config) -> Result<()>
where
W: bitcoin::BroadcastSignedTransaction + bitcoin::WaitForTransactionFinality,
{
let tx_cancel =
bitcoin::TxCancel::new(&self.tx_lock, self.cancel_timelock, self.A, self.b.public());
let tx_refund = bitcoin::TxRefund::new(&tx_cancel, &self.refund_address);
{
let sig_b = self.b.sign(tx_cancel.digest());
let sig_a = self.tx_cancel_sig_a.clone();
let adaptor = Adaptor::<Sha256, Deterministic<Sha256>>::default();
let signed_tx_cancel = tx_cancel.clone().add_signatures(
&self.tx_lock,
(self.A, sig_a),
(self.b.public(), sig_b),
)?;
let sig_b = self.b.sign(tx_refund.digest());
let sig_a =
adaptor.decrypt_signature(&self.s_b.into_secp256k1(), self.tx_refund_encsig.clone());
let _ = bitcoin_wallet
.broadcast_signed_transaction(signed_tx_cancel)
.await?;
}
let signed_tx_refund = tx_refund.add_signatures(
&tx_cancel.clone(),
(self.A, sig_a),
(self.b.public(), sig_b),
)?;
{
let adaptor = Adaptor::<Sha256, Deterministic<Sha256>>::default();
let txid = bitcoin_wallet
.broadcast_signed_transaction(signed_tx_refund)
.await?;
let sig_b = self.b.sign(tx_refund.digest());
let sig_a = adaptor
.decrypt_signature(&self.s_b.into_secp256k1(), self.tx_refund_encsig.clone());
bitcoin_wallet
.wait_for_transaction_finality(txid, config)
.await?;
let signed_tx_refund = tx_refund.add_signatures(
&tx_cancel.clone(),
(self.A, sig_a),
(self.b.public(), sig_b),
)?;
let _ = bitcoin_wallet
.broadcast_signed_transaction(signed_tx_refund)
.await?;
}
Ok(())
}