From 3e7405037e8f6cee6e17329b6bf121928a8c24a0 Mon Sep 17 00:00:00 2001 From: Dan Oved Date: Mon, 6 Nov 2023 10:58:54 -0800 Subject: [PATCH] Fix storage layout issue --- .changeset/curly-fireants-rest.md | 5 +++++ .../1155-contracts/src/royalties/CreatorRoyaltiesControl.sol | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changeset/curly-fireants-rest.md diff --git a/.changeset/curly-fireants-rest.md b/.changeset/curly-fireants-rest.md new file mode 100644 index 000000000..9108b0406 --- /dev/null +++ b/.changeset/curly-fireants-rest.md @@ -0,0 +1,5 @@ +--- +"@zoralabs/zora-1155-contracts": patch +--- + +Fix broken storage layout by not including an interface on CreatorRoyaltiesControl diff --git a/packages/1155-contracts/src/royalties/CreatorRoyaltiesControl.sol b/packages/1155-contracts/src/royalties/CreatorRoyaltiesControl.sol index 1888e4785..8fb239c4e 100644 --- a/packages/1155-contracts/src/royalties/CreatorRoyaltiesControl.sol +++ b/packages/1155-contracts/src/royalties/CreatorRoyaltiesControl.sol @@ -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. @@ -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;