feat(eth-swap): eth tpu v2 methods, eth docker test enhancements

[laruh]

Note: eth tpu v2 tests use Sepolia testnet

eth tpu v2 changes

TakerCoinSwapOpsV2 trait implemented methods for EthCoin

• send_taker_funding
• validate_taker_funding
• refund_taker_funding_timelock
• refund_taker_funding_secret
• search_for_taker_funding_spend (check that taker payment state is TakerApproved)
• gen_taker_funding_spend_preimage
• validate_taker_funding_spend_preimage
• sign_and_send_taker_funding_spend
• refund_combined_taker_payment (used refund_taker_funding_timelock method here)
• gen_taker_payment_spend_preimage
• validate_taker_payment_spend_preimage
• sign_and_broadcast_taker_payment_spend
• wait_for_taker_payment_spend

nft tpu v2 changes

• global_nft_with_random_privkey in eth_docker_tests.rs started to use eth_coin_from_conf_and_request_v2 for nft actiavtion
  

  komodo-defi-framework/mm2src/mm2_main/tests/docker_tests/eth_docker_tests.rs

  Line 405 in 747e51e

  fn global_nft_with_random_privkey(

• nft tests code was refactored to reduce code duplication

The below is for @KomodoPlatform/qa

DOCs repo

PR: KomodoPlatform/komodo-docs-mdx#270

Coins repo

issue: KomodoPlatform/coins#1115
PR: KomodoPlatform/coins#1061

Komodo Proxy configuration

#2169 (comment)

"eth_call" method should be added in proxy config, as wait_for_taker_payment_spend, payment_status_v2 fncs use it.

[laruh]

In this commit f7668ce I provided eth_coin_from_conf_and_request_v2_for_test function which doesn't use p2p context, so dead locks dont occur in nft/eth swap v2 tests from eth_docker_tests.rs. solves this issue #2169 (comment)

[shamardy]

Thanks you for the fixes! Last review from my side!
Please fix docker tests, you can disable slp tests if you have to. Also resolve any old review comment or ones that I asked for more changes for. After that will do a final check of the fixes, approve and merge if there are no problems left.

[shamardy]

Why not use this conditional compilation attribute in the original eth_coin_from_conf_and_request_v2 function and add build_web3_instances_for_test under it? We don't have to maintain 2 functions this way in case we changed the original one.

[laruh]

Why not use this conditional compilation attribute in the original eth_coin_from_conf_and_request_v2 function and add build_web3_instances_for_test under it?

it will lead to clippy errors

error: field `komodo_proxy` is never read
  --> mm2src/coins/eth/web3_transport/http_transport.rs:49:16
   |
47 | pub struct HttpTransportNode {
   |            ----------------- field in this struct
48 |     pub(crate) uri: http::Uri,
49 |     pub(crate) komodo_proxy: bool,
   |                ^^^^^^^^^^^^
   |
   = note: `HttpTransportNode` has derived impls for the traits `Debug` and `Clone`, but these are intentionally ignored during dead code analysis
   = note: `-D dead-code` implied by `-D warnings`

error: function `build_web3_instances` is never used
   --> mm2src/coins/eth/v2_activation.rs:791:10
    |
791 | async fn build_web3_instances(
    |          ^^^^^^^^^^^^^^^^^^^^

error: could not compile `coins` (lib) due to 2 previous errors
warning: build failed, waiting for other jobs to finish...
error: could not compile `coins` (lib test) due to 2 previous errors

we use --all-features flag in ci cd and in production we dont use "for-tests" feature

[laruh]

We can add in eth_coin_from_conf_and_request_v2 doc comment "not to forget to change eth_coin_from_conf_and_request_v2_for_test function" if you did changes. same for build_web3_instances_for_test.

Are you ok with the suggestion above? we shouldn't add #[allow(dead_code)] annotation to build_web3_instances function, as clippy should check it.

[laruh]

added doc comms with notes for now f1e6b20

[shamardy]

Simplified build_web3_instances here f9f8d50 p2p ctx is only used if komodo_proxy is true. Please check the code to make sure I didn't make any mistakes.

[laruh]

p2p ctx is only used if komodo_proxy is true

oh, exactly! right now build_web3_instances looks beautiful. everything is fine.

[shamardy]

@laruh there is an unstable docker test, we shouldn't have this in dev to avoid regressions as docker tests are green there.

[laruh]

@laruh there is an unstable docker test, we shouldn't have this in dev to avoid regressions as docker tests are green there.

They are all unstable due to race conditions. I mean different tests can fail with replacement transaction underpriced. #2169 (comment)

Btw I moved taker swapv2 tests to Geth node using higher gas limits, but confirmations still fail
nft-refund-payment-geth-use-v2-activation-increase-gas-limit branch commits

CI https://github.com/KomodoPlatform/komodo-defi-framework/actions/runs/10589881445/job/29344726554#step:6:1637
example

---- docker_tests::eth_docker_tests::send_and_refund_taker_funding_by_secret_erc20 stdout ----
28 04:04:38, eth_docker_tests:1426] Taker sent ERC20 funding, tx hash: b83a9e1b47b47be644d47feae879cd13f4484bfd9d9151eed42f4b428336d735
· 2024-08-28 04:04:38 +0000 [ERC20DEV] Waiting for confirmations… Failed.
thread 'docker_tests::eth_docker_tests::send_and_refund_taker_funding_by_secret_erc20' panicked at 'called `Result::unwrap()` on an `Err` value: "eth:5292] Internal: eth:5292] Tx receipt Receipt { transaction_hash: 0xb83a9e1b47b47be644d47feae879cd13f4484bfd9d9151eed42f4b428336d735, transaction_index: 0, block_hash: Some(0x03e12c460467c5f5934260b1dcf1097f0ce9183c3ca33d214bf0622d819520f8), block_number: Some(128), from: 0xdbf79d75cb3b0b942500dfb01e1e8327582e941b, to: Some(0x844bf2c9ecca714f2ba60c3e694c776700bbee82), cumulative_gas_used: 24309, gas_used: Some(24309), contract_address: None, logs: [], status: Some(0), root: None, logs_bloom: 0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000, transaction_type: Some(0), effective_gas_price: Some(1000000078) } status of ERC20DEV tx 0xb83a9e1b47b47be644d47feae879cd13f4484bfd9d9151eed42f4b428336d735 is failed"', mm2src/mm2_main/tests/docker_tests/eth_docker_tests.rs:1201:55

gas_used: Some(24309). gas limit in send erc20 was 210_000, which is enough, but confirmation failed.

I suggest to leave Sepolia tests and ignore them when we merge it to dev. And run them again when you work on the swap v2 feature.

[shamardy]

🔥