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

refactor(protocol): add batch transfer and burn for BridgedERC721 #17058

Merged
merged 32 commits into from
May 9, 2024
Merged

refactor(protocol): add batch transfer and burn for BridgedERC721 #17058

merged 32 commits into from
May 9, 2024

Commits on May 8, 2024

  1. Change to transfer and burn pattern

    Keszey Dániel authored and Keszey Dániel committed May 8, 2024
    Configuration menu
    Copy the full SHA
    f59a182 View commit details
    Browse the repository at this point in the history

  2. remove for loop

    Keszey Dániel authored and Keszey Dániel committed May 8, 2024
    Configuration menu
    Copy the full SHA
    b36902d View commit details
    Browse the repository at this point in the history

  3. address pr comments

    Keszey Dániel authored and Keszey Dániel committed May 8, 2024
    Configuration menu
    Copy the full SHA
    6e73966 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into vault_burn_design_fix

    @adaki2004
    adaki2004 committed May 8, 2024
    Configuration menu
    Copy the full SHA
    384632d View commit details
    Browse the repository at this point in the history

  5. forge fmt & update contract layout table

    @adaki2004 @github-actions
    adaki2004 authored and github-actions[bot] committed May 8, 2024
    Configuration menu
    Copy the full SHA
    75389f4 View commit details
    Browse the repository at this point in the history

  6. Update packages/protocol/contracts/tokenvault/BridgedERC721.sol

    @dantaik
    dantaik committed May 8, 2024
    Configuration menu
    Copy the full SHA
    028ce30 View commit details
    Browse the repository at this point in the history

  7. forge fmt & update contract layout table

    @dantaik @github-actions
    dantaik authored and github-actions[bot] committed May 8, 2024
    Configuration menu
    Copy the full SHA
    a69c7d9 View commit details
    Browse the repository at this point in the history

  8. remove pnpm-lock

    Keszey Dániel authored and Keszey Dániel committed May 8, 2024
    Configuration menu
    Copy the full SHA
    251e1af View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. add batch mint/burn function for bridged ERC721 tokens

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

  2. Revert "add batch mint/burn function for bridged ERC721 tokens" 

    This reverts commit 0ee4bde.
    @dantaik
    dantaik committed May 9, 2024
    Configuration menu
    Copy the full SHA
    9decea2 View commit details
    Browse the repository at this point in the history

  3. Reapply "add batch mint/burn function for bridged ERC721 tokens" 

    This reverts commit 9decea2.
    @dantaik
    dantaik committed May 9, 2024
    Configuration menu
    Copy the full SHA
    ddabdd8 View commit details
    Browse the repository at this point in the history

  4. forge fmt & update contract layout table

    @dantaik @github-actions
    dantaik authored and github-actions[bot] committed May 9, 2024
    Configuration menu
    Copy the full SHA
    915f8b1 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into vault_burn_design_fix

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

  6. Merge branch 'vault_burn_design_fix' into batch_erc721

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

  7. Update ERC721Vault.sol

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

  8. Merge branch 'batch_erc721' of ssh://github.com/taikoxyz/taiko-mono i… 

    …nto batch_erc721
    @dantaik
    dantaik committed May 9, 2024
    Configuration menu
    Copy the full SHA
    362cc15 View commit details
    Browse the repository at this point in the history

  9. more

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

  10. more

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

  11. Update packages/protocol/contracts/tokenvault/BridgedERC20.sol

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

  12. fix

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

  13. Merge branch 'batch_erc721' of ssh://github.com/taikoxyz/taiko-mono i… 

    …nto batch_erc721
    @dantaik
    dantaik committed May 9, 2024
    Configuration menu
    Copy the full SHA
    0d7a806 View commit details
    Browse the repository at this point in the history

  14. forge fmt & update contract layout table

    @dantaik @github-actions
    dantaik authored and github-actions[bot] committed May 9, 2024
    Configuration menu
    Copy the full SHA
    5ed6fb7 View commit details
    Browse the repository at this point in the history

  15. more

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

  16. Revert "more" 

    This reverts commit a0d4b61.
    @dantaik
    dantaik committed May 9, 2024
    Configuration menu
    Copy the full SHA
    df8aaf7 View commit details
    Browse the repository at this point in the history

  17. Revert "Merge branch 'batch_erc721' of ssh://github.com/taikoxyz/taik… 

    …o-mono into batch_erc721"

This reverts commit 0d7a806, reversing
changes made to abd90dd.
    @dantaik
    dantaik committed May 9, 2024
    Configuration menu
    Copy the full SHA
    10d5691 View commit details
    Browse the repository at this point in the history

  18. Revert "fix" 

    This reverts commit abd90dd.
    @dantaik
    dantaik committed May 9, 2024
    Configuration menu
    Copy the full SHA
    ad7c372 View commit details
    Browse the repository at this point in the history

  19. Revert "more" 

    This reverts commit 9e9e429.
    @dantaik
    dantaik committed May 9, 2024
    Configuration menu
    Copy the full SHA
    5e6cf39 View commit details
    Browse the repository at this point in the history

  20. Revert "more" 

    This reverts commit c547326.
    @dantaik
    dantaik committed May 9, 2024
    Configuration menu
    Copy the full SHA
    0dbcc0e View commit details
    Browse the repository at this point in the history

  21. Merge branch 'batch_erc721' of ssh://github.com/taikoxyz/taiko-mono i… 

    …nto batch_erc721
    @dantaik
    dantaik committed May 9, 2024
    Configuration menu
    Copy the full SHA
    2a04726 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'main' into batch_erc721

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

  23. more

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

  24. Revert "more" 

    This reverts commit 5f85450.
    @dantaik
    dantaik committed May 9, 2024
    Configuration menu
    Copy the full SHA
    0690818 View commit details
    Browse the repository at this point in the history