Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-09-18 07:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
9eae0db9ac
xmr-btc-swap/swap/src/cli.rs

124 lines
3.9 KiB
Rust
Raw Normal View History

Remove newlines from import statements to avoid problems Rust fmt automatically groups the imports (from top to bottom) as `pub use` `use crate` and `use`. There is no need to introduce sections which cause annoyance when auto importing using the IDE.
2021-01-21 00:20:57 +00:00
use crate::{bitcoin, monero};
Bob refunds swap after restart that requires communication As Bob is dialing Alice, we now ensure that we are connected to Alice at each step that needs communication. If we are not connected, we proceed with dialing. In an attempt to improve libp2p usage, we also add known address of Alice first and only use peer_id to dial. This ensures that we use the expected peer id.
2020-12-18 06:39:04 +00:00
use libp2p::{core::Multiaddr, PeerId};
Remove hardcoded configuration The hardcoded configuration was replaced with CLI configuration options. CLI based config was chosen over a config file as it does not access and clutter the user's file system. By CLI options depend on whether the program is run in Alice or Bob mode.
2020-10-29 03:45:45 +00:00
use url::Url;
Add recovery command
2020-11-06 00:10:22 +00:00
use uuid::Uuid;
Remove hardcoded configuration The hardcoded configuration was replaced with CLI configuration options. CLI based config was chosen over a config file as it does not access and clutter the user's file system. By CLI options depend on whether the program is run in Alice or Bob mode.
2020-10-29 03:45:45 +00:00
Resume command and global database cl-parameter
2020-12-15 10:26:02 +00:00
#[derive(structopt::StructOpt, Debug)]
pub struct Options {
Work in review comments
2020-12-17 08:10:24 +00:00
// TODO: Default value should points to proper configuration folder in home folder
Deterministic peer id from seed for alice This includes the introduction of the --data-dir parameter instead of the --database. Both the seed file and the database are stored in the data-dir, the database in sub-folder `database`.
2021-01-08 01:04:48 +00:00
#[structopt(long = "data-dir", default_value = "./.swap-data/")]
pub data_dir: String,
Resume command and global database cl-parameter
2020-12-15 10:26:02 +00:00
#[structopt(subcommand)]
pub cmd: Command,
}
Add swap/ Add a binary crate `swap` that implements two nodes (Alice and Bob). With this applied we can start up a node for each role and do: - Bob: Requests current amounts using BTC is input - Alice: Responds with amounts - Bob: (mock) get user input to Ok the amounts ... continue with swap (TODO)
2020-10-15 22:14:39 +00:00
#[derive(structopt::StructOpt, Debug)]
Merge xmr_btc crate Created network, storage and protocol modules. Organised files into the modules where the belong. xmr_btc crate moved into isolated modulein swap crate. Remove the xmr_btc module and integrate into swap crate. Consolidate message related code Reorganise imports Remove unused parent Message enum Remove unused parent State enum Remove unused dependencies from Cargo.toml
2021-01-05 03:08:36 +00:00
#[structopt(name = "xmr_btc-swap", about = "XMR BTC atomic swap")]
Resume command and global database cl-parameter
2020-12-15 10:26:02 +00:00
pub enum Command {
Upgrade CLI for mainnet test
2020-12-04 05:27:17 +00:00
SellXmr {
Remove all short-codes because they don't add value at the moment
2020-12-21 06:52:52 +00:00
#[structopt(long = "bitcoind-rpc", default_value = "http://127.0.0.1:8332")]
Remove hardcoded configuration The hardcoded configuration was replaced with CLI configuration options. CLI based config was chosen over a config file as it does not access and clutter the user's file system. By CLI options depend on whether the program is run in Alice or Bob mode.
2020-10-29 03:45:45 +00:00
bitcoind_url: Url,
Remove all short-codes because they don't add value at the moment
2020-12-21 06:52:52 +00:00
#[structopt(long = "bitcoin-wallet-name")]
Upgrade CLI for mainnet test
2020-12-04 05:27:17 +00:00
bitcoin_wallet_name: String,
Add monerod to config Fixed rebase issues
2020-11-03 05:08:46 +00:00
Upgrade CLI for mainnet test
2020-12-04 05:27:17 +00:00
#[structopt(
long = "monero-wallet-rpc",
default_value = "http://127.0.0.1:18083/json_rpc"
)]
monero_wallet_rpc_url: Url,
P2p socket should be listening for external connections
2021-01-07 00:45:55 +00:00
#[structopt(long = "p2p-address", default_value = "/ip4/0.0.0.0/tcp/9876")]
Extract transport creation and remove tor conditional compile The numerous tor conditional compile flags were removed by extracting transport creation to the main statement. A tor transport is created if Alice specifies a tor port using the CLI.
2020-10-29 11:18:59 +00:00
listen_addr: Multiaddr,
Add swap/ Add a binary crate `swap` that implements two nodes (Alice and Bob). With this applied we can start up a node for each role and do: - Bob: Requests current amounts using BTC is input - Alice: Responds with amounts - Bob: (mock) get user input to Ok the amounts ... continue with swap (TODO)
2020-10-15 22:14:39 +00:00
Remove all short-codes because they don't add value at the moment
2020-12-21 06:52:52 +00:00
#[structopt(long = "send-xmr", help = "Monero amount as floating point nr without denomination (e.g. 125.1)", parse(try_from_str = parse_xmr))]
Merge xmr_btc crate Created network, storage and protocol modules. Organised files into the modules where the belong. xmr_btc crate moved into isolated modulein swap crate. Remove the xmr_btc module and integrate into swap crate. Consolidate message related code Reorganise imports Remove unused parent Message enum Remove unused parent State enum Remove unused dependencies from Cargo.toml
2021-01-05 03:08:36 +00:00
send_monero: monero::Amount,
Add Tor to main
2020-10-26 05:55:53 +00:00
Remove all short-codes because they don't add value at the moment
2020-12-21 06:52:52 +00:00
#[structopt(long = "receive-btc", help = "Bitcoin amount as floating point nr without denomination (e.g. 1.25)", parse(try_from_str = parse_btc))]
Re-export bitcoin and monero types
2021-01-07 23:41:25 +00:00
receive_bitcoin: bitcoin::Amount,
Upgrade CLI for mainnet test
2020-12-04 05:27:17 +00:00
},
BuyXmr {
Remove all short-codes because they don't add value at the moment
2020-12-21 06:52:52 +00:00
#[structopt(long = "connect-peer-id")]
Bob refunds swap after restart that requires communication As Bob is dialing Alice, we now ensure that we are connected to Alice at each step that needs communication. If we are not connected, we proceed with dialing. In an attempt to improve libp2p usage, we also add known address of Alice first and only use peer_id to dial. This ensures that we use the expected peer id.
2020-12-18 06:39:04 +00:00
alice_peer_id: PeerId,
Remove all short-codes because they don't add value at the moment
2020-12-21 06:52:52 +00:00
#[structopt(long = "connect-addr")]
Extract transport creation and remove tor conditional compile The numerous tor conditional compile flags were removed by extracting transport creation to the main statement. A tor transport is created if Alice specifies a tor port using the CLI.
2020-10-29 11:18:59 +00:00
alice_addr: Multiaddr,
Remove all short-codes because they don't add value at the moment
2020-12-21 06:52:52 +00:00
#[structopt(long = "bitcoind-rpc", default_value = "http://127.0.0.1:8332")]
Remove hardcoded configuration The hardcoded configuration was replaced with CLI configuration options. CLI based config was chosen over a config file as it does not access and clutter the user's file system. By CLI options depend on whether the program is run in Alice or Bob mode.
2020-10-29 03:45:45 +00:00
bitcoind_url: Url,
Construct tor transport for Bob
2020-11-03 03:54:36 +00:00
Remove all short-codes because they don't add value at the moment
2020-12-21 06:52:52 +00:00
#[structopt(long = "bitcoin-wallet-name")]
Upgrade CLI for mainnet test
2020-12-04 05:27:17 +00:00
bitcoin_wallet_name: String,
Correct monero-wallet-rpc parameter name
2021-01-05 00:00:15 +00:00
#[structopt(
long = "monero-wallet-rpc",
default_value = "http://127.0.0.1:18083/json_rpc"
)]
Upgrade CLI for mainnet test
2020-12-04 05:27:17 +00:00
monero_wallet_rpc_url: Url,
Add monerod to config Fixed rebase issues
2020-11-03 05:08:46 +00:00
Remove all short-codes because they don't add value at the moment
2020-12-21 06:52:52 +00:00
#[structopt(long = "send-btc", help = "Bitcoin amount as floating point nr without denomination (e.g. 1.25)", parse(try_from_str = parse_btc))]
Re-export bitcoin and monero types
2021-01-07 23:41:25 +00:00
send_bitcoin: bitcoin::Amount,
Upgrade CLI for mainnet test
2020-12-04 05:27:17 +00:00
Remove all short-codes because they don't add value at the moment
2020-12-21 06:52:52 +00:00
#[structopt(long = "receive-xmr", help = "Monero amount as floating point nr without denomination (e.g. 125.1)", parse(try_from_str = parse_xmr))]
Merge xmr_btc crate Created network, storage and protocol modules. Organised files into the modules where the belong. xmr_btc crate moved into isolated modulein swap crate. Remove the xmr_btc module and integrate into swap crate. Consolidate message related code Reorganise imports Remove unused parent Message enum Remove unused parent State enum Remove unused dependencies from Cargo.toml
2021-01-05 03:08:36 +00:00
receive_monero: monero::Amount,
Remove hardcoded configuration The hardcoded configuration was replaced with CLI configuration options. CLI based config was chosen over a config file as it does not access and clutter the user's file system. By CLI options depend on whether the program is run in Alice or Bob mode.
2020-10-29 03:45:45 +00:00
},
Re-introduce history command
2020-11-05 05:55:30 +00:00
History,
Separate Buy/Sell for resume command To avoid confusing the user on whether person should enter a listen addr or a connect peer id and address
2020-12-21 03:43:44 +00:00
Resume(Resume),
}
#[derive(structopt::StructOpt, Debug)]
pub enum Resume {
SellXmr {
Remove all short-codes because they don't add value at the moment
2020-12-21 06:52:52 +00:00
#[structopt(long = "swap-id")]
Add recovery command
2020-11-06 00:10:22 +00:00
swap_id: Uuid,
Separate Buy/Sell for resume command To avoid confusing the user on whether person should enter a listen addr or a connect peer id and address
2020-12-21 03:43:44 +00:00
#[structopt(long = "bitcoind-rpc", default_value = "http://127.0.0.1:8332")]
bitcoind_url: Url,
#[structopt(long = "bitcoin-wallet-name")]
bitcoin_wallet_name: String,
#[structopt(
long = "monero-wallet-rpc",
default_value = "http://127.0.0.1:18083/json_rpc"
)]
monero_wallet_rpc_url: Url,
#[structopt(long = "listen-address", default_value = "/ip4/127.0.0.1/tcp/9876")]
listen_addr: Multiaddr,
},
BuyXmr {
#[structopt(long = "swap-id")]
swap_id: Uuid,
#[structopt(long = "counterpart-peer-id")]
Bob refunds swap after restart that requires communication As Bob is dialing Alice, we now ensure that we are connected to Alice at each step that needs communication. If we are not connected, we proceed with dialing. In an attempt to improve libp2p usage, we also add known address of Alice first and only use peer_id to dial. This ensures that we use the expected peer id.
2020-12-18 06:39:04 +00:00
alice_peer_id: PeerId,
Separate Buy/Sell for resume command To avoid confusing the user on whether person should enter a listen addr or a connect peer id and address
2020-12-21 03:43:44 +00:00
#[structopt(long = "counterpart-addr")]
Bob refunds swap after restart that requires communication As Bob is dialing Alice, we now ensure that we are connected to Alice at each step that needs communication. If we are not connected, we proceed with dialing. In an attempt to improve libp2p usage, we also add known address of Alice first and only use peer_id to dial. This ensures that we use the expected peer id.
2020-12-18 06:39:04 +00:00
alice_addr: Multiaddr,
Remove all short-codes because they don't add value at the moment
2020-12-21 06:52:52 +00:00
#[structopt(long = "bitcoind-rpc", default_value = "http://127.0.0.1:8332")]
Add recovery command
2020-11-06 00:10:22 +00:00
bitcoind_url: Url,
Remove all short-codes because they don't add value at the moment
2020-12-21 06:52:52 +00:00
#[structopt(long = "bitcoin-wallet-name")]
Upgrade CLI for mainnet test
2020-12-04 05:27:17 +00:00
bitcoin_wallet_name: String,
Resume command and global database cl-parameter
2020-12-15 10:26:02 +00:00
#[structopt(
long = "monero-wallet-rpc",
default_value = "http://127.0.0.1:18083/json_rpc"
)]
monero_wallet_rpc_url: Url,
Add recovery command
2020-11-06 00:10:22 +00:00
},
Add swap/ Add a binary crate `swap` that implements two nodes (Alice and Bob). With this applied we can start up a node for each role and do: - Bob: Requests current amounts using BTC is input - Alice: Responds with amounts - Bob: (mock) get user input to Ok the amounts ... continue with swap (TODO)
2020-10-15 22:14:39 +00:00
}
Upgrade CLI for mainnet test
2020-12-04 05:27:17 +00:00
fn parse_btc(str: &str) -> anyhow::Result<bitcoin::Amount> {
let amount = bitcoin::Amount::from_str_in(str, ::bitcoin::Denomination::Bitcoin)?;
Ok(amount)
}
Merge xmr_btc crate Created network, storage and protocol modules. Organised files into the modules where the belong. xmr_btc crate moved into isolated modulein swap crate. Remove the xmr_btc module and integrate into swap crate. Consolidate message related code Reorganise imports Remove unused parent Message enum Remove unused parent State enum Remove unused dependencies from Cargo.toml
2021-01-05 03:08:36 +00:00
fn parse_xmr(str: &str) -> anyhow::Result<monero::Amount> {
let amount = monero::Amount::parse_monero(str)?;
Upgrade CLI for mainnet test
2020-12-04 05:27:17 +00:00
Ok(amount)
}
Reference in New Issue Copy Permalink