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

Swap cli executes BuyXmr path if subcommand is not given

Browse Source
This commit is contained in:
rishflab 2021-02-26 15:24:13 +11:00
parent 60de6a9219
commit d6d67f62f1
2 changed files with 106 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
swap/src/bin/swap_cli.rs
View File

@ -13,6 +13,7 @@
#![allow(non_snake_case)]
use anyhow::{Context, Result};
use libp2p::{core::Multiaddr, PeerId};
use prettytable::{row, Table};
use reqwest::Url;
use std::{path::Path, sync::Arc, time::Duration};
@ -21,12 +22,12 @@ use swap::{
bitcoin,
bitcoin::Amount,
cli::{
command::{Arguments, Command},
command::{Arguments, Command, DEFAULT_ALICE_MULTIADDR, DEFAULT_ALICE_PEER_ID},
config::{read_config, Config},
},
database::Database,
execution_params,
execution_params::GetExecutionParams,
execution_params::{ExecutionParams, GetExecutionParams},
monero,
monero::{CreateWallet, OpenWallet},
protocol::{
@ -80,56 +81,44 @@ async fn main() -> Result<()> {
.await?;
match opt.cmd {
Command::BuyXmr {
Some(Command::BuyXmr {
alice_peer_id,
alice_addr,
} => {
let (bitcoin_wallet, monero_wallet) = init_wallets(
}) => {
buy_xmr(
alice_addr,
alice_peer_id,
config,
bitcoin_network,
&wallet_data_dir,
monero_network,
&wallet_data_dir,
seed,
monero_wallet_rpc_process.endpoint(),
db,
execution_params,
)
.await?;
// TODO: Also wait for more funds if balance < dust
if bitcoin_wallet.balance().await? == Amount::ZERO {
debug!(
"Waiting for BTC at address {}",
bitcoin_wallet.new_address().await?
);
while bitcoin_wallet.balance().await? == Amount::ZERO {
bitcoin_wallet.sync_wallet().await?;
tokio::time::sleep(Duration::from_secs(1)).await;
}
debug!("Received {}", bitcoin_wallet.balance().await?);
}
let send_bitcoin = bitcoin_wallet.max_giveable().await?;
info!("Swapping {} ...", send_bitcoin);
let bob_factory = Builder::new(
None => {
buy_xmr(
DEFAULT_ALICE_MULTIADDR
.parse()
.expect("default alice multiaddr str is a valid Multiaddr>"),
DEFAULT_ALICE_PEER_ID
.parse()
.expect("default alice peer id str is a valid PeerId"),
config,
bitcoin_network,
monero_network,
&wallet_data_dir,
seed,
monero_wallet_rpc_process.endpoint(),
db,
Uuid::new_v4(),
Arc::new(bitcoin_wallet),
Arc::new(monero_wallet),
alice_addr,
alice_peer_id,
execution_params,
);
let (swap, event_loop) = bob_factory.with_init_params(send_bitcoin).build().await?;
tokio::spawn(async move { event_loop.run().await });
bob::run(swap).await?;
)
.await?;
}
Command::History => {
Some(Command::History) => {
let mut table = Table::new();
table.add_row(row!["SWAP ID", "STATE"]);
@ -141,11 +130,11 @@ async fn main() -> Result<()> {
// Print the table to stdout
table.printstd();
}
Command::Resume {
Some(Command::Resume {
swap_id,
alice_peer_id,
alice_addr,
} => {
}) => {
let (bitcoin_wallet, monero_wallet) = init_wallets(
config,
bitcoin_network,
@ -171,12 +160,12 @@ async fn main() -> Result<()> {
tokio::spawn(async move { event_loop.run().await });
bob::run(swap).await?;
}
Command::Cancel {
Some(Command::Cancel {
swap_id,
alice_peer_id,
alice_addr,
force,
} => {
}) => {
// TODO: Optimization: Only init the Bitcoin wallet, Monero wallet unnecessary
let (bitcoin_wallet, monero_wallet) = init_wallets(
config,
@ -223,12 +212,12 @@ async fn main() -> Result<()> {
}
}
}
Command::Refund {
Some(Command::Refund {
swap_id,
alice_peer_id,
alice_addr,
force,
} => {
}) => {
let (bitcoin_wallet, monero_wallet) = init_wallets(
config,
bitcoin_network,
@ -332,3 +321,65 @@ async fn init_wallets(
Ok((bitcoin_wallet, monero_wallet))
}
#[allow(clippy::too_many_arguments)]
async fn buy_xmr(
alice_addr: Multiaddr,
alice_peer_id: PeerId,
config: Config,
bitcoin_network: bitcoin::Network,
monero_network: monero::Network,
wallet_data_dir: &Path,
seed: Seed,
monero_wallet_rpc_url: Url,
db: Database,
execution_params: ExecutionParams,
) -> Result<()> {
let (bitcoin_wallet, monero_wallet) = init_wallets(
config,
bitcoin_network,
wallet_data_dir,
monero_network,
seed,
monero_wallet_rpc_url,
)
.await?;
let swap_id = Uuid::new_v4();
// TODO: Also wait for more funds if balance < dust
if bitcoin_wallet.balance().await? == Amount::ZERO {
debug!(
"Waiting for BTC at address {}",
bitcoin_wallet.new_address().await?
);
while bitcoin_wallet.balance().await? == Amount::ZERO {
bitcoin_wallet.sync_wallet().await?;
tokio::time::sleep(Duration::from_secs(1)).await;
}
debug!("Received {}", bitcoin_wallet.balance().await?);
}
let send_bitcoin = bitcoin_wallet.max_giveable().await?;
info!("Swapping {} ...", send_bitcoin);
let bob_factory = Builder::new(
seed,
db,
swap_id,
Arc::new(bitcoin_wallet),
Arc::new(monero_wallet),
alice_addr,
alice_peer_id,
execution_params,
);
let (swap, event_loop) = bob_factory.with_init_params(send_bitcoin).build().await?;
tokio::spawn(async move { event_loop.run().await });
bob::run(swap).await?;
Ok(())
}

6
swap/src/cli/command.rs
View File

@ -2,8 +2,8 @@ use libp2p::{core::Multiaddr, PeerId};
use std::path::PathBuf;
use uuid::Uuid;
const DEFAULT_ALICE_MULTIADDR: &str = "/dns4/xmr-btc-asb.coblox.tech/tcp/9876";
const DEFAULT_ALICE_PEER_ID: &str = "12D3KooWCdMKjesXMJz1SiZ7HgotrxuqhQJbP5sgBm2BwP1cqThi";
pub const DEFAULT_ALICE_MULTIADDR: &str = "/dns4/xmr-btc-asb.coblox.tech/tcp/9876";
pub const DEFAULT_ALICE_PEER_ID: &str = "12D3KooWCdMKjesXMJz1SiZ7HgotrxuqhQJbP5sgBm2BwP1cqThi";
#[derive(structopt::StructOpt, Debug)]
pub struct Arguments {
@ -15,7 +15,7 @@ pub struct Arguments {
pub config: Option<PathBuf>,
#[structopt(subcommand)]
pub cmd: Command,
pub cmd: Option<Command>,
}
#[derive(structopt::StructOpt, Debug)]