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

Fix broken storage layout issue as a result of #313 #330

Merged
merged 1 commit into from
Nov 9, 2023
Merged

Fix broken storage layout issue as a result of #313 #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .changeset/curly-fireants-rest.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@zoralabs/zora-1155-contracts": patch
---

Fix broken storage layout by not including an interface on CreatorRoyaltiesControl
4 changes: 2 additions & 2 deletions packages/1155-contracts/src/royalties/CreatorRoyaltiesControl.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {IERC2981} from "@openzeppelin/contracts/interfaces/IERC2981.sol";
/// @title CreatorRoyaltiesControl
/// @author ZORA @iainnash / @tbtstl
/// @notice Contract for managing the royalties of an 1155 contract
abstract contract CreatorRoyaltiesControl is CreatorRoyaltiesStorageV1, SharedBaseConstants, ICreatorRoyaltyErrors {
abstract contract CreatorRoyaltiesControl is CreatorRoyaltiesStorageV1, SharedBaseConstants {
uint256 immutable ROYALTY_BPS_TO_PERCENT = 10_000;

/// @notice The royalty information for a given token.
Expand Down Expand Up @@ -41,7 +41,7 @@ abstract contract CreatorRoyaltiesControl is CreatorRoyaltiesStorageV1, SharedBa
}
// Don't allow setting royalties to burn address
if (configuration.royaltyRecipient == address(0) && configuration.royaltyBPS > 0) {
revert InvalidMintSchedule();
revert ICreatorRoyaltyErrors.InvalidMintSchedule();
}
royalties[tokenId] = configuration;

Expand Down
Loading