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

Remove possible mix up of timelocks when using State0::new

Browse Source
This commit is contained in:
Franck Royer 2021-02-08 14:39:27 +11:00
parent f35ed436ce
commit 530b9b2ea8
No known key found for this signature in database
GPG Key ID: A82ED75A8DFC50A4
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swap/src/protocol/alice.rs
View File

@ -178,8 +178,7 @@ impl Builder {
let state0 = State0::new( let state0 = State0::new(
amounts.btc, amounts.btc,
amounts.xmr, amounts.xmr,
self.execution_params.bitcoin_cancel_timelock, self.execution_params,
self.execution_params.bitcoin_punish_timelock,
self.bitcoin_wallet.as_ref(), self.bitcoin_wallet.as_ref(),
&mut OsRng, &mut OsRng,
) )

8
swap/src/protocol/alice/state.rs
View File

@ -6,6 +6,7 @@ use crate::{
wait_for_cancel_timelock_to_expire, GetBlockHeight, TransactionBlockHeight, TxCancel, wait_for_cancel_timelock_to_expire, GetBlockHeight, TransactionBlockHeight, TxCancel,
TxRefund, WatchForRawTransaction, TxRefund, WatchForRawTransaction,
}, },
execution_params::ExecutionParams,
monero, monero,
protocol::{ protocol::{
alice::{Message1, Message3, TransferProof}, alice::{Message1, Message3, TransferProof},
@ -104,8 +105,7 @@ impl State0 {
pub async fn new<R>( pub async fn new<R>(
btc: bitcoin::Amount, btc: bitcoin::Amount,
xmr: monero::Amount, xmr: monero::Amount,
cancel_timelock: Timelock, execution_params: ExecutionParams,
punish_timelock: Timelock,
bitcoin_wallet: &bitcoin::Wallet, bitcoin_wallet: &bitcoin::Wallet,
rng: &mut R, rng: &mut R,
) -> Result<Self> ) -> Result<Self>
@ -128,8 +128,8 @@ impl State0 {
punish_address, punish_address,
btc, btc,
xmr, xmr,
cancel_timelock, cancel_timelock: execution_params.bitcoin_cancel_timelock,
punish_timelock, punish_timelock: execution_params.bitcoin_punish_timelock,
}) })
} }