feat(trading-proto-upgrade): locked amounts, kmd burn and other impl #2046

artemii235 · 2024-01-08T06:54:45Z

#1895

What's done:

Locked amount handling for UTXO swaps (more work will be needed for ETH/ERC20)
Implemented conditional wait for maker payment confirmation before signing funding tx spend preimage on taker's side.
active_swaps V2 RPC
Handling accept_only_from for swap messages (validation of the sender)
Added swap_uuid for swap v2 messages to avoid reusage of the messages generated for other swaps
Implemented maker payment immediate refund path handling
Implemented KMD dex fee burn for upgraded swaps
Added dockerized Geth node for ETH-related integration tests (more to be done in the next sprints)
Fixed ETH watcher tests

Updated deps:

test-containers (other Cargo.lock updates are triggered by it). The purpose is to rely on the official version instead of using the fork. The fork also didn't allow passing additional arguments to the image (only docker run options were available).

Active swaps V2 RPC WIP.

Start handling require_maker_payment_confirm_before_funding_spend.

artemii235 · 2024-01-30T08:28:52Z

@laruh I added doc comments and fixed typos, thanks 🙂

mm2src/coins/eth.rs

mm2src/coins/utxo/swap_proto_v2_scripts.rs

shamardy

LGTM but a few non-blockers!

Cargo.lock

mm2src/mm2_state_machine/src/lib.rs

shamardy · 2024-02-01T22:50:00Z

mm2src/coins/eth.rs

+                                // TODO tests passed without this change, need to research on how it worked
+                                if reward.send_contract_reward_on_spend {
+                                    let eth_reward_amount =
+                                        try_tx_fus!(wei_from_big_decimal(&reward.amount, ETH_DECIMALS));
+                                    value += eth_reward_amount;
+                                    eth_reward_amount
+                                } else {
+                                    0.into()
+                                }


Can you please specify which tests pass? As I can see when RewardTarget is PaymentReceiver

komodo-defi-framework/mm2src/coins/utxo/utxo_common.rs

Line 2859 in 52aaa16

let reward_target = RewardTarget::PaymentReceiver;

send_contract_reward_on_spend is always false

komodo-defi-framework/mm2src/coins/utxo/utxo_common.rs

Line 2892 in 52aaa16

let send_contract_reward_on_spend = false;

The RewardTarget::PaymentReceiver variant seems to be used for UTXO coins only for the case of UTXO taker / ETH maker - UTXO taker / ERC20 maker here #1750 (comment) this is probably why this check was not needed in eth code.
P.S. I think watchers code needs a lot of refactors to separate it from default swap case logic.

IIRC, all watcher tests were passing with old testnet environment but started to fail after switching to dockerized Geth. send_contract_reward_on_spend can be true in get_maker_watcher_reward if other_coin.is_eth():

komodo-defi-framework/mm2src/coins/eth.rs

Line 2052 in 8635ed9

let send_contract_reward_on_spend = other_coin.is_eth();

And when it's true, the contract attempts to send additional ETH, which isn't available on its balance. With this change, the reward ETH is also transferred to a contract during payment, making ETH/ERC20 watcher tests pass.

P.S. I think watchers code needs a lot of refactors to separate it from default swap case logic.

I agree with this. My goal was to make tests green and learn ETH watchers code/understand it better. It seems that RewardTarget and send_contract_reward_on_spend can be removed to handle most of the logic on smart contract side. I would like to either work on it myself in the future or guide the developer who will take the task.

send_contract_reward_on_spend can be true in get_maker_watcher_reward if other_coin.is_eth()

Yeah, missed this since I was looking for cases with RewardTarget::PaymentReceive as looking for None case is not logical.

I would like to either work on it myself in the future or guide the developer who will take the task.

Sure. Thanks a lot for offering your help on this :)

shamardy · 2024-02-01T23:38:24Z

mm2src/mm2_main/src/lp_swap/taker_swap_v2.rs

+        let total_payment_value =
+            &(&state_machine.taker_volume + &state_machine.dex_fee.total_spend_amount()) + &state_machine.taker_premium;


As we agreed we should include funding transaction spend fee in the total payment value of the taker. I guess you will do that in next iterations.

Yeah, I will try to do it in the current iteration 🙂

shamardy · 2024-02-02T14:31:14Z

@onur-ozkan @dimxy please check if your comments are resolved or not so that I can merge this PR. It will be good to have dockerized geth dev node and eth tests in dev branch asap.

onur-ozkan

I did one more iteration quickly (I have no time for reviews due to my current sprint tasks), I am happy to approve the PR if everyone else approved.

mm2src/mm2_main/src/database/my_swaps.rs

mm2src/mm2_main/tests/docker_tests/docker_tests_common.rs

mm2src/mm2_main/tests/docker_tests/eth_docker_tests.rs

shamardy · 2024-02-12T14:49:32Z

@artemii235 can you please fix conflicts so that I can re-approve and merge this PR.

…ration-5 # Conflicts: # Cargo.lock # mm2src/coins/eth.rs # mm2src/coins/utxo/utxo_common.rs # mm2src/mm2_bitcoin/script/src/builder.rs # mm2src/mm2_main/src/database.rs

artemii235 · 2024-02-21T10:20:18Z

@shamardy Done 🙂

* dev: feat(zcoin): ARRR WASM implementation (KomodoPlatform#1957) feat(trading-proto-upgrade): locked amounts, kmd burn and other impl (KomodoPlatform#2046) fix(indexeddb): set stop on success cursor condition (KomodoPlatform#2067) feat(config): add `max_concurrent_connections` to mm2 config (KomodoPlatform#2063) feat(stats_swaps): add gui/mm_version in stats db (KomodoPlatform#2061) fix(indexeddb): fix IDB cursor.continue_() call after drop (KomodoPlatform#2028) security bump for `h2` (KomodoPlatform#2062) fix(makerbot): allow more than one prices url in makerbot (KomodoPlatform#2027) fix(wasm worker env): refactor direct usage of `window` (KomodoPlatform#1953) feat(nft): nft abi in withdraw_nft RPC, clear_nft_db RPC (KomodoPlatform#2039) refactor(utxo): refactor utxo output script creation (KomodoPlatform#1960) feat(ETH): balance event streaming for ETH (KomodoPlatform#2041) chore(release): bump mm2 version to 2.1.0-beta (KomodoPlatform#2044) feat(trezor): add segwit support for withdraw with trezor (KomodoPlatform#1984)

artemii235 and others added 30 commits December 25, 2023 13:26

WIP. Implementing locked amounts for upgraded swaps.

f5eb0fc

WIP. Experiments for locked amount handling.

2e3f79b

WIP. Implementing locked amounts for upgraded swaps.

8b1676b

WIP. Locked amounts handling.

ec6d5e2

WIP. Locked amounts handling.

15aca49

WIP. Locked amounts handling after kickstart.

1f2de9b

WIP. Implementing locked amounts on kickstart.

eaf0ace

WIP. Locked amounts handling after kickstart.

e8b99a3

WIP. Implementing locked amounts handling on kickstart.

0464eec

Locked amounts handling partially implemented.

fd60519

Active swaps V2 RPC WIP.

Implemented active_swaps V2 RPC.

d9ff38e

Handling accept_only_from in progress.

c361507

Handling accept_only_from in progress.

94dee63

Finish accept_only_from handling. Include uuid in swap messages payload.

fbf9650

Implementing immediate refund for maker + refactor.

6c9ab43

Implementing immediate refund for maker + refactor.

e1d4908

Implementing maker payment immediate refund.

98493fb

Implementing immediate refund for maker + refactor.

fd53c39

Implementing maker payment immediate refund.

a5fffe7

Implementing immediate refund for maker.

d684fa7

Implementing maker payment immediate refund.

1f109f1

Implementing immediate refund for maker.

7bd7755

Finished maker payment immediate refund.

a8969b3

Start handling require_maker_payment_confirm_before_funding_spend.

Implementing KMD burn.

be9d8d9

Fixes after cherry pick.

5c7e43c

Implementing dex fee burn.

8b9fb7a

Implementing dex fee burn.

d745e73

Dex fee burn finished.

46a91b7

Fixing clippy.

222813a

Fixing clippy.

a1aeb96

dimxy reviewed Jan 30, 2024

View reviewed changes

mm2src/coins/eth.rs Outdated Show resolved Hide resolved

Artem Vitae added 2 commits January 30, 2024 16:46

Use ETH_DECIMALS and tweak ETH docker tests.

57352d2

Tweak watchers tests to be more stable.

c6ea8fa

dimxy reviewed Jan 31, 2024

View reviewed changes

mm2src/coins/utxo/swap_proto_v2_scripts.rs Outdated Show resolved Hide resolved

Remove push_bytes and use push_data instead.

52aaa16

shamardy mentioned this pull request Feb 1, 2024

feat(hd_wallet): evm hd wallet and trezor #1979

Merged

8 tasks

shamardy previously approved these changes Feb 1, 2024

View reviewed changes

Remove unneeded coerce_unsized.

442e759

artemii235 dismissed shamardy’s stale review via 442e759 February 2, 2024 06:58

artemii235 mentioned this pull request Feb 2, 2024

Trading protocol upgrade v2. #1895

Open

21 tasks

onur-ozkan reviewed Feb 5, 2024

View reviewed changes

laruh mentioned this pull request Feb 5, 2024

feat(nft): nft abi in withdraw_nft RPC, clear_nft_db RPC #2039

Merged

shamardy mentioned this pull request Feb 8, 2024

feat(stats_swaps): add gui version in status db #2061

Merged

shamardy mentioned this pull request Feb 15, 2024

feat(ETH transport & heartbeats): various enhancements/features #2058

Merged

8 tasks

Artem Vitae added 2 commits February 21, 2024 16:43

Merge remote-tracking branch 'origin/dev' into swap-proto-upgrade-ite…

e1b42aa

…ration-5 # Conflicts: # Cargo.lock # mm2src/coins/eth.rs # mm2src/coins/utxo/utxo_common.rs # mm2src/mm2_bitcoin/script/src/builder.rs # mm2src/mm2_main/src/database.rs

Fixes after merging with dev.

3d76e08

shamardy approved these changes Feb 21, 2024

View reviewed changes

shamardy merged commit af57160 into dev Feb 21, 2024
23 of 30 checks passed

shamardy deleted the swap-proto-upgrade-iteration-5 branch February 21, 2024 12:20

shamardy added QA sec-review docs deps-review labels Feb 21, 2024

harsenyan3 mentioned this pull request Jul 16, 2024

Add "active_swaps" v2 RPC info to docs KomodoPlatform/komodo-docs-mdx#281

Open

shamardy mentioned this pull request Aug 1, 2024

chore(release): v2.1.0-beta #2043

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(trading-proto-upgrade): locked amounts, kmd burn and other impl #2046

feat(trading-proto-upgrade): locked amounts, kmd burn and other impl #2046

artemii235 commented Jan 8, 2024 •

edited

Loading

artemii235 commented Jan 30, 2024

shamardy left a comment

shamardy Feb 1, 2024

artemii235 Feb 2, 2024

shamardy Feb 2, 2024

shamardy Feb 1, 2024

artemii235 Feb 2, 2024

shamardy commented Feb 2, 2024

onur-ozkan left a comment

shamardy commented Feb 12, 2024

artemii235 commented Feb 21, 2024

		let total_payment_value =
		&(&state_machine.taker_volume + &state_machine.dex_fee.total_spend_amount()) + &state_machine.taker_premium;

feat(trading-proto-upgrade): locked amounts, kmd burn and other impl #2046

feat(trading-proto-upgrade): locked amounts, kmd burn and other impl #2046

Conversation

artemii235 commented Jan 8, 2024 • edited Loading

artemii235 commented Jan 30, 2024

shamardy left a comment

Choose a reason for hiding this comment

shamardy Feb 1, 2024

Choose a reason for hiding this comment

artemii235 Feb 2, 2024

Choose a reason for hiding this comment

shamardy Feb 2, 2024

Choose a reason for hiding this comment

shamardy Feb 1, 2024

Choose a reason for hiding this comment

artemii235 Feb 2, 2024

Choose a reason for hiding this comment

shamardy commented Feb 2, 2024

onur-ozkan left a comment

Choose a reason for hiding this comment

shamardy commented Feb 12, 2024

artemii235 commented Feb 21, 2024

artemii235 commented Jan 8, 2024 •

edited

Loading