feat(swap): implement 0 dexfee for kmd trading pairs #2323

borngraced · 2025-01-16T14:52:38Z

onur-ozkan · 2025-02-05T11:54:21Z

mm2src/coins/eth.rs

+        let fee_coin = match &self.coin_type {
+            EthCoinType::Eth => self.ticker.to_owned(),
+            EthCoinType::Erc20 { platform, .. } => platform.to_owned(),
+            EthCoinType::Nft { .. } => return MmError::err(TradePreimageError::NftProtocolNotSupported),
+        };


You can use platform_ticker instead. I am not sure if you intentionally drop the nft support, but if we want to do that we need to add a if check before using platform_ticker.

onur-ozkan · 2025-02-05T11:56:28Z

mm2src/coins/lp_coins.rs

+    /// Check and return true if DexFee is not required to trade otherwise return false.
+    pub fn no_fee(&self) -> bool { matches!(self, Self::Zero) }


Suggested change

/// Check and return true if DexFee is not required to trade otherwise return false.

pub fn no_fee(&self) -> bool { matches!(self, Self::Zero) }

/// Check and return true if DexFee is not required to trade otherwise return false.

pub fn zero_fee(&self) -> bool { matches!(self, Self::Zero) }

onur-ozkan

Previous notes are also still valid

onur-ozkan · 2025-02-18T05:46:33Z

mm2src/coins/utxo/slp.rs

@@ -1844,6 +1844,14 @@ impl MmCoin for SlpToken {
        dex_fee_amount: DexFee,
        stage: FeeApproxStage,
    ) -> TradePreimageResult<TradeFee> {
+        if dex_fee_amount.no_fee() {
+            return Ok(TradeFee {
+                coin: self.platform_coin.ticker().into(),


nit:

Suggested change

coin: self.platform_coin.ticker().into(),

coin: self.platform_coin.ticker().to_owned(),

mm2src/mm2_main/src/lp_swap/maker_swap_v2.rs

onur-ozkan · 2025-02-18T06:04:04Z

mm2src/mm2_main/src/lp_swap/maker_swap.rs

@@ -739,6 +739,15 @@ impl MakerSwap {
        };
        swap_events.push(MakerSwapEvent::MakerPaymentInstructionsReceived(instructions));

+        let taker_amount = MmNumber::from(self.taker_amount.clone());


MmNumber::from only takes a reference inside the function. You can implement:

impl From<&BigDecimal> for MmNumber { fn from(n: &BigDecimal) -> MmNumber { from_dec_to_ratio(n).into() } }

to avoid unnecessary cloning in cases like this.

yeah, we have such issue
#2338

@borngraced could you please introduce From<&BigDecimal> for MmNumber and start using it for your changes. after pr merge someone can take refactoring as a separate task.

laruh · 2025-02-19T05:47:40Z

@borngraced could you tell why status is blocked? or was it misclick?

onur-ozkan

Just a couple of non-blocker tiny nits, thanks for the fixes!

LGTM

onur-ozkan · 2025-02-19T07:35:17Z

mm2src/coins/lp_coins.rs

@@ -3676,6 +3680,9 @@ impl DexFee {
            Ok(None)
        }
    }
+
+    /// Check and return true if DexFee is not required to trade otherwise return false.


tiny nit:

Suggested change

/// Check and return true if DexFee is not required to trade otherwise return false.

/// Whether this is DexFee::Zero.

onur-ozkan · 2025-02-19T07:37:19Z

mm2src/mm2_main/src/lp_swap/maker_swap_v2.rs

+        let is_kmd = "KMD" == recreate_ctx.maker_coin.ticker() || "KMD" == recreate_ctx.taker_coin.ticker();
+        let dex_fee = if is_kmd {
+            DexFee::Zero


Suggested change

let is_kmd = "KMD" == recreate_ctx.maker_coin.ticker() || "KMD" == recreate_ctx.taker_coin.ticker();

let dex_fee = if is_kmd {

DexFee::Zero

let dex_fee = if "KMD" == recreate_ctx.maker_coin.ticker() || "KMD" == recreate_ctx.taker_coin.ticker() {

DexFee::Zero

onur-ozkan · 2025-02-19T07:38:18Z

mm2src/mm2_main/src/lp_swap/taker_swap_v2.rs

+        let is_kmd = "KMD" == recreate_ctx.maker_coin.ticker() || "KMD" == recreate_ctx.taker_coin.ticker();
+        let dex_fee = if is_kmd {
+            DexFee::Zero


Suggested change

let is_kmd = "KMD" == recreate_ctx.maker_coin.ticker() || "KMD" == recreate_ctx.taker_coin.ticker();

let dex_fee = if is_kmd {

DexFee::Zero

let dex_fee = if "KMD" == recreate_ctx.maker_coin.ticker() || "KMD" == recreate_ctx.taker_coin.ticker() {

DexFee::Zero

borngraced · 2025-02-19T09:37:39Z

@borngraced could you tell why status is blocked? or was it misclick?

this #2112 seems related and not sure which one will be merge first as both have some similar changes

laruh

LGTM!

smk762

Confirmed in swap json.

Before:

       "fee_to_send_taker_fee": {
            "coin": "KMD",
            "amount": "0.00001",
            "paid_from_trading_vol": false
        },
 ...

        {
            "timestamp": 1732532884206,
            "event": {
                "type": "TakerFeeSent",
                "data": {
                    "tx_hex": "040...000",
                    "tx_hash": "fa...b5"
                }
            }
        },

After:

        "fee_to_send_taker_fee": {
            "coin": "KMD",
            "amount": "0",
            "paid_from_trading_vol": false
        },
...       
        {
            "timestamp": 1740128668082,
            "event": {
                "type": "TakerFeeSent",
                "data": {
                    "tx_hex": "",
                    "tx_hash": ""
                }
            }
        }
```

smk762

Subsequent to prior comment, all swaps attempted selling KMD with this binary have failed, so approval rescinded for now until further testing can confirm cause.

In all cases, the error was taker_swap:1401] Error waiting for 'maker-payment' data: lp_swap:416] Timeout (691 > 690)

Example failed swap error info: https://dexapi.cipig.net/public/error.php?uuid=a4a0445e-fa7e-473e-980f-21f8015b9c7b

I can DM full swap json if needed

borngraced · 2025-02-21T18:28:41Z

Subsequent to prior comment, all swaps attempted selling KMD with this binary have failed, so approval rescinded for now until further testing can confirm cause.

In all cases, the error was taker_swap:1401] Error waiting for 'maker-payment' data: lp_swap:416] Timeout (691 > 690)

This is a breaking change no BC...so I guess both nodes involved in this swap uses a different versions of kdf

shamardy · 2025-02-21T18:41:37Z

@borngraced the 0 dex fee should be for TPU only, for legacy protocol the dex fee is needed as an anti-ddos measure. Did you implement it for TPU only?

borngraced · 2025-02-21T18:50:06Z

@borngraced the 0 dex fee should be for TPU only, for legacy protocol the dex fee is needed as an anti-ddos measure. Did you implement it for TPU only?

ah thanks for the further clarification...I missed that!!

laruh · 2025-02-23T11:27:23Z

@borngraced the 0 dex fee should be for TPU only, for legacy protocol the dex fee is needed as an anti-ddos measure. Did you implement it for TPU only?

I see. @borngraced please merge dev to this branch to keep it up to date, when you fix legacy.
I will join to this feature testing to help with TPU (I think smk didnt touch it yet, only me and cipi did it)

laruh · 2025-02-24T14:32:28Z

mm2src/mm2_main/src/lp_swap/taker_swap.rs

-    let threshold_coef = &(&MmNumber::from(1) + &dex_fee_rate) / &dex_fee_rate;
-    let max_vol = if available > min_tx_amount * &threshold_coef {
-        available / (MmNumber::from(1) + dex_fee_rate)
-    } else {
+    let max_vol = if base == "KMD" || rel == "KMD" {
        &available - min_tx_amount
+    } else {
+        let dex_fee_rate = dex_fee_rate(base, rel);
+        let threshold_coef = &(&MmNumber::from(1) + &dex_fee_rate) / &dex_fee_rate;
+        if available > min_tx_amount * &threshold_coef {
+            available / (MmNumber::from(1) + dex_fee_rate)
+        } else {
+            &available - min_tx_amount
+        }


I suppose this should be reverted, as KMD zero dexfee is only for TPU?

laruh · 2025-02-24T14:33:31Z

mm2src/mm2_main/src/lp_swap/taker_swap.rs

@@ -3186,6 +3190,7 @@ mod taker_swap_tests {
        let min_tx_amount = MmNumber::from("0.00001");

        // For these `availables` the dex_fee must be greater than min_tx_amount
+        // For these `availables` the dex_fee must be lesser than min_tx_amount


Same for legacy test

laruh · 2025-02-25T04:48:18Z

mm2src/mm2_main/src/lp_swap/taker_swap.rs

+        // KMD pairs: for these `availables` the dex_fee must be 0
+        // Non KMD pairs: for these `availables` the dex_fee must be the same as min_tx_amount


should be reverted

borngraced added 6 commits January 14, 2025 06:09

impl zero dex fee for KMD

9059f93

fix swap unit test

450ced6

fix docker test and dissallow sending dex fee

0cc613a

fix gen_taker_payment_spend_preimage

49f08ac

check for zero dex fee in other protocol

1a8539a

eth and tendermint

dc45a35

borngraced added the status: in progress label Jan 16, 2025

borngraced self-assigned this Jan 16, 2025

borngraced changed the title ~~feat:(swap) implement 0 dexfee for kmd trading pairs~~ feat(swap) implement 0 dexfee for kmd trading pairs Jan 16, 2025

check for KMD ticker in swap_v2

f62a0de

borngraced changed the title ~~feat(swap) implement 0 dexfee for kmd trading pairs~~ feat(swap): implement 0 dexfee for kmd trading pairs Jan 16, 2025

borngraced added 2 commits January 20, 2025 15:55

save dev state

2d6ae32

update taker fee validated log info

a6cb780

onur-ozkan reviewed Feb 5, 2025

View reviewed changes

shamardy added the 2.5.0-beta label Feb 17, 2025

shamardy requested review from onur-ozkan and laruh February 17, 2025 10:08

onur-ozkan reviewed Feb 18, 2025

View reviewed changes

borngraced added the status: blocked label Feb 18, 2025

borngraced added 2 commits February 18, 2025 14:01

fix review notes, add MmNumber from ref BigDecimal

06ccb20

delegate Zero dex fee check to taker_swap

76cd46e

onur-ozkan previously approved these changes Feb 19, 2025

View reviewed changes

fix nits

4358025

borngraced dismissed onur-ozkan’s stale review via 4358025 February 19, 2025 10:03

laruh previously approved these changes Feb 19, 2025

View reviewed changes

borngraced removed status: blocked status: in progress labels Feb 19, 2025

borngraced added the status: pending review label Feb 19, 2025

Merge branch 'dev' into 0-kmd-dex-fee

c05963e

smk762 self-requested a review February 21, 2025 09:15

smk762 approved these changes Feb 21, 2025

View reviewed changes

smk762 requested changes Feb 21, 2025

View reviewed changes

borngraced added 2 commits February 23, 2025 19:55

Merge branch 'dev' into 0-kmd-dex-fee

634c5f5

remove impl for legacy swap

29a8460

borngraced dismissed laruh’s stale review via 29a8460 February 24, 2025 01:47

laruh self-requested a review February 24, 2025 09:35

laruh requested changes Feb 24, 2025

View reviewed changes

laruh requested changes Feb 25, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(swap): implement 0 dexfee for kmd trading pairs #2323

feat(swap): implement 0 dexfee for kmd trading pairs #2323

borngraced commented Jan 16, 2025 •

edited

Loading

onur-ozkan Feb 5, 2025

onur-ozkan Feb 5, 2025

borngraced Feb 18, 2025

onur-ozkan left a comment

onur-ozkan Feb 18, 2025

onur-ozkan Feb 18, 2025

laruh Feb 18, 2025

laruh Feb 18, 2025

borngraced Feb 18, 2025

laruh commented Feb 19, 2025

onur-ozkan left a comment

onur-ozkan Feb 19, 2025

borngraced Feb 19, 2025

onur-ozkan Feb 19, 2025

borngraced Feb 19, 2025

onur-ozkan Feb 19, 2025

borngraced Feb 19, 2025

borngraced commented Feb 19, 2025 •

edited

Loading

laruh left a comment

smk762 left a comment

smk762 left a comment •

edited

Loading

borngraced commented Feb 21, 2025 •

edited

Loading

shamardy commented Feb 21, 2025

borngraced commented Feb 21, 2025

laruh commented Feb 23, 2025 •

edited

Loading

laruh Feb 24, 2025

laruh Feb 24, 2025

laruh Feb 25, 2025

		/// Check and return true if DexFee is not required to trade otherwise return false.
		pub fn no_fee(&self) -> bool { matches!(self, Self::Zero) }

	coin: self.platform_coin.ticker().into(),
	coin: self.platform_coin.ticker().to_owned(),

	/// Check and return true if DexFee is not required to trade otherwise return false.
	/// Whether this is DexFee::Zero.

		// KMD pairs: for these `availables` the dex_fee must be 0
		// Non KMD pairs: for these `availables` the dex_fee must be the same as min_tx_amount

feat(swap): implement 0 dexfee for kmd trading pairs #2323

Are you sure you want to change the base?

feat(swap): implement 0 dexfee for kmd trading pairs #2323

Conversation

borngraced commented Jan 16, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

onur-ozkan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

laruh commented Feb 19, 2025

onur-ozkan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

borngraced commented Feb 19, 2025 • edited Loading

laruh left a comment

Choose a reason for hiding this comment

smk762 left a comment

Choose a reason for hiding this comment

smk762 left a comment • edited Loading

Choose a reason for hiding this comment

borngraced commented Feb 21, 2025 • edited Loading

shamardy commented Feb 21, 2025

borngraced commented Feb 21, 2025

laruh commented Feb 23, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

borngraced commented Jan 16, 2025 •

edited

Loading

borngraced commented Feb 19, 2025 •

edited

Loading

smk762 left a comment •

edited

Loading

borngraced commented Feb 21, 2025 •

edited

Loading

laruh commented Feb 23, 2025 •

edited

Loading