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.

Sign up for GitHub

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

Jump to bottom

feat(nft-swap): standalone nft maker swap contract and sepolia testenet #2100

Open
wants to merge 48 commits into
base: dev
Choose a base branch
from
Open

feat(nft-swap): standalone nft maker swap contract and sepolia testenet #2100

wants to merge 48 commits into from

Commits on Apr 18, 2024

  1. use NFT_MAKER_SWAP_V2 in nft_swap_v2 mod and in spend erc721 test

    @laruh
    laruh committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    394fe4d View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. deploy contracts before tokens, add constructor to EtomicSwapMakerNft… 

    …V2 contract, some --dev args in geth conf, impl wait_for_geth_node_ready
    @laruh
    laruh committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    44f542d View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. use Sepolia in dockerized nft tests

    @laruh
    laruh committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    ff1006a View commit details
    Browse the repository at this point in the history

  2. global variables and send nft back to maker

    @laruh
    laruh committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    aebf756 View commit details
    Browse the repository at this point in the history

  3. add web3 HTTPS support in mm2_main tests

    @laruh
    laruh committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    1966fcf View commit details
    Browse the repository at this point in the history

  4. wait for send_back_tx confirmation

    @laruh
    laruh committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    1922bff View commit details
    Browse the repository at this point in the history

  5. call contract addresses with functions

    @laruh
    laruh committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    c07e8e2 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. impl check_token_uri and make chains field in ClearNftDbReq optional … 

    …for user
    @laruh
    laruh committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    ebac6e6 View commit details
    Browse the repository at this point in the history

  2. doc comms

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

Commits on Apr 25, 2024

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

    …wap-contract-sepolia-test
    @laruh
    laruh committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    ad0ce31 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 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/mm2_main/tests/docker_tests/eth_docker_tests.rs
    @laruh
    laruh committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    4a4dfc0 View commit details
    Browse the repository at this point in the history

  2. fix merge conflicts

    @laruh
    laruh committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    c703913 View commit details
    Browse the repository at this point in the history

  3. impl wait_pending_transactions

    @laruh
    laruh committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    fe498fa View commit details
    Browse the repository at this point in the history

  4. increase max nonce by 1

    @laruh
    laruh committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    18fa53e View commit details
    Browse the repository at this point in the history

  5. Revert "increase max nonce by 1" 

    This reverts commit 18fa53e.
    @laruh
    laruh committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    b9a6719 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

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

    …wap-contract-sepolia-test
    @laruh
    laruh committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    9a23f20 View commit details
    Browse the repository at this point in the history

  2. impl get_or_create_nft function

    @laruh
    laruh committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    998708b View commit details
    Browse the repository at this point in the history

  3. additional logs, ignore erc1155

    @laruh
    laruh committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    364d795 View commit details
    Browse the repository at this point in the history

  4. deploy new SEPOLIA_ERC721_CONTRACT

    @laruh
    laruh committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    cb187c7 View commit details
    Browse the repository at this point in the history

  5. fix linter

    @laruh
    laruh committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    9d4e3ee View commit details
    Browse the repository at this point in the history

  6. run both nft send payment tests

    @laruh
    laruh committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    495e7a9 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

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

    …etPayload format, add body: Option<String> for wasm target request, None payload in tests
    @laruh
    laruh committed May 8, 2024
    Configuration menu
    Copy the full SHA
    e917b0b 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
    laruh committed May 8, 2024
    Configuration menu
    Copy the full SHA
    f868a50 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. provide UrlSignWrapper structure

    @laruh
    laruh committed May 9, 2024
    Configuration menu
    Copy the full SHA
    e94fac7 View commit details
    Browse the repository at this point in the history

  2. additionally include chain field into UrlSignWrapper

    @laruh
    laruh committed May 9, 2024
    Configuration menu
    Copy the full SHA
    2e8c662 View commit details
    Browse the repository at this point in the history

  3. increase erc721 tx confirmation time to 150, add more logs

    @laruh
    laruh committed May 9, 2024
    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
    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. proxy: send regular http post request to proxy for nft feature

    @laruh
    laruh committed May 12, 2024
    Configuration menu
    Copy the full SHA
    b8b05d1 View commit details
    Browse the repository at this point in the history

  2. make erc721 and erc1155 time locks different in tests

    @laruh
    laruh committed May 12, 2024
    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
    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
    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. review: impl lock_coins() to keep coins field in CoinsContext private

    @laruh
    laruh committed May 14, 2024
    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. review: rename Gui-Auth types to align with new names in the KomodoDe… 

    …fi Proxy project
    @laruh
    laruh committed May 15, 2024
    Configuration menu
    Copy the full SHA
    36eaf38 View commit details
    Browse the repository at this point in the history

  2. review: use "http-rustls-tls" feature in web3 crate for tests

    @laruh
    laruh committed May 15, 2024
    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. review: send Http GET request to activate NFT

    @laruh
    laruh committed May 16, 2024
    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. review: support GET requests to KomodoDeFi Proxy layer and to 3rd API… 

    … directly
    @laruh
    laruh committed May 17, 2024
    Configuration menu
    Copy the full SHA
    d03b6d1 View commit details
    Browse the repository at this point in the history

  2. impl build_and_send_request func to avoid code repetition

    @laruh
    laruh committed May 17, 2024
    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
    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
    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
    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. send only signed message as header in nft

    @laruh
    laruh committed May 23, 2024
    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
    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 Jun 22, 2024

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

    …e-nft-maker-swap-contract-sepolia-test
    @laruh
    laruh committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    5f34f1c View commit details
    Browse the repository at this point in the history

  2. review: provide log!, instead println! in tests

    @laruh
    laruh committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    e672485 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

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

    …e-nft-maker-swap-contract-sepolia-test
    @laruh
    laruh committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    0d54567 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
    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
    laruh committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    1e050d2 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

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

    …e-nft-maker-swap-contract-sepolia-test
    @laruh
    laruh committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    7cbb941 View commit details
    Browse the repository at this point in the history