mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2025-01-12 16:09:29 -05:00
Clean-up unused code
This commit is contained in:
Franck Royer
parent
e71bf7d8e9
commit
ef6e8fc723
@ -2,39 +2,22 @@
|
|||||||
//! Alice holds XMR and wishes receive BTC.
|
//! Alice holds XMR and wishes receive BTC.
|
||||||
use self::{amounts::*, message0::*, message1::*, message2::*, message3::*};
|
use self::{amounts::*, message0::*, message1::*, message2::*, message3::*};
|
||||||
use crate::{
|
use crate::{
|
||||||
bitcoin,
|
|
||||||
bitcoin::TX_LOCK_MINE_TIMEOUT,
|
|
||||||
monero,
|
|
||||||
network::{
|
network::{
|
||||||
peer_tracker::{self, PeerTracker},
|
peer_tracker::{self, PeerTracker},
|
||||||
request_response::AliceToBob,
|
request_response::AliceToBob,
|
||||||
transport::SwapTransport,
|
transport::SwapTransport,
|
||||||
TokioExecutor,
|
TokioExecutor,
|
||||||
},
|
},
|
||||||
state,
|
SwapAmounts,
|
||||||
storage::Database,
|
|
||||||
SwapAmounts, PUNISH_TIMELOCK, REFUND_TIMELOCK,
|
|
||||||
};
|
};
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
use async_trait::async_trait;
|
|
||||||
use backoff::{backoff::Constant as ConstantBackoff, future::FutureOperation as _};
|
|
||||||
use genawaiter::GeneratorState;
|
|
||||||
use libp2p::{
|
use libp2p::{
|
||||||
core::{identity::Keypair, Multiaddr},
|
core::{identity::Keypair, Multiaddr},
|
||||||
request_response::ResponseChannel,
|
request_response::ResponseChannel,
|
||||||
NetworkBehaviour, PeerId,
|
NetworkBehaviour, PeerId,
|
||||||
};
|
};
|
||||||
use rand::rngs::OsRng;
|
use tracing::{debug, info};
|
||||||
use std::{sync::Arc, time::Duration};
|
use xmr_btc::{alice::State0, bob};
|
||||||
use tokio::sync::Mutex;
|
|
||||||
use tracing::{debug, info, warn};
|
|
||||||
use uuid::Uuid;
|
|
||||||
use xmr_btc::{
|
|
||||||
alice::{self, action_generator, Action, ReceiveBitcoinRedeemEncsig, State0},
|
|
||||||
bitcoin::BroadcastSignedTransaction,
|
|
||||||
bob, cross_curve_dleq,
|
|
||||||
monero::{CreateWalletForOutput, Transfer},
|
|
||||||
};
|
|
||||||
|
|
||||||
mod amounts;
|
mod amounts;
|
||||||
pub mod event_loop;
|
pub mod event_loop;
|
||||||
@ -45,237 +28,6 @@ mod message2;
|
|||||||
mod message3;
|
mod message3;
|
||||||
pub mod swap;
|
pub mod swap;
|
||||||
|
|
||||||
pub async fn swap(
|
|
||||||
bitcoin_wallet: Arc<bitcoin::Wallet>,
|
|
||||||
monero_wallet: Arc<monero::Wallet>,
|
|
||||||
db: Database,
|
|
||||||
listen: Multiaddr,
|
|
||||||
transport: SwapTransport,
|
|
||||||
behaviour: Behaviour,
|
|
||||||
) -> Result<()> {
|
|
||||||
struct Network {
|
|
||||||
swarm: Arc<Mutex<Swarm>>,
|
|
||||||
channel: Option<ResponseChannel<AliceToBob>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Network {
|
|
||||||
pub async fn send_message2(&mut self, proof: monero::TransferProof) {
|
|
||||||
match self.channel.take() {
|
|
||||||
None => warn!("Channel not found, did you call this twice?"),
|
|
||||||
Some(channel) => {
|
|
||||||
let mut guard = self.swarm.lock().await;
|
|
||||||
guard.send_message2(channel, alice::Message2 {
|
|
||||||
tx_lock_proof: proof,
|
|
||||||
});
|
|
||||||
info!("Sent transfer proof");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: For retry, use `backoff::ExponentialBackoff` in production as opposed
|
|
||||||
// to `ConstantBackoff`.
|
|
||||||
#[async_trait]
|
|
||||||
impl ReceiveBitcoinRedeemEncsig for Network {
|
|
||||||
async fn receive_bitcoin_redeem_encsig(&mut self) -> bitcoin::EncryptedSignature {
|
|
||||||
#[derive(Debug)]
|
|
||||||
struct UnexpectedMessage;
|
|
||||||
|
|
||||||
let encsig = (|| async {
|
|
||||||
let mut guard = self.swarm.lock().await;
|
|
||||||
let encsig = match guard.next().await {
|
|
||||||
OutEvent::Message3(msg) => msg.tx_redeem_encsig,
|
|
||||||
other => {
|
|
||||||
warn!("Expected Bob's Bitcoin redeem encsig, got: {:?}", other);
|
|
||||||
return Err(backoff::Error::Transient(UnexpectedMessage));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
Result::<_, backoff::Error<UnexpectedMessage>>::Ok(encsig)
|
|
||||||
})
|
|
||||||
.retry(ConstantBackoff::new(Duration::from_secs(1)))
|
|
||||||
.await
|
|
||||||
.expect("transient errors to be retried");
|
|
||||||
|
|
||||||
info!("Received Bitcoin redeem encsig");
|
|
||||||
|
|
||||||
encsig
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut swarm = new_swarm(listen, transport, behaviour)?;
|
|
||||||
let message0: bob::Message0;
|
|
||||||
let mut state0: Option<alice::State0> = None;
|
|
||||||
let mut last_amounts: Option<SwapAmounts> = None;
|
|
||||||
|
|
||||||
// TODO: This loop is a neat idea for local development, as it allows us to keep
|
|
||||||
// Alice up and let Bob keep trying to connect, request amounts and/or send the
|
|
||||||
// first message of the handshake, but it comes at the cost of needing to handle
|
|
||||||
// mutable state, which has already been the source of a bug at one point. This
|
|
||||||
// is an obvious candidate for refactoring
|
|
||||||
loop {
|
|
||||||
match swarm.next().await {
|
|
||||||
OutEvent::ConnectionEstablished(bob) => {
|
|
||||||
info!("Connection established with: {}", bob);
|
|
||||||
}
|
|
||||||
OutEvent::Request(amounts::OutEvent { btc, channel }) => {
|
|
||||||
let amounts = calculate_amounts(btc);
|
|
||||||
last_amounts = Some(amounts);
|
|
||||||
swarm.send_amounts(channel, amounts);
|
|
||||||
|
|
||||||
let SwapAmounts { btc, xmr } = amounts;
|
|
||||||
|
|
||||||
let redeem_address = bitcoin_wallet.as_ref().new_address().await?;
|
|
||||||
let punish_address = redeem_address.clone();
|
|
||||||
|
|
||||||
// TODO: Pass this in using <R: RngCore + CryptoRng>
|
|
||||||
let rng = &mut OsRng;
|
|
||||||
let a = bitcoin::SecretKey::new_random(rng);
|
|
||||||
let s_a = cross_curve_dleq::Scalar::random(rng);
|
|
||||||
let v_a = monero::PrivateViewKey::new_random(rng);
|
|
||||||
let state = State0::new(
|
|
||||||
a,
|
|
||||||
s_a,
|
|
||||||
v_a,
|
|
||||||
btc,
|
|
||||||
xmr,
|
|
||||||
REFUND_TIMELOCK,
|
|
||||||
PUNISH_TIMELOCK,
|
|
||||||
redeem_address,
|
|
||||||
punish_address,
|
|
||||||
);
|
|
||||||
|
|
||||||
state0 = Some(state)
|
|
||||||
}
|
|
||||||
OutEvent::Message0(msg) => {
|
|
||||||
// We don't want Bob to be able to crash us by sending an out of
|
|
||||||
// order message. Keep looping if Bob has not requested amounts.
|
|
||||||
if last_amounts.is_some() {
|
|
||||||
// TODO: We should verify the amounts and notify Bob if they have changed.
|
|
||||||
message0 = msg;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
other => panic!("Unexpected event: {:?}", other),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
let state1 = state0.expect("to be set").receive(message0)?;
|
|
||||||
|
|
||||||
let (state2, channel) = match swarm.next().await {
|
|
||||||
OutEvent::Message1 { msg, channel } => {
|
|
||||||
let state2 = state1.receive(msg);
|
|
||||||
(state2, channel)
|
|
||||||
}
|
|
||||||
other => panic!("Unexpected event: {:?}", other),
|
|
||||||
};
|
|
||||||
|
|
||||||
let msg = state2.next_message();
|
|
||||||
swarm.send_message1(channel, msg);
|
|
||||||
|
|
||||||
let (state3, channel) = match swarm.next().await {
|
|
||||||
OutEvent::Message2 { msg, channel } => {
|
|
||||||
let state3 = state2.receive(msg)?;
|
|
||||||
(state3, channel)
|
|
||||||
}
|
|
||||||
other => panic!("Unexpected event: {:?}", other),
|
|
||||||
};
|
|
||||||
|
|
||||||
let swap_id = Uuid::new_v4();
|
|
||||||
db.insert_latest_state(swap_id, state::Alice::Negotiated(state3.clone()).into())
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
info!("Handshake complete, we now have State3 for Alice.");
|
|
||||||
|
|
||||||
let network = Arc::new(Mutex::new(Network {
|
|
||||||
swarm: Arc::new(Mutex::new(swarm)),
|
|
||||||
channel: Some(channel),
|
|
||||||
}));
|
|
||||||
|
|
||||||
let mut action_generator = action_generator(
|
|
||||||
network.clone(),
|
|
||||||
bitcoin_wallet.clone(),
|
|
||||||
state3.clone(),
|
|
||||||
TX_LOCK_MINE_TIMEOUT,
|
|
||||||
);
|
|
||||||
|
|
||||||
loop {
|
|
||||||
let state = action_generator.async_resume().await;
|
|
||||||
|
|
||||||
tracing::info!("Resumed execution of generator, got: {:?}", state);
|
|
||||||
|
|
||||||
match state {
|
|
||||||
GeneratorState::Yielded(Action::LockXmr {
|
|
||||||
amount,
|
|
||||||
public_spend_key,
|
|
||||||
public_view_key,
|
|
||||||
}) => {
|
|
||||||
db.insert_latest_state(swap_id, state::Alice::BtcLocked(state3.clone()).into())
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let (transfer_proof, _) = monero_wallet
|
|
||||||
.transfer(public_spend_key, public_view_key, amount)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
db.insert_latest_state(swap_id, state::Alice::XmrLocked(state3.clone()).into())
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let mut guard = network.as_ref().lock().await;
|
|
||||||
guard.send_message2(transfer_proof).await;
|
|
||||||
info!("Sent transfer proof");
|
|
||||||
}
|
|
||||||
|
|
||||||
GeneratorState::Yielded(Action::RedeemBtc(tx)) => {
|
|
||||||
db.insert_latest_state(
|
|
||||||
swap_id,
|
|
||||||
state::Alice::BtcRedeemable {
|
|
||||||
state: state3.clone(),
|
|
||||||
redeem_tx: tx.clone(),
|
|
||||||
}
|
|
||||||
.into(),
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let _ = bitcoin_wallet.broadcast_signed_transaction(tx).await?;
|
|
||||||
}
|
|
||||||
GeneratorState::Yielded(Action::CancelBtc(tx)) => {
|
|
||||||
let _ = bitcoin_wallet.broadcast_signed_transaction(tx).await?;
|
|
||||||
}
|
|
||||||
GeneratorState::Yielded(Action::PunishBtc(tx)) => {
|
|
||||||
db.insert_latest_state(swap_id, state::Alice::BtcPunishable(state3.clone()).into())
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let _ = bitcoin_wallet.broadcast_signed_transaction(tx).await?;
|
|
||||||
}
|
|
||||||
GeneratorState::Yielded(Action::CreateMoneroWalletForOutput {
|
|
||||||
spend_key,
|
|
||||||
view_key,
|
|
||||||
}) => {
|
|
||||||
db.insert_latest_state(
|
|
||||||
swap_id,
|
|
||||||
state::Alice::BtcRefunded {
|
|
||||||
state: state3.clone(),
|
|
||||||
spend_key,
|
|
||||||
view_key,
|
|
||||||
}
|
|
||||||
.into(),
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
monero_wallet
|
|
||||||
.create_and_load_wallet_for_output(spend_key, view_key)
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
GeneratorState::Complete(()) => {
|
|
||||||
db.insert_latest_state(swap_id, state::Alice::SwapComplete.into())
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub type Swarm = libp2p::Swarm<Behaviour>;
|
pub type Swarm = libp2p::Swarm<Behaviour>;
|
||||||
|
|
||||||
pub fn new_swarm(
|
pub fn new_swarm(
|
||||||
@ -433,31 +185,3 @@ impl Behaviour {
|
|||||||
debug!("Sent Message2");
|
debug!("Sent Message2");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn calculate_amounts(btc: ::bitcoin::Amount) -> SwapAmounts {
|
|
||||||
// TODO (Franck): This should instead verify that the received amounts matches
|
|
||||||
// the command line arguments This value corresponds to 100 XMR per BTC
|
|
||||||
const PICONERO_PER_SAT: u64 = 1_000_000;
|
|
||||||
|
|
||||||
let picos = btc.as_sat() * PICONERO_PER_SAT;
|
|
||||||
let xmr = monero::Amount::from_piconero(picos);
|
|
||||||
|
|
||||||
SwapAmounts { btc, xmr }
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
const ONE_BTC: u64 = 100_000_000;
|
|
||||||
const HUNDRED_XMR: u64 = 100_000_000_000_000;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn one_bitcoin_equals_a_hundred_moneroj() {
|
|
||||||
let btc = ::bitcoin::Amount::from_sat(ONE_BTC);
|
|
||||||
let want = monero::Amount::from_piconero(HUNDRED_XMR);
|
|
||||||
|
|
||||||
let SwapAmounts { xmr: got, .. } = calculate_amounts(btc);
|
|
||||||
assert_eq!(got, want);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@ -13,275 +13,8 @@
|
|||||||
#![forbid(unsafe_code)]
|
#![forbid(unsafe_code)]
|
||||||
|
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
use futures::{channel::mpsc, StreamExt};
|
|
||||||
use libp2p::Multiaddr;
|
|
||||||
use prettytable::{row, Table};
|
|
||||||
use rand::rngs::OsRng;
|
|
||||||
use std::{io, io::Write, process, sync::Arc};
|
|
||||||
use structopt::StructOpt;
|
|
||||||
use swap::{
|
|
||||||
alice, bitcoin, bob,
|
|
||||||
cli::Options,
|
|
||||||
monero,
|
|
||||||
network::transport::{build, build_tor, SwapTransport},
|
|
||||||
recover::recover,
|
|
||||||
storage::Database,
|
|
||||||
Cmd, Rsp, SwapAmounts, PUNISH_TIMELOCK, REFUND_TIMELOCK,
|
|
||||||
};
|
|
||||||
use tracing::info;
|
|
||||||
use xmr_btc::{alice::State0, cross_curve_dleq};
|
|
||||||
|
|
||||||
#[macro_use]
|
|
||||||
extern crate prettytable;
|
|
||||||
|
|
||||||
// TODO: Add root seed file instead of generating new seed each run.
|
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> Result<()> {
|
async fn main() -> Result<()> {
|
||||||
let opt = Options::from_args();
|
unimplemented!()
|
||||||
|
|
||||||
// This currently creates the directory if it's not there in the first place
|
|
||||||
let db = Database::open(std::path::Path::new("./.swap-db/")).unwrap();
|
|
||||||
|
|
||||||
match opt {
|
|
||||||
Options::Alice {
|
|
||||||
bitcoind_url,
|
|
||||||
monerod_url,
|
|
||||||
listen_addr,
|
|
||||||
tor_port,
|
|
||||||
} => {
|
|
||||||
info!("running swap node as Alice ...");
|
|
||||||
|
|
||||||
let bitcoin_wallet = bitcoin::Wallet::new("alice", bitcoind_url)
|
|
||||||
.await
|
|
||||||
.expect("failed to create bitcoin wallet");
|
|
||||||
let bitcoin_wallet = Arc::new(bitcoin_wallet);
|
|
||||||
|
|
||||||
let monero_wallet = Arc::new(monero::Wallet::new(monerod_url));
|
|
||||||
|
|
||||||
let rng = &mut OsRng;
|
|
||||||
let a = bitcoin::SecretKey::new_random(rng);
|
|
||||||
let s_a = cross_curve_dleq::Scalar::random(rng);
|
|
||||||
let v_a = xmr_btc::monero::PrivateViewKey::new_random(rng);
|
|
||||||
let redeem_address = bitcoin_wallet.as_ref().new_address().await?;
|
|
||||||
let punish_address = redeem_address.clone();
|
|
||||||
let state0 = State0::new(
|
|
||||||
a,
|
|
||||||
s_a,
|
|
||||||
v_a,
|
|
||||||
// todo: get from CLI args
|
|
||||||
bitcoin::Amount::from_sat(100),
|
|
||||||
// todo: get from CLI args
|
|
||||||
monero::Amount::from_piconero(1000000),
|
|
||||||
REFUND_TIMELOCK,
|
|
||||||
PUNISH_TIMELOCK,
|
|
||||||
redeem_address,
|
|
||||||
punish_address,
|
|
||||||
);
|
|
||||||
|
|
||||||
let behaviour = alice::Behaviour::new(state0);
|
|
||||||
let local_key_pair = behaviour.identity();
|
|
||||||
|
|
||||||
let (listen_addr, _ac, transport) = match tor_port {
|
|
||||||
Some(tor_port) => {
|
|
||||||
let tor_secret_key = torut::onion::TorSecretKeyV3::generate();
|
|
||||||
let onion_address = tor_secret_key
|
|
||||||
.public()
|
|
||||||
.get_onion_address()
|
|
||||||
.get_address_without_dot_onion();
|
|
||||||
let onion_address_string = format!("/onion3/{}:{}", onion_address, tor_port);
|
|
||||||
let addr: Multiaddr = onion_address_string.parse()?;
|
|
||||||
let ac = create_tor_service(tor_secret_key, tor_port).await?;
|
|
||||||
let transport = build_tor(local_key_pair, Some((addr.clone(), tor_port)))?;
|
|
||||||
(addr, Some(ac), transport)
|
|
||||||
}
|
|
||||||
None => {
|
|
||||||
let transport = build(local_key_pair)?;
|
|
||||||
(listen_addr, None, transport)
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
swap_as_alice(
|
|
||||||
bitcoin_wallet,
|
|
||||||
monero_wallet,
|
|
||||||
db,
|
|
||||||
listen_addr,
|
|
||||||
transport,
|
|
||||||
behaviour,
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
Options::Bob {
|
|
||||||
alice_addr,
|
|
||||||
satoshis,
|
|
||||||
bitcoind_url,
|
|
||||||
monerod_url,
|
|
||||||
tor,
|
|
||||||
} => {
|
|
||||||
info!("running swap node as Bob ...");
|
|
||||||
|
|
||||||
let behaviour = bob::Behaviour::default();
|
|
||||||
let local_key_pair = behaviour.identity();
|
|
||||||
|
|
||||||
let transport = match tor {
|
|
||||||
true => build_tor(local_key_pair, None)?,
|
|
||||||
false => build(local_key_pair)?,
|
|
||||||
};
|
|
||||||
|
|
||||||
let bitcoin_wallet = bitcoin::Wallet::new("bob", bitcoind_url)
|
|
||||||
.await
|
|
||||||
.expect("failed to create bitcoin wallet");
|
|
||||||
let bitcoin_wallet = Arc::new(bitcoin_wallet);
|
|
||||||
|
|
||||||
let monero_wallet = Arc::new(monero::Wallet::new(monerod_url));
|
|
||||||
|
|
||||||
swap_as_bob(
|
|
||||||
bitcoin_wallet,
|
|
||||||
monero_wallet,
|
|
||||||
db,
|
|
||||||
satoshis,
|
|
||||||
alice_addr,
|
|
||||||
transport,
|
|
||||||
behaviour,
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
Options::History => {
|
|
||||||
let mut table = Table::new();
|
|
||||||
|
|
||||||
table.add_row(row!["SWAP ID", "STATE"]);
|
|
||||||
|
|
||||||
for (swap_id, state) in db.all()? {
|
|
||||||
table.add_row(row![swap_id, state]);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Print the table to stdout
|
|
||||||
table.printstd();
|
|
||||||
}
|
|
||||||
Options::Recover {
|
|
||||||
swap_id,
|
|
||||||
bitcoind_url,
|
|
||||||
monerod_url,
|
|
||||||
} => {
|
|
||||||
let state = db.get_state(swap_id)?;
|
|
||||||
let bitcoin_wallet = bitcoin::Wallet::new("bob", bitcoind_url)
|
|
||||||
.await
|
|
||||||
.expect("failed to create bitcoin wallet");
|
|
||||||
let monero_wallet = monero::Wallet::new(monerod_url);
|
|
||||||
|
|
||||||
recover(bitcoin_wallet, monero_wallet, state).await?;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn create_tor_service(
|
|
||||||
tor_secret_key: torut::onion::TorSecretKeyV3,
|
|
||||||
tor_port: u16,
|
|
||||||
) -> Result<swap::tor::AuthenticatedConnection> {
|
|
||||||
// TODO use configurable ports for tor connection
|
|
||||||
let mut authenticated_connection = swap::tor::UnauthenticatedConnection::default()
|
|
||||||
.init_authenticated_connection()
|
|
||||||
.await?;
|
|
||||||
tracing::info!("Tor authenticated.");
|
|
||||||
|
|
||||||
authenticated_connection
|
|
||||||
.add_service(tor_port, &tor_secret_key)
|
|
||||||
.await?;
|
|
||||||
tracing::info!("Tor service added.");
|
|
||||||
|
|
||||||
Ok(authenticated_connection)
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn swap_as_alice(
|
|
||||||
bitcoin_wallet: Arc<swap::bitcoin::Wallet>,
|
|
||||||
monero_wallet: Arc<swap::monero::Wallet>,
|
|
||||||
db: Database,
|
|
||||||
addr: Multiaddr,
|
|
||||||
transport: SwapTransport,
|
|
||||||
behaviour: alice::Behaviour,
|
|
||||||
) -> Result<()> {
|
|
||||||
alice::swap(
|
|
||||||
bitcoin_wallet,
|
|
||||||
monero_wallet,
|
|
||||||
db,
|
|
||||||
addr,
|
|
||||||
transport,
|
|
||||||
behaviour,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn swap_as_bob(
|
|
||||||
bitcoin_wallet: Arc<swap::bitcoin::Wallet>,
|
|
||||||
monero_wallet: Arc<swap::monero::Wallet>,
|
|
||||||
db: Database,
|
|
||||||
sats: u64,
|
|
||||||
alice: Multiaddr,
|
|
||||||
transport: SwapTransport,
|
|
||||||
behaviour: bob::Behaviour,
|
|
||||||
) -> Result<()> {
|
|
||||||
let (cmd_tx, mut cmd_rx) = mpsc::channel(1);
|
|
||||||
let (mut rsp_tx, rsp_rx) = mpsc::channel(1);
|
|
||||||
tokio::spawn(bob::swap(
|
|
||||||
bitcoin_wallet,
|
|
||||||
monero_wallet,
|
|
||||||
db,
|
|
||||||
sats,
|
|
||||||
alice,
|
|
||||||
cmd_tx,
|
|
||||||
rsp_rx,
|
|
||||||
transport,
|
|
||||||
behaviour,
|
|
||||||
));
|
|
||||||
|
|
||||||
loop {
|
|
||||||
let read = cmd_rx.next().await;
|
|
||||||
match read {
|
|
||||||
Some(cmd) => match cmd {
|
|
||||||
Cmd::VerifyAmounts(p) => {
|
|
||||||
let rsp = verify(p);
|
|
||||||
rsp_tx.try_send(rsp)?;
|
|
||||||
if rsp == Rsp::Abort {
|
|
||||||
process::exit(0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
None => {
|
|
||||||
info!("Channel closed from other end");
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn verify(amounts: SwapAmounts) -> Rsp {
|
|
||||||
let mut s = String::new();
|
|
||||||
println!("Got rate from Alice for XMR/BTC swap\n");
|
|
||||||
println!("{}", amounts);
|
|
||||||
print!("Would you like to continue with this swap [y/N]: ");
|
|
||||||
|
|
||||||
let _ = io::stdout().flush();
|
|
||||||
io::stdin()
|
|
||||||
.read_line(&mut s)
|
|
||||||
.expect("Did not enter a correct string");
|
|
||||||
|
|
||||||
if let Some('\n') = s.chars().next_back() {
|
|
||||||
s.pop();
|
|
||||||
}
|
|
||||||
if let Some('\r') = s.chars().next_back() {
|
|
||||||
s.pop();
|
|
||||||
}
|
|
||||||
|
|
||||||
if !is_yes(&s) {
|
|
||||||
println!("No worries, try again later - Alice updates her rate regularly");
|
|
||||||
return Rsp::Abort;
|
|
||||||
}
|
|
||||||
|
|
||||||
Rsp::VerifiedAmounts
|
|
||||||
}
|
|
||||||
|
|
||||||
fn is_yes(s: &str) -> bool {
|
|
||||||
matches!(s, "y" | "Y" | "yes" | "YES" | "Yes")
|
|
||||||
}
|
}
|
||||||
|
|||||||
243
swap/src/bob.rs
243
swap/src/bob.rs
@ -1,20 +1,22 @@
|
|||||||
//! Run an XMR/BTC swap in the role of Bob.
|
//! Run an XMR/BTC swap in the role of Bob.
|
||||||
//! Bob holds BTC and wishes receive XMR.
|
//! Bob holds BTC and wishes receive XMR.
|
||||||
use anyhow::Result;
|
use self::{amounts::*, message0::*, message1::*, message2::*, message3::*};
|
||||||
|
use crate::{
|
||||||
use async_trait::async_trait;
|
network::{
|
||||||
use backoff::{backoff::Constant as ConstantBackoff, future::FutureOperation as _};
|
peer_tracker::{self, PeerTracker},
|
||||||
use futures::{
|
transport::SwapTransport,
|
||||||
channel::mpsc::{Receiver, Sender},
|
TokioExecutor,
|
||||||
FutureExt, StreamExt,
|
},
|
||||||
|
SwapAmounts,
|
||||||
|
};
|
||||||
|
use anyhow::Result;
|
||||||
|
use libp2p::{core::identity::Keypair, NetworkBehaviour, PeerId};
|
||||||
|
use tracing::{debug, info};
|
||||||
|
use xmr_btc::{
|
||||||
|
alice,
|
||||||
|
bitcoin::EncryptedSignature,
|
||||||
|
bob::{self},
|
||||||
};
|
};
|
||||||
use genawaiter::GeneratorState;
|
|
||||||
use libp2p::{core::identity::Keypair, Multiaddr, NetworkBehaviour, PeerId};
|
|
||||||
use rand::rngs::OsRng;
|
|
||||||
use std::{process, sync::Arc, time::Duration};
|
|
||||||
use tokio::sync::Mutex;
|
|
||||||
use tracing::{debug, info, warn};
|
|
||||||
use uuid::Uuid;
|
|
||||||
|
|
||||||
mod amounts;
|
mod amounts;
|
||||||
pub mod event_loop;
|
pub mod event_loop;
|
||||||
@ -25,219 +27,6 @@ mod message2;
|
|||||||
mod message3;
|
mod message3;
|
||||||
pub mod swap;
|
pub mod swap;
|
||||||
|
|
||||||
use self::{amounts::*, message0::*, message1::*, message2::*, message3::*};
|
|
||||||
use crate::{
|
|
||||||
bitcoin::{self, TX_LOCK_MINE_TIMEOUT},
|
|
||||||
monero,
|
|
||||||
network::{
|
|
||||||
peer_tracker::{self, PeerTracker},
|
|
||||||
transport::SwapTransport,
|
|
||||||
TokioExecutor,
|
|
||||||
},
|
|
||||||
state,
|
|
||||||
storage::Database,
|
|
||||||
Cmd, Rsp, SwapAmounts, PUNISH_TIMELOCK, REFUND_TIMELOCK,
|
|
||||||
};
|
|
||||||
use xmr_btc::{
|
|
||||||
alice,
|
|
||||||
bitcoin::{BroadcastSignedTransaction, EncryptedSignature, SignTxLock},
|
|
||||||
bob::{self, action_generator, ReceiveTransferProof, State0},
|
|
||||||
monero::CreateWalletForOutput,
|
|
||||||
};
|
|
||||||
|
|
||||||
#[allow(clippy::too_many_arguments)]
|
|
||||||
pub async fn swap(
|
|
||||||
bitcoin_wallet: Arc<bitcoin::Wallet>,
|
|
||||||
monero_wallet: Arc<monero::Wallet>,
|
|
||||||
db: Database,
|
|
||||||
btc: u64,
|
|
||||||
addr: Multiaddr,
|
|
||||||
mut cmd_tx: Sender<Cmd>,
|
|
||||||
mut rsp_rx: Receiver<Rsp>,
|
|
||||||
transport: SwapTransport,
|
|
||||||
behaviour: Behaviour,
|
|
||||||
) -> Result<()> {
|
|
||||||
struct Network(Swarm);
|
|
||||||
|
|
||||||
// TODO: For retry, use `backoff::ExponentialBackoff` in production as opposed
|
|
||||||
// to `ConstantBackoff`.
|
|
||||||
|
|
||||||
#[async_trait]
|
|
||||||
impl ReceiveTransferProof for Network {
|
|
||||||
async fn receive_transfer_proof(&mut self) -> monero::TransferProof {
|
|
||||||
#[derive(Debug)]
|
|
||||||
struct UnexpectedMessage;
|
|
||||||
|
|
||||||
let future = self.0.next().shared();
|
|
||||||
|
|
||||||
let proof = (|| async {
|
|
||||||
let proof = match future.clone().await {
|
|
||||||
OutEvent::Message2(msg) => msg.tx_lock_proof,
|
|
||||||
other => {
|
|
||||||
warn!("Expected transfer proof, got: {:?}", other);
|
|
||||||
return Err(backoff::Error::Transient(UnexpectedMessage));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
Result::<_, backoff::Error<UnexpectedMessage>>::Ok(proof)
|
|
||||||
})
|
|
||||||
.retry(ConstantBackoff::new(Duration::from_secs(1)))
|
|
||||||
.await
|
|
||||||
.expect("transient errors to be retried");
|
|
||||||
|
|
||||||
info!("Received transfer proof");
|
|
||||||
|
|
||||||
proof
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut swarm = new_swarm(transport, behaviour)?;
|
|
||||||
|
|
||||||
libp2p::Swarm::dial_addr(&mut swarm, addr)?;
|
|
||||||
let alice = match swarm.next().await {
|
|
||||||
OutEvent::ConnectionEstablished(alice) => alice,
|
|
||||||
other => panic!("unexpected event: {:?}", other),
|
|
||||||
};
|
|
||||||
info!("Connection established with: {}", alice);
|
|
||||||
|
|
||||||
swarm.request_amounts(alice.clone(), btc);
|
|
||||||
|
|
||||||
let (btc, xmr) = match swarm.next().await {
|
|
||||||
OutEvent::Amounts(amounts) => {
|
|
||||||
info!("Got amounts from Alice: {:?}", amounts);
|
|
||||||
let cmd = Cmd::VerifyAmounts(amounts);
|
|
||||||
cmd_tx.try_send(cmd)?;
|
|
||||||
let response = rsp_rx.next().await;
|
|
||||||
if response == Some(Rsp::Abort) {
|
|
||||||
info!("User rejected amounts proposed by Alice, aborting...");
|
|
||||||
process::exit(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
info!("User accepted amounts proposed by Alice");
|
|
||||||
(amounts.btc, amounts.xmr)
|
|
||||||
}
|
|
||||||
other => panic!("unexpected event: {:?}", other),
|
|
||||||
};
|
|
||||||
|
|
||||||
let refund_address = bitcoin_wallet.new_address().await?;
|
|
||||||
|
|
||||||
// TODO: Pass this in using <R: RngCore + CryptoRng>
|
|
||||||
let rng = &mut OsRng;
|
|
||||||
let state0 = State0::new(
|
|
||||||
rng,
|
|
||||||
btc,
|
|
||||||
xmr,
|
|
||||||
REFUND_TIMELOCK,
|
|
||||||
PUNISH_TIMELOCK,
|
|
||||||
refund_address,
|
|
||||||
);
|
|
||||||
|
|
||||||
info!("Commencing handshake");
|
|
||||||
|
|
||||||
swarm.send_message0(alice.clone(), state0.next_message(rng));
|
|
||||||
let state1 = match swarm.next().await {
|
|
||||||
OutEvent::Message0(msg) => state0.receive(bitcoin_wallet.as_ref(), msg).await?,
|
|
||||||
other => panic!("unexpected event: {:?}", other),
|
|
||||||
};
|
|
||||||
|
|
||||||
swarm.send_message1(alice.clone(), state1.next_message());
|
|
||||||
let state2 = match swarm.next().await {
|
|
||||||
OutEvent::Message1(msg) => {
|
|
||||||
state1.receive(msg)? // TODO: Same as above.
|
|
||||||
}
|
|
||||||
other => panic!("unexpected event: {:?}", other),
|
|
||||||
};
|
|
||||||
|
|
||||||
let swap_id = Uuid::new_v4();
|
|
||||||
db.insert_latest_state(swap_id, state::Bob::Handshaken(state2.clone()).into())
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
swarm.send_message2(alice.clone(), state2.next_message());
|
|
||||||
|
|
||||||
info!("Handshake complete");
|
|
||||||
|
|
||||||
let network = Arc::new(Mutex::new(Network(swarm)));
|
|
||||||
|
|
||||||
let mut action_generator = action_generator(
|
|
||||||
network.clone(),
|
|
||||||
monero_wallet.clone(),
|
|
||||||
bitcoin_wallet.clone(),
|
|
||||||
state2.clone(),
|
|
||||||
TX_LOCK_MINE_TIMEOUT,
|
|
||||||
);
|
|
||||||
|
|
||||||
loop {
|
|
||||||
let state = action_generator.async_resume().await;
|
|
||||||
|
|
||||||
info!("Resumed execution of generator, got: {:?}", state);
|
|
||||||
|
|
||||||
// TODO: Protect against transient errors
|
|
||||||
// TODO: Ignore transaction-already-in-block-chain errors
|
|
||||||
|
|
||||||
match state {
|
|
||||||
GeneratorState::Yielded(bob::Action::LockBtc(tx_lock)) => {
|
|
||||||
let signed_tx_lock = bitcoin_wallet.sign_tx_lock(tx_lock).await?;
|
|
||||||
let _ = bitcoin_wallet
|
|
||||||
.broadcast_signed_transaction(signed_tx_lock)
|
|
||||||
.await?;
|
|
||||||
db.insert_latest_state(swap_id, state::Bob::BtcLocked(state2.clone()).into())
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
GeneratorState::Yielded(bob::Action::SendBtcRedeemEncsig(tx_redeem_encsig)) => {
|
|
||||||
db.insert_latest_state(swap_id, state::Bob::XmrLocked(state2.clone()).into())
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let mut guard = network.as_ref().lock().await;
|
|
||||||
guard.0.send_message3(alice.clone(), tx_redeem_encsig);
|
|
||||||
info!("Sent Bitcoin redeem encsig");
|
|
||||||
|
|
||||||
// FIXME: Having to wait for Alice's response here is a big problem, because
|
|
||||||
// we're stuck if she doesn't send her response back. I believe this is
|
|
||||||
// currently necessary, so we may have to rework this and/or how we use libp2p
|
|
||||||
match guard.0.next().shared().await {
|
|
||||||
OutEvent::Message3 => {
|
|
||||||
debug!("Got Message3 empty response");
|
|
||||||
}
|
|
||||||
other => panic!("unexpected event: {:?}", other),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
GeneratorState::Yielded(bob::Action::CreateXmrWalletForOutput {
|
|
||||||
spend_key,
|
|
||||||
view_key,
|
|
||||||
}) => {
|
|
||||||
db.insert_latest_state(swap_id, state::Bob::BtcRedeemed(state2.clone()).into())
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
monero_wallet
|
|
||||||
.create_and_load_wallet_for_output(spend_key, view_key)
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
GeneratorState::Yielded(bob::Action::CancelBtc(tx_cancel)) => {
|
|
||||||
db.insert_latest_state(swap_id, state::Bob::BtcRefundable(state2.clone()).into())
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let _ = bitcoin_wallet
|
|
||||||
.broadcast_signed_transaction(tx_cancel)
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
GeneratorState::Yielded(bob::Action::RefundBtc(tx_refund)) => {
|
|
||||||
db.insert_latest_state(swap_id, state::Bob::BtcRefundable(state2.clone()).into())
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let _ = bitcoin_wallet
|
|
||||||
.broadcast_signed_transaction(tx_refund)
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
GeneratorState::Complete(()) => {
|
|
||||||
db.insert_latest_state(swap_id, state::Bob::SwapComplete.into())
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub type Swarm = libp2p::Swarm<Behaviour>;
|
pub type Swarm = libp2p::Swarm<Behaviour>;
|
||||||
|
|
||||||
pub fn new_swarm(transport: SwapTransport, behaviour: Behaviour) -> Result<Swarm> {
|
pub fn new_swarm(transport: SwapTransport, behaviour: Behaviour) -> Result<Swarm> {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user