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

Conversation

JulissaDantes
Copy link
Contributor

Fixes #2789

Implementation of NFT Royalties according to the EIP-2981. This implemementation supports both global royalties and token based royalties.

PR Checklist

  • Tests
  • Documentation
  • Changelog entry

@JulissaDantes JulissaDantes marked this pull request as draft December 10, 2021 18:05
@JulissaDantes JulissaDantes marked this pull request as ready for review December 10, 2021 18:44
@JulissaDantes JulissaDantes changed the title Eip2981 Non Fungible Token Royalty Implementation (Eip2981) Dec 10, 2021
@JulissaDantes JulissaDantes changed the title Non Fungible Token Royalty Implementation (Eip2981) Non Fungible Token Royalty Implementation (EIP2981) Dec 10, 2021
frangio
frangio reviewed Dec 10, 2021
View reviewed changes
contracts/token/ERC721/extensions/draft-ERC721Royalty.sol Outdated Show resolved Hide resolved
contracts/token/ERC721/extensions/draft-ERC721Royalty.sol Outdated Show resolved Hide resolved
contracts/token/ERC721/extensions/draft-ERC721Royalty.sol Outdated Show resolved Hide resolved
contracts/token/ERC721/extensions/draft-ERC721Royalty.sol Outdated Show resolved Hide resolved
contracts/token/ERC721/extensions/draft-ERC721Royalty.sol Outdated Show resolved Hide resolved
contracts/token/ERC721/extensions/draft-ERC721Royalty.sol Outdated Show resolved Hide resolved
contracts/token/ERC721/extensions/draft-ERC721Royalty.sol Outdated Show resolved Hide resolved
contracts/token/ERC721/extensions/draft-ERC721Royalty.sol Outdated Show resolved Hide resolved
contracts/token/ERC721/extensions/draft-ERC721Royalty.sol Outdated Show resolved Hide resolved
test/token/ERC721/extensions/ERC721Royalty.test.js Outdated Show resolved Hide resolved
@JulissaDantes JulissaDantes changed the title Non Fungible Token Royalty Implementation (EIP2981) Implement Non Fungible Token Royalty(EIP2981) Dec 13, 2021
frangio
frangio reviewed Dec 13, 2021
View reviewed changes
Copy link
Contributor

@frangio frangio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is looking good!

contracts/interfaces/IERC2981.sol Outdated Show resolved Hide resolved
contracts/token/ERC721/extensions/draft-IERC721Royalty.sol Outdated Show resolved Hide resolved
contracts/token/ERC721/extensions/draft-IERC721Royalty.sol Outdated Show resolved Hide resolved
contracts/token/ERC721/extensions/draft-ERC721Royalty.sol Outdated Show resolved Hide resolved
JulissaDantes and others added 2 commits December 13, 2021 19:13
@Amxx Amxx mentioned this pull request Dec 14, 2021
Closed
turbowars
turbowars reviewed Dec 22, 2021
View reviewed changes
Copy link

@turbowars turbowars left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must commend this is some deep work.

@gmertk gmertk mentioned this pull request Jan 3, 2022
Open
5 tasks
@frangio frangio changed the title Implement Non Fungible Token Royalty(EIP2981) Implement Non Fungible Token Royalty (EIP2981) Jan 6, 2022
@frangio frangio merged commit a65c03b into OpenZeppelin:master Jan 6, 2022
@frangio
Copy link
Contributor

frangio commented Jan 6, 2022

🚀 Thanks everyone! This will be released in 4.5 later this month.

@frangio frangio mentioned this pull request Jan 7, 2022
Closed
@hasandogu
Copy link

This is exciting, thank you! Any chance there could be an intermediate release? We are in the middle of implementing our own EIP2981 but would much rather use this.

@frangio
Copy link
Contributor

frangio commented Jan 7, 2022

@hasandogu Sorry, can't release this immediately, it has to go through our release process for review and bug bounty.

We're targetting a release candidate next week though, you're welcome to use it!

@hasandogu
Copy link

We're targetting a release candidate next week though, you're welcome to use it!

Thank you @frangio. We'll wait for the release candidate and see if we can contribute to the bug bounty.

@trivikramak
Copy link

trivikramak commented Jan 28, 2022 •
edited
Loading

Great work by everyone involved!
Hi @frangio, Waiting for the release. Do we have a release candidate?
Also, any updated timeline for 4.5? and is this confirmed to be included in 4.5?

UPDATE: Sorry for bothering, I've got my answers here - https://forum.openzeppelin.com/t/release-candidate-for-contracts-4-5-open-review-period/22700

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sreyemnayr sreyemnayr sreyemnayr left review comments

@turbowars turbowars turbowars left review comments

@frangio frangio frangio approved these changes

@Amxx Amxx Awaiting requested review from Amxx

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Implementing EIP-2981 (ERC721 Royalties)
7 participants
@JulissaDantes @frangio @hasandogu @trivikramak @Amxx @turbowars @sreyemnayr