feat(nft-swap): complete refund methods #2129

laruh · 2024-05-31T04:44:29Z

#900
continues this PR #2100

Refund Maker Payment functions impl
nft swap_v2 tests started to work correctly on Geth again
nft activation started to use NFT conf from coins config aa1d70f (provide EVM NFT configs coins#1061)
Note: I use nft activation with coin conf usage formulation instead of nft activation from coins conf, as NFT activation still uses some platform coin fields in initialize_global_nft function. Actually erc20 tokens do the same in initialize_erc20_token func.
The key point is that in coin_conf_with_protocol, NFT, along with all other tokens, now relies on the "protocol" from the coin config file, instead of using the configuration of the platform coin.
auth message was moved from Body to Header in Quicknode Http request ece5152 (refactor quicknode: move SignedMessage to Header komodo-defi-proxy#23)

Note

In this PR maker_swap_v2_contract and taker_swap_v2_contract non-optional fields were added for Eth platform coin activation in the eth_coin_from_conf_and_request function.

Currently, if the maker/taker V2 contract addresses are not provided in the request, an error occurs. This is a breaking change, and the legacy 'enable' RPC will fail without these fields. The NFT swap address is optional.

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

Lines 6247 to 6265 in 888108c

    
           let swap_contract_address: Address = try_s!(json::from_value(req["swap_contract_address"].clone())); 
        
           if swap_contract_address == Address::default() { 
        
               return ERR!("swap_contract_address can't be zero address"); 
        
           } 
        
           let maker_swap_v2_contract: Address = try_s!(json::from_value(req["maker_swap_v2_contract"].clone())); 
        
           if maker_swap_v2_contract == Address::default() { 
        
               return ERR!("maker_swap_v2_contract can't be zero address"); 
        
           } 
        
           let taker_swap_v2_contract: Address = try_s!(json::from_value(req["taker_swap_v2_contract"].clone())); 
        
           if taker_swap_v2_contract == Address::default() { 
        
               return ERR!("taker_swap_v2_contract can't be zero address"); 
        
           } 
        
           let nft_maker_swap_v2_contract: Option<Address> = 
        
               try_s!(json::from_value(req["nft_maker_swap_v2_contract"].clone())); 
        
           if let Some(nft_maker_swap_v2) = nft_maker_swap_v2_contract { 
        
               if nft_maker_swap_v2 == Address::default() { 
        
                   return ERR!("nft_maker_swap_v2_contract can't be zero address"); 
        
               } 
        
           }

if we prefer to avoid this behavior, then I suggest, instead of returning an error, duplicate the swap_contract_address to the maker_swap_v2_contract and taker_swap_v2_contract fields if these parameters are missing.
This way, the V2 swaps can be initialized, but send funding process will fail since the legacy address lacks the necessary functionality. So currency won't get stuck in the swap contract.

…V2 contract, some --dev args in geth conf, impl wait_for_geth_node_ready

…for user

…wap-contract-sepolia-test

…e-nft-maker-swap-contract-sepolia-test # Conflicts: # mm2src/coins/eth.rs # mm2src/mm2_main/tests/docker_tests/eth_docker_tests.rs

This reverts commit 18fa53e.

…wap-contract-sepolia-test

…etPayload format, add body: Option<String> for wasm target request, None payload in tests

…e-nft-maker-swap-contract-sepolia-test

… for MM_CTX1, remove unnecessary Geth args, simplify request_body creation, change sleep duration in tests

…e-nft-maker-swap-contract-sepolia-test

mm2src/coins/eth/v2_activation.rs

mm2src/coins/eth/taker_swap_v2_abi.json

mm2src/coins/eth/maker_swap_v2_abi.json

shamardy

🔥

shamardy · 2024-08-01T22:44:19Z

@laruh can you please write new changes that need to be documented e.g. swap_v2_contracts field/parameter? we can instead open an issue in the docs repo https://github.com/KomodoPlatform/komodo-docs-mdx/issues and coins repo https://github.com/KomodoPlatform/coins/issues with 2.2.0-beta tag and link the PR to it. I think this is a better approach c.c. @smk762 @cipig

borngraced

Great work! last notes from me

mm2src/coins/eth/eth_swap_v2.rs

mm2src/coins/eth.rs

borngraced

LGTM 🚀

laruh · 2024-08-02T04:20:48Z

@laruh can you please write new changes that need to be documented e.g. swap_v2_contracts field/parameter? we can instead open an issue in the docs repo https://github.com/KomodoPlatform/komodo-docs-mdx/issues and coins repo https://github.com/KomodoPlatform/coins/issues with 2.2.0-beta tag and link the PR to it. I think this is a better approach c.c. @smk762 @cipig

opened coins issue KomodoPlatform/coins#1115 (I cant create new labels here)
issue in docs KomodoPlatform/komodo-docs-mdx#310

shamardy · 2024-08-02T14:55:23Z

opened coins issue KomodoPlatform/coins#1115 (I cant create new labels here)

created a label and added it to the issue.

shamardy · 2024-08-02T14:59:54Z

In this PR maker_swap_v2_contract and taker_swap_v2_contract non-optional fields were added for Eth platform coin activation in the eth_coin_from_conf_and_request function.

@laruh The above is in the PR description but we made these non-optional, please update PR description even post-merge.

This commit does the following: - Resolves issues with NFT swap_v2 tests on Geth. - Updates NFT activation to utilize coins config. - Moves authentication message from Body to Header in Quicknode HTTP requests. - Adds optional `swap_v2_contracts` field for Ethereum platform coin activation.

* dev: (22 commits) chore(release): bump mm2 version to 2.2.0-beta (KomodoPlatform#2188) ci(docker-tests): ignore tendermint IBC tests for now (KomodoPlatform#2185) feat(nft-swap): complete refund methods (KomodoPlatform#2129) chore(release): add changelog entries for v2.1.0-beta (KomodoPlatform#2165) fix(zcoin): don't force low r signing to generate htlc pubkey for zcoin (KomodoPlatform#2184) chore(rust-analyzer): add rust-analyzer into the workspace toolchain (KomodoPlatform#2179) chore: migrate .cargo/config to .cargo/config.toml to avoid deprecation warning (KomodoPlatform#2177) fix(swaps): ensure taker payment spend confirmations (KomodoPlatform#2176) feat(nft-swap): add standalone maker contract and proxy support (KomodoPlatform#2100) feat(ETH): add `gas_limit` coins param to override default values (KomodoPlatform#2137) feat(tendermint): implement better sequence resolving logic (KomodoPlatform#2164) ci(artifact): add target for macos on apple silicon (KomodoPlatform#2163) fix(helpers): extend http to ws address conversion (KomodoPlatform#2166) fix(makerbot): add "testcoin" to provider options (KomodoPlatform#2161) fix(hd_wallet): make extended pubkey of hd wallet generic (KomodoPlatform#2159) fix(docker-tests): implement containers runtime directories (KomodoPlatform#2162) feat(tendermint): improve the `max` handling for tendermint withdraw (KomodoPlatform#2155) revert KomodoPlatform#2158 (comment) (KomodoPlatform#2160) ci(artifacts): upload build artifacts with in-tree script (KomodoPlatform#2158) test(tendermint): migrate to local/offline containerized testnets (KomodoPlatform#2128) ...

* dev: chore(mm2_main): replace lib.rs by mm2.rs as the root lib (#2178) chore(release): bump mm2 version to 2.2.0-beta (#2188) ci(docker-tests): ignore tendermint IBC tests for now (#2185) feat(nft-swap): complete refund methods (#2129) chore(release): add changelog entries for v2.1.0-beta (#2165) fix(zcoin): don't force low r signing to generate htlc pubkey for zcoin (#2184) chore(rust-analyzer): add rust-analyzer into the workspace toolchain (#2179) chore: migrate .cargo/config to .cargo/config.toml to avoid deprecation warning (#2177) fix(swaps): ensure taker payment spend confirmations (#2176)

laruh added 30 commits April 18, 2024 20:31

use NFT_MAKER_SWAP_V2 in nft_swap_v2 mod and in spend erc721 test

394fe4d

deploy contracts before tokens, add constructor to EtomicSwapMakerNft…

44f542d

…V2 contract, some --dev args in geth conf, impl wait_for_geth_node_ready

use Sepolia in dockerized nft tests

ff1006a

global variables and send nft back to maker

aebf756

add web3 HTTPS support in mm2_main tests

1966fcf

wait for send_back_tx confirmation

1922bff

call contract addresses with functions

c07e8e2

impl check_token_uri and make chains field in ClearNftDbReq optional …

ebac6e6

…for user

doc comms

f9f4eab

Merge remote-tracking branch 'origin/dev' into standalone-nft-maker-s…

ad0ce31

…wap-contract-sepolia-test

Merge remote-tracking branch 'refs/remotes/origin/dev' into standalon…

4a4dfc0

…e-nft-maker-swap-contract-sepolia-test # Conflicts: # mm2src/coins/eth.rs # mm2src/mm2_main/tests/docker_tests/eth_docker_tests.rs

fix merge conflicts

c703913

impl wait_pending_transactions

fe498fa

increase max nonce by 1

18fa53e

Revert "increase max nonce by 1"

b9a6719

This reverts commit 18fa53e.

Merge remote-tracking branch 'origin/dev' into standalone-nft-maker-s…

9a23f20

…wap-contract-sepolia-test

impl get_or_create_nft function

998708b

additional logs, ignore erc1155

364d795

deploy new SEPOLIA_ERC721_CONTRACT

cb187c7

fix linter

9d4e3ee

run both nft send payment tests

495e7a9

proxy: send nft reqs with payload data in body to satisfy proxy HttpG…

e917b0b

…etPayload format, add body: Option<String> for wasm target request, None payload in tests

Merge remote-tracking branch 'refs/remotes/origin/dev' into standalon…

f868a50

…e-nft-maker-swap-contract-sepolia-test

provide UrlSignWrapper structure

e94fac7

additionally include chain field into UrlSignWrapper

2e8c662

increase erc721 tx confirmation time to 150, add more logs

0fbf75d

review: use map_err for generate_gui_auth_signed_validation, doc comm…

03860e1

… for MM_CTX1, remove unnecessary Geth args, simplify request_body creation, change sleep duration in tests

proxy: send regular http post request to proxy for nft feature

b8b05d1

make erc721 and erc1155 time locks different in tests

3de2b92

Merge remote-tracking branch 'refs/remotes/origin/dev' into standalon…

f2625fd

…e-nft-maker-swap-contract-sepolia-test

laruh added in progress Changes will be made from the author and removed under review labels Jul 29, 2024

laruh mentioned this pull request Jul 29, 2024

Trading protocol upgrade v2. #1895

Open

21 tasks

laruh added 4 commits July 29, 2024 13:19

review: use Public::from_slice directly in parse_pubkey

c58808a

review: use public_to_address to get address from pubkey

1a5bf73

review: use dex_fee plus payment_amount for eth_total_payment

5d6f943

review: extract sign_and_send_transaction outside the if/else

2007a70

borngraced requested changes Jul 29, 2024

View reviewed changes

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

mm2src/coins/eth/taker_swap_v2_abi.json Outdated Show resolved Hide resolved

mm2src/coins/eth/maker_swap_v2_abi.json Outdated Show resolved Hide resolved

laruh added under review and removed in progress Changes will be made from the author labels Jul 29, 2024

review: minify json

9aca0d7

laruh mentioned this pull request Jul 29, 2024

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

Open

4 tasks

shamardy previously approved these changes Aug 1, 2024

View reviewed changes

shamardy added 2.2.0-beta docs labels Aug 1, 2024

borngraced requested changes Aug 1, 2024

View reviewed changes

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

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

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

review: drop variables, return result value directly

fe730fa

laruh dismissed shamardy’s stale review via fe730fa August 2, 2024 02:49

borngraced approved these changes Aug 2, 2024

View reviewed changes

This was referenced Aug 2, 2024

Document Eth coin with tokens v2 activation update KomodoPlatform/komodo-docs-mdx#310

Open

Add EVM NFT configurations KomodoPlatform/coins#1115

Open

shamardy merged commit 9b01339 into dev Aug 2, 2024
20 of 27 checks passed

shamardy deleted the nft-refund-payment-geth branch August 2, 2024 15:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(nft-swap): complete refund methods #2129

feat(nft-swap): complete refund methods #2129

laruh commented May 31, 2024 •

edited

Loading

shamardy left a comment

shamardy commented Aug 1, 2024

borngraced left a comment

borngraced left a comment

laruh commented Aug 2, 2024

shamardy commented Aug 2, 2024

shamardy commented Aug 2, 2024 •

edited

Loading

	let swap_contract_address: Address = try_s!(json::from_value(req["swap_contract_address"].clone()));
	if swap_contract_address == Address::default() {
	return ERR!("swap_contract_address can't be zero address");
	}
	let maker_swap_v2_contract: Address = try_s!(json::from_value(req["maker_swap_v2_contract"].clone()));
	if maker_swap_v2_contract == Address::default() {
	return ERR!("maker_swap_v2_contract can't be zero address");
	}
	let taker_swap_v2_contract: Address = try_s!(json::from_value(req["taker_swap_v2_contract"].clone()));
	if taker_swap_v2_contract == Address::default() {
	return ERR!("taker_swap_v2_contract can't be zero address");
	}
	let nft_maker_swap_v2_contract: Option<Address> =
	try_s!(json::from_value(req["nft_maker_swap_v2_contract"].clone()));
	if let Some(nft_maker_swap_v2) = nft_maker_swap_v2_contract {
	if nft_maker_swap_v2 == Address::default() {
	return ERR!("nft_maker_swap_v2_contract can't be zero address");
	}
	}

feat(nft-swap): complete refund methods #2129

feat(nft-swap): complete refund methods #2129

Conversation

laruh commented May 31, 2024 • edited Loading

Note

shamardy left a comment

Choose a reason for hiding this comment

shamardy commented Aug 1, 2024

borngraced left a comment

Choose a reason for hiding this comment

borngraced left a comment

Choose a reason for hiding this comment

laruh commented Aug 2, 2024

shamardy commented Aug 2, 2024

shamardy commented Aug 2, 2024 • edited Loading

laruh commented May 31, 2024 •

edited

Loading

shamardy commented Aug 2, 2024 •

edited

Loading