Merge pull request #340 from rishkwal/rk/hardcode-transaction-fee

fix: hardcode the transaction fee

Author: mojoX911

src/bin/taker.rs

@@ -54,9 +54,6 @@ struct Cli {
     /// Sets the transaction count.
     #[clap(name = "tx_count", default_value = "3")]
     pub tx_count: u32,
-    /// Sets the fee-rate.
-    #[clap(name = "fee_rate", default_value = "1000")]
-    pub fee_rate: u64,
     /// Sets the required on-chain confirmations.
     #[clap(name = "required_confirms", default_value = "1000")]
     pub required_confirms: u64,
@@ -118,7 +115,6 @@ fn main() -> Result<(), TakerError> {
         maker_count: args.maker_count,
         tx_count: args.tx_count,
         required_confirms: args.required_confirms,
-        fee_rate: Amount::from_sat(args.fee_rate),
     };
 
     let mut taker = Taker::init(

src/taker/api.rs

@@ -71,6 +71,9 @@ pub const RECONNECT_SHORT_SLEEP_DELAY: u64 = 10;
 pub const RECONNECT_LONG_SLEEP_DELAY: u64 = 60;
 pub const SHORT_LONG_SLEEP_DELAY_TRANSITION: u32 = 60;
 pub const RECONNECT_ATTEMPT_TIMEOUT_SEC: u64 = 300;
+// TODO: Maker should decide this miner fee
+// This fee is used for both funding and contract txs.
+pub const MINER_FEE: u64 = 1000;
 
 /// Swap specific parameters. These are user's policy and can differ among swaps.
 /// SwapParams govern the criteria to find suitable set of makers from the offerbook.
@@ -87,8 +90,6 @@ pub struct SwapParams {
     // TODO: Following two should be moved to TakerConfig as global configuration.
     /// Confirmation count required for funding txs.
     pub required_confirms: u64,
-    /// Fee rate for funding txs.
-    pub fee_rate: Amount,
 }
 
 // Defines the Taker's position in the current ongoing swap.
@@ -463,7 +464,7 @@ impl Taker {
                     &hashlock_pubkeys,
                     self.get_preimage_hash(),
                     swap_locktime,
-                    self.ongoing_swap_state.swap_params.fee_rate,
+                    Amount::from_sat(MINER_FEE),
                 )?;
 
             let contract_reedemscripts = outgoing_swapcoins
@@ -954,7 +955,7 @@ impl Taker {
                 next_peer_multisig_pubkeys: next_peer_multisig_pubkeys.clone(),
                 next_peer_hashlock_pubkeys: next_peer_hashlock_pubkeys.clone(),
                 next_maker_refund_locktime: maker_refund_locktime,
-                next_maker_fee_rate: self.ongoing_swap_state.swap_params.fee_rate,
+                next_maker_fee_rate: Amount::from_sat(MINER_FEE),
             };
 
             let this_maker_info = ThisMakerInfo {
@@ -1196,7 +1197,7 @@ impl Taker {
                         previous_funding_output,
                         maker_funding_tx_value,
                         next_contract_redeemscript,
-                        self.ongoing_swap_state.swap_params.fee_rate,
+                        Amount::from_sat(MINER_FEE),
                     )
                 },
             )

tests/abort1.rs

@@ -138,7 +138,6 @@ fn test_stop_taker_after_setup() {
         maker_count: 2,
         tx_count: 3,
         required_confirms: 1,
-        fee_rate: Amount::from_sat(1000),
     };
 
     info!("Initiating coinswap protocol");

tests/abort2_case1.rs

@@ -114,7 +114,6 @@ fn test_abort_case_2_move_on_with_other_makers() {
         maker_count: 2,
         tx_count: 3,
         required_confirms: 1,
-        fee_rate: Amount::from_sat(1000),
     };
 
     info!("Initiating coinswap protocol");

tests/abort2_case2.rs

@@ -130,7 +130,6 @@ fn test_abort_case_2_recover_if_no_makers_found() {
         maker_count: 2,
         tx_count: 3,
         required_confirms: 1,
-        fee_rate: Amount::from_sat(1000),
     };
 
     // Calculate Original balance excluding fidelity bonds.

tests/abort2_case3.rs

@@ -113,7 +113,6 @@ fn maker_drops_after_sending_senders_sigs() {
         maker_count: 2,
         tx_count: 3,
         required_confirms: 1,
-        fee_rate: Amount::from_sat(1000),
     };
 
     info!("Initiating coinswap protocol");

tests/abort3_case1.rs

@@ -114,7 +114,6 @@ fn abort3_case1_close_at_contract_sigs_for_recvr_and_sender() {
         maker_count: 2,
         tx_count: 3,
         required_confirms: 1,
-        fee_rate: Amount::from_sat(1000),
     };
 
     // Spawn a Taker coinswap thread.

tests/abort3_case2.rs

@@ -111,7 +111,6 @@ fn abort3_case2_close_at_contract_sigs_for_recvr() {
         maker_count: 2,
         tx_count: 3,
         required_confirms: 1,
-        fee_rate: Amount::from_sat(1000),
     };
 
     // Spawn a Taker coinswap thread.

tests/abort3_case3.rs

@@ -109,7 +109,6 @@ fn abort3_case3_close_at_hash_preimage_handover() {
         maker_count: 2,
         tx_count: 3,
         required_confirms: 1,
-        fee_rate: Amount::from_sat(1000),
     };
 
     // Spawn a Taker coinswap thread.

tests/malice1.rs

@@ -137,7 +137,6 @@ fn malice1_taker_broadcast_contract_prematurely() {
         maker_count: 2,
         tx_count: 3,
         required_confirms: 1,
-        fee_rate: Amount::from_sat(1000),
     };
 
     // Calculate Original balance excluding fidelity bonds.