|
|
@ -21,7 +21,6 @@ pub async fn init_bob(
|
|
|
|
btc_to_swap: bitcoin::Amount,
|
|
|
|
btc_to_swap: bitcoin::Amount,
|
|
|
|
btc_starting_balance: bitcoin::Amount,
|
|
|
|
btc_starting_balance: bitcoin::Amount,
|
|
|
|
xmr_to_swap: xmr_btc::monero::Amount,
|
|
|
|
xmr_to_swap: xmr_btc::monero::Amount,
|
|
|
|
xmr_stating_balance: xmr_btc::monero::Amount,
|
|
|
|
|
|
|
|
config: Config,
|
|
|
|
config: Config,
|
|
|
|
) -> (
|
|
|
|
) -> (
|
|
|
|
BobState,
|
|
|
|
BobState,
|
|
|
@ -31,25 +30,15 @@ pub async fn init_bob(
|
|
|
|
Arc<swap::monero::Wallet>,
|
|
|
|
Arc<swap::monero::Wallet>,
|
|
|
|
Database,
|
|
|
|
Database,
|
|
|
|
) {
|
|
|
|
) {
|
|
|
|
let bob_btc_wallet = Arc::new(
|
|
|
|
let (bob_btc_wallet, bob_xmr_wallet) = init_wallets(
|
|
|
|
swap::bitcoin::Wallet::new("bob", bitcoind.node_url.clone(), config.bitcoin_network)
|
|
|
|
"bob",
|
|
|
|
.await
|
|
|
|
bitcoind,
|
|
|
|
.unwrap(),
|
|
|
|
monero,
|
|
|
|
);
|
|
|
|
Some(btc_starting_balance),
|
|
|
|
bitcoind
|
|
|
|
None,
|
|
|
|
.mint(
|
|
|
|
config,
|
|
|
|
bob_btc_wallet.inner.new_address().await.unwrap(),
|
|
|
|
|
|
|
|
btc_starting_balance,
|
|
|
|
|
|
|
|
)
|
|
|
|
)
|
|
|
|
.await
|
|
|
|
.await;
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
monero
|
|
|
|
|
|
|
|
.init(vec![("bob", xmr_stating_balance.as_piconero())])
|
|
|
|
|
|
|
|
.await
|
|
|
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let bob_xmr_wallet = Arc::new(swap::monero::Wallet(monero.wallet("bob").unwrap().client()));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let amounts = SwapAmounts {
|
|
|
|
let amounts = SwapAmounts {
|
|
|
|
btc: btc_to_swap,
|
|
|
|
btc: btc_to_swap,
|
|
|
@ -89,17 +78,12 @@ pub async fn init_bob(
|
|
|
|
)
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pub async fn init_alice_eventloop(
|
|
|
|
pub async fn init_alice_state(
|
|
|
|
btc_to_swap: bitcoin::Amount,
|
|
|
|
btc_to_swap: bitcoin::Amount,
|
|
|
|
xmr_to_swap: monero::Amount,
|
|
|
|
xmr_to_swap: monero::Amount,
|
|
|
|
alice_btc_wallet: Arc<bitcoin::Wallet>,
|
|
|
|
alice_btc_wallet: Arc<bitcoin::Wallet>,
|
|
|
|
listen: Multiaddr,
|
|
|
|
|
|
|
|
config: Config,
|
|
|
|
config: Config,
|
|
|
|
) -> (
|
|
|
|
) -> AliceState {
|
|
|
|
AliceState,
|
|
|
|
|
|
|
|
alice::event_loop::EventLoop,
|
|
|
|
|
|
|
|
alice::event_loop::EventLoopHandle,
|
|
|
|
|
|
|
|
) {
|
|
|
|
|
|
|
|
let rng = &mut OsRng;
|
|
|
|
let rng = &mut OsRng;
|
|
|
|
|
|
|
|
|
|
|
|
let amounts = SwapAmounts {
|
|
|
|
let amounts = SwapAmounts {
|
|
|
@ -123,39 +107,74 @@ pub async fn init_alice_eventloop(
|
|
|
|
redeem_address,
|
|
|
|
redeem_address,
|
|
|
|
punish_address,
|
|
|
|
punish_address,
|
|
|
|
);
|
|
|
|
);
|
|
|
|
let start_state = AliceState::Started { amounts, state0 };
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
AliceState::Started { amounts, state0 }
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pub fn init_alice_eventloop(
|
|
|
|
|
|
|
|
listen: Multiaddr,
|
|
|
|
|
|
|
|
) -> (
|
|
|
|
|
|
|
|
alice::event_loop::EventLoop,
|
|
|
|
|
|
|
|
alice::event_loop::EventLoopHandle,
|
|
|
|
|
|
|
|
) {
|
|
|
|
let alice_behaviour = alice::Behaviour::default();
|
|
|
|
let alice_behaviour = alice::Behaviour::default();
|
|
|
|
let alice_transport = build(alice_behaviour.identity()).unwrap();
|
|
|
|
let alice_transport = build(alice_behaviour.identity()).unwrap();
|
|
|
|
|
|
|
|
|
|
|
|
let (swarm_driver, handle) =
|
|
|
|
let (swarm_driver, handle) =
|
|
|
|
alice::event_loop::EventLoop::new(alice_transport, alice_behaviour, listen).unwrap();
|
|
|
|
alice::event_loop::EventLoop::new(alice_transport, alice_behaviour, listen).unwrap();
|
|
|
|
|
|
|
|
|
|
|
|
(start_state, swarm_driver, handle)
|
|
|
|
(swarm_driver, handle)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pub async fn init_containers(cli: &Cli) -> (Monero, Containers<'_>) {
|
|
|
|
|
|
|
|
let bitcoind = Bitcoind::new(&cli, "0.19.1").unwrap();
|
|
|
|
|
|
|
|
let _ = bitcoind.init(5).await;
|
|
|
|
|
|
|
|
let (monero, monerods) = Monero::new(&cli, None, vec!["alice".to_string(), "bob".to_string()])
|
|
|
|
|
|
|
|
.await
|
|
|
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(monero, Containers { bitcoind, monerods })
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pub async fn init_alice_wallets(
|
|
|
|
pub async fn init_wallets(
|
|
|
|
|
|
|
|
name: &str,
|
|
|
|
bitcoind: &Bitcoind<'_>,
|
|
|
|
bitcoind: &Bitcoind<'_>,
|
|
|
|
monero: &Monero,
|
|
|
|
monero: &Monero,
|
|
|
|
xmr_starting_balance: xmr_btc::monero::Amount,
|
|
|
|
btc_starting_balance: Option<xmr_btc::bitcoin::Amount>,
|
|
|
|
|
|
|
|
xmr_starting_balance: Option<xmr_btc::monero::Amount>,
|
|
|
|
config: Config,
|
|
|
|
config: Config,
|
|
|
|
) -> (Arc<monero::Wallet>, Arc<bitcoin::Wallet>) {
|
|
|
|
) -> (Arc<bitcoin::Wallet>, Arc<monero::Wallet>) {
|
|
|
|
|
|
|
|
match xmr_starting_balance {
|
|
|
|
|
|
|
|
Some(amount) => {
|
|
|
|
|
|
|
|
monero
|
|
|
|
|
|
|
|
.init(vec![(name, amount.as_piconero())])
|
|
|
|
|
|
|
|
.await
|
|
|
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
None => {
|
|
|
|
monero
|
|
|
|
monero
|
|
|
|
.init(vec![("alice", xmr_starting_balance.as_piconero())])
|
|
|
|
.init(vec![(name, monero::Amount::ZERO.as_piconero())])
|
|
|
|
.await
|
|
|
|
.await
|
|
|
|
.unwrap();
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
let alice_xmr_wallet = Arc::new(swap::monero::Wallet(
|
|
|
|
let xmr_wallet = Arc::new(swap::monero::Wallet(monero.wallet(name).unwrap().client()));
|
|
|
|
monero.wallet("alice").unwrap().client(),
|
|
|
|
|
|
|
|
));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let alice_btc_wallet = Arc::new(
|
|
|
|
let btc_wallet = Arc::new(
|
|
|
|
swap::bitcoin::Wallet::new("alice", bitcoind.node_url.clone(), config.bitcoin_network)
|
|
|
|
swap::bitcoin::Wallet::new(name, bitcoind.node_url.clone(), config.bitcoin_network)
|
|
|
|
.await
|
|
|
|
.await
|
|
|
|
.unwrap(),
|
|
|
|
.unwrap(),
|
|
|
|
);
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
(alice_xmr_wallet, alice_btc_wallet)
|
|
|
|
if let Some(amount) = btc_starting_balance {
|
|
|
|
|
|
|
|
bitcoind
|
|
|
|
|
|
|
|
.mint(btc_wallet.inner.new_address().await.unwrap(), amount)
|
|
|
|
|
|
|
|
.await
|
|
|
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(btc_wallet, xmr_wallet)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[allow(clippy::too_many_arguments)]
|
|
|
|
#[allow(clippy::too_many_arguments)]
|
|
|
@ -174,17 +193,21 @@ pub async fn init_alice(
|
|
|
|
Arc<swap::bitcoin::Wallet>,
|
|
|
|
Arc<swap::bitcoin::Wallet>,
|
|
|
|
Arc<swap::monero::Wallet>,
|
|
|
|
Arc<swap::monero::Wallet>,
|
|
|
|
) {
|
|
|
|
) {
|
|
|
|
let (alice_xmr_wallet, alice_btc_wallet) =
|
|
|
|
let (alice_btc_wallet, alice_xmr_wallet) = init_wallets(
|
|
|
|
init_alice_wallets(bitcoind, monero, xmr_starting_balance, config).await;
|
|
|
|
"alice",
|
|
|
|
|
|
|
|
bitcoind,
|
|
|
|
let (alice_start_state, swarm_driver, handle) = init_alice_eventloop(
|
|
|
|
monero,
|
|
|
|
btc_to_swap,
|
|
|
|
None,
|
|
|
|
xmr_to_swap,
|
|
|
|
Some(xmr_starting_balance),
|
|
|
|
alice_btc_wallet.clone(),
|
|
|
|
|
|
|
|
listen,
|
|
|
|
|
|
|
|
config,
|
|
|
|
config,
|
|
|
|
)
|
|
|
|
)
|
|
|
|
.await;
|
|
|
|
.await;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let alice_start_state =
|
|
|
|
|
|
|
|
init_alice_state(btc_to_swap, xmr_to_swap, alice_btc_wallet.clone(), config).await;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let (swarm_driver, handle) = init_alice_eventloop(listen);
|
|
|
|
|
|
|
|
|
|
|
|
(
|
|
|
|
(
|
|
|
|
alice_start_state,
|
|
|
|
alice_start_state,
|
|
|
|
swarm_driver,
|
|
|
|
swarm_driver,
|
|
|
@ -197,8 +220,8 @@ pub async fn init_alice(
|
|
|
|
// This is just to keep the containers alive
|
|
|
|
// This is just to keep the containers alive
|
|
|
|
#[allow(dead_code)]
|
|
|
|
#[allow(dead_code)]
|
|
|
|
pub struct Containers<'a> {
|
|
|
|
pub struct Containers<'a> {
|
|
|
|
bitcoind: Bitcoind<'a>,
|
|
|
|
pub bitcoind: Bitcoind<'a>,
|
|
|
|
monerods: Vec<Container<'a, Cli, image::Monero>>,
|
|
|
|
pub monerods: Vec<Container<'a, Cli, image::Monero>>,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// Utility function to initialize logging in the test environment.
|
|
|
|
/// Utility function to initialize logging in the test environment.
|
|
|
|