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.

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

[SMR-979] Royalty Enforcement #24

Merged
merged 20 commits into from Mar 28, 2023
Merged

[SMR-979] Royalty Enforcement #24

merged 20 commits into from Mar 28, 2023

Conversation

EdwardJES
Copy link
Contributor

@EdwardJES EdwardJES commented Mar 17, 2023

https://immutable.atlassian.net/browse/SMR-979

PR adds royalty enforcement to the ERC721 Preset contract.

Added:

  • RoyaltyWhitelist.sol: whitelist registry that allows for whitelisting of addresses and bytecode
  • EIP2981 and WhitelistRegistry to ImmutableERC721Base
  • RoyaltyWhitelist.test.ts: tests for whitelist registry
  • WhitelistERC721TransfersApprovals: tests for ERC721 transfers and approvals with whitelist
  • extended ImmutableERC721PermissionedMintable.test to include e2e enforced royalty trade flow
  • Mocks for testing
  • helper functions for deploying fixtures in utils.ts

@github-actions
Copy link

CLA Assistant Lite bot:
Thank you for your submission, we really appreciate it. Like many open-source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution. You can sign the CLA by just posting a Pull Request Comment same as the below format.


I have read the CLA Document and I hereby sign the CLA


You can retrigger this bot by commenting recheck in this Pull Request

@EdwardJES EdwardJES marked this pull request as ready for review March 17, 2023 04:57
contracts/royalty-enforcement/RoyaltyWhitelist.sol Outdated Show resolved Hide resolved
contracts/royalty-enforcement/RoyaltyWhitelist.sol Outdated Show resolved Hide resolved
contracts/royalty-enforcement/RoyaltyWhitelist.sol Outdated Show resolved Hide resolved
contracts/royalty-enforcement/RoyaltyWhitelist.sol Outdated Show resolved Hide resolved
contracts/token/erc721/ImmutableERC721Base.sol Outdated Show resolved Hide resolved
contracts/token/erc721/ImmutableERC721Base.sol Outdated Show resolved Hide resolved
test/royalty-enforcement/RoyaltyWhitelist.test.ts Outdated Show resolved Hide resolved
Copy link
Contributor

@felipetavares felipetavares left a comment

Choose a reason for hiding this comment

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

None of my own comments are blocking, but this is IMO:

So if I move my assets to a smart contract wallet that's not whitelisted, I may never be able to sell them?

contracts/royalty-enforcement/RoyaltyWhitelist.sol Outdated Show resolved Hide resolved
contracts/royalty-enforcement/RoyaltyWhitelist.sol Outdated Show resolved Hide resolved
contracts/token/erc721/ImmutableERC721Base.sol Outdated Show resolved Hide resolved
contracts/royalty-enforcement/RoyaltyWhitelist.sol Outdated Show resolved Hide resolved
contracts/royalty-enforcement/RoyaltyWhitelist.sol Outdated Show resolved Hide resolved
@EdwardJES EdwardJES merged commit 3460dd5 into main Mar 28, 2023
1 check passed
@EdwardJES EdwardJES deleted the SMR-979/royalty-enforcement branch March 28, 2023 02:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants