Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 273 commits into from
Aug 30, 2024
This pull request is big! We’re only showing the most recent 250 commits.

Commits on May 9, 2024

  1. Configuration menu
    Copy the full SHA
    e94fac7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2e8c662 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0fbf75d View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. review: use map_err for generate_gui_auth_signed_validation, doc comm…

    … for MM_CTX1, remove unnecessary Geth args, simplify request_body creation, change sleep duration in tests
    laruh committed May 10, 2024
    Configuration menu
    Copy the full SHA
    03860e1 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2024

  1. Configuration menu
    Copy the full SHA
    b8b05d1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3de2b92 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

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

    …e-nft-maker-swap-contract-sepolia-test
    laruh committed May 13, 2024
    Configuration menu
    Copy the full SHA
    f2625fd View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

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

    …e-nft-maker-swap-contract-sepolia-test
    laruh committed May 14, 2024
    Configuration menu
    Copy the full SHA
    930a593 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    350abd6 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Configuration menu
    Copy the full SHA
    36eaf38 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4478ccb View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Configuration menu
    Copy the full SHA
    7882e6e View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Configuration menu
    Copy the full SHA
    d03b6d1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ff92a20 View commit details
    Browse the repository at this point in the history
  3. review: panic in wait_for_geth_node_ready if Deth node is not ready a…

    …fter several attempts
    laruh committed May 17, 2024
    Configuration menu
    Copy the full SHA
    a2c47f8 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

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

    …e-nft-maker-swap-contract-sepolia-test
    
    # Conflicts:
    #	mm2src/coins/eth.rs
    #	mm2src/coins/eth/nft_swap_v2/mod.rs
    #	mm2src/coins/eth/v2_activation.rs
    #	mm2src/mm2_main/Cargo.toml
    #	mm2src/mm2_main/tests/docker_tests/eth_docker_tests.rs
    laruh committed May 21, 2024
    Configuration menu
    Copy the full SHA
    d6cbfd8 View commit details
    Browse the repository at this point in the history
  2. merge: fmt, log tx_hash() in NFT payments instead of bytes, import et…

    …hcore_transaction::Action in eth_docker_tests.rs separately
    laruh committed May 21, 2024
    Configuration menu
    Copy the full SHA
    9c3ff07 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Configuration menu
    Copy the full SHA
    0bedba3 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

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

    …e-nft-maker-swap-contract-sepolia-test
    laruh committed May 24, 2024
    Configuration menu
    Copy the full SHA
    7976761 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. Configuration menu
    Copy the full SHA
    a6ad6fc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5daf723 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2daec7a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6992931 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3f07f1f View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Configuration menu
    Copy the full SHA
    0079362 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0c164fb View commit details
    Browse the repository at this point in the history
  3. use global_nft_with_random_privkey in send_send_and_refund_erc721_mak…

    …er_payment_timelock
    laruh committed May 28, 2024
    Configuration menu
    Copy the full SHA
    63af2bc View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e2f8ccf View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    dad6988 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9b1a700 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    fc4d6e4 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Configuration menu
    Copy the full SHA
    cc8e78e View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. use Geth node for swap tests

    laruh committed May 31, 2024
    Configuration menu
    Copy the full SHA
    87b297a View commit details
    Browse the repository at this point in the history
  2. reduce code duplication

    laruh committed May 31, 2024
    Configuration menu
    Copy the full SHA
    780b1e8 View commit details
    Browse the repository at this point in the history
  3. provide NftSwapInfo type

    laruh committed May 31, 2024
    Configuration menu
    Copy the full SHA
    f789e91 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    aa1d70f View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

  1. Configuration menu
    Copy the full SHA
    b9f2a98 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Configuration menu
    Copy the full SHA
    ece5152 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Configuration menu
    Copy the full SHA
    920861e View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. eth tpu v2: deploy maker and taker swap v2 contracts in tests. add ma…

    …ker_swap_v2_contract, taker_swap_v2_contract, nft_maker_swap_v2_contract in EthCoinImpl
    laruh committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    e478711 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. Configuration menu
    Copy the full SHA
    9803fd5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2828be0 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Configuration menu
    Copy the full SHA
    04d99e4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d31566d View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. Configuration menu
    Copy the full SHA
    4064999 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Configuration menu
    Copy the full SHA
    b986279 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e636da1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    40ffb65 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. Configuration menu
    Copy the full SHA
    888108c View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. Configuration menu
    Copy the full SHA
    8143cc2 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2024

  1. Configuration menu
    Copy the full SHA
    b391a16 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'refs/remotes/origin/dev' into standalon…

    …e-nft-maker-swap-contract-sepolia-test
    laruh committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    5f34f1c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e672485 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'refs/remotes/origin/standalone-nft-make…

    …r-swap-contract-sepolia-test' into nft-refund-payment-geth
    laruh committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    986c5e7 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2024

  1. Configuration menu
    Copy the full SHA
    d998062 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Configuration menu
    Copy the full SHA
    ff4d306 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Configuration menu
    Copy the full SHA
    2ae0b04 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'refs/remotes/origin/dev' into standalon…

    …e-nft-maker-swap-contract-sepolia-test
    laruh committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    0d54567 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'refs/remotes/origin/standalone-nft-make…

    …r-swap-contract-sepolia-test' into nft-refund-payment-geth
    laruh committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    602206d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    604d182 View commit details
    Browse the repository at this point in the history
  5. change sleep duration in send_and_refund_erc721_maker_payment_timeloc…

    …k and send_and_spend_erc20_maker_payment_impl
    laruh committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    36d94b9 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ce6673b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    933d4b9 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. eth tpu v2: add swap_v2_contracts Opt param in EthActivationV2Request…

    …, remove swap_v2_contracts from legacy "enable" RPC and add if ctx.use_trading_proto_v2() check in eth_coin_from_conf_and_request_v2
    laruh committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    1e90600 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. Configuration menu
    Copy the full SHA
    b9049bf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8e4cd71 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4e9f902 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

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

    …e-nft-maker-swap-contract-sepolia-test
    
    # Conflicts:
    #	mm2src/mm2_main/tests/docker_tests/docker_tests_common.rs
    #	mm2src/mm2_main/tests/docker_tests_main.rs
    laruh committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    801a688 View commit details
    Browse the repository at this point in the history
  2. fmt code after merge

    laruh committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    1e050d2 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'refs/remotes/origin/standalone-nft-make…

    …r-swap-contract-sepolia-test' into nft-refund-payment-geth
    
    # Conflicts:
    #	mm2src/mm2_main/tests/docker_tests/docker_tests_common.rs
    laruh committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    2447763 View commit details
    Browse the repository at this point in the history
  4. fix merge conflicts

    laruh committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    fa3f553 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. make "proxy_auth" Optional

    laruh committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    eddeb1a View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'refs/remotes/origin/dev' into standalon…

    …e-nft-maker-swap-contract-sepolia-test
    laruh committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    7cbb941 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'refs/remotes/origin/standalone-nft-make…

    …r-swap-contract-sepolia-test' into nft-refund-payment-geth
    laruh committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    87cc404 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2024

  1. Configuration menu
    Copy the full SHA
    49c1450 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2024

  1. Configuration menu
    Copy the full SHA
    5971601 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    647f425 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    af70871 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ceeaac5 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. Configuration menu
    Copy the full SHA
    bb39b36 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. eth tpu v2: send_and_refund_taker_funding_by_secret ETH/ERC20 tests. …

    …Remove "swap_contract_address" field from RefundFundingSecretArgs struct
    laruh committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    ac38aea View commit details
    Browse the repository at this point in the history
  2. eth tpu v2: add wait_for_confirmations in send_and_refund_taker_fundi…

    …ng_by_secret ETH/ERC20 tests
    laruh committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    c64af3b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bac63a9 View commit details
    Browse the repository at this point in the history
  4. fix typo and add now_sec()

    laruh committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    5c0361f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    49f435d View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. Configuration menu
    Copy the full SHA
    b5861b0 View commit details
    Browse the repository at this point in the history
  2. change sleep Duration

    laruh committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    2b24db6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ae16a3c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    01cd625 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

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

    …wap-contract-sepolia-test
    
    # Conflicts:
    #	mm2src/coins/eth.rs
    #	mm2src/coins/eth/nft_swap_v2/mod.rs
    laruh committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    191b5f0 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/standalone-nft-maker-swap-contra…

    …ct-sepolia-test' into nft-refund-payment-geth
    
    # Conflicts:
    #	mm2src/coins/eth/nft_swap_v2/mod.rs
    laruh committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    734edbc View commit details
    Browse the repository at this point in the history
  3. fmt and clippy

    laruh committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    7b69886 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'origin/nft-refund-payment-geth' into nf…

    …t-refund-payment-geth-use-v2-activation
    laruh committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    078fc5c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    603daa7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    99ec522 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. Merge remote-tracking branch 'origin/dev' into nft-refund-payment-geth

    # Conflicts:
    #	mm2src/coins/eth.rs
    #	mm2src/coins/eth/nft_swap_v2/mod.rs
    #	mm2src/coins/eth/v2_activation.rs
    #	mm2src/coins/eth/web3_transport/http_transport.rs
    #	mm2src/coins/eth/web3_transport/mod.rs
    #	mm2src/coins/nft.rs
    #	mm2src/coins/nft/nft_structs.rs
    #	mm2src/coins_activation/src/erc20_token_activation.rs
    #	mm2src/coins_activation/src/eth_with_token_activation.rs
    #	mm2src/mm2_main/tests/docker_tests/docker_tests_common.rs
    #	mm2src/mm2_main/tests/docker_tests/eth_docker_tests.rs
    laruh committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    b13ab34 View commit details
    Browse the repository at this point in the history
  2. fmt, clippy

    laruh committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    dab5bd9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    42f6d37 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'origin/nft-refund-payment-geth' into nf…

    …t-refund-payment-geth-use-v2-activation
    
    # Conflicts:
    #	mm2src/mm2_main/tests/docker_tests/eth_docker_tests.rs
    laruh committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    b3d0e12 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    114637a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c924520 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. doc comments

    laruh committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    69d2fbe View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cac2d0d View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'origin/nft-refund-payment-geth' into nf…

    …t-refund-payment-geth-use-v2-activation
    
    # Conflicts:
    #	mm2src/coins/eth/eth_swap_v2.rs
    laruh committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    2358c11 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    071a1f6 View commit details
    Browse the repository at this point in the history
  5. Merge remote-tracking branch 'origin/nft-refund-payment-geth' into nf…

    …t-refund-payment-geth-use-v2-activation
    laruh committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    37031bd View commit details
    Browse the repository at this point in the history
  6. use etomic_swap_id in eth_swap_v2.rs, remove funding_time_lock from R…

    …efundTakerPaymentArgs
    laruh committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    b3c66bd View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. review: use fixed size arrays

    laruh committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    439243a View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/nft-refund-payment-geth' into nf…

    …t-refund-payment-geth-use-v2-activation
    
    # Conflicts:
    #	mm2src/coins/eth/eth_swap_v2.rs
    laruh committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    ec59a27 View commit details
    Browse the repository at this point in the history
  3. review: use fixed size arrays

    laruh committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    ee9d9dc View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b971ad8 View commit details
    Browse the repository at this point in the history
  5. ignore tendermint tests

    laruh committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    c26c7a5 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c7e01d5 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    8719922 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    a7974a9 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. eth tpu v2 docker tests: change sleep duration, add `wait_for_confirm…

    …ations` for tx_refund in `funding_timelock` tests
    laruh committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    472c34b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    10b8f9b View commit details
    Browse the repository at this point in the history
  3. ignore tendermint tests

    laruh committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    dc215ec View commit details
    Browse the repository at this point in the history
  4. ignore nft, eth docker tests

    laruh committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    787a2b2 View commit details
    Browse the repository at this point in the history
  5. add balance checks

    laruh committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    9e353a6 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    351d538 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e0e9126 View commit details
    Browse the repository at this point in the history
  8. update taker_swap_v2_bytes

    laruh committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    f2ac7ef View commit details
    Browse the repository at this point in the history
  9. more logs

    laruh committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    fdb7fef View commit details
    Browse the repository at this point in the history
  10. init erc20

    laruh committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    52d4ddf View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    0d34688 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    7cd09ca View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    14f86b7 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Configuration menu
    Copy the full SHA
    2ffe134 View commit details
    Browse the repository at this point in the history
  2. remove balance logs

    laruh committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    fd504b1 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. Configuration menu
    Copy the full SHA
    c629d7a View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/nft-refund-payment-geth' into nf…

    …t-refund-payment-geth-use-v2-activation
    laruh committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    60f5432 View commit details
    Browse the repository at this point in the history
  3. review: fix typo

    laruh committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    ed08df9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    89e543f View commit details
    Browse the repository at this point in the history
  5. Merge remote-tracking branch 'origin/nft-refund-payment-geth' into nf…

    …t-refund-payment-geth-use-v2-activation
    laruh committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    8c03854 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    cf1e0bf View commit details
    Browse the repository at this point in the history
  7. review: remove legacy "derive_htlc_pubkey" function from swap_v2, use…

    … derive_htlc_pubkey_v2_bytes instead
    laruh committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    28bc18a View commit details
    Browse the repository at this point in the history
  8. Merge remote-tracking branch 'origin/nft-refund-payment-geth' into nf…

    …t-refund-payment-geth-use-v2-activation
    
    # Conflicts:
    #	mm2src/coins/test_coin.rs
    #	mm2src/mm2_main/tests/docker_tests/eth_docker_tests.rs
    laruh committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    5901e74 View commit details
    Browse the repository at this point in the history
  9. fmt code

    laruh committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    173dd33 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. Configuration menu
    Copy the full SHA
    69a07a8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7570df7 View commit details
    Browse the repository at this point in the history
  3. todo burnFee support

    laruh committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    3042e60 View commit details
    Browse the repository at this point in the history
  4. review: update doc comments for taker and maker secret hashes in Send…

    …TakerFundingArgs struct
    laruh committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    e1e2242 View commit details
    Browse the repository at this point in the history
  5. review: specify timelock doc comments for UTXO and smart contracts in…

    … SendTakerFundingArgs struct
    laruh committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    fcd394d View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    6a231a3 View commit details
    Browse the repository at this point in the history
  7. Merge remote-tracking branch 'origin/nft-refund-payment-geth' into nf…

    …t-refund-payment-geth-use-v2-activation
    laruh committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    45ac62b View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    37845ac View commit details
    Browse the repository at this point in the history
  9. fix clippy and provide sleep duration to test pre-approved timelock u…

    …sing funding_time_lock
    laruh committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    e780280 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2024

  1. erc20 tests on sepolia

    laruh committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    8473304 View commit details
    Browse the repository at this point in the history
  2. eth tpu v2: validate_taker_funding_impl WIP, provide validation in v2…

    … refund tests.
    
    Update nft_maker_swap_v2_bytes and taker_swap_v2_bytes according to the commit link.
    laruh committed Jul 28, 2024
    Configuration menu
    Copy the full SHA
    84b8ad4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cee5f61 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    10c6a14 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d53bc66 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    067b2ae View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. Configuration menu
    Copy the full SHA
    9c157e5 View commit details
    Browse the repository at this point in the history
  2. change sleep duration

    laruh committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    027da95 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c58808a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1a5bf73 View commit details
    Browse the repository at this point in the history
  5. Merge remote-tracking branch 'origin/nft-refund-payment-geth' into nf…

    …t-refund-payment-geth-use-v2-activation
    
    # Conflicts:
    #	mm2src/coins/eth/eth_swap_v2.rs
    laruh committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    4c8c425 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d922395 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    5d6f943 View commit details
    Browse the repository at this point in the history
  8. Merge remote-tracking branch 'origin/nft-refund-payment-geth' into nf…

    …t-refund-payment-geth-use-v2-activation
    laruh committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    27473bb View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    2007a70 View commit details
    Browse the repository at this point in the history
  10. Merge remote-tracking branch 'origin/nft-refund-payment-geth' into nf…

    …t-refund-payment-geth-use-v2-activation
    
    # Conflicts:
    #	mm2src/coins/eth/eth_swap_v2.rs
    laruh committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    5524dca View commit details
    Browse the repository at this point in the history
  11. review: minify json

    laruh committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    9aca0d7 View commit details
    Browse the repository at this point in the history
  12. Merge remote-tracking branch 'origin/nft-refund-payment-geth' into nf…

    …t-refund-payment-geth-use-v2-activation
    laruh committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    0ef082d View commit details
    Browse the repository at this point in the history
  13. eth tpu v2: impl validate_from_to_and_status func, additionally use i…

    …t in nft swap v2 validation
    laruh committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    2bf5294 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    8a16714 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. Configuration menu
    Copy the full SHA
    25074b8 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. eth tpu v2: prepare_taker_payment_approve_data.

    remove sleep duration in eth dcoker tests (except seploia)
    laruh committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    95f21dd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d0c038e View commit details
    Browse the repository at this point in the history
  3. eth tpu v2: log approve tx

    laruh committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    4ef88fa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fac2d38 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b2d6d4b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    70dfcdc View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Configuration menu
    Copy the full SHA
    fe730fa View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/nft-refund-payment-geth' into nf…

    …t-refund-payment-geth-use-v2-activation
    laruh committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    4f8ef5b View commit details
    Browse the repository at this point in the history
  3. eth tpu v2: use match self.coin_type for token_address in sign_and_br…

    …oadcast_taker_payment_spend_impl
    laruh committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    a814575 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    bd41f9a View commit details
    Browse the repository at this point in the history
  5. eth tpu v2: refactor spend. approve impls.

    docker tests: send_approve_and_spend_erc20.
    laruh committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    d6e42c5 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2024

  1. Configuration menu
    Copy the full SHA
    6949b7a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    89cf307 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'origin/dev' into nft-refund-payment-get…

    …h-use-v2-activation
    
    # Conflicts:
    #	mm2src/coins/eth.rs
    #	mm2src/coins/eth/eth_swap_v2.rs
    #	mm2src/coins/eth/nft_swap_v2/mod.rs
    #	mm2src/coins/lp_coins.rs
    #	mm2src/coins/test_coin.rs
    #	mm2src/mm2_main/src/lp_swap/taker_swap_v2.rs
    #	mm2src/mm2_main/tests/docker_tests/docker_tests_common.rs
    #	mm2src/mm2_main/tests/docker_tests/eth_docker_tests.rs
    #	mm2src/mm2_main/tests/docker_tests/swap_proto_v2_tests.rs
    #	mm2src/mm2_test_helpers/contract_bytes/maker_swap_v2_bytes
    #	mm2src/mm2_test_helpers/contract_bytes/nft_maker_swap_v2_bytes
    #	mm2src/mm2_test_helpers/contract_bytes/taker_swap_v2_bytes
    laruh committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    8df5c47 View commit details
    Browse the repository at this point in the history
  4. fix code after merge

    laruh committed Aug 4, 2024
    Configuration menu
    Copy the full SHA
    747e51e View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. Configuration menu
    Copy the full SHA
    ff00bf0 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Revert "ignore tendermint tests"

    This reverts commit dc215ec.
    laruh committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    e5eef68 View commit details
    Browse the repository at this point in the history
  2. Revert "ignore tendermint tests"

    This reverts commit c26c7a5.
    laruh committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    ddbcdba View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dfc482d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c5607d8 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8d33bfe View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. review fixes

    laruh committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    5e3e0fd View commit details
    Browse the repository at this point in the history
  2. use Arc mut

    laruh committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    8b8e0a5 View commit details
    Browse the repository at this point in the history
  3. return old set_coin_type

    laruh committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    4e1352d View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2024

  1. review: create decoded variable within an inner scope, From<RefundTak…

    …erPaymentArgs> for RefundPaymentArgs
    laruh committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    467a421 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    284fc0f View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. review: change error type, move match coin_type to the top, update ma…

    …ker/taker coin doc coms.
    laruh committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    9f31649 View commit details
    Browse the repository at this point in the history
  2. docker tests: add search_for_taker_funding_spend func in send_appro…

    …ve_and_spend tests
    laruh committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    67e7f15 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    046dc32 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    303056f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    bf70525 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Configuration menu
    Copy the full SHA
    0bae344 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e65f224 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    46dcbc1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6c4814d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3bf653e View commit details
    Browse the repository at this point in the history
  6. change sleep duration in send_and_refund_taker_funding_exceed, remove…

    … validate func from them
    laruh committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    74d31ca View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. Configuration menu
    Copy the full SHA
    8a5d5df View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a72247f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    78166b1 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'origin/dev' into nft-refund-payment-get…

    …h-use-v2-activation
    laruh committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    b08be1a View commit details
    Browse the repository at this point in the history
  5. add doc comms, update sleep duration for send_and_refund_taker_fundin…

    …g_by_secret_erc20 and send_and_refund_taker_funding_exceed_pre_approve_timelock_erc20
    laruh committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    3629f0e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f6ffcf1 View commit details
    Browse the repository at this point in the history
  7. review: update wrapper docs

    laruh committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    bce1752 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    2ee4ef1 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Configuration menu
    Copy the full SHA
    a5765b1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    006963a View commit details
    Browse the repository at this point in the history
  3. re-check payment state in fncs taker_payment_approve and `sign_and_…

    …broadcast_taker_payment_spend_impl`
    laruh committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    a859414 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    738731c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d9e3c4e View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2024

  1. Configuration menu
    Copy the full SHA
    e1144d1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fbe7bb6 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. review: provide RefundMakerPaymentTimelockArgs, RefundMakerPaymentSec…

    …retArgs in maker opsv2
    laruh committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    adb69d5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    28694c7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a933c74 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e5bde47 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    be41221 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    983ea4d View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Merge remote-tracking branch 'origin/dev' into nft-refund-payment-get…

    …h-use-v2-activation
    laruh committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    07fa30a View commit details
    Browse the repository at this point in the history
  2. fix compile error

    laruh committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    8e50c8f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1c635b4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6f34920 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    098e270 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. Configuration menu
    Copy the full SHA
    8469aff View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    98f78d2 View commit details
    Browse the repository at this point in the history
  3. comment for_slp_ops.wait_ready

    laruh committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    885c0e9 View commit details
    Browse the repository at this point in the history
  4. Revert "comment for_slp_ops.wait_ready"

    This reverts commit 885c0e9.
    laruh committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    525b99d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0e35898 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Configuration menu
    Copy the full SHA
    fbdbf10 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    eb83c70 View commit details
    Browse the repository at this point in the history
  3. docker tests: provide build_web3_instances_for_test and eth_coin_from…

    …_conf_and_request_v2_for_test functions
    laruh committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    f7668ce View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2024

  1. review: remove unused code, except SwapAddresses::init and eth_coin_v…

    …2_activation_with_random_privkey
    laruh committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    653c063 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/dev' into nft-refund-payment-get…

    …h-use-v2-activation
    laruh committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    20b9428 View commit details
    Browse the repository at this point in the history
  3. fix clippy

    laruh committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    1fda81b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    722b807 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f1e6b20 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Configuration menu
    Copy the full SHA
    f9f8d50 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. Configuration menu
    Copy the full SHA
    b744a1d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2381b7d View commit details
    Browse the repository at this point in the history
  3. ignore taker sepolia tests

    laruh committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    1faea01 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Configuration menu
    Copy the full SHA
    6dd0fc2 View commit details
    Browse the repository at this point in the history