feat(UTXO swaps): kmd burn plan impl by onur-ozkan · Pull Request #2006 · GLEECBTC/komodo-defi-framework

onur-ozkan · 2023-11-14T12:15:16Z

For KMD, taker fee payment algorithm is updated by burning up to 25% of the dex fee amount.

Add a new output to the DEX fee transaction that is an OP_RETURN with up to 25% of the fee burned in KMD.
Validate the new output by the maker as part of the taker fee validation step.

Helps with: #2010

Signed-off-by: onur-ozkan <work@onurozkan.dev>

artemii235 · 2023-11-16T08:39:37Z

Implement this feature for the trading protocol upgrade.

As discussed in DM, I can take care of implementing this for the trading protocol upgrade a bit later (likely in the next iteration) 🙂

shamardy

Thanks for the fast PR! First review iteration where I just make sure calculations are right :)

Please also fix the failing test_dex_fee_amount test.

mm2src/mm2_main/src/lp_swap.rs

Signed-off-by: onur-ozkan <work@onurozkan.dev>

artemii235

Thanks for the PR! I have two notes.
Please also fix Clippy lints (CI fails).

mm2src/mm2_main/src/lp_swap.rs

Signed-off-by: onur-ozkan <work@onurozkan.dev>

shamardy

Thank you for the Fixes! Next review iteration where we can now see how to handle different usage for dex_fee_amount after we used an enum.

mm2src/mm2_main/src/lp_swap.rs

mm2src/mm2_main/src/lp_swap/taker_swap.rs

Signed-off-by: onur-ozkan <work@onurozkan.dev>

shamardy

🔥 🔥 🔥

artemii235

Great work 👍

shamardy · 2023-11-22T09:44:57Z

@KomodoPlatform/qa this PR is ready to be tested and documented if needed, it has high priority as it's needed in the next breaking release 1.1.0-beta.

shamardy · 2023-11-22T10:02:07Z

As confirmed by @smk762 on DM, he already tested an earlier version of this PR so I will merge this PR to dev and then it can be tested inside GUIs along other recent changes in dev.

* dev: (22 commits) chore(config): remove vscode launchjson (GLEECBTC#2040) feat(trading-proto-upgrade): wasm DB, kickstart, refund states, v2 RPCs (GLEECBTC#2015) feat(UTXO): balance event streaming for Electrum clients (GLEECBTC#2013) feat(tx): add new sign_raw_transaction rpc for UTXO and EVM coins (GLEECBTC#1930) fix(p2p): handle encode_and_sign errors (GLEECBTC#2038) chore(release): add changelog entries for v2.0.0-beta (GLEECBTC#2037) chore(network): write network information to stdout (GLEECBTC#2034) fix(price_endpoints): add cached url (GLEECBTC#2032) deps(network): sync with upstream yamux (GLEECBTC#2030) fix(config): accept a string as rpcport value (GLEECBTC#2026) feat(nft): move db lock, add tx fee and confirmations (GLEECBTC#1989) chore(network): update seednodes for netid 8762 (GLEECBTC#2024) chore(network): add todo on peer storage behaviour (GLEECBTC#2025) chore(network): exclude `168.119.236.249` from the seednode list (GLEECBTC#2021) feat(network): deprecate 7777 network (GLEECBTC#2020) chore(release): bump mm2 version to 2.0.0-beta (GLEECBTC#2018) feat(UTXO swaps): kmd burn plan impl (GLEECBTC#2006) chore(docs): fix the link to simple market maker in README.md (GLEECBTC#2011) refactor(cli): cli dependency updates and warn on bad config perm (GLEECBTC#1956) chore(containers and docs): update docs and container images (GLEECBTC#2003) ... # Conflicts: # mm2src/mm2_main/tests/mm2_tests/mm2_tests_inner.rs # mm2src/mm2_test_helpers/src/for_tests.rs

* dev: (24 commits) chore(release): bump mm2 version to 2.1.0-beta (GLEECBTC#2044) feat(trezor): add segwit support for withdraw with trezor (GLEECBTC#1984) chore(config): remove vscode launchjson (GLEECBTC#2040) feat(trading-proto-upgrade): wasm DB, kickstart, refund states, v2 RPCs (GLEECBTC#2015) feat(UTXO): balance event streaming for Electrum clients (GLEECBTC#2013) feat(tx): add new sign_raw_transaction rpc for UTXO and EVM coins (GLEECBTC#1930) fix(p2p): handle encode_and_sign errors (GLEECBTC#2038) chore(release): add changelog entries for v2.0.0-beta (GLEECBTC#2037) chore(network): write network information to stdout (GLEECBTC#2034) fix(price_endpoints): add cached url (GLEECBTC#2032) deps(network): sync with upstream yamux (GLEECBTC#2030) fix(config): accept a string as rpcport value (GLEECBTC#2026) feat(nft): move db lock, add tx fee and confirmations (GLEECBTC#1989) chore(network): update seednodes for netid 8762 (GLEECBTC#2024) chore(network): add todo on peer storage behaviour (GLEECBTC#2025) chore(network): exclude `168.119.236.249` from the seednode list (GLEECBTC#2021) feat(network): deprecate 7777 network (GLEECBTC#2020) chore(release): bump mm2 version to 2.0.0-beta (GLEECBTC#2018) feat(UTXO swaps): kmd burn plan impl (GLEECBTC#2006) chore(docs): fix the link to simple market maker in README.md (GLEECBTC#2011) ...

onur-ozkan added enhancement labels Nov 14, 2023

onur-ozkan changed the title ~~feat(UTXO swaps): KMD burn plan impl~~ feat(UTXO): KMD burn plan impl Nov 14, 2023

onur-ozkan changed the title ~~feat(UTXO): KMD burn plan impl~~ feat(UTXO): kmd burn plan impl Nov 14, 2023

onur-ozkan changed the title ~~feat(UTXO): kmd burn plan impl~~ feat(UTXO swaps): kmd burn plan impl Nov 14, 2023

onur-ozkan force-pushed the kmd-op-return branch 2 times, most recently from 5664cd9 to d07137f Compare November 14, 2023 20:20

onur-ozkan marked this pull request as ready for review November 14, 2023 20:33

burn out the 25% of the KMD taker fees

d4c9b9f

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the kmd-op-return branch 2 times, most recently from 5427fd1 to ffc1710 Compare November 14, 2023 21:14

test kmd taker fee calculation

8d3a227

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the kmd-op-return branch from ffc1710 to 8d3a227 Compare November 14, 2023 23:00

validate burn output from maker side

920e9eb

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the kmd-op-return branch from 7321506 to 920e9eb Compare November 15, 2023 15:07

onur-ozkan added 2 commits November 15, 2023 18:08

leave a TODO note

c1bb28e

Signed-off-by: onur-ozkan <work@onurozkan.dev>

replace "DOC" tickers with "KMD" for burn impl

e665bec

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan mentioned this pull request Nov 15, 2023

Implement a Fee Splitting and Burning mechanism to burn KMD and support the Komodo blockchain #2010

Closed

4 tasks

onur-ozkan self-assigned this Nov 15, 2023

add unit test for should_taker_burn_kmd

38ae93c

Signed-off-by: onur-ozkan <work@onurozkan.dev>

artemii235 mentioned this pull request Nov 16, 2023

Trading protocol upgrade v2. #1895

Open

29 tasks

onur-ozkan added under review and removed in progress labels Nov 16, 2023

onur-ozkan requested review from artemii235 and shamardy November 16, 2023 11:15

shamardy reviewed Nov 16, 2023

View reviewed changes

mm2src/mm2_main/src/lp_swap.rs Outdated Show resolved Hide resolved

fix dex fee calculation bug

7fedd40

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the kmd-op-return branch 2 times, most recently from 103e9d9 to 925b39d Compare November 18, 2023 10:19

onur-ozkan force-pushed the kmd-op-return branch from 4c1c43a to 56b69e7 Compare November 18, 2023 10:47

improve dex fee handling in whole mm2

8bdfb5a

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the kmd-op-return branch from 56b69e7 to 8bdfb5a Compare November 18, 2023 10:55

artemii235 suggested changes Nov 20, 2023

View reviewed changes

mm2src/mm2_main/src/lp_swap.rs Outdated Show resolved Hide resolved

mm2src/mm2_main/src/lp_swap.rs Outdated Show resolved Hide resolved

onur-ozkan added 2 commits November 20, 2023 09:17

fix clippy for docker tests

bbd4c80

Signed-off-by: onur-ozkan <work@onurozkan.dev>

improve min_tx_amount check in dex_fee_amount

7e05366

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the kmd-op-return branch from d993709 to 7e05366 Compare November 20, 2023 09:48

update burn algorithm

c005c11

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the kmd-op-return branch from d817f00 to c005c11 Compare November 20, 2023 12:46

shamardy reviewed Nov 20, 2023

View reviewed changes

fix review notes

2f553d1

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the kmd-op-return branch from 3f0e3a8 to 2f553d1 Compare November 21, 2023 10:05

shamardy approved these changes Nov 21, 2023

View reviewed changes

artemii235 approved these changes Nov 22, 2023

View reviewed changes

shamardy added 1.1.0-beta labels Nov 22, 2023

shamardy added the breaking-change label Nov 22, 2023

shamardy merged commit 0221505 into dev Nov 22, 2023

shamardy deleted the kmd-op-return branch November 22, 2023 10:05

shamardy mentioned this pull request Dec 15, 2023

chore(release): v2.0.0-beta #1968

Merged

shamardy added breaking-change: swap and removed breaking-change labels Nov 4, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(UTXO swaps): kmd burn plan impl#2006

feat(UTXO swaps): kmd burn plan impl#2006
shamardy merged 12 commits intodevfrom
kmd-op-return

onur-ozkan commented Nov 14, 2023 •

edited

Loading

Uh oh!

artemii235 commented Nov 16, 2023

Uh oh!

shamardy left a comment

Uh oh!

Uh oh!

artemii235 left a comment

Uh oh!

Uh oh!

Uh oh!

shamardy left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shamardy left a comment

Uh oh!

artemii235 left a comment

Uh oh!

shamardy commented Nov 22, 2023

Uh oh!

shamardy commented Nov 22, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

onur-ozkan commented Nov 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

artemii235 commented Nov 16, 2023

Uh oh!

shamardy left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

artemii235 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

shamardy left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shamardy left a comment

Choose a reason for hiding this comment

Uh oh!

artemii235 left a comment

Choose a reason for hiding this comment

Uh oh!

shamardy commented Nov 22, 2023

Uh oh!

shamardy commented Nov 22, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

onur-ozkan commented Nov 14, 2023 •

edited

Loading