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

Monero confirmations are a u64

Browse Source 
Trying to deserialize the number as a u32 caused deserialization
errors.
This commit is contained in:
Thomas Eizinger 2021-03-29 12:05:20 +11:00
parent 1b63d5486d
commit 5616683d7d
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monero-rpc/src/rpc/wallet.rs
View File

@ -470,7 +470,7 @@ struct CheckTxKeyParams {
#[derive(Clone, Copy, Debug, Deserialize)]
pub struct CheckTxKey {
pub confirmations: u32,
pub confirmations: u64,
pub received: u64,
}

2
swap/src/env.rs
View File

@ -12,7 +12,7 @@ pub struct Config {
pub bitcoin_punish_timelock: PunishTimelock,
pub bitcoin_network: bitcoin::Network,
pub monero_avg_block_time: Duration,
pub monero_finality_confirmations: u32,
pub monero_finality_confirmations: u64,
pub monero_network: monero::Network,
}

12
swap/src/monero/wallet.rs
View File

@ -271,7 +271,7 @@ pub struct WatchRequest {
pub public_spend_key: PublicKey,
pub public_view_key: PublicViewKey,
pub transfer_proof: TransferProof,
pub conf_target: u32,
pub conf_target: u64,
pub expected: Amount,
}
@ -280,12 +280,12 @@ async fn wait_for_confirmations<Fut>(
fetch_tx: impl Fn(String) -> Fut,
mut check_interval: Interval,
expected: Amount,
conf_target: u32,
conf_target: u64,
) -> Result<(), InsufficientFunds>
where
Fut: Future<Output = Result<CheckTxKey>>,
{
let mut seen_confirmations = 0u32;
let mut seen_confirmations = 0u64;
while seen_confirmations < conf_target {
check_interval.tick().await; // tick() at the beginning of the loop so every `continue` tick()s as well
@ -323,7 +323,7 @@ where
mod tests {
use super::*;
use monero_rpc::wallet::CheckTxKey;
use std::sync::atomic::{AtomicU32, Ordering};
use std::sync::atomic::{AtomicU32, AtomicU64, Ordering};
use std::sync::Arc;
#[tokio::test]
@ -364,9 +364,9 @@ mod tests {
#[tokio::test]
async fn visual_log_check() {
let _ = tracing_subscriber::fmt().with_test_writer().try_init();
const MAX_REQUESTS: u32 = 20;
const MAX_REQUESTS: u64 = 20;
let requests = Arc::new(AtomicU32::new(0));
let requests = Arc::new(AtomicU64::new(0));
let result = wait_for_confirmations(
String::from("TXID"),

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

@ -361,7 +361,7 @@ impl State3 {
pub fn lock_xmr_watch_request(
&self,
transfer_proof: TransferProof,
conf_target: u32,
conf_target: u64,
) -> WatchRequest {
let S_a = monero::PublicKey::from_private_key(&monero::PrivateKey { scalar: self.s_a });

10
swap/src/protocol/bob/state.rs
View File

@ -83,7 +83,7 @@ pub struct State0 {
cancel_timelock: CancelTimelock,
punish_timelock: PunishTimelock,
refund_address: bitcoin::Address,
min_monero_confirmations: u32,
min_monero_confirmations: u64,
}
impl State0 {
@ -94,7 +94,7 @@ impl State0 {
cancel_timelock: CancelTimelock,
punish_timelock: PunishTimelock,
refund_address: bitcoin::Address,
min_monero_confirmations: u32,
min_monero_confirmations: u64,
) -> Self {
let b = bitcoin::SecretKey::new_random(rng);
@ -185,7 +185,7 @@ pub struct State1 {
redeem_address: bitcoin::Address,
punish_address: bitcoin::Address,
tx_lock: bitcoin::TxLock,
min_monero_confirmations: u32,
min_monero_confirmations: u64,
}
impl State1 {
@ -245,7 +245,7 @@ pub struct State2 {
tx_lock: bitcoin::TxLock,
tx_cancel_sig_a: Signature,
tx_refund_encsig: bitcoin::EncryptedSignature,
min_monero_confirmations: u32,
min_monero_confirmations: u64,
}
impl State2 {
@ -302,7 +302,7 @@ pub struct State3 {
tx_lock: bitcoin::TxLock,
tx_cancel_sig_a: Signature,
tx_refund_encsig: bitcoin::EncryptedSignature,
min_monero_confirmations: u32,
min_monero_confirmations: u64,
}
impl State3 {