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

Allow withdrawing and viewing of the bitcoin balance on swap-cli

Browse source
This commit is contained in:
devbordecraft 2021-08-29 18:31:41 +02:00 • committed by rishflab
parent 51d8623ed7
commit f2df838a3c
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
swap/src/cli/command.rs
View file

@ -3,7 +3,7 @@ use crate::env::GetConfig;
use crate::fs::system_data_dir;
use crate::network::rendezvous::XmrBtcNamespace;
use crate::{env, monero};
use anyhow::{Context, Result};
use anyhow::{bail, Context, Result};
use bitcoin::{Address, AddressType};
use libp2p::core::Multiaddr;
use serde::Serialize;
@ -141,7 +141,7 @@ where
bitcoin_electrum_rpc_url,
bitcoin_target_block,
amount,
address: validate_bitcoin_address(address, is_testnet)?,
address: bitcoin_address(address, is_testnet)?,
},
}
}
@ -529,6 +529,23 @@ fn env_config_from(testnet: bool) -> env::Config {
}
}
fn bitcoin_address(address: Address, is_testnet: bool) -> Result<Address> {
let network = if is_testnet {
bitcoin::Network::Testnet
} else {
bitcoin::Network::Bitcoin
};
if address.network != network {
bail!(BitcoinAddressNetworkMismatch {
expected: network,
actual: address.network
});
}
Ok(address)
}
fn validate_monero_address(
address: monero::Address,
testnet: bool,