Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-04-20 16:06:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Pass in existing bitcoind wallet name

Browse Source
This commit is contained in:
Daniel Karzel 2020-12-02 10:17:38 +11:00
parent 95524ce967
commit 74af2b57eb
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
swap/src/bin/swap.rs
View File

@ -50,6 +50,7 @@ async fn main() -> Result<()> {
match opt {
Options::Alice {
bitcoind_url,
bitcoin_wallet_name,
monero_wallet_rpc_url,
listen_addr,
tor_port,
@ -87,7 +88,7 @@ async fn main() -> Result<()> {
xmr: send_monero,
};
let bitcoin_wallet = bitcoin::Wallet::new("alice", bitcoind_url)
let bitcoin_wallet = bitcoin::Wallet::new(bitcoin_wallet_name.as_ref(), bitcoind_url)
.await
.expect("failed to create bitcoin wallet");
let bitcoin_wallet = Arc::new(bitcoin_wallet);
@ -120,6 +121,7 @@ async fn main() -> Result<()> {
alice_addr,
alice_peer_id,
bitcoind_url,
bitcoin_wallet_name,
monero_wallet_rpc_url,
tor,
send_bitcoin,
@ -141,7 +143,7 @@ async fn main() -> Result<()> {
xmr: receive_monero,
};
let bitcoin_wallet = bitcoin::Wallet::new("bob", bitcoind_url)
let bitcoin_wallet = bitcoin::Wallet::new(bitcoin_wallet_name.as_ref(), bitcoind_url)
.await
.expect("failed to create bitcoin wallet");
let bitcoin_wallet = Arc::new(bitcoin_wallet);
@ -191,9 +193,10 @@ async fn main() -> Result<()> {
swap_id,
bitcoind_url,
monerod_url,
bitcoin_wallet_name,
} => {
let state = db.get_state(swap_id)?;
let bitcoin_wallet = bitcoin::Wallet::new("bob", bitcoind_url)
let bitcoin_wallet = bitcoin::Wallet::new(bitcoin_wallet_name.as_ref(), bitcoind_url)
.await
.expect("failed to create bitcoin wallet");
let monero_wallet = monero::Wallet::new(monerod_url);

9
swap/src/cli.rs
View File

@ -14,6 +14,9 @@ pub enum Options {
)]
bitcoind_url: Url,
#[structopt(short = "bn", long = "bitcoin-wallet-name")]
bitcoin_wallet_name: String,
#[structopt(
short = "m",
long = "monero-wallet-rpc",
@ -54,6 +57,9 @@ pub enum Options {
)]
bitcoind_url: Url,
#[structopt(short = "bn", long = "bitcoin-wallet-name")]
bitcoin_wallet_name: String,
#[structopt(
short = "m",
long = "monerod",
@ -80,6 +86,9 @@ pub enum Options {
#[structopt(default_value = "http://127.0.0.1:18083/json_rpc", long = "monerod")]
monerod_url: Url,
#[structopt(short = "bn", long = "bitcoin-wallet-name")]
bitcoin_wallet_name: String,
},
}