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

Make royaltyInfo(uint256 _tokenId, uint256 _salePrice) virtual #3133

Merged
merged 2 commits into from
Jan 26, 2022
Merged

Make royaltyInfo(uint256 _tokenId, uint256 _salePrice) virtual #3133

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b474a04
Make royaltyInfo(uint256 _tokenId, uint256 _salePrice) virtual
Amxx Jan 25, 2022
68865d6
fix lint
Amxx Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion contracts/token/common/ERC2981.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,13 @@ abstract contract ERC2981 is IERC2981, ERC165 {
/**
* @inheritdoc IERC2981
*/
function royaltyInfo(uint256 _tokenId, uint256 _salePrice) external view override returns (address, uint256) {
function royaltyInfo(uint256 _tokenId, uint256 _salePrice)
external
view
virtual
override
returns (address, uint256)
{
RoyaltyInfo memory royalty = _tokenRoyaltyInfo[_tokenId];

if (royalty.receiver == address(0)) {
Expand Down