feat(swap): add utxo/cosmos/ARRR pre-burn address output

mm2src/coins/Cargo.toml

@@ -12,7 +12,7 @@ enable-sia = [
 ]
 default = []
 run-docker-tests = []
-for-tests = []
+for-tests = ["dep:mocktopus"]
 
 [lib]
 path = "lp_coins.rs"
@@ -72,7 +72,7 @@ mm2_number = { path = "../mm2_number"}
 mm2_p2p = { path = "../mm2_p2p", default-features = false }
 mm2_rpc = { path = "../mm2_rpc" }
 mm2_state_machine = { path = "../mm2_state_machine" }
-mocktopus = "0.8.0"
+mocktopus = { version = "0.8.0", optional = true }
 num-traits = "0.2"
 parking_lot = { version = "0.12.0", features = ["nightly"] }
 primitives = { path = "../mm2_bitcoin/primitives" }
@@ -162,6 +162,7 @@ winapi = "0.3"
 
 [dev-dependencies]
 mm2_test_helpers = { path = "../mm2_test_helpers" }
+mocktopus = { version = "0.8.0" }
 mm2_p2p = { path = "../mm2_p2p", features = ["application"] }
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]

mm2src/coins/eth.rs

@@ -80,7 +80,6 @@ use instant::Instant;
 use mm2_core::mm_ctx::{MmArc, MmWeak};
 use mm2_number::bigdecimal_custom::CheckedDivision;
 use mm2_number::{BigDecimal, BigUint, MmNumber};
-#[cfg(test)] use mocktopus::macros::*;
 use rand::seq::SliceRandom;
 use rlp::{DecoderError, Encodable, RlpStream};
 use rpc::v1::types::Bytes as BytesJson;
@@ -1284,14 +1283,8 @@ impl Deref for EthCoin {
 
 #[async_trait]
 impl SwapOps for EthCoin {
-    async fn send_taker_fee(
-        &self,
-        fee_addr: &[u8],
-        dex_fee: DexFee,
-        _uuid: &[u8],
-        _expire_at: u64,
-    ) -> TransactionResult {
-        let address = try_tx_s!(addr_from_raw_pubkey(fee_addr));
+    async fn send_taker_fee(&self, dex_fee: DexFee, _uuid: &[u8], _expire_at: u64) -> TransactionResult {
+        let address = try_tx_s!(addr_from_raw_pubkey(self.dex_pubkey()));
         self.send_to_address(
             address,
             try_tx_s!(wei_from_big_decimal(&dex_fee.fee_amount().into(), self.decimals)),
@@ -1358,7 +1351,6 @@ impl SwapOps for EthCoin {
         validate_fee_impl(self.clone(), EthValidateFeeArgs {
             fee_tx_hash: &tx.tx_hash(),
             expected_sender: validate_fee_args.expected_sender,
-            fee_addr: validate_fee_args.fee_addr,
             amount: &validate_fee_args.dex_fee.fee_amount().into(),
             min_block_number: validate_fee_args.min_block_number,
             uuid: validate_fee_args.uuid,
@@ -1697,7 +1689,6 @@ impl WatcherOps for EthCoin {
         validate_fee_impl(self.clone(), EthValidateFeeArgs {
             fee_tx_hash: &H256::from_slice(validate_fee_args.taker_fee_hash.as_slice()),
             expected_sender: &validate_fee_args.sender_pubkey,
-            fee_addr: &validate_fee_args.fee_addr,
             amount: &BigDecimal::from(0),
             min_block_number: validate_fee_args.min_block_number,
             uuid: &[],
@@ -2307,7 +2298,6 @@ impl WatcherOps for EthCoin {
 
 #[async_trait]
 #[cfg_attr(test, mockable)]
-#[async_trait]
 impl MarketCoinOps for EthCoin {
     fn ticker(&self) -> &str { &self.ticker[..] }
 
@@ -2672,6 +2662,9 @@ impl MarketCoinOps for EthCoin {
         MmNumber::from(1) / MmNumber::from(10u64.pow(pow))
     }
 
+    #[inline]
+    fn should_burn_dex_fee(&self) -> bool { false }
+
     fn is_trezor(&self) -> bool { self.priv_key_policy.is_trezor() }
 }
 
@@ -5981,8 +5974,7 @@ fn validate_fee_impl(coin: EthCoin, validate_fee_args: EthValidateFeeArgs<'_>) -
     let sender_addr = try_f!(
         addr_from_raw_pubkey(validate_fee_args.expected_sender).map_to_mm(ValidatePaymentError::InvalidParameter)
     );
-    let fee_addr =
-        try_f!(addr_from_raw_pubkey(validate_fee_args.fee_addr).map_to_mm(ValidatePaymentError::InvalidParameter));
+    let fee_addr = try_f!(addr_from_raw_pubkey(coin.dex_pubkey()).map_to_mm(ValidatePaymentError::InvalidParameter));
     let amount = validate_fee_args.amount.clone();
     let min_block_number = validate_fee_args.min_block_number;
 
@@ -7344,6 +7336,12 @@ impl CommonSwapOpsV2 for EthCoin {
     fn derive_htlc_pubkey_v2_bytes(&self, swap_unique_data: &[u8]) -> Vec<u8> {
         self.derive_htlc_pubkey_v2(swap_unique_data).to_bytes()
     }
+
+    #[inline(always)]
+    fn taker_pubkey_bytes(&self) -> Option<Vec<u8>> {
+        let dummy_unique_data = []; // not used for non-private coins
+        Some(self.derive_htlc_pubkey_v2(&dummy_unique_data).to_bytes())
+    }
 }
 
 #[cfg(all(feature = "for-tests", not(target_arch = "wasm32")))]

mm2src/coins/eth/eth_tests.rs

@@ -580,7 +580,6 @@ fn validate_dex_fee_invalid_sender_eth() {
     let validate_fee_args = ValidateFeeArgs {
         fee_tx: &tx,
         expected_sender: &DEX_FEE_ADDR_RAW_PUBKEY,
-        fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
         dex_fee: &DexFee::Standard(amount.into()),
         min_block_number: 0,
         uuid: &[],
@@ -616,7 +615,6 @@ fn validate_dex_fee_invalid_sender_erc() {
     let validate_fee_args = ValidateFeeArgs {
         fee_tx: &tx,
         expected_sender: &DEX_FEE_ADDR_RAW_PUBKEY,
-        fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
         dex_fee: &DexFee::Standard(amount.into()),
         min_block_number: 0,
         uuid: &[],
@@ -656,7 +654,6 @@ fn validate_dex_fee_eth_confirmed_before_min_block() {
     let validate_fee_args = ValidateFeeArgs {
         fee_tx: &tx,
         expected_sender: &compressed_public,
-        fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
         dex_fee: &DexFee::Standard(amount.into()),
         min_block_number: 11784793,
         uuid: &[],
@@ -695,7 +692,6 @@ fn validate_dex_fee_erc_confirmed_before_min_block() {
     let validate_fee_args = ValidateFeeArgs {
         fee_tx: &tx,
         expected_sender: &compressed_public,
-        fee_addr: &DEX_FEE_ADDR_RAW_PUBKEY,
         dex_fee: &DexFee::Standard(amount.into()),
         min_block_number: 11823975,
         uuid: &[],

mm2src/coins/lightning.rs

@@ -611,13 +611,7 @@ impl LightningCoin {
 #[async_trait]
 impl SwapOps for LightningCoin {
     // Todo: This uses dummy data for now for the sake of swap P.O.C., this should be implemented probably after agreeing on how fees will work for lightning
-    async fn send_taker_fee(
-        &self,
-        _fee_addr: &[u8],
-        _dex_fee: DexFee,
-        _uuid: &[u8],
-        _expire_at: u64,
-    ) -> TransactionResult {
+    async fn send_taker_fee(&self, _dex_fee: DexFee, _uuid: &[u8], _expire_at: u64) -> TransactionResult {
         Ok(TransactionEnum::LightningPayment(PaymentHash([1; 32])))
     }
 
@@ -1251,6 +1245,8 @@ impl MarketCoinOps for LightningCoin {
     // Todo: doesn't take routing fees into account too, There is no way to know the route to the other side of the swap when placing the order, need to find a workaround for this
     fn min_trading_vol(&self) -> MmNumber { self.min_tx_amount().into() }
 
+    fn should_burn_dex_fee(&self) -> bool { false }
+
     fn is_trezor(&self) -> bool { self.platform.coin.is_trezor() }
 }