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

Rename ExecutionParams to EnvironmentConfig

Browse Source
This commit is contained in:
Thomas Eizinger 2021-03-17 14:55:42 +11:00
parent bc43ed6ebd
commit 09c41f89c4
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96
14 changed files with 132 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
swap/src/bin/asb.rs
View File

@ -24,13 +24,13 @@ use swap::asb::config::{
initial_setup, query_user_for_initial_testnet_config, read_config, Config, ConfigNotInitialized, initial_setup, query_user_for_initial_testnet_config, read_config, Config, ConfigNotInitialized,
}; };
use swap::database::Database; use swap::database::Database;
use swap::execution_params::{ExecutionParams, GetExecutionParams}; use swap::env::GetConfig;
use swap::fs::default_config_path; use swap::fs::default_config_path;
use swap::monero::Amount; use swap::monero::Amount;
use swap::protocol::alice::{run, EventLoop}; use swap::protocol::alice::{run, EventLoop};
use swap::seed::Seed; use swap::seed::Seed;
use swap::trace::init_tracing; use swap::trace::init_tracing;
use swap::{bitcoin, execution_params, kraken, monero}; use swap::{bitcoin, env, kraken, monero};
use tracing::{info, warn}; use tracing::{info, warn};
use tracing_subscriber::filter::LevelFilter; use tracing_subscriber::filter::LevelFilter;
@ -76,13 +76,13 @@ async fn main() -> Result<()> {
let seed = Seed::from_file_or_generate(&config.data.dir) let seed = Seed::from_file_or_generate(&config.data.dir)
.expect("Could not retrieve/initialize seed"); .expect("Could not retrieve/initialize seed");
let exec_params = execution_params::Testnet::get_execution_params(); let env_config = env::Testnet::get_config();
let (bitcoin_wallet, monero_wallet) = init_wallets( let (bitcoin_wallet, monero_wallet) = init_wallets(
config.clone(), config.clone(),
&wallet_data_dir, &wallet_data_dir,
seed.derive_extended_private_key(exec_params.bitcoin_network)?, seed.derive_extended_private_key(env_config.bitcoin_network)?,
exec_params, env_config,
) )
.await?; .await?;
@ -96,7 +96,7 @@ async fn main() -> Result<()> {
let (event_loop, mut swap_receiver) = EventLoop::new( let (event_loop, mut swap_receiver) = EventLoop::new(
config.network.listen, config.network.listen,
seed, seed,
exec_params, env_config,
Arc::new(bitcoin_wallet), Arc::new(bitcoin_wallet),
Arc::new(monero_wallet), Arc::new(monero_wallet),
Arc::new(db), Arc::new(db),
@ -146,13 +146,13 @@ async fn init_wallets(
config: Config, config: Config,
bitcoin_wallet_data_dir: &Path, bitcoin_wallet_data_dir: &Path,
key: impl DerivableKey<Segwitv0> + Clone, key: impl DerivableKey<Segwitv0> + Clone,
exec_params: ExecutionParams, env_config: env::Config,
) -> Result<(bitcoin::Wallet, monero::Wallet)> { ) -> Result<(bitcoin::Wallet, monero::Wallet)> {
let bitcoin_wallet = bitcoin::Wallet::new( let bitcoin_wallet = bitcoin::Wallet::new(
config.bitcoin.electrum_rpc_url, config.bitcoin.electrum_rpc_url,
bitcoin_wallet_data_dir, bitcoin_wallet_data_dir,
key, key,
exec_params, env_config,
) )
.await?; .await?;
@ -167,7 +167,7 @@ async fn init_wallets(
let monero_wallet = monero::Wallet::new( let monero_wallet = monero::Wallet::new(
config.monero.wallet_rpc_url.clone(), config.monero.wallet_rpc_url.clone(),
DEFAULT_WALLET_NAME.to_string(), DEFAULT_WALLET_NAME.to_string(),
exec_params, env_config,
); );
// Setup the Monero wallet // Setup the Monero wallet

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

@ -23,12 +23,12 @@ use structopt::StructOpt;
use swap::bitcoin::{Amount, TxLock}; use swap::bitcoin::{Amount, TxLock};
use swap::cli::command::{AliceConnectParams, Arguments, Command, Data, MoneroParams}; use swap::cli::command::{AliceConnectParams, Arguments, Command, Data, MoneroParams};
use swap::database::Database; use swap::database::Database;
use swap::execution_params::{ExecutionParams, GetExecutionParams}; use swap::env::{Config, GetConfig};
use swap::network::quote::BidQuote; use swap::network::quote::BidQuote;
use swap::protocol::bob; use swap::protocol::bob;
use swap::protocol::bob::{Builder, EventLoop}; use swap::protocol::bob::{Builder, EventLoop};
use swap::seed::Seed; use swap::seed::Seed;
use swap::{bitcoin, execution_params, monero}; use swap::{bitcoin, env, monero};
use tracing::{debug, error, info, warn, Level}; use tracing::{debug, error, info, warn, Level};
use tracing_subscriber::FmtSubscriber; use tracing_subscriber::FmtSubscriber;
use url::Url; use url::Url;
@ -76,7 +76,7 @@ async fn main() -> Result<()> {
let seed = let seed =
Seed::from_file_or_generate(data_dir.as_path()).context("Failed to read in seed file")?; Seed::from_file_or_generate(data_dir.as_path()).context("Failed to read in seed file")?;
let exec_params = execution_params::Testnet::get_execution_params(); let env_config = env::Testnet::get_config();
match args.cmd { match args.cmd {
Command::BuyXmr { Command::BuyXmr {
@ -92,18 +92,18 @@ async fn main() -> Result<()> {
}, },
electrum_rpc_url, electrum_rpc_url,
} => { } => {
if receive_monero_address.network != exec_params.monero_network { if receive_monero_address.network != env_config.monero_network {
bail!( bail!(
"Given monero address is on network {:?}, expected address on network {:?}", "Given monero address is on network {:?}, expected address on network {:?}",
receive_monero_address.network, receive_monero_address.network,
exec_params.monero_network env_config.monero_network
) )
} }
let bitcoin_wallet = let bitcoin_wallet =
init_bitcoin_wallet(electrum_rpc_url, seed, data_dir.clone(), exec_params).await?; init_bitcoin_wallet(electrum_rpc_url, seed, data_dir.clone(), env_config).await?;
let (monero_wallet, _process) = let (monero_wallet, _process) =
init_monero_wallet(data_dir, monero_daemon_host, exec_params).await?; init_monero_wallet(data_dir, monero_daemon_host, env_config).await?;
let bitcoin_wallet = Arc::new(bitcoin_wallet); let bitcoin_wallet = Arc::new(bitcoin_wallet);
let (event_loop, mut event_loop_handle) = EventLoop::new( let (event_loop, mut event_loop_handle) = EventLoop::new(
&seed.derive_libp2p_identity(), &seed.derive_libp2p_identity(),
@ -135,7 +135,7 @@ async fn main() -> Result<()> {
Uuid::new_v4(), Uuid::new_v4(),
bitcoin_wallet.clone(), bitcoin_wallet.clone(),
Arc::new(monero_wallet), Arc::new(monero_wallet),
exec_params, env_config,
event_loop_handle, event_loop_handle,
receive_monero_address, receive_monero_address,
) )
@ -178,14 +178,14 @@ async fn main() -> Result<()> {
}, },
electrum_rpc_url, electrum_rpc_url,
} => { } => {
if receive_monero_address.network != exec_params.monero_network { if receive_monero_address.network != env_config.monero_network {
bail!("The given monero address is on network {:?}, expected address of network {:?}.", receive_monero_address.network, exec_params.monero_network) bail!("The given monero address is on network {:?}, expected address of network {:?}.", receive_monero_address.network, env_config.monero_network)
} }
let bitcoin_wallet = let bitcoin_wallet =
init_bitcoin_wallet(electrum_rpc_url, seed, data_dir.clone(), exec_params).await?; init_bitcoin_wallet(electrum_rpc_url, seed, data_dir.clone(), env_config).await?;
let (monero_wallet, _process) = let (monero_wallet, _process) =
init_monero_wallet(data_dir, monero_daemon_host, exec_params).await?; init_monero_wallet(data_dir, monero_daemon_host, env_config).await?;
let bitcoin_wallet = Arc::new(bitcoin_wallet); let bitcoin_wallet = Arc::new(bitcoin_wallet);
let (event_loop, event_loop_handle) = EventLoop::new( let (event_loop, event_loop_handle) = EventLoop::new(
@ -201,7 +201,7 @@ async fn main() -> Result<()> {
swap_id, swap_id,
bitcoin_wallet.clone(), bitcoin_wallet.clone(),
Arc::new(monero_wallet), Arc::new(monero_wallet),
exec_params, env_config,
event_loop_handle, event_loop_handle,
receive_monero_address, receive_monero_address,
) )
@ -223,7 +223,7 @@ async fn main() -> Result<()> {
electrum_rpc_url, electrum_rpc_url,
} => { } => {
let bitcoin_wallet = let bitcoin_wallet =
init_bitcoin_wallet(electrum_rpc_url, seed, data_dir, exec_params).await?; init_bitcoin_wallet(electrum_rpc_url, seed, data_dir, env_config).await?;
let resume_state = db.get_state(swap_id)?.try_into_bob()?.into(); let resume_state = db.get_state(swap_id)?.try_into_bob()?.into();
let cancel = let cancel =
@ -248,7 +248,7 @@ async fn main() -> Result<()> {
electrum_rpc_url, electrum_rpc_url,
} => { } => {
let bitcoin_wallet = let bitcoin_wallet =
init_bitcoin_wallet(electrum_rpc_url, seed, data_dir, exec_params).await?; init_bitcoin_wallet(electrum_rpc_url, seed, data_dir, env_config).await?;
let resume_state = db.get_state(swap_id)?.try_into_bob()?.into(); let resume_state = db.get_state(swap_id)?.try_into_bob()?.into();
@ -262,15 +262,15 @@ async fn init_bitcoin_wallet(
electrum_rpc_url: Url, electrum_rpc_url: Url,
seed: Seed, seed: Seed,
data_dir: PathBuf, data_dir: PathBuf,
exec_params: ExecutionParams, env_config: Config,
) -> Result<bitcoin::Wallet> { ) -> Result<bitcoin::Wallet> {
let wallet_dir = data_dir.join("wallet"); let wallet_dir = data_dir.join("wallet");
let wallet = bitcoin::Wallet::new( let wallet = bitcoin::Wallet::new(
electrum_rpc_url.clone(), electrum_rpc_url.clone(),
&wallet_dir, &wallet_dir,
seed.derive_extended_private_key(exec_params.bitcoin_network)?, seed.derive_extended_private_key(env_config.bitcoin_network)?,
exec_params, env_config,
) )
.await .await
.context("Failed to initialize Bitcoin wallet")?; .context("Failed to initialize Bitcoin wallet")?;
@ -283,9 +283,9 @@ async fn init_bitcoin_wallet(
async fn init_monero_wallet( async fn init_monero_wallet(
data_dir: PathBuf, data_dir: PathBuf,
monero_daemon_host: String, monero_daemon_host: String,
exec_params: ExecutionParams, env_config: Config,
) -> Result<(monero::Wallet, monero::WalletRpcProcess)> { ) -> Result<(monero::Wallet, monero::WalletRpcProcess)> {
let network = exec_params.monero_network; let network = env_config.monero_network;
const MONERO_BLOCKCHAIN_MONITORING_WALLET_NAME: &str = "swap-tool-blockchain-monitoring-wallet"; const MONERO_BLOCKCHAIN_MONITORING_WALLET_NAME: &str = "swap-tool-blockchain-monitoring-wallet";
@ -298,7 +298,7 @@ async fn init_monero_wallet(
let monero_wallet = monero::Wallet::new( let monero_wallet = monero::Wallet::new(
monero_wallet_rpc_process.endpoint(), monero_wallet_rpc_process.endpoint(),
MONERO_BLOCKCHAIN_MONITORING_WALLET_NAME.to_string(), MONERO_BLOCKCHAIN_MONITORING_WALLET_NAME.to_string(),
exec_params, env_config,
); );
monero_wallet.open_or_create().await?; monero_wallet.open_or_create().await?;

8
swap/src/bitcoin/wallet.rs
View File

@ -1,6 +1,6 @@
use crate::bitcoin::timelocks::BlockHeight; use crate::bitcoin::timelocks::BlockHeight;
use crate::bitcoin::{Address, Amount, Transaction}; use crate::bitcoin::{Address, Amount, Transaction};
use crate::execution_params::ExecutionParams; use crate::env::Config;
use ::bitcoin::util::psbt::PartiallySignedTransaction; use ::bitcoin::util::psbt::PartiallySignedTransaction;
use ::bitcoin::Txid; use ::bitcoin::Txid;
use anyhow::{anyhow, bail, Context, Result}; use anyhow::{anyhow, bail, Context, Result};
@ -33,7 +33,7 @@ impl Wallet {
electrum_rpc_url: Url, electrum_rpc_url: Url,
wallet_dir: &Path, wallet_dir: &Path,
key: impl DerivableKey<Segwitv0> + Clone, key: impl DerivableKey<Segwitv0> + Clone,
exec_params: ExecutionParams, env_config: Config,
) -> Result<Self> { ) -> Result<Self> {
// Workaround for https://github.com/bitcoindevkit/rust-electrum-client/issues/47. // Workaround for https://github.com/bitcoindevkit/rust-electrum-client/issues/47.
let config = electrum_client::ConfigBuilder::default().retry(2).build(); let config = electrum_client::ConfigBuilder::default().retry(2).build();
@ -47,7 +47,7 @@ impl Wallet {
let bdk_wallet = bdk::Wallet::new( let bdk_wallet = bdk::Wallet::new(
bdk::template::BIP84(key.clone(), KeychainKind::External), bdk::template::BIP84(key.clone(), KeychainKind::External),
Some(bdk::template::BIP84(key, KeychainKind::Internal)), Some(bdk::template::BIP84(key, KeychainKind::Internal)),
exec_params.bitcoin_network, env_config.bitcoin_network,
db, db,
ElectrumBlockchain::from(client), ElectrumBlockchain::from(client),
)?; )?;
@ -60,7 +60,7 @@ impl Wallet {
Ok(Self { Ok(Self {
wallet: Arc::new(Mutex::new(bdk_wallet)), wallet: Arc::new(Mutex::new(bdk_wallet)),
client: Arc::new(Mutex::new(Client::new(electrum, interval)?)), client: Arc::new(Mutex::new(Client::new(electrum, interval)?)),
finality_confirmations: exec_params.bitcoin_finality_confirmations, finality_confirmations: env_config.bitcoin_finality_confirmations,
}) })
} }

26
swap/src/execution_params.rs → swap/src/env.rs
View File

@ -3,7 +3,7 @@ use std::time::Duration;
use time::NumericalStdDurationShort; use time::NumericalStdDurationShort;
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]
pub struct ExecutionParams { pub struct Config {
pub bob_time_to_act: Duration, pub bob_time_to_act: Duration,
pub bitcoin_finality_confirmations: u32, pub bitcoin_finality_confirmations: u32,
pub bitcoin_avg_block_time: Duration, pub bitcoin_avg_block_time: Duration,
@ -15,8 +15,8 @@ pub struct ExecutionParams {
pub monero_network: monero::Network, pub monero_network: monero::Network,
} }
pub trait GetExecutionParams { pub trait GetConfig {
fn get_execution_params() -> ExecutionParams; fn get_config() -> Config;
} }
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
@ -28,9 +28,9 @@ pub struct Testnet;
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
pub struct Regtest; pub struct Regtest;
impl GetExecutionParams for Mainnet { impl GetConfig for Mainnet {
fn get_execution_params() -> ExecutionParams { fn get_config() -> Config {
ExecutionParams { Config {
bob_time_to_act: 10.minutes(), bob_time_to_act: 10.minutes(),
bitcoin_finality_confirmations: 3, bitcoin_finality_confirmations: 3,
bitcoin_avg_block_time: 10.minutes(), bitcoin_avg_block_time: 10.minutes(),
@ -44,9 +44,9 @@ impl GetExecutionParams for Mainnet {
} }
} }
impl GetExecutionParams for Testnet { impl GetConfig for Testnet {
fn get_execution_params() -> ExecutionParams { fn get_config() -> Config {
ExecutionParams { Config {
bob_time_to_act: 60.minutes(), bob_time_to_act: 60.minutes(),
bitcoin_finality_confirmations: 1, bitcoin_finality_confirmations: 1,
bitcoin_avg_block_time: 5.minutes(), bitcoin_avg_block_time: 5.minutes(),
@ -60,9 +60,9 @@ impl GetExecutionParams for Testnet {
} }
} }
impl GetExecutionParams for Regtest { impl GetConfig for Regtest {
fn get_execution_params() -> ExecutionParams { fn get_config() -> Config {
ExecutionParams { Config {
bob_time_to_act: 30.seconds(), bob_time_to_act: 30.seconds(),
bitcoin_finality_confirmations: 1, bitcoin_finality_confirmations: 1,
bitcoin_avg_block_time: 5.seconds(), bitcoin_avg_block_time: 5.seconds(),
@ -71,7 +71,7 @@ impl GetExecutionParams for Regtest {
bitcoin_network: bitcoin::Network::Regtest, bitcoin_network: bitcoin::Network::Regtest,
monero_avg_block_time: 1.seconds(), monero_avg_block_time: 1.seconds(),
monero_finality_confirmations: 10, monero_finality_confirmations: 10,
monero_network: monero::Network::Testnet, monero_network: monero::Network::Mainnet, // yes this is strange
} }
} }
} }

2
swap/src/lib.rs
View File

@ -20,7 +20,7 @@ pub mod asb;
pub mod bitcoin; pub mod bitcoin;
pub mod cli; pub mod cli;
pub mod database; pub mod database;
pub mod execution_params; pub mod env;
pub mod fs; pub mod fs;
pub mod kraken; pub mod kraken;
pub mod monero; pub mod monero;

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

@ -1,4 +1,4 @@
use crate::execution_params::ExecutionParams; use crate::env::Config;
use crate::monero::{ use crate::monero::{
Amount, InsufficientFunds, PrivateViewKey, PublicViewKey, TransferProof, TxHash, Amount, InsufficientFunds, PrivateViewKey, PublicViewKey, TransferProof, TxHash,
}; };
@ -24,20 +24,16 @@ pub struct Wallet {
} }
impl Wallet { impl Wallet {
pub fn new(url: Url, name: String, exec_params: ExecutionParams) -> Self { pub fn new(url: Url, name: String, env_config: Config) -> Self {
Self::new_with_client(Client::new(url), name, exec_params) Self::new_with_client(Client::new(url), name, env_config)
} }
pub fn new_with_client( pub fn new_with_client(client: wallet::Client, name: String, env_config: Config) -> Self {
client: wallet::Client,
name: String,
exec_params: ExecutionParams,
) -> Self {
Self { Self {
inner: Mutex::new(client), inner: Mutex::new(client),
network: exec_params.monero_network, network: env_config.monero_network,
name, name,
avg_block_time: exec_params.monero_avg_block_time, avg_block_time: env_config.monero_avg_block_time,
} }
} }

4
swap/src/protocol/alice.rs
View File

@ -1,7 +1,7 @@
//! Run an XMR/BTC swap in the role of Alice. //! Run an XMR/BTC swap in the role of Alice.
//! Alice holds XMR and wishes receive BTC. //! Alice holds XMR and wishes receive BTC.
use crate::database::Database; use crate::database::Database;
use crate::execution_params::ExecutionParams; use crate::env::Config;
use crate::{bitcoin, monero}; use crate::{bitcoin, monero};
use std::sync::Arc; use std::sync::Arc;
use uuid::Uuid; use uuid::Uuid;
@ -28,7 +28,7 @@ pub struct Swap {
pub event_loop_handle: EventLoopHandle, pub event_loop_handle: EventLoopHandle,
pub bitcoin_wallet: Arc<bitcoin::Wallet>, pub bitcoin_wallet: Arc<bitcoin::Wallet>,
pub monero_wallet: Arc<monero::Wallet>, pub monero_wallet: Arc<monero::Wallet>,
pub exec_params: ExecutionParams, pub env_config: Config,
pub swap_id: Uuid, pub swap_id: Uuid,
pub db: Arc<Database>, pub db: Arc<Database>,
} }

6
swap/src/protocol/alice/behaviour.rs
View File

@ -1,4 +1,4 @@
use crate::execution_params::ExecutionParams; use crate::env::Config;
use crate::network::quote::BidQuote; use crate::network::quote::BidQuote;
use crate::network::{peer_tracker, quote, spot_price}; use crate::network::{peer_tracker, quote, spot_price};
use crate::protocol::alice::{ use crate::protocol::alice::{
@ -206,11 +206,11 @@ impl Behaviour {
peer: PeerId, peer: PeerId,
btc: bitcoin::Amount, btc: bitcoin::Amount,
xmr: monero::Amount, xmr: monero::Amount,
exec_params: ExecutionParams, env_config: Config,
bitcoin_wallet: &bitcoin::Wallet, bitcoin_wallet: &bitcoin::Wallet,
rng: &mut (impl RngCore + CryptoRng), rng: &mut (impl RngCore + CryptoRng),
) -> Result<()> { ) -> Result<()> {
let state0 = State0::new(btc, xmr, exec_params, bitcoin_wallet, rng).await?; let state0 = State0::new(btc, xmr, env_config, bitcoin_wallet, rng).await?;
tracing::info!( tracing::info!(
%peer, %peer,

12
swap/src/protocol/alice/event_loop.rs
View File

@ -1,6 +1,6 @@
use crate::asb::{FixedRate, Rate}; use crate::asb::{FixedRate, Rate};
use crate::database::Database; use crate::database::Database;
use crate::execution_params::ExecutionParams; use crate::env::Config;
use crate::monero::BalanceTooLow; use crate::monero::BalanceTooLow;
use crate::network::quote::BidQuote; use crate::network::quote::BidQuote;
use crate::network::{spot_price, transport, TokioExecutor}; use crate::network::{spot_price, transport, TokioExecutor};
@ -23,7 +23,7 @@ use uuid::Uuid;
pub struct EventLoop<RS> { pub struct EventLoop<RS> {
swarm: libp2p::Swarm<Behaviour>, swarm: libp2p::Swarm<Behaviour>,
peer_id: PeerId, peer_id: PeerId,
exec_params: ExecutionParams, env_config: Config,
bitcoin_wallet: Arc<bitcoin::Wallet>, bitcoin_wallet: Arc<bitcoin::Wallet>,
monero_wallet: Arc<monero::Wallet>, monero_wallet: Arc<monero::Wallet>,
db: Arc<Database>, db: Arc<Database>,
@ -53,7 +53,7 @@ where
pub fn new( pub fn new(
listen_address: Multiaddr, listen_address: Multiaddr,
seed: Seed, seed: Seed,
exec_params: ExecutionParams, env_config: Config,
bitcoin_wallet: Arc<bitcoin::Wallet>, bitcoin_wallet: Arc<bitcoin::Wallet>,
monero_wallet: Arc<monero::Wallet>, monero_wallet: Arc<monero::Wallet>,
db: Arc<Database>, db: Arc<Database>,
@ -81,7 +81,7 @@ where
let event_loop = EventLoop { let event_loop = EventLoop {
swarm, swarm,
peer_id, peer_id,
exec_params, env_config,
bitcoin_wallet, bitcoin_wallet,
monero_wallet, monero_wallet,
db, db,
@ -133,7 +133,7 @@ where
} }
} }
match self.swarm.start_execution_setup(peer, btc, xmr, self.exec_params, self.bitcoin_wallet.as_ref(), &mut OsRng).await { match self.swarm.start_execution_setup(peer, btc, xmr, self.env_config, self.bitcoin_wallet.as_ref(), &mut OsRng).await {
Ok(_) => {}, Ok(_) => {},
Err(e) => { Err(e) => {
tracing::warn!(%peer, "failed to start execution setup: {:#}", e); tracing::warn!(%peer, "failed to start execution setup: {:#}", e);
@ -241,7 +241,7 @@ where
event_loop_handle: handle, event_loop_handle: handle,
bitcoin_wallet: self.bitcoin_wallet.clone(), bitcoin_wallet: self.bitcoin_wallet.clone(),
monero_wallet: self.monero_wallet.clone(), monero_wallet: self.monero_wallet.clone(),
exec_params: self.exec_params, env_config: self.env_config,
db: self.db.clone(), db: self.db.clone(),
state: initial_state, state: initial_state,
swap_id, swap_id,

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

@ -1,7 +1,7 @@
use crate::bitcoin::{ use crate::bitcoin::{
current_epoch, CancelTimelock, ExpiredTimelocks, PunishTimelock, TxCancel, TxPunish, TxRefund, current_epoch, CancelTimelock, ExpiredTimelocks, PunishTimelock, TxCancel, TxPunish, TxRefund,
}; };
use crate::execution_params::ExecutionParams; use crate::env::Config;
use crate::protocol::alice::{Message1, Message3}; use crate::protocol::alice::{Message1, Message3};
use crate::protocol::bob::{Message0, Message2, Message4}; use crate::protocol::bob::{Message0, Message2, Message4};
use crate::protocol::CROSS_CURVE_PROOF_SYSTEM; use crate::protocol::CROSS_CURVE_PROOF_SYSTEM;
@ -96,7 +96,7 @@ impl State0 {
pub async fn new<R>( pub async fn new<R>(
btc: bitcoin::Amount, btc: bitcoin::Amount,
xmr: monero::Amount, xmr: monero::Amount,
exec_params: ExecutionParams, env_config: Config,
bitcoin_wallet: &bitcoin::Wallet, bitcoin_wallet: &bitcoin::Wallet,
rng: &mut R, rng: &mut R,
) -> Result<Self> ) -> Result<Self>
@ -124,8 +124,8 @@ impl State0 {
punish_address, punish_address,
btc, btc,
xmr, xmr,
cancel_timelock: exec_params.bitcoin_cancel_timelock, cancel_timelock: env_config.bitcoin_cancel_timelock,
punish_timelock: exec_params.bitcoin_punish_timelock, punish_timelock: env_config.bitcoin_punish_timelock,
}) })
} }

28
swap/src/protocol/alice/swap.rs
View File

@ -2,7 +2,7 @@
//! Alice holds XMR and wishes receive BTC. //! Alice holds XMR and wishes receive BTC.
use crate::bitcoin::{ExpiredTimelocks, TxRedeem}; use crate::bitcoin::{ExpiredTimelocks, TxRedeem};
use crate::database::Database; use crate::database::Database;
use crate::execution_params::ExecutionParams; use crate::env::Config;
use crate::monero_ext::ScalarExt; use crate::monero_ext::ScalarExt;
use crate::protocol::alice; use crate::protocol::alice;
use crate::protocol::alice::event_loop::EventLoopHandle; use crate::protocol::alice::event_loop::EventLoopHandle;
@ -51,7 +51,7 @@ pub async fn run_until(
swap.event_loop_handle, swap.event_loop_handle,
swap.bitcoin_wallet, swap.bitcoin_wallet,
swap.monero_wallet, swap.monero_wallet,
swap.exec_params, swap.env_config,
swap.swap_id, swap.swap_id,
swap.db, swap.db,
) )
@ -67,7 +67,7 @@ async fn run_until_internal(
mut event_loop_handle: EventLoopHandle, mut event_loop_handle: EventLoopHandle,
bitcoin_wallet: Arc<bitcoin::Wallet>, bitcoin_wallet: Arc<bitcoin::Wallet>,
monero_wallet: Arc<monero::Wallet>, monero_wallet: Arc<monero::Wallet>,
exec_params: ExecutionParams, env_config: Config,
swap_id: Uuid, swap_id: Uuid,
db: Arc<Database>, db: Arc<Database>,
) -> Result<AliceState> { ) -> Result<AliceState> {
@ -81,7 +81,7 @@ async fn run_until_internal(
bob_peer_id, bob_peer_id,
} => { } => {
timeout( timeout(
exec_params.bob_time_to_act, env_config.bob_time_to_act,
bitcoin_wallet bitcoin_wallet
.watch_until_status(&state3.tx_lock, |status| status.has_been_seen()), .watch_until_status(&state3.tx_lock, |status| status.has_been_seen()),
) )
@ -90,7 +90,7 @@ async fn run_until_internal(
bitcoin_wallet bitcoin_wallet
.watch_until_status(&state3.tx_lock, |status| { .watch_until_status(&state3.tx_lock, |status| {
status.is_confirmed_with(exec_params.bitcoin_finality_confirmations) status.is_confirmed_with(env_config.bitcoin_finality_confirmations)
}) })
.await?; .await?;
@ -108,7 +108,7 @@ async fn run_until_internal(
event_loop_handle, event_loop_handle,
bitcoin_wallet, bitcoin_wallet,
monero_wallet, monero_wallet,
exec_params, env_config,
swap_id, swap_id,
db, db,
) )
@ -144,7 +144,7 @@ async fn run_until_internal(
event_loop_handle, event_loop_handle,
bitcoin_wallet, bitcoin_wallet,
monero_wallet, monero_wallet,
exec_params, env_config,
swap_id, swap_id,
db, db,
) )
@ -192,7 +192,7 @@ async fn run_until_internal(
event_loop_handle, event_loop_handle,
bitcoin_wallet.clone(), bitcoin_wallet.clone(),
monero_wallet, monero_wallet,
exec_params, env_config,
swap_id, swap_id,
db, db,
) )
@ -258,7 +258,7 @@ async fn run_until_internal(
event_loop_handle, event_loop_handle,
bitcoin_wallet, bitcoin_wallet,
monero_wallet, monero_wallet,
exec_params, env_config,
swap_id, swap_id,
db, db,
) )
@ -291,7 +291,7 @@ async fn run_until_internal(
event_loop_handle, event_loop_handle,
bitcoin_wallet, bitcoin_wallet,
monero_wallet, monero_wallet,
exec_params, env_config,
swap_id, swap_id,
db, db,
) )
@ -326,7 +326,7 @@ async fn run_until_internal(
event_loop_handle, event_loop_handle,
bitcoin_wallet.clone(), bitcoin_wallet.clone(),
monero_wallet, monero_wallet,
exec_params, env_config,
swap_id, swap_id,
db, db,
) )
@ -355,7 +355,7 @@ async fn run_until_internal(
event_loop_handle, event_loop_handle,
bitcoin_wallet.clone(), bitcoin_wallet.clone(),
monero_wallet, monero_wallet,
exec_params, env_config,
swap_id, swap_id,
db, db,
) )
@ -432,7 +432,7 @@ async fn run_until_internal(
event_loop_handle, event_loop_handle,
bitcoin_wallet.clone(), bitcoin_wallet.clone(),
monero_wallet, monero_wallet,
exec_params, env_config,
swap_id, swap_id,
db, db,
) )
@ -452,7 +452,7 @@ async fn run_until_internal(
event_loop_handle, event_loop_handle,
bitcoin_wallet.clone(), bitcoin_wallet.clone(),
monero_wallet, monero_wallet,
exec_params, env_config,
swap_id, swap_id,
db, db,
) )

12
swap/src/protocol/bob.rs
View File

@ -1,5 +1,5 @@
use crate::database::Database; use crate::database::Database;
use crate::execution_params::ExecutionParams; use crate::env::Config;
use crate::network::{peer_tracker, spot_price}; use crate::network::{peer_tracker, spot_price};
use crate::protocol::alice::TransferProof; use crate::protocol::alice::TransferProof;
use crate::protocol::bob; use crate::protocol::bob;
@ -37,7 +37,7 @@ pub struct Swap {
pub db: Database, pub db: Database,
pub bitcoin_wallet: Arc<bitcoin::Wallet>, pub bitcoin_wallet: Arc<bitcoin::Wallet>,
pub monero_wallet: Arc<monero::Wallet>, pub monero_wallet: Arc<monero::Wallet>,
pub exec_params: ExecutionParams, pub env_config: Config,
pub swap_id: Uuid, pub swap_id: Uuid,
pub receive_monero_address: ::monero::Address, pub receive_monero_address: ::monero::Address,
} }
@ -50,7 +50,7 @@ pub struct Builder {
monero_wallet: Arc<monero::Wallet>, monero_wallet: Arc<monero::Wallet>,
init_params: InitParams, init_params: InitParams,
exec_params: ExecutionParams, env_config: Config,
event_loop_handle: EventLoopHandle, event_loop_handle: EventLoopHandle,
@ -69,7 +69,7 @@ impl Builder {
swap_id: Uuid, swap_id: Uuid,
bitcoin_wallet: Arc<bitcoin::Wallet>, bitcoin_wallet: Arc<bitcoin::Wallet>,
monero_wallet: Arc<monero::Wallet>, monero_wallet: Arc<monero::Wallet>,
exec_params: ExecutionParams, env_config: Config,
event_loop_handle: EventLoopHandle, event_loop_handle: EventLoopHandle,
receive_monero_address: ::monero::Address, receive_monero_address: ::monero::Address,
) -> Self { ) -> Self {
@ -79,7 +79,7 @@ impl Builder {
bitcoin_wallet, bitcoin_wallet,
monero_wallet, monero_wallet,
init_params: InitParams::None, init_params: InitParams::None,
exec_params, env_config,
event_loop_handle, event_loop_handle,
receive_monero_address, receive_monero_address,
} }
@ -105,7 +105,7 @@ impl Builder {
bitcoin_wallet: self.bitcoin_wallet.clone(), bitcoin_wallet: self.bitcoin_wallet.clone(),
monero_wallet: self.monero_wallet.clone(), monero_wallet: self.monero_wallet.clone(),
swap_id: self.swap_id, swap_id: self.swap_id,
exec_params: self.exec_params, env_config: self.env_config,
receive_monero_address: self.receive_monero_address, receive_monero_address: self.receive_monero_address,
}) })
} }

34
swap/src/protocol/bob/swap.rs
View File

@ -1,6 +1,6 @@
use crate::bitcoin::ExpiredTimelocks; use crate::bitcoin::ExpiredTimelocks;
use crate::database::{Database, Swap}; use crate::database::{Database, Swap};
use crate::execution_params::ExecutionParams; use crate::env::Config;
use crate::monero::InsufficientFunds; use crate::monero::InsufficientFunds;
use crate::protocol::bob; use crate::protocol::bob;
use crate::protocol::bob::event_loop::EventLoopHandle; use crate::protocol::bob::event_loop::EventLoopHandle;
@ -41,7 +41,7 @@ pub async fn run_until(
swap.bitcoin_wallet, swap.bitcoin_wallet,
swap.monero_wallet, swap.monero_wallet,
swap.swap_id, swap.swap_id,
swap.exec_params, swap.env_config,
swap.receive_monero_address, swap.receive_monero_address,
) )
.await .await
@ -58,7 +58,7 @@ async fn run_until_internal(
bitcoin_wallet: Arc<bitcoin::Wallet>, bitcoin_wallet: Arc<bitcoin::Wallet>,
monero_wallet: Arc<monero::Wallet>, monero_wallet: Arc<monero::Wallet>,
swap_id: Uuid, swap_id: Uuid,
exec_params: ExecutionParams, env_config: Config,
receive_monero_address: monero::Address, receive_monero_address: monero::Address,
) -> Result<BobState> { ) -> Result<BobState> {
trace!("Current state: {}", state); trace!("Current state: {}", state);
@ -74,7 +74,7 @@ async fn run_until_internal(
let state2 = request_price_and_setup( let state2 = request_price_and_setup(
btc_amount, btc_amount,
&mut event_loop_handle, &mut event_loop_handle,
exec_params, env_config,
bitcoin_refund_address, bitcoin_refund_address,
) )
.await?; .await?;
@ -90,7 +90,7 @@ async fn run_until_internal(
bitcoin_wallet, bitcoin_wallet,
monero_wallet, monero_wallet,
swap_id, swap_id,
exec_params, env_config,
receive_monero_address, receive_monero_address,
) )
.await .await
@ -121,7 +121,7 @@ async fn run_until_internal(
bitcoin_wallet, bitcoin_wallet,
monero_wallet, monero_wallet,
swap_id, swap_id,
exec_params, env_config,
receive_monero_address, receive_monero_address,
) )
.await .await
@ -177,7 +177,7 @@ async fn run_until_internal(
bitcoin_wallet, bitcoin_wallet,
monero_wallet, monero_wallet,
swap_id, swap_id,
exec_params, env_config,
receive_monero_address, receive_monero_address,
) )
.await .await
@ -232,7 +232,7 @@ async fn run_until_internal(
bitcoin_wallet, bitcoin_wallet,
monero_wallet, monero_wallet,
swap_id, swap_id,
exec_params, env_config,
receive_monero_address, receive_monero_address,
) )
.await .await
@ -275,7 +275,7 @@ async fn run_until_internal(
bitcoin_wallet, bitcoin_wallet,
monero_wallet, monero_wallet,
swap_id, swap_id,
exec_params, env_config,
receive_monero_address, receive_monero_address,
) )
.await .await
@ -311,7 +311,7 @@ async fn run_until_internal(
bitcoin_wallet.clone(), bitcoin_wallet.clone(),
monero_wallet, monero_wallet,
swap_id, swap_id,
exec_params, env_config,
receive_monero_address, receive_monero_address,
) )
.await .await
@ -342,7 +342,7 @@ async fn run_until_internal(
bitcoin_wallet, bitcoin_wallet,
monero_wallet, monero_wallet,
swap_id, swap_id,
exec_params, env_config,
receive_monero_address, receive_monero_address,
) )
.await .await
@ -368,7 +368,7 @@ async fn run_until_internal(
bitcoin_wallet, bitcoin_wallet,
monero_wallet, monero_wallet,
swap_id, swap_id,
exec_params, env_config,
receive_monero_address, receive_monero_address,
) )
.await .await
@ -398,7 +398,7 @@ async fn run_until_internal(
bitcoin_wallet, bitcoin_wallet,
monero_wallet, monero_wallet,
swap_id, swap_id,
exec_params, env_config,
receive_monero_address, receive_monero_address,
) )
.await .await
@ -414,7 +414,7 @@ async fn run_until_internal(
pub async fn request_price_and_setup( pub async fn request_price_and_setup(
btc: bitcoin::Amount, btc: bitcoin::Amount,
event_loop_handle: &mut EventLoopHandle, event_loop_handle: &mut EventLoopHandle,
exec_params: ExecutionParams, env_config: Config,
bitcoin_refund_address: bitcoin::Address, bitcoin_refund_address: bitcoin::Address,
) -> Result<bob::state::State2> { ) -> Result<bob::state::State2> {
let xmr = event_loop_handle.request_spot_price(btc).await?; let xmr = event_loop_handle.request_spot_price(btc).await?;
@ -425,10 +425,10 @@ pub async fn request_price_and_setup(
&mut OsRng, &mut OsRng,
btc, btc,
xmr, xmr,
exec_params.bitcoin_cancel_timelock, env_config.bitcoin_cancel_timelock,
exec_params.bitcoin_punish_timelock, env_config.bitcoin_punish_timelock,
bitcoin_refund_address, bitcoin_refund_address,
exec_params.monero_finality_confirmations, env_config.monero_finality_confirmations,
); );
let state2 = event_loop_handle.execution_setup(state0).await?; let state2 = event_loop_handle.execution_setup(state0).await?;

52
swap/tests/testutils/mod.rs
View File

@ -16,12 +16,12 @@ use std::time::Duration;
use swap::asb::FixedRate; use swap::asb::FixedRate;
use swap::bitcoin::{CancelTimelock, PunishTimelock}; use swap::bitcoin::{CancelTimelock, PunishTimelock};
use swap::database::Database; use swap::database::Database;
use swap::execution_params::{ExecutionParams, GetExecutionParams}; use swap::env::{Config, GetConfig};
use swap::protocol::alice::{AliceState, Swap}; use swap::protocol::alice::{AliceState, Swap};
use swap::protocol::bob::BobState; use swap::protocol::bob::BobState;
use swap::protocol::{alice, bob}; use swap::protocol::{alice, bob};
use swap::seed::Seed; use swap::seed::Seed;
use swap::{bitcoin, execution_params, monero}; use swap::{bitcoin, env, monero};
use tempfile::tempdir; use tempfile::tempdir;
use testcontainers::clients::Cli; use testcontainers::clients::Cli;
use testcontainers::{Container, Docker, RunArgs}; use testcontainers::{Container, Docker, RunArgs};
@ -52,7 +52,7 @@ struct BobParams {
monero_wallet: Arc<monero::Wallet>, monero_wallet: Arc<monero::Wallet>,
alice_address: Multiaddr, alice_address: Multiaddr,
alice_peer_id: PeerId, alice_peer_id: PeerId,
exec_params: ExecutionParams, env_config: Config,
} }
impl BobParams { impl BobParams {
@ -64,7 +64,7 @@ impl BobParams {
self.swap_id, self.swap_id,
self.bitcoin_wallet.clone(), self.bitcoin_wallet.clone(),
self.monero_wallet.clone(), self.monero_wallet.clone(),
self.exec_params, self.env_config,
event_loop_handle, event_loop_handle,
receive_address, receive_address,
)) ))
@ -311,13 +311,13 @@ pub async fn setup_test<T, F, C>(_config: C, testfn: T)
where where
T: Fn(TestContext) -> F, T: Fn(TestContext) -> F,
F: Future<Output = Result<()>>, F: Future<Output = Result<()>>,
C: GetExecutionParams, C: GetConfig,
{ {
let cli = Cli::default(); let cli = Cli::default();
let _guard = init_tracing(); let _guard = init_tracing();
let exec_params = C::get_execution_params(); let env_config = C::get_config();
let (monero, containers) = testutils::init_containers(&cli).await; let (monero, containers) = testutils::init_containers(&cli).await;
@ -351,7 +351,7 @@ where
tempdir().unwrap().path(), tempdir().unwrap().path(),
electrs_rpc_port, electrs_rpc_port,
alice_seed, alice_seed,
exec_params, env_config,
) )
.await; .await;
@ -373,14 +373,14 @@ where
tempdir().unwrap().path(), tempdir().unwrap().path(),
electrs_rpc_port, electrs_rpc_port,
bob_seed, bob_seed,
exec_params, env_config,
) )
.await; .await;
let (alice_event_loop, alice_swap_handle) = alice::EventLoop::new( let (alice_event_loop, alice_swap_handle) = alice::EventLoop::new(
alice_listen_address.clone(), alice_listen_address.clone(),
alice_seed, alice_seed,
exec_params, env_config,
alice_bitcoin_wallet.clone(), alice_bitcoin_wallet.clone(),
alice_monero_wallet.clone(), alice_monero_wallet.clone(),
alice_db, alice_db,
@ -401,7 +401,7 @@ where
monero_wallet: bob_monero_wallet.clone(), monero_wallet: bob_monero_wallet.clone(),
alice_address: alice_listen_address, alice_address: alice_listen_address,
alice_peer_id, alice_peer_id,
exec_params, env_config,
}; };
let test = TestContext { let test = TestContext {
@ -580,7 +580,7 @@ async fn init_test_wallets(
datadir: &Path, datadir: &Path,
electrum_rpc_port: u16, electrum_rpc_port: u16,
seed: Seed, seed: Seed,
exec_params: ExecutionParams, env_config: Config,
) -> (Arc<bitcoin::Wallet>, Arc<monero::Wallet>) { ) -> (Arc<bitcoin::Wallet>, Arc<monero::Wallet>) {
monero monero
.init(vec![(name, starting_balances.xmr.as_piconero())]) .init(vec![(name, starting_balances.xmr.as_piconero())])
@ -590,7 +590,7 @@ async fn init_test_wallets(
let xmr_wallet = swap::monero::Wallet::new_with_client( let xmr_wallet = swap::monero::Wallet::new_with_client(
monero.wallet(name).unwrap().client(), monero.wallet(name).unwrap().client(),
name.to_string(), name.to_string(),
exec_params, env_config,
); );
let electrum_rpc_url = { let electrum_rpc_url = {
@ -601,9 +601,9 @@ async fn init_test_wallets(
let btc_wallet = swap::bitcoin::Wallet::new( let btc_wallet = swap::bitcoin::Wallet::new(
electrum_rpc_url, electrum_rpc_url,
datadir, datadir,
seed.derive_extended_private_key(exec_params.bitcoin_network) seed.derive_extended_private_key(env_config.bitcoin_network)
.expect("Could not create extended private key from seed"), .expect("Could not create extended private key from seed"),
exec_params, env_config,
) )
.await .await
.expect("could not init btc wallet"); .expect("could not init btc wallet");
@ -702,34 +702,34 @@ pub mod bob_run_until {
pub struct SlowCancelConfig; pub struct SlowCancelConfig;
impl GetExecutionParams for SlowCancelConfig { impl GetConfig for SlowCancelConfig {
fn get_execution_params() -> ExecutionParams { fn get_config() -> Config {
ExecutionParams { Config {
bitcoin_cancel_timelock: CancelTimelock::new(180), bitcoin_cancel_timelock: CancelTimelock::new(180),
..execution_params::Regtest::get_execution_params() ..env::Regtest::get_config()
} }
} }
} }
pub struct FastCancelConfig; pub struct FastCancelConfig;
impl GetExecutionParams for FastCancelConfig { impl GetConfig for FastCancelConfig {
fn get_execution_params() -> ExecutionParams { fn get_config() -> Config {
ExecutionParams { Config {
bitcoin_cancel_timelock: CancelTimelock::new(1), bitcoin_cancel_timelock: CancelTimelock::new(1),
..execution_params::Regtest::get_execution_params() ..env::Regtest::get_config()
} }
} }
} }
pub struct FastPunishConfig; pub struct FastPunishConfig;
impl GetExecutionParams for FastPunishConfig { impl GetConfig for FastPunishConfig {
fn get_execution_params() -> ExecutionParams { fn get_config() -> Config {
ExecutionParams { Config {
bitcoin_cancel_timelock: CancelTimelock::new(1), bitcoin_cancel_timelock: CancelTimelock::new(1),
bitcoin_punish_timelock: PunishTimelock::new(1), bitcoin_punish_timelock: PunishTimelock::new(1),
..execution_params::Regtest::get_execution_params() ..env::Regtest::get_config()
} }
} }
} }