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

[r2r] update deps and solc version, add ERC721 and ERC1155 support #2

Merged
merged 23 commits into from
Jan 22, 2024
Merged

[r2r] update deps and solc version, add ERC721 and ERC1155 support #2

merged 23 commits into from
Jan 22, 2024

Commits on Nov 14, 2023

  1. fix docker, update stack

    @laruh
    laruh committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    12a815e View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. "web3": "^4.2.2", "@openzeppelin/contracts": "^5.0.0", solc 0.8.23

    @laruh
    laruh committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    1226dad View commit details
    Browse the repository at this point in the history

  2. update ganache version

    @laruh
    laruh committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    b6f524b View commit details
    Browse the repository at this point in the history

  3. update more deps

    @laruh
    laruh committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    2400009 View commit details
    Browse the repository at this point in the history

  4. fix increase time problem, needed to mine block

    @laruh
    laruh committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    db4e886 View commit details
    Browse the repository at this point in the history

  5. combine evm_increaseTime and evm_mine methods

    @laruh
    laruh committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    a902aa2 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. format sol code

    @laruh
    laruh committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    65d3386 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. update readme, fix ReceivedSpent typo

    @laruh
    laruh committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    a941a19 View commit details
    Browse the repository at this point in the history

  2. update project structure info

    @laruh
    laruh committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    45c8fcd View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. add Erc721Token.sol and erc721Payment, receiverSpendErc721 functions

    @laruh
    laruh committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    2ca81ec View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

  1. add senderRefundErc721 func and ERC721 tests

    @laruh
    laruh committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    07753cf View commit details
    Browse the repository at this point in the history

  2. Erc1155Token.sol, add onERC1155Received etc funcs, add License

    @laruh
    laruh committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    6b8182f View commit details
    Browse the repository at this point in the history

  3. add ERC1155 balance test

    @laruh
    laruh committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    133a9b6 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. ERC1155 payment funcs in EtomicSwap, ERC1155 tests

    @laruh
    laruh committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    8b9e696 View commit details
    Browse the repository at this point in the history

  2. use safeTransferFrom for ERC721

    @laruh
    laruh committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    71cb6a1 View commit details
    Browse the repository at this point in the history

  3. use selector for onERC1155Received funcs

    @laruh
    laruh committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    cb9d1fd View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. call erc721token.safeTransferFrom directly

    @laruh
    laruh committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    6d719d2 View commit details
    Browse the repository at this point in the history

  2. call erc1155token.safeTransferFrom directly

    @laruh
    laruh committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    47caecb View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. add more checks in on...Received funcs, impl invalid secret

    @laruh
    laruh committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    db3e251 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. use solc version 0.8.20, mixedCase function arguments

    @laruh
    laruh committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    fe6f40f View commit details
    Browse the repository at this point in the history

  2. CEI pattern in EtomicSwap.sol

    @laruh
    laruh committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    e8833c6 View commit details
    Browse the repository at this point in the history

  3. more mixedCase func args

    @laruh
    laruh committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    c44a786 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. msg.sender == tx.origin check, remove redundant computation

    @laruh
    laruh committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    944973b View commit details
    Browse the repository at this point in the history