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

Fix rebase conflicts

Browse source
This commit is contained in:
rishflab 2020-10-22 19:25:54 +11:00
parent e3b68a3864
commit 62bc3c0432
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
xmr-btc/src/alice.rs
View file

@ -346,16 +346,16 @@ pub struct State3 {
pub S_b_bitcoin: bitcoin::PublicKey, pub S_b_bitcoin: bitcoin::PublicKey,
pub v: monero::PrivateViewKey, pub v: monero::PrivateViewKey,
#[serde(with = "bitcoin_amount")] #[serde(with = "bitcoin_amount")]
btc: bitcoin::Amount, pub btc: bitcoin::Amount,
xmr: monero::Amount, pub xmr: monero::Amount,
refund_timelock: u32, pub refund_timelock: u32,
punish_timelock: u32, pub punish_timelock: u32,
refund_address: bitcoin::Address, pub refund_address: bitcoin::Address,
redeem_address: bitcoin::Address, pub redeem_address: bitcoin::Address,
punish_address: bitcoin::Address, pub punish_address: bitcoin::Address,
tx_lock: bitcoin::TxLock, pub tx_lock: bitcoin::TxLock,
tx_punish_sig_bob: bitcoin::Signature, pub tx_punish_sig_bob: bitcoin::Signature,
tx_cancel_sig_bob: bitcoin::Signature, pub tx_cancel_sig_bob: bitcoin::Signature,
} }
impl State3 { impl State3 {