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

dimxy · 2024-05-06T18:34:05Z

Adds a burn output sending 25% of the taker utxo DEX fee to a dedicated pre-burn address. Funds collected on the pre-burn address will be traded for KMD to burn them (thus additionally burning KMD supply).
This PR partially closes #2010

The requirements for this PR: #2269

In this PR:

NOTE: As mocktopus now is marked 'optional = true' in coins Cargo.toml and activated from the mm2_main crate by adding features = ["mocktopus"] in [dev-dependencies] section, you also need to mark your mockable code, called from other crates, this way: #[cfg_attr(feature = "mocktopus", mockable)], otherwise mocks won't work (see samples in code)

TODO:

fix burn zaddr (enable burn for zcoin)
disable non-split non-kmd dex fee (no burn output) validation when all taker nodes upgrade to new dex fee splitting

* dev: docs(README): remove outdated information from the README (#2097) fix(sia): fix sia compilation after hd wallet PR merge (#2103) feat(hd_wallet): utxo and evm hd wallet and trezor (#1962) feat(sia): initial Sia integration (#2086) fix(BCH): deserialize BCH header that uses KAWPOW version correctly (#2099) fix(eth_tests): remove ETH_DEV_NODE from tests (#2101)

fix is_kmd in TestCoin

* dev: feat(tendermint): pubkey-only activation and unsigned tx (#2088) fix(tests): set txfee for some tbtc tests (#2116) fix(eth): remove my_address from sign_and_send_transaction_with_keypair (#2115) fix(utxo-swap): apply events occurred while taker down (#2114) refactor(memory): memory usage improvements (#2098) feat(app-dir): implement root application dir `.kdf` (#2102) fix tendermint fee calculation (#2106) update dockerfile (#2104)

* dev: feat(ETH): eip1559 gas fee estimator and rpcs (#2051) fix(p2pk-tests): fix p2pk tests post merge (#2119) fix(p2pk): show and spend P2PK balance (#2053) fix(swap): use tmp file for swap and order files (#2118)

fix zhtlc send and spend tests

add should_burn_dex_fee method to indicate which coin has burn output

* dev: fix(indexeddb): window usage in worker env (#2131) feat(tx-history): handle encoded transaction values (#2133) fix(core): tendermint withdraws on hd accounts (#2130) fix(core): improve validation rules for table names (#2123) fix(test): improve log wait condition to fix taker restart test (#2125)

…er test add timeout in wait for fee in qrc20 docker test

… docker test failed due to different dex fee values if trait default impl was used)

laruh

Great progress! Here is the first review iteration

mm2src/coins/lp_coins.rs

use same ovk for dex fee and burn outputs

add sanity check for dex_fee in calc_burn_amount_for_op_return

shamardy · 2025-03-17T11:54:01Z

@dimxy please add the correct DEX_BURN_Z_ADDR

* dev: refactor(eth): use trait addr_to_string method instead of old function (#2348) fix(ci): use correct rustup component syntax in fmt-and-lint job (#2390) refactor(tx-query): use TxSearchRequest for tx queries (#2384) refactor(tpu-v2): allow to skip p2p message with taker payment spend preimage for eth (#2359)

shamardy

LGTM! Please resolve conflicts and this #2112 (comment) for me to merge it. Next step (next week) we should bring back versioning to finally enable this feature.

laruh · 2025-03-20T08:00:38Z

Next step (next week) we should bring back versioning to finally enable this feature.

Could you clarify, you suggest to add it in new pr or in the current?

laruh

I dont have more comments. LGTM!

* dev: feat(tendermint): staking queries (#2377)

dimxy · 2025-03-20T08:48:21Z

@onur-ozkan plz take a look at this: 1ed4af7, I had to do this apparently bcz of mockable added to TendermintCoin

shamardy · 2025-03-20T12:19:17Z

Could you clarify, you suggest to add it in new pr or in the current?

In a new PR :)

onur-ozkan · 2025-03-24T09:17:48Z

@onur-ozkan plz take a look at this: 1ed4af7, I had to do this apparently bcz of mockable added to TendermintCoin

I don't know the context of the error but the change doesn't seem harmful.

So it looks good to me. :)

* dev: improvement(best-orders): return an rpc error when we can't find best orders (#2318) feat(utxo): support FIRO Spark verbose tx feat(ARRR): dockerize zombie/pirate tests (#2374) improvement(event-streaming): move UnknownClient error to trace level (#2401) feat(tpu): implement 0 dexfee for kmd trading pairs (#2323) feat(db-arch): ctx functions and use of global db (#2378) feat(swap): add utxo/cosmos/ARRR pre-burn address output (#2112)

* lr-swap-wip: (45 commits) review (mariocynicys): fix iterators zipping, refactor 1inch url builder, add docs to cross prices data, remove extra coin decimals check added doc comments for LrData struct error msg improved fix tx value eth conversion eliminate from_api_error fn fix src_decimals var name improve bad api TokenInfo error messages improvement(best-orders): return an rpc error when we can't find best orders (GLEECBTC#2318) feat(utxo): support FIRO Spark verbose tx feat(ARRR): dockerize zombie/pirate tests (GLEECBTC#2374) improvement(event-streaming): move UnknownClient error to trace level (GLEECBTC#2401) feat(tpu): implement 0 dexfee for kmd trading pairs (GLEECBTC#2323) feat(db-arch): ctx functions and use of global db (GLEECBTC#2378) feat(swap): add utxo/cosmos/ARRR pre-burn address output (GLEECBTC#2112) review (laruh): rename fn review (laruh): add fn to get contracts from LrData add TODO fix find best lr swap behaviour: skip lr provider error results (to use successful ones) refactor 1inch url builder fix 1inch result conversion test ...

dimxy added 9 commits April 27, 2024 14:33

make mockable optional

f3625e5

add support for utxo coin burn account to dex fee

d3f843d

remove left over dup dex_fee_rate()

7894f7d

fix coins crate mocktopus dependency for mm2_main crate tests

2984c67

fix dex fee changed due to new burn output in couple of lp_swap tests

128c4b4

fix is_kmd in TestCoin

fix swap v2 test non-kmd burn output

23f2a08

fix fmt

2c810b0

remove comment

af45b71

dimxy changed the title ~~Add utxo burn output for non-kmd taker fee~~ feat(utxo-swap): add utxo burn output for non-kmd taker fee May 6, 2024

dimxy added in progress and removed in progress labels May 6, 2024

dimxy assigned shamardy May 19, 2024

Merge branch 'dev' into burn-dex-fee-for-non-kmd

0f34d2e

* dev: feat(ETH): eip1559 gas fee estimator and rpcs (#2051) fix(p2pk-tests): fix p2pk tests post merge (#2119) fix(p2pk): show and spend P2PK balance (#2053) fix(swap): use tmp file for swap and order files (#2118)

dimxy added in progress and removed under review labels Jun 9, 2024

dimxy added 9 commits June 14, 2024 20:54

fix zombie chain scan block num

d53dc37

fix zhtlc send and spend tests

add burn output for privacy coin,

81263e0

add should_burn_dex_fee method to indicate which coin has burn output

use custom log! instead debug! (as env_logger disabled) in qrc20 dock…

9331e40

…er test add timeout in wait for fee in qrc20 docker test

fix to make should_burn_dex_fee explicitly in each coin (to fix qrc20…

b343275

… docker test failed due to different dex fee values if trait default impl was used)

restore original test log message

587b1ae

add test for std dex fee for zcoin

58d84cf

remove unused cache dir var in z_coin init block

1243935

fix clippy

bc00ee8

laruh suggested changes Jun 18, 2024

View reviewed changes

dimxy added 2 commits June 19, 2024 13:05

fix burn addr in ZOutput

4d59545

use same ovk for dex fee and burn outputs

refactor dex fee code;

dc9e710

add sanity check for dex_fee in calc_burn_amount_for_op_return

shamardy self-requested a review March 17, 2025 11:17

dimxy added 3 commits March 17, 2025 17:18

fix actual z burn address

6200833

fix after merge

74202d3

shamardy previously approved these changes Mar 19, 2025

View reviewed changes

rename dex fee fn for maker

87a1e49

laruh previously approved these changes Mar 20, 2025

View reviewed changes

dimxy added 2 commits March 20, 2025 13:34

Merge branch 'dev' into burn-dex-fee-for-non-kmd

7ace910

* dev: feat(tendermint): staking queries (#2377)

fix after merge: fix mockable parse error

1ed4af7

dimxy dismissed stale reviews from laruh and shamardy via 1ed4af7 March 20, 2025 08:41

borngraced mentioned this pull request Mar 24, 2025

enhancement(utxo): improve trade and withdraw fee calculations #2083

Closed

shamardy added 3 commits March 24, 2025 22:18

Merge branch 'dev' into burn-dex-fee-for-non-kmd

d953e6c

fix mac-dylib-x86-64 dev build issue

101b69f

add x86_64-apple-darwin target

d886fd8

shamardy approved these changes Mar 24, 2025

View reviewed changes

shamardy changed the title ~~feat(utxo-swap): add utxo burn output for non-kmd taker fee~~ feat(swap): add utxo/cosmos/ARRR burn address output Mar 24, 2025

shamardy changed the title ~~feat(swap): add utxo/cosmos/ARRR burn address output~~ feat(swap): add utxo/cosmos/ARRR pre-burn address output Mar 24, 2025

shamardy merged commit 5b2f045 into dev Mar 24, 2025
26 checks passed

shamardy deleted the burn-dex-fee-for-non-kmd branch March 24, 2025 23:23

shamardy added 2.4.0-beta and removed 2.5.0-beta labels Mar 24, 2025

shamardy mentioned this pull request Apr 16, 2025

chore(release): v2.4.0-beta #2345

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

Uh oh!

dimxy commented May 6, 2024 •

edited

Loading

Uh oh!

laruh left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shamardy commented Mar 17, 2025

Uh oh!

shamardy left a comment

Uh oh!

laruh commented Mar 20, 2025

Uh oh!

laruh left a comment

Uh oh!

dimxy commented Mar 20, 2025

Uh oh!

shamardy commented Mar 20, 2025

Uh oh!

onur-ozkan commented Mar 24, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

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

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

Uh oh!

Conversation

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

Uh oh!

Uh oh!

laruh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shamardy commented Mar 17, 2025

Uh oh!

shamardy left a comment

Choose a reason for hiding this comment

Uh oh!

laruh commented Mar 20, 2025

Uh oh!

laruh left a comment

Choose a reason for hiding this comment

Uh oh!

dimxy commented Mar 20, 2025

Uh oh!

shamardy commented Mar 20, 2025

Uh oh!

onur-ozkan commented Mar 24, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

dimxy commented May 6, 2024 •

edited

Loading