Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-08-07 05:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use Bob swap factory in production

Browse source
This commit is contained in:
Daniel Karzel 2021-01-18 21:57:17 +11:00
parent e56c48ee23
commit 75f89f3b25
3 changed files with 225 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

134
swap/src/main.rs
View file

@ -14,20 +14,16 @@
#![allow(non_snake_case)]
use crate::cli::{Command, Options, Resume};
use anyhow::{bail, Context, Result};
use libp2p::{core::Multiaddr, PeerId};
use anyhow::{Context, Result};
use prettytable::{row, Table};
use rand::rngs::OsRng;
use std::sync::Arc;
use structopt::StructOpt;
use swap::{
bitcoin,
config::Config,
database::{Database, Swap},
monero, network,
network::transport::build,
protocol::{alice, bob, bob::BobState},
seed::Seed,
database::Database,
monero,
protocol::{alice, bob, bob::BobSwapFactory},
trace::init_tracing,
StartingBalances, SwapAmounts,
};
@ -53,8 +49,6 @@ async fn main() -> Result<()> {
let data_dir = std::path::Path::new(opt.data_dir.as_str()).to_path_buf();
let db_path = data_dir.join("database");
let db = Database::open(db_path.as_path()).context("Could not open database")?;
let seed = swap::config::seed::Seed::from_file_or_generate(&data_dir)
.expect("Could not retrieve/initialize seed")
.into();
@ -83,6 +77,11 @@ async fn main() -> Result<()> {
let swap_id = Uuid::new_v4();
info!(
"Swap sending {} and receiving {} starting with ID {}",
send_monero, receive_bitcoin, swap_id
);
let alice_factory = alice::AliceSwapFactory::new(
seed,
config,
@ -108,7 +107,12 @@ async fn main() -> Result<()> {
send_bitcoin,
receive_monero,
} => {
let (bitcoin_wallet, monero_wallet, _) = setup_wallets(
let swap_amounts = SwapAmounts {
btc: send_bitcoin,
xmr: receive_monero,
};
let (bitcoin_wallet, monero_wallet, starting_balances) = setup_wallets(
bitcoind_url,
bitcoin_wallet_name.as_str(),
monero_wallet_rpc_url,
@ -116,47 +120,36 @@ async fn main() -> Result<()> {
)
.await?;
let refund_address = bitcoin_wallet.new_address().await?;
let state0 = bob::state::State0::new(
&mut OsRng,
send_bitcoin,
receive_monero,
config.bitcoin_cancel_timelock,
config.bitcoin_punish_timelock,
refund_address,
config.monero_finality_confirmations,
);
let amounts = SwapAmounts {
btc: send_bitcoin,
xmr: receive_monero,
};
let bob_state = BobState::Started { state0, amounts };
let swap_id = Uuid::new_v4();
info!(
"Swap sending {} and receiving {} started with ID {}",
"Swap sending {} and receiving {} starting with ID {}",
send_bitcoin, receive_monero, swap_id
);
bob_swap(
let bob_factory = BobSwapFactory::new(
seed,
db_path,
swap_id,
bob_state,
bitcoin_wallet,
monero_wallet,
db,
alice_peer_id,
config,
starting_balances,
alice_addr,
seed,
)
.await?;
alice_peer_id,
);
let (swap, event_loop) = bob_factory.new_swap_as_bob(swap_amounts).await?;
tokio::spawn(async move { event_loop.run().await });
bob::run(swap).await?;
}
Command::History => {
let mut table = Table::new();
table.add_row(row!["SWAP ID", "STATE"]);
let db = Database::open(db_path.as_path()).context("Could not open database")?;
for (swap_id, state) in db.all()? {
table.add_row(row![swap_id, state]);
}
@ -203,30 +196,29 @@ async fn main() -> Result<()> {
alice_peer_id,
alice_addr,
}) => {
let db_state = if let Swap::Bob(db_state) = db.get_state(swap_id)? {
db_state
} else {
bail!("Swap {} is not buy xmr.", swap_id)
};
let (bitcoin_wallet, monero_wallet, _) = setup_wallets(
let (bitcoin_wallet, monero_wallet, starting_balances) = setup_wallets(
bitcoind_url,
bitcoin_wallet_name.as_str(),
monero_wallet_rpc_url,
config,
)
.await?;
bob_swap(
let bob_factory = BobSwapFactory::new(
seed,
db_path,
swap_id,
db_state.into(),
bitcoin_wallet,
monero_wallet,
db,
alice_peer_id,
config,
starting_balances,
alice_addr,
seed,
)
.await?;
alice_peer_id,
);
let (swap, event_loop) = bob_factory.recover_bob_from_db().await?;
tokio::spawn(async move { event_loop.run().await });
bob::run(swap).await?;
}
};
@ -268,43 +260,3 @@ async fn setup_wallets(
Ok((bitcoin_wallet, monero_wallet, starting_balances))
}
#[allow(clippy::too_many_arguments)]
async fn bob_swap(
swap_id: Uuid,
state: BobState,
bitcoin_wallet: Arc<swap::bitcoin::Wallet>,
monero_wallet: Arc<swap::monero::Wallet>,
db: Database,
alice_peer_id: PeerId,
alice_addr: Multiaddr,
seed: Seed,
) -> Result<BobState> {
let identity = network::Seed::new(seed).derive_libp2p_identity();
let peer_id = identity.public().into_peer_id();
let bob_behaviour = bob::Behaviour::default();
let bob_transport = build(identity)?;
let (event_loop, handle) = bob::event_loop::EventLoop::new(
bob_transport,
bob_behaviour,
peer_id,
alice_peer_id,
alice_addr,
)?;
let swap = bob::Swap {
state,
event_loop_handle: handle,
db,
bitcoin_wallet,
monero_wallet,
swap_id,
};
let swap = bob::swap::run(swap);
tokio::spawn(event_loop.run());
swap.await
}

165
swap/src/protocol/bob.rs
View file

@ -1,15 +1,16 @@
//! Run an XMR/BTC swap in the role of Bob.
//! Bob holds BTC and wishes receive XMR.
use anyhow::Result;
use libp2p::{core::Multiaddr, NetworkBehaviour, PeerId};
use tracing::{debug, info};
use crate::{
bitcoin,
bitcoin::EncryptedSignature,
monero,
database, monero, network,
network::peer_tracker::{self, PeerTracker},
protocol::{alice, bob},
SwapAmounts,
StartingBalances, SwapAmounts,
};
pub use self::{
@ -22,8 +23,10 @@ pub use self::{
state::*,
swap::{run, run_until},
};
use crate::database::Database;
use std::sync::Arc;
use crate::{config::Config, database::Database, network::transport::build, seed::Seed};
use libp2p::identity::Keypair;
use rand::rngs::OsRng;
use std::{path::PathBuf, sync::Arc};
use uuid::Uuid;
mod amounts;
@ -44,6 +47,160 @@ pub struct Swap {
pub swap_id: Uuid,
}
pub struct BobSwapFactory {
identity: Keypair,
peer_id: PeerId,
db_path: PathBuf,
swap_id: Uuid,
pub bitcoin_wallet: Arc<bitcoin::Wallet>,
pub monero_wallet: Arc<monero::Wallet>,
config: Config,
pub starting_balances: StartingBalances,
alice_connect_address: Multiaddr,
alice_connect_peer_id: PeerId,
}
impl BobSwapFactory {
#[allow(clippy::too_many_arguments)]
pub fn new(
seed: Seed,
db_path: PathBuf,
swap_id: Uuid,
bitcoin_wallet: Arc<bitcoin::Wallet>,
monero_wallet: Arc<monero::Wallet>,
config: Config,
starting_balances: StartingBalances,
alice_connect_address: Multiaddr,
alice_connect_peer_id: PeerId,
) -> Self {
let identity = network::Seed::new(seed).derive_libp2p_identity();
let peer_id = identity.public().into_peer_id();
Self {
identity,
peer_id,
db_path,
swap_id,
bitcoin_wallet,
monero_wallet,
config,
starting_balances,
alice_connect_address,
alice_connect_peer_id,
}
}
pub async fn new_swap_as_bob(
&self,
swap_amounts: SwapAmounts,
) -> Result<(bob::Swap, bob::EventLoop)> {
let initial_state = init_bob_state(
swap_amounts.btc,
swap_amounts.xmr,
self.bitcoin_wallet.clone(),
self.config,
)
.await?;
let (event_loop, event_loop_handle) = init_bob_event_loop(
self.identity.clone(),
self.peer_id.clone(),
self.alice_connect_peer_id.clone(),
self.alice_connect_address.clone(),
)?;
let db = Database::open(self.db_path.as_path())?;
Ok((
Swap {
state: initial_state,
event_loop_handle,
db,
bitcoin_wallet: self.bitcoin_wallet.clone(),
monero_wallet: self.monero_wallet.clone(),
swap_id: self.swap_id,
},
event_loop,
))
}
pub async fn recover_bob_from_db(&self) -> Result<(bob::Swap, bob::EventLoop)> {
// reopen the existing database
let db = Database::open(self.db_path.clone().as_path())?;
let resume_state = if let database::Swap::Bob(state) = db.get_state(self.swap_id)? {
state.into()
} else {
unreachable!()
};
let (event_loop, event_loop_handle) = init_bob_event_loop(
self.identity.clone(),
self.peer_id.clone(),
self.alice_connect_peer_id.clone(),
self.alice_connect_address.clone(),
)?;
Ok((
Swap {
state: resume_state,
event_loop_handle,
db,
bitcoin_wallet: self.bitcoin_wallet.clone(),
monero_wallet: self.monero_wallet.clone(),
swap_id: self.swap_id,
},
event_loop,
))
}
}
async fn init_bob_state(
btc_to_swap: bitcoin::Amount,
xmr_to_swap: monero::Amount,
bob_btc_wallet: Arc<bitcoin::Wallet>,
config: Config,
) -> Result<BobState> {
let amounts = SwapAmounts {
btc: btc_to_swap,
xmr: xmr_to_swap,
};
let refund_address = bob_btc_wallet.new_address().await?;
let state0 = bob::State0::new(
&mut OsRng,
btc_to_swap,
xmr_to_swap,
config.bitcoin_cancel_timelock,
config.bitcoin_punish_timelock,
refund_address,
config.monero_finality_confirmations,
);
Ok(BobState::Started { state0, amounts })
}
fn init_bob_event_loop(
identity: Keypair,
peer_id: PeerId,
alice_peer_id: PeerId,
alice_addr: Multiaddr,
) -> Result<(bob::event_loop::EventLoop, bob::event_loop::EventLoopHandle)> {
let bob_behaviour = bob::Behaviour::default();
let bob_transport = build(identity)?;
bob::event_loop::EventLoop::new(
bob_transport,
bob_behaviour,
peer_id,
alice_peer_id,
alice_addr,
)
}
#[derive(Debug, Clone)]
pub enum OutEvent {
ConnectionEstablished(PeerId),