fix(TPU): correct dexfee in check balance to prevent swap failures by dimxy · Pull Request #2600 · GLEECBTC/komodo-defi-framework

dimxy · 2025-08-19T07:54:22Z

Two fixes for dexfee to prevent TPU swaps failures:

correct the platform coin in the params for check balance function (caused ETH swaps failures)
remove extra dexfee from the taker volume in check balance function (caused TPU swaps with max volume failures)

Also updates TPU swap contracts and ABI byte code to fix TPU docker tests

TODO: add a test to validate spending max volume for TPU

TODO: maybe we should refactor check_balance_for_taker_swap for TPU because it was developed for legacy swaps: assumes legacy dex fee transaction but no TPU funding transaction.

* dev: improvement(`static mut`s): `static mut` removal (#2590) fix(orders): set subscription on kickstart and skip GC of own pubkeys (#2597) fix(ordermatch): ignore loop-back; clear on null root; reject stale keep-alives (#2580) fix(clippy): fix clippy warnings for #2565 (#2589) fix(Trezor): fix utxo and eth calls due to firmware changes (#2565) fix(utxo): calculate min_trading_vol based on fixed tx fees (#2564) feat(protocol): [0] solana support (#2586) fix(utxo): fix header deserialization; guard AuxPoW (#2583) chore(rust 1.89): make CI clippy/fmt pass (wasm32, all-targets) (#2581) fix(utxo): deserialize sapling root for PIVX block headers (#2572) improvement(dep-stack): security bumps (#2562) fix(utxo): correct block header deserialization for AuxPow and KAWPOW coins (#2563) feat(wallet-connect): impl BTC (UTxO) activation via WalletConnect (#2499) feat(utxo): add new fixed txfee option for DINGO-like coins (#2454) ci(pull-requests): review notification bot (#2468) improvement(walletconnect): return the `pairing_topic` in `new_connection` response (#2538) bless clippy (#2560) refactor(toolchain): use latest available stable compiler (#2557) feat(wallet): implement unified offline private key export API (#2542) chore(release): v2.3.0-beta (#2284) # Conflicts: # mm2src/mm2_main/tests/docker_tests/eth_docker_tests.rs

mariocynicys

Thanks for the fixes!

the last section of test_v2_eth_eth_kickstart_impl isn't straight forward to understand. maybe we can add some comments here and there.

mariocynicys · 2025-08-26T15:32:28Z

mm2src/mm2_main/tests/docker_tests/eth_docker_tests.rs

+            // add some tolerance
+            let (low_tol, high_tol) = if !is_token {
+                (
+                    // txfee with tolerance
+                    BigDecimal::from_f64(0.0001).unwrap(),
+                    BigDecimal::from_f64(0.0005).unwrap(),
+                )
+            } else {
+                (
+                    // no fee, only tolerance
+                    BigDecimal::from_f64(-0.0001).unwrap(),
+                    BigDecimal::from_f64(0.0001).unwrap(),
+                )
+            };


what are the choice of these numbers based on?

Those numbers mean that "amount + gas fee" for the swap are okay in some interval.
I did not want to calculate the exact amount (because we have other tests for that purpose)
so I just picked values from this test results and rounded them up and down to create a tolerance interval, to have some rough check.
My idea was to catch hard errors when swaps totally broken and swap produced obviously incorrect amounts.

I am open to other suggestions regarding this check, btw

mariocynicys · 2025-08-26T15:34:28Z

mm2src/mm2_main/tests/docker_tests/eth_docker_tests.rs

+            if action == "sell" {
+                let low_diff = &volume + &low_tol;
+                let high_diff = &volume + &high_tol;
+                assert!(bal_0 - bal_1 >= low_diff, "{} >= {}", bal_0 - bal_1, low_diff);
+                assert!(bal_0 - bal_1 <= high_diff, "{} <= {}", bal_0 - bal_1, high_diff);
+            } else {
+                let low_diff = &volume - &high_tol;
+                let high_diff = &volume - &low_tol;
+                assert!(bal_1 - bal_0 >= low_diff, "{} >= {}", bal_1 - bal_0, low_diff);
+                assert!(bal_1 - bal_0 <= high_diff, "{} <= {}", bal_1 - bal_0, high_diff);
+            }
+        };


let's document why we minus or plus these tolerance values in each case.

Refactored this code and added comments: 95acde1

mm2src/mm2_main/src/lp_swap/taker_swap_v2.rs

shamardy · 2025-10-06T12:24:00Z

@dimxy both test_v2_eth_erc20_kickstart and test_v2_erc20_eth_kickstart are failing

… to removed 1 gwei limit in increase_by_percent fn)

dimxy · 2025-10-07T10:00:24Z

@dimxy both test_v2_eth_erc20_kickstart and test_v2_erc20_eth_kickstart are failing

Fixed the tests (I had to change the check gas fee interval due to the fix in which we removed the 1 gwei gas_price minimum)

* dev: fix(TPU): correct dexfee in check balance to prevent swap failures (#2600) fix(tests): fix/remove kmd rewards failing test (#2633) chore(ci): bump CI container image to debian bullseye-slim to match dev (#2641) chore(release): add changelog entries for v2.5.2-beta (#2639) chore(release): bump mm2 version to 2.5.2-beta (#2638) feat(ci): add macos universal2 build (#2628) fix(metrics): remove memory_db size metric (#2632) chore(rust 1.90): make CI clippy/fmt pass Revert "fix(ordermatch): ignore loop-back; clear on null root; reject stale keep-alives (#2580)" Revert "fix(orderbook): validate roots before commit (#2605)"

* dev: fix(TPU): correct dexfee in check balance to prevent swap failures (#2600) fix(tests): fix/remove kmd rewards failing test (#2633) chore(ci): bump CI container image to debian bullseye-slim to match dev (#2641) chore(release): add changelog entries for v2.5.2-beta (#2639) chore(release): bump mm2 version to 2.5.2-beta (#2638) feat(ci): add macos universal2 build (#2628) fix(metrics): remove memory_db size metric (#2632) fix(zcoin): exact-anchor witnesses in wasm get_spendable_notes (#2629) fix(evm-swapv2): no mempool inclusion required for maker payment validation (#2618) chore(rust 1.90): make CI clippy/fmt pass Revert "fix(ordermatch): ignore loop-back; clear on null root; reject stale keep-alives (#2580)" Revert "fix(orderbook): validate roots before commit (#2605)"

…2600) This corrects the platform coin in the params for check balance function which caused ETH swaps failures. It also removes extra dexfee from the taker volume in check balance function which caused TPU swaps with max volume failures.

dimxy added 5 commits July 28, 2025 11:45

fix platform ticker in TakerSwapPreparedParams for taker swap v2

83e1f39

update TPU contracts ABI and bytecode

9534906

improve eth TPU kickstart test to check balances

76e5b84

fix(TPU): remove extra dexfee from volume

d237d49

dimxy requested a review from shamardy August 19, 2025 07:54

dimxy self-assigned this Aug 19, 2025

dimxy added priority: high Important tasks that need attention soon. bug: swap labels Aug 19, 2025

dimxy added 2 commits August 19, 2025 12:56

fix cargo fmt

9804682

revert erc711 and erc1155 byte code (to use ver with mint fn)

5ca54b5

dimxy marked this pull request as ready for review August 19, 2025 18:21

revert IERC1155 and IERC721 ABI .json

b290ab8

mariocynicys reviewed Aug 26, 2025

View reviewed changes

improve comment

17de3cf

shamardy marked this pull request as draft September 11, 2025 03:30

dimxy added 2 commits September 12, 2025 12:56

fix(review): add dexfee to preimage volume

b279564

fix(tests): add timeout to make test_approve_erc20 stable

5612c6e

dimxy marked this pull request as ready for review September 12, 2025 09:57

shamardy added the 2.6.0-beta label Oct 6, 2025

Merge remote-tracking branch 'origin/dev' into fix-TPU-dexfee

f8a1194

dimxy added 3 commits October 6, 2025 23:38

fix(test): update eth test tolerance (following decreased gas fee due…

8977726

… to removed 1 gwei limit in increase_by_percent fn)

fix(test): add more gas fee tolerance in balance check

676e67e

refactor(test): improve check tolerance and add more doc comments

95acde1

shamardy approved these changes Oct 7, 2025

View reviewed changes

shamardy merged commit 347d8fc into dev Oct 7, 2025
19 of 25 checks passed

shamardy deleted the fix-TPU-dexfee branch October 7, 2025 12:49

shamardy mentioned this pull request Nov 25, 2025

chore(release): v2.6.0-beta #2696

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(TPU): correct dexfee in check balance to prevent swap failures#2600

fix(TPU): correct dexfee in check balance to prevent swap failures#2600
shamardy merged 15 commits intodevfrom
fix-TPU-dexfee

dimxy commented Aug 19, 2025 •

edited

Loading

Uh oh!

mariocynicys left a comment

Uh oh!

mariocynicys Aug 26, 2025

Uh oh!

dimxy Oct 6, 2025 •

edited

Loading

Uh oh!

dimxy Oct 6, 2025 •

edited

Loading

Uh oh!

mariocynicys Aug 26, 2025

Uh oh!

dimxy Oct 7, 2025

Uh oh!

Uh oh!

shamardy commented Oct 6, 2025

Uh oh!

dimxy commented Oct 7, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

dimxy commented Aug 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mariocynicys left a comment

Choose a reason for hiding this comment

Uh oh!

mariocynicys Aug 26, 2025

Choose a reason for hiding this comment

Uh oh!

dimxy Oct 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dimxy Oct 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mariocynicys Aug 26, 2025

Choose a reason for hiding this comment

Uh oh!

dimxy Oct 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

shamardy commented Oct 6, 2025

Uh oh!

dimxy commented Oct 7, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

dimxy commented Aug 19, 2025 •

edited

Loading

dimxy Oct 6, 2025 •

edited

Loading

dimxy Oct 6, 2025 •

edited

Loading