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: support erc1155. Impl Batcher for supporting erc721/erc1155 in batch #16

Merged
merged 33 commits into from
Apr 11, 2024
Merged

feat: support erc1155. Impl Batcher for supporting erc721/erc1155 in batch #16

merged 33 commits into from
Apr 11, 2024

Commits on Mar 13, 2024

  1. fix(Token): nit prettier Token lib

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    5078d3e View commit details
    Browse the repository at this point in the history

  2. fix(Token): rename _ for internal lib

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    cb1706f View commit details
    Browse the repository at this point in the history

  3. fix(Owner): move TokenOwner to a separate lib

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    079fa61 View commit details
    Browse the repository at this point in the history

  4. fix(Info): move to LibTokenInfo

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    c7751f5 View commit details
    Browse the repository at this point in the history

  5. fix(Info): add two array fields for info

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    d4c7a9b View commit details
    Browse the repository at this point in the history

  6. fix(Info): validate erc1155 and erc721 batch

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    77396ac View commit details
    Browse the repository at this point in the history

  7. fix(Info): add router

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    8d0becb View commit details
    Browse the repository at this point in the history

  8. fix(Info): restrict scope of tryTransfer to private

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    68b9c86 View commit details
    Browse the repository at this point in the history

  9. feat(Info): support hash batch

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    6efc05a View commit details
    Browse the repository at this point in the history

  10. fix(Info): move helpers to EoF

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    66b166a View commit details
    Browse the repository at this point in the history

  11. fix(Info): refactor handleAssetTransfer

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    eb9a888 View commit details
    Browse the repository at this point in the history

  12. feat(Info): rename transferFrom to handleTransferFrom

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    fe51f39 View commit details
    Browse the repository at this point in the history

  13. fix(Info): rename to ERC1155Batch

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    f65c25d View commit details
    Browse the repository at this point in the history

  14. fix(Info): return instead of nested if-else

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    5090262 View commit details
    Browse the repository at this point in the history

  15. feat(Info): impl transfer1155

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    ec8adac View commit details
    Browse the repository at this point in the history

  16. feat(Info): mint and transfer 1155 in batch

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    87c1c15 View commit details
    Browse the repository at this point in the history

  17. fix(Gateway): rename tranferFrom to handleAssetIn

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    a9649a5 View commit details
    Browse the repository at this point in the history

  18. fix((Info): rework the transfer methods

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    f722a9c View commit details
    Browse the repository at this point in the history

  19. fix(Info): transfer in ERC721 by private method

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    bb4d8b9 View commit details
    Browse the repository at this point in the history

  20. fix(Info): support ERC721Batch

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    69df309 View commit details
    Browse the repository at this point in the history

  21. fix(Info): chore: update docs

    @nxqbao
    nxqbao committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    3d39232 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. fix(Info): fix validation

    @nxqbao
    nxqbao committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    e9d6435 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. test: add test for ERC721 Batch

    @nxqbao
    nxqbao committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    2ca888e View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. fea(GatewayBatcher): init commit

    @nxqbao
    nxqbao committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    4e04462 View commit details
    Browse the repository at this point in the history

  2. feat(GatewayBatcher): separate to two -Batch lib

    @nxqbao
    nxqbao committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    7d7c5d5 View commit details
    Browse the repository at this point in the history

  3. feat(GatewayBatcher): refactor by dispatcher

    @nxqbao
    nxqbao committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    65bbf4c View commit details
    Browse the repository at this point in the history

  4. feat(TokenInfo): remove batch action in legacy TokenInfo

    @nxqbao
    nxqbao committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    a0e0e36 View commit details
    Browse the repository at this point in the history

  5. feat(GatewayBatcher): fix validation erc1155

    @nxqbao
    nxqbao committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    7a8e1ef View commit details
    Browse the repository at this point in the history

  6. test(GatewayBatcher): init first 1155 batch test

    @nxqbao
    nxqbao committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    d5aca70 View commit details
    Browse the repository at this point in the history

  7. feat(*Gateway): inherit ERC1155Holder

    @nxqbao
    nxqbao committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    a8ca9ee View commit details
    Browse the repository at this point in the history

  8. test(ERC1155): fix the first test

    @nxqbao
    nxqbao committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    9b8fc4a View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. Apply suggestions from code review 

    Co-authored-by: tu-do.ron <[email protected]>
Signed-off-by: Bao <[email protected]>
    @nxqbao @TuDo1403
    nxqbao and TuDo1403 committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    150705a View commit details
    Browse the repository at this point in the history

  2. Update src/libraries/LibTokenInfoBatch.sol 

    Co-authored-by: tu-do.ron <[email protected]>
Signed-off-by: Bao <[email protected]>
    @nxqbao @TuDo1403
    nxqbao and TuDo1403 committed Apr 1, 2024
    Configuration menu
    Copy the full SHA
    fa39256 View commit details
    Browse the repository at this point in the history