Dynamically chose fee for TxCancel.

Bob chooses the fee for TxCancel because he is the one that cares.
This commit is contained in:
Philipp Hoenisch 2021-04-29 10:59:40 +10:00
parent 1012e39527
commit 38540b4de5
No known key found for this signature in database
GPG Key ID: E5F8E74C672BC666
8 changed files with 121 additions and 36 deletions

View File

@ -37,19 +37,11 @@ use serde::{Deserialize, Serialize};
use sha2::Sha256; use sha2::Sha256;
use std::str::FromStr; use std::str::FromStr;
pub use crate::bitcoin::cancel::ESTIMATED_WEIGHT as ESTIMATED_WEIGHT_TX_CANCEL;
pub use crate::bitcoin::punish::ESTIMATED_WEIGHT as ESTIMATED_WEIGHT_TX_PUNISH; pub use crate::bitcoin::punish::ESTIMATED_WEIGHT as ESTIMATED_WEIGHT_TX_PUNISH;
pub use crate::bitcoin::redeem::ESTIMATED_WEIGHT as ESTIMATED_WEIGHT_TX_REDEEM; pub use crate::bitcoin::redeem::ESTIMATED_WEIGHT as ESTIMATED_WEIGHT_TX_REDEEM;
pub use crate::bitcoin::refund::ESTIMATED_WEIGHT as ESTIMATED_WEIGHT_TX_REFUND; pub use crate::bitcoin::refund::ESTIMATED_WEIGHT as ESTIMATED_WEIGHT_TX_REFUND;
// TODO: Configurable tx-fee (note: parties have to agree prior to swapping)
// Current reasoning:
// tx with largest weight (as determined by get_weight() upon broadcast in e2e
// test) = 609 assuming segwit and 60 sat/vB:
// (609 / 4) * 60 (sat/vB) = 9135 sats
// Recommended: Overpay a bit to ensure we don't have to wait too long for test
// runs.
pub const TX_FEE: u64 = 15_000;
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq)] #[derive(Debug, Clone, Deserialize, Serialize, PartialEq)]
pub struct SecretKey { pub struct SecretKey {
inner: Scalar, inner: Scalar,

View File

@ -2,7 +2,6 @@ use crate::bitcoin;
use crate::bitcoin::wallet::Watchable; use crate::bitcoin::wallet::Watchable;
use crate::bitcoin::{ use crate::bitcoin::{
build_shared_output_descriptor, Address, Amount, BlockHeight, PublicKey, Transaction, TxLock, build_shared_output_descriptor, Address, Amount, BlockHeight, PublicKey, Transaction, TxLock,
TX_FEE,
}; };
use ::bitcoin::util::bip143::SigHashCache; use ::bitcoin::util::bip143::SigHashCache;
use ::bitcoin::{OutPoint, Script, SigHash, SigHashType, TxIn, TxOut, Txid}; use ::bitcoin::{OutPoint, Script, SigHash, SigHashType, TxIn, TxOut, Txid};
@ -14,6 +13,9 @@ use std::cmp::Ordering;
use std::collections::HashMap; use std::collections::HashMap;
use std::ops::Add; use std::ops::Add;
// TODO take real tx weight from past transaction
pub const ESTIMATED_WEIGHT: usize = 10_000;
/// Represent a timelock, expressed in relative block height as defined in /// Represent a timelock, expressed in relative block height as defined in
/// [BIP68](https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki). /// [BIP68](https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki).
/// E.g. The timelock expires 10 blocks after the reference transaction is /// E.g. The timelock expires 10 blocks after the reference transaction is
@ -96,6 +98,7 @@ impl TxCancel {
cancel_timelock: CancelTimelock, cancel_timelock: CancelTimelock,
A: PublicKey, A: PublicKey,
B: PublicKey, B: PublicKey,
spending_fee: Amount,
) -> Self { ) -> Self {
let cancel_output_descriptor = build_shared_output_descriptor(A.0, B.0); let cancel_output_descriptor = build_shared_output_descriptor(A.0, B.0);
@ -107,7 +110,7 @@ impl TxCancel {
}; };
let tx_out = TxOut { let tx_out = TxOut {
value: tx_lock.lock_amount().as_sat() - TX_FEE, value: tx_lock.lock_amount().as_sat() - spending_fee.as_sat(),
script_pubkey: cancel_output_descriptor.script_pubkey(), script_pubkey: cancel_output_descriptor.script_pubkey(),
}; };

View File

@ -30,6 +30,8 @@ pub struct Message0 {
refund_address: bitcoin::Address, refund_address: bitcoin::Address,
#[serde(with = "::bitcoin::util::amount::serde::as_sat")] #[serde(with = "::bitcoin::util::amount::serde::as_sat")]
tx_refund_fee: bitcoin::Amount, tx_refund_fee: bitcoin::Amount,
#[serde(with = "::bitcoin::util::amount::serde::as_sat")]
tx_cancel_fee: bitcoin::Amount,
} }
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]

View File

@ -191,6 +191,7 @@ impl State0 {
tx_redeem_fee: self.tx_redeem_fee, tx_redeem_fee: self.tx_redeem_fee,
tx_punish_fee: self.tx_punish_fee, tx_punish_fee: self.tx_punish_fee,
tx_refund_fee: msg.tx_refund_fee, tx_refund_fee: msg.tx_refund_fee,
tx_cancel_fee: msg.tx_cancel_fee,
})) }))
} }
} }
@ -217,6 +218,7 @@ pub struct State1 {
tx_redeem_fee: bitcoin::Amount, tx_redeem_fee: bitcoin::Amount,
tx_punish_fee: bitcoin::Amount, tx_punish_fee: bitcoin::Amount,
tx_refund_fee: bitcoin::Amount, tx_refund_fee: bitcoin::Amount,
tx_cancel_fee: bitcoin::Amount,
} }
impl State1 { impl State1 {
@ -256,6 +258,7 @@ impl State1 {
tx_redeem_fee: self.tx_redeem_fee, tx_redeem_fee: self.tx_redeem_fee,
tx_punish_fee: self.tx_punish_fee, tx_punish_fee: self.tx_punish_fee,
tx_refund_fee: self.tx_refund_fee, tx_refund_fee: self.tx_refund_fee,
tx_cancel_fee: self.tx_cancel_fee,
}) })
} }
} }
@ -279,12 +282,18 @@ pub struct State2 {
tx_redeem_fee: bitcoin::Amount, tx_redeem_fee: bitcoin::Amount,
tx_punish_fee: bitcoin::Amount, tx_punish_fee: bitcoin::Amount,
tx_refund_fee: bitcoin::Amount, tx_refund_fee: bitcoin::Amount,
tx_cancel_fee: bitcoin::Amount,
} }
impl State2 { impl State2 {
pub fn next_message(&self) -> Message3 { pub fn next_message(&self) -> Message3 {
let tx_cancel = let tx_cancel = bitcoin::TxCancel::new(
bitcoin::TxCancel::new(&self.tx_lock, self.cancel_timelock, self.a.public(), self.B); &self.tx_lock,
self.cancel_timelock,
self.a.public(),
self.B,
self.tx_cancel_fee,
);
let tx_refund = let tx_refund =
bitcoin::TxRefund::new(&tx_cancel, &self.refund_address, self.tx_refund_fee); bitcoin::TxRefund::new(&tx_cancel, &self.refund_address, self.tx_refund_fee);
@ -303,8 +312,13 @@ impl State2 {
} }
pub fn receive(self, msg: Message4) -> Result<State3> { pub fn receive(self, msg: Message4) -> Result<State3> {
let tx_cancel = let tx_cancel = bitcoin::TxCancel::new(
bitcoin::TxCancel::new(&self.tx_lock, self.cancel_timelock, self.a.public(), self.B); &self.tx_lock,
self.cancel_timelock,
self.a.public(),
self.B,
self.tx_cancel_fee,
);
bitcoin::verify_sig(&self.B, &tx_cancel.digest(), &msg.tx_cancel_sig) bitcoin::verify_sig(&self.B, &tx_cancel.digest(), &msg.tx_cancel_sig)
.context("Failed to verify cancel transaction")?; .context("Failed to verify cancel transaction")?;
let tx_punish = bitcoin::TxPunish::new( let tx_punish = bitcoin::TxPunish::new(
@ -336,6 +350,7 @@ impl State2 {
tx_redeem_fee: self.tx_redeem_fee, tx_redeem_fee: self.tx_redeem_fee,
tx_punish_fee: self.tx_punish_fee, tx_punish_fee: self.tx_punish_fee,
tx_refund_fee: self.tx_refund_fee, tx_refund_fee: self.tx_refund_fee,
tx_cancel_fee: self.tx_cancel_fee,
}) })
} }
} }
@ -365,6 +380,8 @@ pub struct State3 {
tx_punish_fee: bitcoin::Amount, tx_punish_fee: bitcoin::Amount,
#[serde(with = "::bitcoin::util::amount::serde::as_sat")] #[serde(with = "::bitcoin::util::amount::serde::as_sat")]
tx_refund_fee: bitcoin::Amount, tx_refund_fee: bitcoin::Amount,
#[serde(with = "::bitcoin::util::amount::serde::as_sat")]
tx_cancel_fee: bitcoin::Amount,
} }
impl State3 { impl State3 {
@ -417,7 +434,13 @@ impl State3 {
} }
pub fn tx_cancel(&self) -> TxCancel { pub fn tx_cancel(&self) -> TxCancel {
TxCancel::new(&self.tx_lock, self.cancel_timelock, self.a.public(), self.B) TxCancel::new(
&self.tx_lock,
self.cancel_timelock,
self.a.public(),
self.B,
self.tx_cancel_fee,
)
} }
pub fn tx_refund(&self) -> TxRefund { pub fn tx_refund(&self) -> TxRefund {

View File

@ -84,6 +84,7 @@ pub struct State0 {
refund_address: bitcoin::Address, refund_address: bitcoin::Address,
min_monero_confirmations: u64, min_monero_confirmations: u64,
tx_refund_fee: bitcoin::Amount, tx_refund_fee: bitcoin::Amount,
tx_cancel_fee: bitcoin::Amount,
} }
impl State0 { impl State0 {
@ -98,6 +99,7 @@ impl State0 {
refund_address: bitcoin::Address, refund_address: bitcoin::Address,
min_monero_confirmations: u64, min_monero_confirmations: u64,
tx_refund_fee: bitcoin::Amount, tx_refund_fee: bitcoin::Amount,
tx_cancel_fee: bitcoin::Amount,
) -> Self { ) -> Self {
let b = bitcoin::SecretKey::new_random(rng); let b = bitcoin::SecretKey::new_random(rng);
@ -123,6 +125,7 @@ impl State0 {
refund_address, refund_address,
min_monero_confirmations, min_monero_confirmations,
tx_refund_fee, tx_refund_fee,
tx_cancel_fee,
} }
} }
@ -136,6 +139,7 @@ impl State0 {
v_b: self.v_b, v_b: self.v_b,
refund_address: self.refund_address.clone(), refund_address: self.refund_address.clone(),
tx_refund_fee: self.tx_refund_fee, tx_refund_fee: self.tx_refund_fee,
tx_cancel_fee: self.tx_cancel_fee,
} }
} }
@ -176,6 +180,7 @@ impl State0 {
tx_redeem_fee: msg.tx_redeem_fee, tx_redeem_fee: msg.tx_redeem_fee,
tx_refund_fee: self.tx_refund_fee, tx_refund_fee: self.tx_refund_fee,
tx_punish_fee: msg.tx_punish_fee, tx_punish_fee: msg.tx_punish_fee,
tx_cancel_fee: self.tx_cancel_fee,
}) })
} }
} }
@ -199,6 +204,7 @@ pub struct State1 {
tx_redeem_fee: bitcoin::Amount, tx_redeem_fee: bitcoin::Amount,
tx_refund_fee: bitcoin::Amount, tx_refund_fee: bitcoin::Amount,
tx_punish_fee: bitcoin::Amount, tx_punish_fee: bitcoin::Amount,
tx_cancel_fee: bitcoin::Amount,
} }
impl State1 { impl State1 {
@ -209,7 +215,13 @@ impl State1 {
} }
pub fn receive(self, msg: Message3) -> Result<State2> { pub fn receive(self, msg: Message3) -> Result<State2> {
let tx_cancel = TxCancel::new(&self.tx_lock, self.cancel_timelock, self.A, self.b.public()); let tx_cancel = TxCancel::new(
&self.tx_lock,
self.cancel_timelock,
self.A,
self.b.public(),
self.tx_cancel_fee,
);
let tx_refund = let tx_refund =
bitcoin::TxRefund::new(&tx_cancel, &self.refund_address, self.tx_refund_fee); bitcoin::TxRefund::new(&tx_cancel, &self.refund_address, self.tx_refund_fee);
@ -241,6 +253,7 @@ impl State1 {
tx_redeem_fee: self.tx_redeem_fee, tx_redeem_fee: self.tx_redeem_fee,
tx_refund_fee: self.tx_refund_fee, tx_refund_fee: self.tx_refund_fee,
tx_punish_fee: self.tx_punish_fee, tx_punish_fee: self.tx_punish_fee,
tx_cancel_fee: self.tx_cancel_fee,
}) })
} }
} }
@ -269,11 +282,19 @@ pub struct State2 {
tx_punish_fee: bitcoin::Amount, tx_punish_fee: bitcoin::Amount,
#[serde(with = "::bitcoin::util::amount::serde::as_sat")] #[serde(with = "::bitcoin::util::amount::serde::as_sat")]
tx_refund_fee: bitcoin::Amount, tx_refund_fee: bitcoin::Amount,
#[serde(with = "::bitcoin::util::amount::serde::as_sat")]
tx_cancel_fee: bitcoin::Amount,
} }
impl State2 { impl State2 {
pub fn next_message(&self) -> Message4 { pub fn next_message(&self) -> Message4 {
let tx_cancel = TxCancel::new(&self.tx_lock, self.cancel_timelock, self.A, self.b.public()); let tx_cancel = TxCancel::new(
&self.tx_lock,
self.cancel_timelock,
self.A,
self.b.public(),
self.tx_cancel_fee,
);
let tx_cancel_sig = self.b.sign(tx_cancel.digest()); let tx_cancel_sig = self.b.sign(tx_cancel.digest());
let tx_punish = bitcoin::TxPunish::new( let tx_punish = bitcoin::TxPunish::new(
&tx_cancel, &tx_cancel,
@ -309,6 +330,7 @@ impl State2 {
min_monero_confirmations: self.min_monero_confirmations, min_monero_confirmations: self.min_monero_confirmations,
tx_redeem_fee: self.tx_redeem_fee, tx_redeem_fee: self.tx_redeem_fee,
tx_refund_fee: self.tx_refund_fee, tx_refund_fee: self.tx_refund_fee,
tx_cancel_fee: self.tx_cancel_fee,
}, },
self.tx_lock, self.tx_lock,
)) ))
@ -336,6 +358,8 @@ pub struct State3 {
tx_redeem_fee: bitcoin::Amount, tx_redeem_fee: bitcoin::Amount,
#[serde(with = "::bitcoin::util::amount::serde::as_sat")] #[serde(with = "::bitcoin::util::amount::serde::as_sat")]
tx_refund_fee: bitcoin::Amount, tx_refund_fee: bitcoin::Amount,
#[serde(with = "::bitcoin::util::amount::serde::as_sat")]
tx_cancel_fee: bitcoin::Amount,
} }
impl State3 { impl State3 {
@ -370,6 +394,7 @@ impl State3 {
monero_wallet_restore_blockheight, monero_wallet_restore_blockheight,
tx_redeem_fee: self.tx_redeem_fee, tx_redeem_fee: self.tx_redeem_fee,
tx_refund_fee: self.tx_refund_fee, tx_refund_fee: self.tx_refund_fee,
tx_cancel_fee: self.tx_cancel_fee,
} }
} }
@ -385,6 +410,7 @@ impl State3 {
tx_cancel_sig_a: self.tx_cancel_sig_a.clone(), tx_cancel_sig_a: self.tx_cancel_sig_a.clone(),
tx_refund_encsig: self.tx_refund_encsig.clone(), tx_refund_encsig: self.tx_refund_encsig.clone(),
tx_refund_fee: self.tx_refund_fee, tx_refund_fee: self.tx_refund_fee,
tx_cancel_fee: self.tx_cancel_fee,
} }
} }
@ -396,7 +422,13 @@ impl State3 {
&self, &self,
bitcoin_wallet: &bitcoin::Wallet, bitcoin_wallet: &bitcoin::Wallet,
) -> Result<ExpiredTimelocks> { ) -> Result<ExpiredTimelocks> {
let tx_cancel = TxCancel::new(&self.tx_lock, self.cancel_timelock, self.A, self.b.public()); let tx_cancel = TxCancel::new(
&self.tx_lock,
self.cancel_timelock,
self.A,
self.b.public(),
self.tx_cancel_fee,
);
let tx_lock_status = bitcoin_wallet.status_of_script(&self.tx_lock).await?; let tx_lock_status = bitcoin_wallet.status_of_script(&self.tx_lock).await?;
let tx_cancel_status = bitcoin_wallet.status_of_script(&tx_cancel).await?; let tx_cancel_status = bitcoin_wallet.status_of_script(&tx_cancel).await?;
@ -429,6 +461,8 @@ pub struct State4 {
tx_redeem_fee: bitcoin::Amount, tx_redeem_fee: bitcoin::Amount,
#[serde(with = "::bitcoin::util::amount::serde::as_sat")] #[serde(with = "::bitcoin::util::amount::serde::as_sat")]
tx_refund_fee: bitcoin::Amount, tx_refund_fee: bitcoin::Amount,
#[serde(with = "::bitcoin::util::amount::serde::as_sat")]
tx_cancel_fee: bitcoin::Amount,
} }
impl State4 { impl State4 {
@ -469,7 +503,13 @@ impl State4 {
&self, &self,
bitcoin_wallet: &bitcoin::Wallet, bitcoin_wallet: &bitcoin::Wallet,
) -> Result<ExpiredTimelocks> { ) -> Result<ExpiredTimelocks> {
let tx_cancel = TxCancel::new(&self.tx_lock, self.cancel_timelock, self.A, self.b.public()); let tx_cancel = TxCancel::new(
&self.tx_lock,
self.cancel_timelock,
self.A,
self.b.public(),
self.tx_cancel_fee,
);
let tx_lock_status = bitcoin_wallet.status_of_script(&self.tx_lock).await?; let tx_lock_status = bitcoin_wallet.status_of_script(&self.tx_lock).await?;
let tx_cancel_status = bitcoin_wallet.status_of_script(&tx_cancel).await?; let tx_cancel_status = bitcoin_wallet.status_of_script(&tx_cancel).await?;
@ -494,6 +534,7 @@ impl State4 {
tx_cancel_sig_a: self.tx_cancel_sig_a, tx_cancel_sig_a: self.tx_cancel_sig_a,
tx_refund_encsig: self.tx_refund_encsig, tx_refund_encsig: self.tx_refund_encsig,
tx_refund_fee: self.tx_refund_fee, tx_refund_fee: self.tx_refund_fee,
tx_cancel_fee: self.tx_cancel_fee,
} }
} }
} }
@ -534,6 +575,8 @@ pub struct State6 {
tx_refund_encsig: bitcoin::EncryptedSignature, tx_refund_encsig: bitcoin::EncryptedSignature,
#[serde(with = "::bitcoin::util::amount::serde::as_sat")] #[serde(with = "::bitcoin::util::amount::serde::as_sat")]
pub tx_refund_fee: bitcoin::Amount, pub tx_refund_fee: bitcoin::Amount,
#[serde(with = "::bitcoin::util::amount::serde::as_sat")]
pub tx_cancel_fee: bitcoin::Amount,
} }
impl State6 { impl State6 {
@ -541,7 +584,13 @@ impl State6 {
&self, &self,
bitcoin_wallet: &bitcoin::Wallet, bitcoin_wallet: &bitcoin::Wallet,
) -> Result<ExpiredTimelocks> { ) -> Result<ExpiredTimelocks> {
let tx_cancel = TxCancel::new(&self.tx_lock, self.cancel_timelock, self.A, self.b.public()); let tx_cancel = TxCancel::new(
&self.tx_lock,
self.cancel_timelock,
self.A,
self.b.public(),
self.tx_cancel_fee,
);
let tx_lock_status = bitcoin_wallet.status_of_script(&self.tx_lock).await?; let tx_lock_status = bitcoin_wallet.status_of_script(&self.tx_lock).await?;
let tx_cancel_status = bitcoin_wallet.status_of_script(&tx_cancel).await?; let tx_cancel_status = bitcoin_wallet.status_of_script(&tx_cancel).await?;
@ -558,8 +607,13 @@ impl State6 {
&self, &self,
bitcoin_wallet: &bitcoin::Wallet, bitcoin_wallet: &bitcoin::Wallet,
) -> Result<Transaction> { ) -> Result<Transaction> {
let tx_cancel = let tx_cancel = bitcoin::TxCancel::new(
bitcoin::TxCancel::new(&self.tx_lock, self.cancel_timelock, self.A, self.b.public()); &self.tx_lock,
self.cancel_timelock,
self.A,
self.b.public(),
self.tx_cancel_fee,
);
let tx = bitcoin_wallet.get_raw_transaction(tx_cancel.txid()).await?; let tx = bitcoin_wallet.get_raw_transaction(tx_cancel.txid()).await?;
@ -567,8 +621,13 @@ impl State6 {
} }
pub async fn submit_tx_cancel(&self, bitcoin_wallet: &bitcoin::Wallet) -> Result<Txid> { pub async fn submit_tx_cancel(&self, bitcoin_wallet: &bitcoin::Wallet) -> Result<Txid> {
let transaction = let transaction = bitcoin::TxCancel::new(
bitcoin::TxCancel::new(&self.tx_lock, self.cancel_timelock, self.A, self.b.public()) &self.tx_lock,
self.cancel_timelock,
self.A,
self.b.public(),
self.tx_cancel_fee,
)
.complete_as_bob(self.A, self.b.clone(), self.tx_cancel_sig_a.clone()) .complete_as_bob(self.A, self.b.clone(), self.tx_cancel_sig_a.clone())
.context("Failed to complete Bitcoin cancel transaction")?; .context("Failed to complete Bitcoin cancel transaction")?;
@ -578,8 +637,13 @@ impl State6 {
} }
pub async fn refund_btc(&self, bitcoin_wallet: &bitcoin::Wallet) -> Result<()> { pub async fn refund_btc(&self, bitcoin_wallet: &bitcoin::Wallet) -> Result<()> {
let tx_cancel = let tx_cancel = bitcoin::TxCancel::new(
bitcoin::TxCancel::new(&self.tx_lock, self.cancel_timelock, self.A, self.b.public()); &self.tx_lock,
self.cancel_timelock,
self.A,
self.b.public(),
self.tx_cancel_fee,
);
let tx_refund = let tx_refund =
bitcoin::TxRefund::new(&tx_cancel, &self.refund_address, self.tx_refund_fee); bitcoin::TxRefund::new(&tx_cancel, &self.refund_address, self.tx_refund_fee);

View File

@ -67,6 +67,7 @@ async fn next_state(
BobState::Started { btc_amount } => { BobState::Started { btc_amount } => {
let bitcoin_refund_address = bitcoin_wallet.new_address().await?; let bitcoin_refund_address = bitcoin_wallet.new_address().await?;
let tx_refund_fee = bitcoin_wallet.estimate_fee(bitcoin::ESTIMATED_WEIGHT_TX_REDEEM); let tx_refund_fee = bitcoin_wallet.estimate_fee(bitcoin::ESTIMATED_WEIGHT_TX_REDEEM);
let tx_cancel_fee = bitcoin_wallet.estimate_fee(bitcoin::ESTIMATED_WEIGHT_TX_CANCEL);
let state2 = request_price_and_setup( let state2 = request_price_and_setup(
swap_id, swap_id,
@ -75,6 +76,7 @@ async fn next_state(
env_config, env_config,
bitcoin_refund_address, bitcoin_refund_address,
tx_refund_fee, tx_refund_fee,
tx_cancel_fee,
) )
.await?; .await?;
@ -271,6 +273,7 @@ pub async fn request_price_and_setup(
env_config: &Config, env_config: &Config,
bitcoin_refund_address: bitcoin::Address, bitcoin_refund_address: bitcoin::Address,
tx_refund_fee: bitcoin::Amount, tx_refund_fee: bitcoin::Amount,
tx_cancel_fee: bitcoin::Amount,
) -> 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?;
@ -286,6 +289,7 @@ pub async fn request_price_and_setup(
bitcoin_refund_address, bitcoin_refund_address,
env_config.monero_finality_confirmations, env_config.monero_finality_confirmations,
tx_refund_fee, tx_refund_fee,
tx_cancel_fee,
); );
let state2 = event_loop_handle.execution_setup(state0).await?; let state2 = event_loop_handle.execution_setup(state0).await?;

View File

@ -8,10 +8,6 @@ pub const RPC_PORT: u16 = 18443;
pub const PORT: u16 = 18886; pub const PORT: u16 = 18886;
pub const DATADIR: &str = "/home/bdk"; pub const DATADIR: &str = "/home/bdk";
// Bitcoin regtest TX fee. The fee itself does not matter for our tests. It just
// has to be static so that we can assert on the amounts.
pub const TX_FEE: u64 = 15_000;
#[derive(Debug)] #[derive(Debug)]
pub struct Bitcoind { pub struct Bitcoind {
args: BitcoindArgs, args: BitcoindArgs,

View File

@ -1,7 +1,6 @@
mod bitcoind; mod bitcoind;
mod electrs; mod electrs;
use crate::harness::bitcoind::TX_FEE;
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
use async_trait::async_trait; use async_trait::async_trait;
use bitcoin_harness::{BitcoindRpcApi, Client}; use bitcoin_harness::{BitcoindRpcApi, Client};
@ -41,7 +40,8 @@ use uuid::Uuid;
// TODO: see if there is a better way. // TODO: see if there is a better way.
const TX_REDEEM_FEE: u64 = 12500; const TX_REDEEM_FEE: u64 = 12500;
const TX_REFUND_FEE: u64 = 12500; const TX_REFUND_FEE: u64 = 12500;
const TX_CANCEL_FEE: u64 = TX_FEE; const TX_CANCEL_FEE: u64 = 12500;
const TX_PUNISH_FEE: u64 = 12500;
pub async fn setup_test<T, F, C>(_config: C, testfn: T) pub async fn setup_test<T, F, C>(_config: C, testfn: T)
where where
@ -719,7 +719,8 @@ impl TestContext {
fn alice_punished_btc_balance(&self) -> bitcoin::Amount { fn alice_punished_btc_balance(&self) -> bitcoin::Amount {
self.alice_starting_balances.btc + self.btc_amount self.alice_starting_balances.btc + self.btc_amount
- bitcoin::Amount::from_sat(2 * bitcoind::TX_FEE) - bitcoin::Amount::from_sat(TX_CANCEL_FEE)
- bitcoin::Amount::from_sat(TX_PUNISH_FEE)
} }
fn bob_punished_xmr_balance(&self) -> monero::Amount { fn bob_punished_xmr_balance(&self) -> monero::Amount {