refactor: deprecate supply royalty #267
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Current dependencies on/for this PR:
This comment was auto-generated by Graphite. |
oveddan
reviewed
Oct 12, 2023
| _requireCanMintQuantity(id, amount + supplyRoyaltyMints); | ||
|
|
||
| super._mint(to, id, amount, data); | ||
| tokens[id].totalMinted += amount + supplyRoyaltyMints; |
There was a problem hiding this comment.
do we still want to track totalMinted ? are we using that anywhere?
There was a problem hiding this comment.
ah good catch - @iainnash wdyt?
There was a problem hiding this comment.
i just checked our frontend repo and they're using it - i'll add that back
There was a problem hiding this comment.
yep we want to track this still.
| @@ -388,7 +388,8 @@ contract ZoraCreator1155Impl is | |||
| _requireAdminOrRole(msg.sender, tokenIds[i], PERMISSION_BIT_MINTER); | |||
| } | |||
| } | |||
| _mintBatch(recipient, tokenIds, quantities, data); | |||
|
|
|||
| super._mintBatch(recipient, tokenIds, quantities, data); | |||
| @@ -553,63 +554,8 @@ contract ZoraCreator1155Impl is | |||
| return super.supportsInterface(interfaceId) || interfaceId == type(IZoraCreator1155).interfaceId || ERC1155Upgradeable.supportsInterface(interfaceId); | |||
| } | |||
|
|
|||
| function _handleSupplyRoyalty(uint256 tokenId, uint256 mintAmount, bytes memory data) internal returns (uint256 totalRoyaltyMints) { | |||
There was a problem hiding this comment.
yup got the approval!
iainnash
requested changes
Oct 12, 2023
|
sooo i forgot about the |
|
adding back the overrides 😭 |
oveddan
reviewed
Oct 13, 2023
| /// @param to to mint to | ||
| /// @param id token id to mint | ||
| /// @param amount of tokens to mint | ||
| /// @param data as specified by 1155 standard | ||
| function _mint(address to, uint256 id, uint256 amount, bytes memory data) internal virtual override { | ||
| uint256 supplyRoyaltyMints = _handleSupplyRoyalty(id, amount, data); | ||
| _requireCanMintQuantity(id, amount + supplyRoyaltyMints); | ||
| _requireCanMintQuantity(id, amount); |
There was a problem hiding this comment.
yes for limited supply nfts.
|
yes for limited size editions
…On Fri, Oct 13, 2023 at 17:08 Dan Oved ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In packages/1155-contracts/src/nft/ZoraCreator1155Impl.sol
<#267 (comment)>
:
> /// @param to to mint to
/// @param id token id to mint
/// @param amount of tokens to mint
/// @param data as specified by 1155 standard
function _mint(address to, uint256 id, uint256 amount, bytes memory data) internal virtual override {
- uint256 supplyRoyaltyMints = _handleSupplyRoyalty(id, amount, data);
- _requireCanMintQuantity(id, amount + supplyRoyaltyMints);
+ _requireCanMintQuantity(id, amount);
we need this check?
—
Reply to this email directly, view it on GitHub
<#267 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAGMCOASZHBKABDSE7B65UTX7GUUXAVCNFSM6AAAAAA56HCRWGVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMYTMNZXGM3TKNBTGQ>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
This was referenced Oct 13, 2023
oveddan
requested changes
Oct 13, 2023
oveddan
force-pushed
the
deprecate_supply_royalty
branch
from
a1716d2
to
2b887a0
Compare
This was referenced Oct 17, 2023
Merged
oveddan
approved these changes
Oct 18, 2023
Merged
iainnash
pushed a commit
that referenced
this pull request
Jan 11, 2024
before margin: 0.117 kb ~available margin: 0.839 kb~ available margin: 0.576 kb
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
before margin: 0.117 kb
available margin: 0.839 kbavailable margin: 0.576 kb