mirror of
https://github.com/comit-network/xmr-btc-swap.git
synced 2024-10-01 01:45:40 -04:00
5ff46be279
* saving: implementing internal api shared by cli and rpc server * writing async rpc methods and using arc for shared struct references * cleaning up, renamed Init to Context * saving: cleaning up and initial work for tests * Respond with bitcoin withdraw txid * Print RPC server address * Cleanup, formatting, add `get_seller`, `get_swap_start_date` RPC endpoints * fixing tests in cli module * uncommenting and fixing more tests * split api module and propagate errors with rpc server * moving methods to api and validating addresses for rpc * add broadcast channel to handle shutdowns gracefully and prepare for RPC server test * added files * Update rpc.rs * adding new unfinished RPC tests * updating rpc-server tests * fixing warnings * fixing formatting and cargo clippy warnings * fix missing import in test * fix: add data_dir to config to make config command work * set server listen address manually and return file locations in JSON on Config * Add called api method and swap_id to tracing for context, reduced boilerplate * Pass server_address properly to RpcServer * Update Cargo.lock * dprint fmt * Add cancel_refund RPC endpoint * Combine Cmd and Params * Disallow concurrent swaps * Use RwLock instead of Mutex to allow for parallel reads and add get_current_swap endpoint * Return wallet descriptor to RPC API caller * Append all cli logs to single log file After careful consideration, I've concluded that it's not practical/possible to ensure that the previous behaviour (one log file per swap) is preserved due to limitations of the tracing-subscriber crate and a big in the built in JSON formatter * Add get_swap_expired_timelock timelock, other small refactoring - Add get_swap_expired_timelock endpoint to return expired timelock if one exists. Fails if bitcoin lock tx has not yet published or if swap is already finished. - Rename current_epoch to expired_timelock to enforce consistent method names - Add blocks left until current expired timelock expires (next timelock expires) to ExpiredTimelock struct - Change .expect() to .unwrap() in rpc server method register because those will only fail if we register the same method twice which will never happen * initiating swaps in a separate task and handling shutdown signals with broadcast queues * Replace get_swap_start_date, get_seller, get_expired_timelock with one get_swap_info rpc method * WIP: Struct for concurrent swaps manager * Ensure correct tracing spans * Add note regarding Request, Method structs * Update request.rs * Add tracing span attribute log_reference_id to logs caused by rpc call * Sync bitcoin wallet before initial max_giveable call * use Span::current() to pass down to tracing span to spawned tasks * Remove unused shutdown channel * Add `get_monero_recovery_info` RPC endpoint - Add `get_monero_recovery_info` RPC endpoint - format PrivateViewKey using Display * Rename `Method::RawHistory` to `Method::GetRawStates` * Wait for swap to be suspended after sending signal * Remove notes * Add tracing span attribute log_reference_id to logs caused by rpc call * Sync bitcoin wallet before initial max_giveable call * use Span::current() to pass down to tracing span to spawned tasks * Remove unused shutdown channel * Add `get_monero_recovery_info` RPC endpoint - Add `get_monero_recovery_info` RPC endpoint - format PrivateViewKey using Display * Rename `Method::RawHistory` to `Method::GetRawStates` * Wait for swap to be suspended after sending signal * Return additonal info on GetSwapInfo * Update wallet.rs * fix compile issues for tests and use serial_test crate * fix rpc tests, only check for RPC errors and not returned values * Rename `get_raw_history` tp `get_raw_states` * Fix typo in rpc server stopped tracing log * Remove unnecessary success property on suspend_current_swap response * fixing test_cli_arguments and other tests * WIP: RPC server integration tests * WIP: Integration tests for RPC server * Update rpc tests * fix compile and warnings in tests/rpc.rs * test: fix assert * clippy --fix * remove otp file * cargo clippy fixes * move resume swap initialization code out of spawned task * Use `in_current_span` to pass down tracing span to spawned tasks * moving buy_xmr initialization code out of spawned tasks * cargo fmt * Moving swap initialization code inside tokio select block to handle swap lock release logic * Remove unnecessary swap suspension listener from determine_btc_to_swap call in BuyXmr * Spawn event loop before requesting quote * Release swap lock after receiving shutdown signal * Remove inner tokio::select in BuyXmr and Resume * Improve debug text for swap resume * Return error to API caller if bid quote request fails * Print error if one occurs during process invoked by API call * Return bid quote to API caller * Use type safe query! macro for database retrieval of states * Return tx_lock_fee to API caller on GetSwapInfo call Update request.rs * Allow API caller to retrieve last synced bitcoin balane and avoid costly sync * Return restore height on MoneroRecovery command to API Caller * Include entire error cause-chain in API response * Add span to bitcoin wallet logs * Log event loop connection properties as tracing fields * Wait for background tasks to complete before exiting CLI * clippy * specify sqlx patch version explicitly * remove mem::forget and replace with _guard * ci: add rpc test job * test: wrap rpc test in #[cfg(test)] * add missing tokio::test attribute * fix and merge rpc tests, parse uuuid and multiaddr from serde_json value * default Tor socks port to 9050, Cargo fmt * Update swap/sqlite_dev_setup.sh: add version Co-authored-by: Byron Hambly <byron@hambly.dev> * ci: free up space on ubuntu test job * Update swap/src/bitcoin/wallet.rs Co-authored-by: Byron Hambly <byron@hambly.dev> * Update swap/src/bitcoin/wallet.rs Co-authored-by: Byron Hambly <byron@hambly.dev> * fmt --------- Co-authored-by: binarybaron <86064887+binarybaron@users.noreply.github.com> Co-authored-by: Byron Hambly <byron@hambly.dev>
293 lines
7.8 KiB
Rust
293 lines
7.8 KiB
Rust
use crate::bitcoin;
|
|
use crate::bitcoin::wallet::Watchable;
|
|
use crate::bitcoin::{
|
|
build_shared_output_descriptor, Address, Amount, BlockHeight, PublicKey, Transaction, TxLock,
|
|
};
|
|
use ::bitcoin::util::sighash::SighashCache;
|
|
use ::bitcoin::{
|
|
EcdsaSighashType, OutPoint, PackedLockTime, Script, Sequence, Sighash, TxIn, TxOut, Txid,
|
|
};
|
|
use anyhow::Result;
|
|
use bdk::miniscript::Descriptor;
|
|
use ecdsa_fun::Signature;
|
|
use serde::{Deserialize, Serialize};
|
|
use std::cmp::Ordering;
|
|
use std::collections::HashMap;
|
|
use std::fmt;
|
|
use std::ops::Add;
|
|
|
|
/// Represent a timelock, expressed in relative block height as defined in
|
|
/// [BIP68](https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki).
|
|
/// E.g. The timelock expires 10 blocks after the reference transaction is
|
|
/// mined.
|
|
#[derive(Debug, Copy, Clone, Serialize, Deserialize, Eq, PartialEq)]
|
|
#[serde(transparent)]
|
|
pub struct CancelTimelock(u32);
|
|
|
|
impl From<CancelTimelock> for u32 {
|
|
fn from(cancel_timelock: CancelTimelock) -> Self {
|
|
cancel_timelock.0
|
|
}
|
|
}
|
|
|
|
impl CancelTimelock {
|
|
pub const fn new(number_of_blocks: u32) -> Self {
|
|
Self(number_of_blocks)
|
|
}
|
|
}
|
|
|
|
impl Add<CancelTimelock> for BlockHeight {
|
|
type Output = BlockHeight;
|
|
|
|
fn add(self, rhs: CancelTimelock) -> Self::Output {
|
|
self + rhs.0
|
|
}
|
|
}
|
|
|
|
impl PartialOrd<CancelTimelock> for u32 {
|
|
fn partial_cmp(&self, other: &CancelTimelock) -> Option<Ordering> {
|
|
self.partial_cmp(&other.0)
|
|
}
|
|
}
|
|
|
|
impl PartialEq<CancelTimelock> for u32 {
|
|
fn eq(&self, other: &CancelTimelock) -> bool {
|
|
self.eq(&other.0)
|
|
}
|
|
}
|
|
|
|
impl fmt::Display for CancelTimelock {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
write!(f, "{} blocks", self.0)
|
|
}
|
|
}
|
|
|
|
/// Represent a timelock, expressed in relative block height as defined in
|
|
/// [BIP68](https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki).
|
|
/// E.g. The timelock expires 10 blocks after the reference transaction is
|
|
/// mined.
|
|
#[derive(Debug, Copy, Clone, Serialize, Deserialize, Eq, PartialEq)]
|
|
#[serde(transparent)]
|
|
pub struct PunishTimelock(u32);
|
|
|
|
impl From<PunishTimelock> for u32 {
|
|
fn from(punish_timelock: PunishTimelock) -> Self {
|
|
punish_timelock.0
|
|
}
|
|
}
|
|
|
|
impl PunishTimelock {
|
|
pub const fn new(number_of_blocks: u32) -> Self {
|
|
Self(number_of_blocks)
|
|
}
|
|
}
|
|
|
|
impl Add<PunishTimelock> for BlockHeight {
|
|
type Output = BlockHeight;
|
|
|
|
fn add(self, rhs: PunishTimelock) -> Self::Output {
|
|
self + rhs.0
|
|
}
|
|
}
|
|
|
|
impl PartialOrd<PunishTimelock> for u32 {
|
|
fn partial_cmp(&self, other: &PunishTimelock) -> Option<Ordering> {
|
|
self.partial_cmp(&other.0)
|
|
}
|
|
}
|
|
|
|
impl PartialEq<PunishTimelock> for u32 {
|
|
fn eq(&self, other: &PunishTimelock) -> bool {
|
|
self.eq(&other.0)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct TxCancel {
|
|
inner: Transaction,
|
|
digest: Sighash,
|
|
pub(in crate::bitcoin) output_descriptor: Descriptor<::bitcoin::PublicKey>,
|
|
lock_output_descriptor: Descriptor<::bitcoin::PublicKey>,
|
|
}
|
|
|
|
impl TxCancel {
|
|
pub fn new(
|
|
tx_lock: &TxLock,
|
|
cancel_timelock: CancelTimelock,
|
|
A: PublicKey,
|
|
B: PublicKey,
|
|
spending_fee: Amount,
|
|
) -> Self {
|
|
let cancel_output_descriptor = build_shared_output_descriptor(A.0, B.0);
|
|
|
|
let tx_in = TxIn {
|
|
previous_output: tx_lock.as_outpoint(),
|
|
script_sig: Default::default(),
|
|
sequence: Sequence(cancel_timelock.0),
|
|
witness: Default::default(),
|
|
};
|
|
|
|
let tx_out = TxOut {
|
|
value: tx_lock.lock_amount().to_sat() - spending_fee.to_sat(),
|
|
script_pubkey: cancel_output_descriptor.script_pubkey(),
|
|
};
|
|
|
|
let transaction = Transaction {
|
|
version: 2,
|
|
lock_time: PackedLockTime(0),
|
|
input: vec![tx_in],
|
|
output: vec![tx_out],
|
|
};
|
|
|
|
let digest = SighashCache::new(&transaction)
|
|
.segwit_signature_hash(
|
|
0, // Only one input: lock_input (lock transaction)
|
|
&tx_lock.output_descriptor.script_code().expect("scriptcode"),
|
|
tx_lock.lock_amount().to_sat(),
|
|
EcdsaSighashType::All,
|
|
)
|
|
.expect("sighash");
|
|
|
|
Self {
|
|
inner: transaction,
|
|
digest,
|
|
output_descriptor: cancel_output_descriptor,
|
|
lock_output_descriptor: tx_lock.output_descriptor.clone(),
|
|
}
|
|
}
|
|
|
|
pub fn txid(&self) -> Txid {
|
|
self.inner.txid()
|
|
}
|
|
|
|
pub fn digest(&self) -> Sighash {
|
|
self.digest
|
|
}
|
|
|
|
pub fn amount(&self) -> Amount {
|
|
Amount::from_sat(self.inner.output[0].value)
|
|
}
|
|
|
|
pub fn as_outpoint(&self) -> OutPoint {
|
|
OutPoint::new(self.inner.txid(), 0)
|
|
}
|
|
|
|
pub fn complete_as_alice(
|
|
self,
|
|
a: bitcoin::SecretKey,
|
|
B: bitcoin::PublicKey,
|
|
tx_cancel_sig_B: bitcoin::Signature,
|
|
) -> Result<Transaction> {
|
|
let sig_a = a.sign(self.digest());
|
|
let sig_b = tx_cancel_sig_B;
|
|
|
|
let tx_cancel = self
|
|
.add_signatures((a.public(), sig_a), (B, sig_b))
|
|
.expect("sig_{a,b} to be valid signatures for tx_cancel");
|
|
|
|
Ok(tx_cancel)
|
|
}
|
|
|
|
pub fn complete_as_bob(
|
|
self,
|
|
A: bitcoin::PublicKey,
|
|
b: bitcoin::SecretKey,
|
|
tx_cancel_sig_A: bitcoin::Signature,
|
|
) -> Result<Transaction> {
|
|
let sig_a = tx_cancel_sig_A;
|
|
let sig_b = b.sign(self.digest());
|
|
|
|
let tx_cancel = self
|
|
.add_signatures((A, sig_a), (b.public(), sig_b))
|
|
.expect("sig_{a,b} to be valid signatures for tx_cancel");
|
|
|
|
Ok(tx_cancel)
|
|
}
|
|
|
|
fn add_signatures(
|
|
self,
|
|
(A, sig_a): (PublicKey, Signature),
|
|
(B, sig_b): (PublicKey, Signature),
|
|
) -> Result<Transaction> {
|
|
let satisfier = {
|
|
let mut satisfier = HashMap::with_capacity(2);
|
|
|
|
let A = ::bitcoin::PublicKey {
|
|
compressed: true,
|
|
inner: A.0.into(),
|
|
};
|
|
let B = ::bitcoin::PublicKey {
|
|
compressed: true,
|
|
inner: B.0.into(),
|
|
};
|
|
|
|
// The order in which these are inserted doesn't matter
|
|
satisfier.insert(
|
|
A,
|
|
::bitcoin::EcdsaSig {
|
|
sig: sig_a.into(),
|
|
hash_ty: EcdsaSighashType::All,
|
|
},
|
|
);
|
|
satisfier.insert(
|
|
B,
|
|
::bitcoin::EcdsaSig {
|
|
sig: sig_b.into(),
|
|
hash_ty: EcdsaSighashType::All,
|
|
},
|
|
);
|
|
|
|
satisfier
|
|
};
|
|
|
|
let mut tx_cancel = self.inner;
|
|
self.lock_output_descriptor
|
|
.satisfy(&mut tx_cancel.input[0], satisfier)?;
|
|
|
|
Ok(tx_cancel)
|
|
}
|
|
|
|
pub fn build_spend_transaction(
|
|
&self,
|
|
spend_address: &Address,
|
|
sequence: Option<PunishTimelock>,
|
|
spending_fee: Amount,
|
|
) -> Transaction {
|
|
let previous_output = self.as_outpoint();
|
|
|
|
let sequence = Sequence(sequence.map(|seq| seq.0).unwrap_or(0xFFFF_FFFF));
|
|
let tx_in = TxIn {
|
|
previous_output,
|
|
script_sig: Default::default(),
|
|
sequence,
|
|
witness: Default::default(),
|
|
};
|
|
|
|
let tx_out = TxOut {
|
|
value: self.amount().to_sat() - spending_fee.to_sat(),
|
|
script_pubkey: spend_address.script_pubkey(),
|
|
};
|
|
|
|
Transaction {
|
|
version: 2,
|
|
lock_time: PackedLockTime(0),
|
|
input: vec![tx_in],
|
|
output: vec![tx_out],
|
|
}
|
|
}
|
|
|
|
pub fn weight() -> usize {
|
|
596
|
|
}
|
|
}
|
|
|
|
impl Watchable for TxCancel {
|
|
fn id(&self) -> Txid {
|
|
self.txid()
|
|
}
|
|
|
|
fn script(&self) -> Script {
|
|
self.output_descriptor.script_pubkey()
|
|
}
|
|
}
|