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

Move current_epoch from lib to bitcoin.rs

Browse Source
This commit is contained in:
Daniel Karzel 2020-12-22 16:45:30 +11:00
parent 83ce6f2c85
commit 0cdb7ca8a8
4 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xmr-btc/src/alice.rs
View File

@ -28,7 +28,7 @@ use std::{
use tokio::{sync::Mutex, time::timeout}; use tokio::{sync::Mutex, time::timeout};
use tracing::{error, info}; use tracing::{error, info};
pub mod message; pub mod message;
use crate::bitcoin::{BlockHeight, TransactionBlockHeight}; use crate::bitcoin::{BlockHeight, TransactionBlockHeight, current_epoch};
pub use message::{Message, Message0, Message1, Message2}; pub use message::{Message, Message0, Message1, Message2};
#[derive(Debug)] #[derive(Debug)]
@ -697,7 +697,7 @@ impl State3 {
where where
W: WatchForRawTransaction + TransactionBlockHeight + BlockHeight, W: WatchForRawTransaction + TransactionBlockHeight + BlockHeight,
{ {
crate::current_epoch( current_epoch(
bitcoin_wallet, bitcoin_wallet,
self.refund_timelock, self.refund_timelock,
self.punish_timelock, self.punish_timelock,

23
xmr-btc/src/bitcoin.rs
View File

@ -14,6 +14,7 @@ use std::str::FromStr;
pub use bitcoin::{util::psbt::PartiallySignedTransaction, *}; pub use bitcoin::{util::psbt::PartiallySignedTransaction, *};
pub use ecdsa_fun::{adaptor::EncryptedSignature, fun::Scalar, Signature}; pub use ecdsa_fun::{adaptor::EncryptedSignature, fun::Scalar, Signature};
pub use transactions::{TxCancel, TxLock, TxPunish, TxRedeem, TxRefund}; pub use transactions::{TxCancel, TxLock, TxPunish, TxRedeem, TxRefund};
use crate::Epoch;
// TODO: Configurable tx-fee (note: parties have to agree prior to swapping) // TODO: Configurable tx-fee (note: parties have to agree prior to swapping)
// Current reasoning: // Current reasoning:
@ -243,3 +244,25 @@ where
tokio::time::delay_for(std::time::Duration::from_secs(1)).await; tokio::time::delay_for(std::time::Duration::from_secs(1)).await;
} }
} }
pub async fn current_epoch<W>(
bitcoin_wallet: &W,
refund_timelock: u32,
punish_timelock: u32,
lock_tx_id: ::bitcoin::Txid,
) -> anyhow::Result<Epoch>
where
W: WatchForRawTransaction + TransactionBlockHeight + BlockHeight,
{
let current_block_height = bitcoin_wallet.block_height().await;
let t0 = bitcoin_wallet.transaction_block_height(lock_tx_id).await;
let t1 = t0 + refund_timelock;
let t2 = t1 + punish_timelock;
match (current_block_height < t1, current_block_height < t2) {
(true, _) => Ok(Epoch::T0),
(false, true) => Ok(Epoch::T1),
(false, false) => Ok(Epoch::T2),
}
}

5
xmr-btc/src/bob.rs
View File

@ -39,6 +39,7 @@ use crate::{
}; };
use ::bitcoin::{Transaction, Txid}; use ::bitcoin::{Transaction, Txid};
pub use message::{Message, Message0, Message1, Message2, Message3}; pub use message::{Message, Message0, Message1, Message2, Message3};
use crate::bitcoin::current_epoch;
#[allow(clippy::large_enum_variant)] #[allow(clippy::large_enum_variant)]
#[derive(Debug)] #[derive(Debug)]
@ -650,7 +651,7 @@ impl State3 {
where where
W: WatchForRawTransaction + TransactionBlockHeight + BlockHeight, W: WatchForRawTransaction + TransactionBlockHeight + BlockHeight,
{ {
crate::current_epoch( current_epoch(
bitcoin_wallet, bitcoin_wallet,
self.refund_timelock, self.refund_timelock,
self.punish_timelock, self.punish_timelock,
@ -795,7 +796,7 @@ impl State4 {
where where
W: WatchForRawTransaction + TransactionBlockHeight + BlockHeight, W: WatchForRawTransaction + TransactionBlockHeight + BlockHeight,
{ {
crate::current_epoch( current_epoch(
bitcoin_wallet, bitcoin_wallet,
self.refund_timelock, self.refund_timelock,
self.punish_timelock, self.punish_timelock,

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

@ -60,26 +60,4 @@ pub mod monero;
pub mod serde; pub mod serde;
pub mod transport; pub mod transport;
use crate::bitcoin::{BlockHeight, TransactionBlockHeight, WatchForRawTransaction};
pub use cross_curve_dleq; pub use cross_curve_dleq;
pub async fn current_epoch<W>(
bitcoin_wallet: &W,
refund_timelock: u32,
punish_timelock: u32,
lock_tx_id: ::bitcoin::Txid,
) -> anyhow::Result<Epoch>
where
W: WatchForRawTransaction + TransactionBlockHeight + BlockHeight,
{
let current_block_height = bitcoin_wallet.block_height().await;
let t0 = bitcoin_wallet.transaction_block_height(lock_tx_id).await;
let t1 = t0 + refund_timelock;
let t2 = t1 + punish_timelock;
match (current_block_height < t1, current_block_height < t2) {
(true, _) => Ok(Epoch::T0),
(false, true) => Ok(Epoch::T1),
(false, false) => Ok(Epoch::T2),
}
}