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

Implement Non Fungible Token Royalty (EIP2981) #3012

Merged
merged 52 commits into from
Jan 6, 2022
Merged

Implement Non Fungible Token Royalty (EIP2981) #3012

merged 52 commits into from
Jan 6, 2022

Commits on Dec 10, 2021

  1. Add initial contracts for royalties

    @JulissaDantes
    JulissaDantes committed Dec 10, 2021
    Configuration menu
    Copy the full SHA
    129ab6f View commit details
    Browse the repository at this point in the history

  2. Update interface helper/add tests

    @JulissaDantes
    JulissaDantes committed Dec 10, 2021
    Configuration menu
    Copy the full SHA
    3fa2485 View commit details
    Browse the repository at this point in the history

  3. Update 2981 tests

    @JulissaDantes
    JulissaDantes committed Dec 10, 2021
    Configuration menu
    Copy the full SHA
    7fb8bfd View commit details
    Browse the repository at this point in the history

  4. Add documentation for 2981 implementation

    @JulissaDantes
    JulissaDantes committed Dec 10, 2021
    Configuration menu
    Copy the full SHA
    e979b93 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2021

  1. Rename setRoyalty function

    @JulissaDantes
    JulissaDantes committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    5f4499a View commit details
    Browse the repository at this point in the history

  2. Rename variables

    @JulissaDantes
    JulissaDantes committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    0f814dc View commit details
    Browse the repository at this point in the history

  3. Remove ERC165Storage inheritance

    @JulissaDantes
    JulissaDantes committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    d8a82c8 View commit details
    Browse the repository at this point in the history

  4. Add different denominator logic

    @JulissaDantes
    JulissaDantes committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    646380b View commit details
    Browse the repository at this point in the history

  5. Refactor royaltyInfo function

    @JulissaDantes
    JulissaDantes committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    9493268 View commit details
    Browse the repository at this point in the history

  6. Add validations to set royalty

    @JulissaDantes
    JulissaDantes committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    76fa5b2 View commit details
    Browse the repository at this point in the history

  7. Inherit from ERC721, include burn override

    @JulissaDantes
    JulissaDantes committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    f64275b View commit details
    Browse the repository at this point in the history

  8. Add tests coverage

    @JulissaDantes
    JulissaDantes committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    d93ede8 View commit details
    Browse the repository at this point in the history

  9. Refactor tests

    @JulissaDantes
    JulissaDantes committed Dec 13, 2021
    Configuration menu
    Copy the full SHA
    6859452 View commit details
    Browse the repository at this point in the history

  10. Update contracts/token/ERC721/extensions/draft-IERC721Royalty.sol 

    Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
    @JulissaDantes @frangio
    JulissaDantes and frangio authored Dec 13, 2021
    Configuration menu
    Copy the full SHA
    f4378c5 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2021

  1. Rename variable

    @JulissaDantes
    JulissaDantes committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    349fbf9 View commit details
    Browse the repository at this point in the history

  2. Remove if

    @JulissaDantes
    JulissaDantes committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    44e6e6d View commit details
    Browse the repository at this point in the history

  3. Add test case and global royalty delete

    @JulissaDantes
    JulissaDantes committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    5fb5bfc View commit details
    Browse the repository at this point in the history

  4. Add mixed royalties test cases

    @JulissaDantes
    JulissaDantes committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    b0f90c3 View commit details
    Browse the repository at this point in the history

  5. Avoid doing ssload twice

    @JulissaDantes
    JulissaDantes committed Dec 14, 2021
    Configuration menu
    Copy the full SHA
    85955fc View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2021

  1. Avoid token exclussion from global royalties tests cases

    @JulissaDantes
    JulissaDantes committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    9e3572d View commit details
    Browse the repository at this point in the history

  2. Update variable type

    @JulissaDantes
    JulissaDantes committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    cd33397 View commit details
    Browse the repository at this point in the history

  3. Rename function and update documentation

    @JulissaDantes
    JulissaDantes committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    dffd19e View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2021

  1. Update contracts/token/ERC721/extensions/draft-ERC721Royalty.sol 

    Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
    @JulissaDantes @frangio
    JulissaDantes and frangio authored Dec 16, 2021
    Configuration menu
    Copy the full SHA
    98bbc5d View commit details
    Browse the repository at this point in the history

  2. Update contracts/token/ERC721/extensions/draft-ERC721Royalty.sol 

    Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
    @JulissaDantes @frangio
    JulissaDantes and frangio authored Dec 16, 2021
    Configuration menu
    Copy the full SHA
    1fca44f View commit details
    Browse the repository at this point in the history

  3. Update contracts/token/ERC721/extensions/draft-ERC721Royalty.sol 

    Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
    @JulissaDantes @frangio
    JulissaDantes and frangio authored Dec 16, 2021
    Configuration menu
    Copy the full SHA
    37ccc42 View commit details
    Browse the repository at this point in the history

  4. Reorder tests and rename variables

    @JulissaDantes
    JulissaDantes committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    5e4d4a4 View commit details
    Browse the repository at this point in the history

  5. Remove .only

    @JulissaDantes
    JulissaDantes committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    b37621c View commit details
    Browse the repository at this point in the history

  6. Rename files

    @JulissaDantes
    JulissaDantes committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    79e01be View commit details
    Browse the repository at this point in the history

  7. Add royalty implementation without token inheritance, Add ERC1155 roy… 

    …alty implementation and tests
    @JulissaDantes
    JulissaDantes committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    fb6facf View commit details
    Browse the repository at this point in the history

  8. Remove double supportinterface test

    @JulissaDantes
    JulissaDantes committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    3d826f8 View commit details
    Browse the repository at this point in the history

  9. Add the supportInterface override on the royalty base contract

    @JulissaDantes
    JulissaDantes committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    7180b20 View commit details
    Browse the repository at this point in the history

  10. Add Royalty tests behavior

    @JulissaDantes
    JulissaDantes committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    8cf5939 View commit details
    Browse the repository at this point in the history

  11. Update ERC1155 royalty test file

    @JulissaDantes
    JulissaDantes committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    1ce08da View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2021

  1. cleanup ERC165 override

    @Amxx
    Amxx committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    7ab210f View commit details
    Browse the repository at this point in the history

  2. Update burn implementation for ERC1155

    @JulissaDantes
    JulissaDantes committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    c2c11bb View commit details
    Browse the repository at this point in the history

  3. Add warning detail

    @JulissaDantes
    JulissaDantes committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    55aa14f View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2021

  1. Add warning details

    @JulissaDantes
    JulissaDantes committed Dec 21, 2021
    Configuration menu
    Copy the full SHA
    2845801 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2021

  1. Update changelog after latest changes

    @JulissaDantes
    JulissaDantes committed Dec 22, 2021
    Configuration menu
    Copy the full SHA
    90feaf4 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2022

  1. whitespace

    @frangio
    frangio committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    da0e9bc View commit details
    Browse the repository at this point in the history

  2. rename deleteRoyalty -> deleteDefaultRoyalty

    @frangio
    frangio committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    2a848df View commit details
    Browse the repository at this point in the history

  3. whitespace

    @frangio
    frangio committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    40214df View commit details
    Browse the repository at this point in the history

  4. remove slither.db.json

    @frangio
    frangio committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    bf10a4f View commit details
    Browse the repository at this point in the history

  5. improve docs for ERC2981

    @frangio
    frangio committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    a927dc7 View commit details
    Browse the repository at this point in the history

  6. remove ERC1155Royalty, not safe to reset royalties if supply goes to … 

    …zero
    @frangio
    frangio committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    1f7eeae View commit details
    Browse the repository at this point in the history

  7. improve ERC721Royalty docs

    @frangio
    frangio committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    e2e4a56 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into EIP2981

    @frangio
    frangio committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    e3c0f4c View commit details
    Browse the repository at this point in the history

  9. add ERC721Royalty to ERC721 docs

    @frangio
    frangio committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    fb239db View commit details
    Browse the repository at this point in the history

  10. improve docs and reason strings

    @frangio
    frangio committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    a00c10d View commit details
    Browse the repository at this point in the history

  11. reorder functions more naturally

    @frangio
    frangio committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    3035b32 View commit details
    Browse the repository at this point in the history

  12. wording

    @frangio
    frangio committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    ff12eb3 View commit details
    Browse the repository at this point in the history

  13. lint

    @frangio
    frangio committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    e8d141c View commit details
    Browse the repository at this point in the history

  14. simplify docs for ERC721Royalty

    @frangio
    frangio committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    877a8a1 View commit details
    Browse the repository at this point in the history