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

💥 Add ERC1155MetadataURI Implementation Logic #34

Merged
merged 21 commits into from
Dec 28, 2022
Merged

💥 Add ERC1155MetadataURI Implementation Logic #34

merged 21 commits into from
Dec 28, 2022

Commits on Dec 21, 2022

  1. add contract & update interface

    @jtriley-eth
    jtriley-eth committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    19deb3c View commit details
    Browse the repository at this point in the history

  2. add set_uri function

    @jtriley-eth
    jtriley-eth committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    c23fa29 View commit details
    Browse the repository at this point in the history

  3. add set minter function

    @jtriley-eth
    jtriley-eth committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    cccfd22 View commit details
    Browse the repository at this point in the history

  4. add constructor stuffs

    @jtriley-eth
    jtriley-eth committed Dec 21, 2022
    Configuration menu
    Copy the full SHA
    1a0bce6 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2022

  1. add test boilerplate

    @jtriley-eth
    jtriley-eth committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    12ddd56 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'erc1155' into erc1155

    @jtriley-eth
    jtriley-eth authored Dec 22, 2022
    Configuration menu
    Copy the full SHA
    66d828a View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2022

  1. Update src/tokens/interfaces/IERC1155Receiver.vy 

    Co-authored-by: Pascal Marco Caversaccio <pcaversaccio@users.noreply.github.com>
Signed-off-by: JT <Jtriley15@gmail.com>
    @jtriley-eth @pcaversaccio
    jtriley-eth and pcaversaccio authored Dec 24, 2022
    Configuration menu
    Copy the full SHA
    b778f46 View commit details
    Browse the repository at this point in the history

  2. Update test/tokens/interfaces/IERC1155Extended.sol 

    Co-authored-by: Pascal Marco Caversaccio <pcaversaccio@users.noreply.github.com>
Signed-off-by: JT <Jtriley15@gmail.com>
    @jtriley-eth @pcaversaccio
    jtriley-eth and pcaversaccio authored Dec 24, 2022
    Configuration menu
    Copy the full SHA
    4a49f81 View commit details
    Browse the repository at this point in the history

  3. Update src/tokens/ERC1155.vy 

    Co-authored-by: Pascal Marco Caversaccio <pcaversaccio@users.noreply.github.com>
Signed-off-by: JT <Jtriley15@gmail.com>
    @jtriley-eth @pcaversaccio
    jtriley-eth and pcaversaccio authored Dec 24, 2022
    Configuration menu
    Copy the full SHA
    3100695 View commit details
    Browse the repository at this point in the history

  4. Update src/tokens/ERC1155.vy 

    Co-authored-by: Pascal Marco Caversaccio <pcaversaccio@users.noreply.github.com>
Signed-off-by: JT <Jtriley15@gmail.com>
    @jtriley-eth @pcaversaccio
    jtriley-eth and pcaversaccio authored Dec 24, 2022
    Configuration menu
    Copy the full SHA
    43a45a1 View commit details
    Browse the repository at this point in the history

  5. Update src/tokens/ERC1155.vy 

    Co-authored-by: Pascal Marco Caversaccio <pcaversaccio@users.noreply.github.com>
Signed-off-by: JT <Jtriley15@gmail.com>
    @jtriley-eth @pcaversaccio
    jtriley-eth and pcaversaccio authored Dec 24, 2022
    Configuration menu
    Copy the full SHA
    712b4de View commit details
    Browse the repository at this point in the history

  6. Update test/tokens/interfaces/IERC1155Extended.sol 

    Co-authored-by: Pascal Marco Caversaccio <pcaversaccio@users.noreply.github.com>
Signed-off-by: JT <Jtriley15@gmail.com>
    @jtriley-eth @pcaversaccio
    jtriley-eth and pcaversaccio authored Dec 24, 2022
    Configuration menu
    Copy the full SHA
    c5996ae View commit details
    Browse the repository at this point in the history

  7. Update test/tokens/ERC1155.t.sol 

    Co-authored-by: Pascal Marco Caversaccio <pcaversaccio@users.noreply.github.com>
Signed-off-by: JT <Jtriley15@gmail.com>
    @jtriley-eth @pcaversaccio
    jtriley-eth and pcaversaccio authored Dec 24, 2022
    Configuration menu
    Copy the full SHA
    dde010f View commit details
    Browse the repository at this point in the history

  8. Update src/tokens/ERC1155.vy 

    Co-authored-by: Pascal Marco Caversaccio <pcaversaccio@users.noreply.github.com>
Signed-off-by: JT <Jtriley15@gmail.com>
    @jtriley-eth @pcaversaccio
    jtriley-eth and pcaversaccio authored Dec 24, 2022
    Configuration menu
    Copy the full SHA
    b9ff7da View commit details
    Browse the repository at this point in the history

  9. Apply suggestions from code review 

    Co-authored-by: Pascal Marco Caversaccio <pcaversaccio@users.noreply.github.com>
Signed-off-by: JT <Jtriley15@gmail.com>
    @jtriley-eth @pcaversaccio
    jtriley-eth and pcaversaccio authored Dec 24, 2022
    Configuration menu
    Copy the full SHA
    ba47a3b View commit details
    Browse the repository at this point in the history

  10. add tests, mocks, minor edits to dynarray sizes

    @jtriley-eth
    jtriley-eth committed Dec 24, 2022
    Configuration menu
    Copy the full SHA
    656c63e View commit details
    Browse the repository at this point in the history

  11. add proper indent to natspec

    @jtriley-eth
    jtriley-eth committed Dec 24, 2022
    Configuration menu
    Copy the full SHA
    391326c View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2022

  1. update contract based on code review

    @jtriley-eth
    jtriley-eth committed Dec 26, 2022
    Configuration menu
    Copy the full SHA
    092abd4 View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2022

  1. rm tests to decouple pr

    @jtriley-eth
    jtriley-eth committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    098d5b9 View commit details
    Browse the repository at this point in the history

  2. break out auth checks to external transfers and mints

    @jtriley-eth
    jtriley-eth committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    0c1b641 View commit details
    Browse the repository at this point in the history

  3. rm outdated todo

    @jtriley-eth
    jtriley-eth committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    da61332 View commit details
    Browse the repository at this point in the history