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

Reduce logging when signing transactions

Browse source 
1. We can generalize the signing interface by passing a PSBT in
instead of the `TxLock` transaction.
2. Knowing the transaction ID of a transaction that we are about
to sign is not very useful. Instead, it is much more useful to know
what failed. Hence we add a `.context` to the call of `sign_and_finalize`.
3. In case the signing succeeds, we will immediately broadcast it
afterwards. The new broadcasting interface will tell us that we broadcasted
the "lock" transaction.
This commit is contained in:
Thomas Eizinger 2021-03-02 12:53:40 +11:00
parent 8c9b087e39
commit 3ad9516188
No known key found for this signature in database
GPG key ID: 651AC83A6C6C8B96
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
swap/src/bitcoin/wallet.rs
View file

@ -1,5 +1,5 @@
use crate::{ use crate::{
bitcoin::{timelocks::BlockHeight, Address, Amount, Transaction, TxLock}, bitcoin::{timelocks::BlockHeight, Address, Amount, Transaction},
execution_params::ExecutionParams, execution_params::ExecutionParams,
}; };
use ::bitcoin::{util::psbt::PartiallySignedTransaction, Txid}; use ::bitcoin::{util::psbt::PartiallySignedTransaction, Txid};
@ -165,16 +165,15 @@ impl Wallet {
Ok(txid) Ok(txid)
} }
pub async fn sign_tx_lock(&self, tx_lock: TxLock) -> Result<Transaction> { pub async fn sign_and_finalize(&self, psbt: PartiallySignedTransaction) -> Result<Transaction> {
let txid = tx_lock.txid();
tracing::debug!("signing tx lock: {}", txid);
let psbt = PartiallySignedTransaction::from(tx_lock);
let (signed_psbt, finalized) = self.inner.lock().await.sign(psbt, None)?; let (signed_psbt, finalized) = self.inner.lock().await.sign(psbt, None)?;
if !finalized { if !finalized {
bail!("Could not finalize TxLock psbt") bail!("PSBT is not finalized")
} }
let tx = signed_psbt.extract_tx(); let tx = signed_psbt.extract_tx();
tracing::debug!("signed tx lock: {}", txid);
Ok(tx) Ok(tx)
} }

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

@ -13,7 +13,7 @@ use crate::{
CROSS_CURVE_PROOF_SYSTEM, CROSS_CURVE_PROOF_SYSTEM,
}, },
}; };
use anyhow::{anyhow, bail, Result}; use anyhow::{anyhow, bail, Context, Result};
use ecdsa_fun::{ use ecdsa_fun::{
adaptor::{Adaptor, HashTranscript}, adaptor::{Adaptor, HashTranscript},
nonce::Deterministic, nonce::Deterministic,
@ -269,9 +269,12 @@ impl State2 {
} }
pub async fn lock_btc(self, bitcoin_wallet: &bitcoin::Wallet) -> Result<State3> { pub async fn lock_btc(self, bitcoin_wallet: &bitcoin::Wallet) -> Result<State3> {
let signed_tx_lock = bitcoin_wallet.sign_tx_lock(self.tx_lock.clone()).await?; let signed_tx = bitcoin_wallet
.sign_and_finalize(self.tx_lock.clone().into())
.await
.context("failed to sign Bitcoin lock transaction")?;
let _ = bitcoin_wallet.broadcast(signed_tx_lock, "lock").await?; let _ = bitcoin_wallet.broadcast(signed_tx, "lock").await?;
Ok(State3 { Ok(State3 {
A: self.A, A: self.A,