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

Bubble up unrecoverable errors instead of expecting

Browse Source 
This does introduce the ability of expressing incorrect combinations
of the enums `SwapFailed` and `Reason`, but these are just internal
to this function and it's terser that way.
This commit is contained in:
Lucas Soriano del Pino 2020-10-16 11:43:24 +11:00
parent 369770488f
commit e457130b6c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,6 +120,7 @@ where
enum SwapFailed { enum SwapFailed {
BeforeBtcLock, BeforeBtcLock,
AfterBtcLock(Reason), AfterBtcLock(Reason),
AfterBtcRedeem(Reason),
} }
/// Reason why the swap has failed. /// Reason why the swap has failed.
@ -128,6 +129,12 @@ where
BtcExpired, BtcExpired,
/// Alice did not lock up enough monero in the shared output. /// Alice did not lock up enough monero in the shared output.
InsufficientXMR(monero::InsufficientFunds), InsufficientXMR(monero::InsufficientFunds),
/// Could not find Bob's signature on the redeem transaction witness
/// stack.
BtcRedeemSignature,
/// Could not recover secret `s_a` from Bob's redeem transaction
/// signature.
SecretRecovery,
} }
async fn poll_until(condition_future: impl Future<Output = bool> + Clone) { async fn poll_until(condition_future: impl Future<Output = bool> + Clone) {
@ -221,10 +228,9 @@ where
// Therefore, there is no way to handle these errors other than aborting // Therefore, there is no way to handle these errors other than aborting
let tx_redeem_sig = tx_redeem let tx_redeem_sig = tx_redeem
.extract_signature_by_key(tx_redeem_published, b.public()) .extract_signature_by_key(tx_redeem_published, b.public())
.expect("redeem transaction must include signature from us"); .map_err(|_| SwapFailed::AfterBtcRedeem(Reason::BtcRedeemSignature))?;
let s_a = bitcoin::recover(S_a_bitcoin, tx_redeem_sig, tx_redeem_encsig).expect( let s_a = bitcoin::recover(S_a_bitcoin, tx_redeem_sig, tx_redeem_encsig)
"alice can only produce our signature by decrypting our encrypted signature", .map_err(|_| SwapFailed::AfterBtcRedeem(Reason::SecretRecovery))?;
);
let s_a = monero::PrivateKey::from_scalar(monero::Scalar::from_bytes_mod_order( let s_a = monero::PrivateKey::from_scalar(monero::Scalar::from_bytes_mod_order(
s_a.to_bytes(), s_a.to_bytes(),
)); ));