From 07cf1117703cb6849d644cd96e1a6aafe40f0d65 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 9 Nov 2023 00:33:12 +0000 Subject: [PATCH 1/3] Version Packages --- .changeset/curly-fireants-rest.md | 5 ----- packages/1155-contracts/CHANGELOG.md | 6 ++++++ packages/1155-contracts/package.json | 2 +- packages/1155-contracts/src/version/ContractVersionBase.sol | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 .changeset/curly-fireants-rest.md diff --git a/.changeset/curly-fireants-rest.md b/.changeset/curly-fireants-rest.md deleted file mode 100644 index 9108b0406..000000000 --- a/.changeset/curly-fireants-rest.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@zoralabs/zora-1155-contracts": patch ---- - -Fix broken storage layout by not including an interface on CreatorRoyaltiesControl diff --git a/packages/1155-contracts/CHANGELOG.md b/packages/1155-contracts/CHANGELOG.md index 900a76d17..254117ace 100644 --- a/packages/1155-contracts/CHANGELOG.md +++ b/packages/1155-contracts/CHANGELOG.md @@ -1,5 +1,11 @@ # @zoralabs/zora-1155-contracts +## 2.3.2 + +### Patch Changes + +- 366ac20: Fix broken storage layout by not including an interface on CreatorRoyaltiesControl + ## 2.3.1 ### Patch Changes diff --git a/packages/1155-contracts/package.json b/packages/1155-contracts/package.json index cbc882480..97d590d32 100644 --- a/packages/1155-contracts/package.json +++ b/packages/1155-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@zoralabs/zora-1155-contracts", - "version": "2.3.1", + "version": "2.3.2", "repository": "git@github.com:ourzora/zora-protocol.git", "author": "Iain ", "license": "MIT", diff --git a/packages/1155-contracts/src/version/ContractVersionBase.sol b/packages/1155-contracts/src/version/ContractVersionBase.sol index 236c94a3e..12b4724d9 100644 --- a/packages/1155-contracts/src/version/ContractVersionBase.sol +++ b/packages/1155-contracts/src/version/ContractVersionBase.sol @@ -1,5 +1,5 @@ // This file is automatically generated by code; do not manually update -// Last updated on 2023-11-06T00:58:51.853Z +// Last updated on 2023-11-09T00:33:12.481Z // SPDX-License-Identifier: MIT pragma solidity 0.8.17; @@ -10,6 +10,6 @@ import {IVersionedContract} from "../interfaces/IVersionedContract.sol"; contract ContractVersionBase is IVersionedContract { /// @notice The version of the contract function contractVersion() external pure override returns (string memory) { - return "2.3.1"; + return "2.3.2"; } } From 907af477e429612cf456b41c542de500ac3a0040 Mon Sep 17 00:00:00 2001 From: Dan Oved Date: Thu, 9 Nov 2023 09:26:27 -0800 Subject: [PATCH 2/3] change to minor patch --- packages/1155-contracts/CHANGELOG.md | 5 +++-- packages/1155-contracts/package.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/1155-contracts/CHANGELOG.md b/packages/1155-contracts/CHANGELOG.md index 254117ace..5278cd306 100644 --- a/packages/1155-contracts/CHANGELOG.md +++ b/packages/1155-contracts/CHANGELOG.md @@ -1,10 +1,11 @@ # @zoralabs/zora-1155-contracts -## 2.3.2 +## 2.4.0 -### Patch Changes +### Minor Changes - 366ac20: Fix broken storage layout by not including an interface on CreatorRoyaltiesControl +- e25ac54: ignore nonzero supply royalty schedule ## 2.3.1 diff --git a/packages/1155-contracts/package.json b/packages/1155-contracts/package.json index 97d590d32..87d152c6d 100644 --- a/packages/1155-contracts/package.json +++ b/packages/1155-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@zoralabs/zora-1155-contracts", - "version": "2.3.2", + "version": "2.4.0", "repository": "git@github.com:ourzora/zora-protocol.git", "author": "Iain ", "license": "MIT", From 8245fe1dd68dfbd1e11858a8bc295e35b3bd7f26 Mon Sep 17 00:00:00 2001 From: Dan Oved Date: Thu, 9 Nov 2023 10:02:01 -0800 Subject: [PATCH 3/3] fix contract verison --- packages/1155-contracts/src/version/ContractVersionBase.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/1155-contracts/src/version/ContractVersionBase.sol b/packages/1155-contracts/src/version/ContractVersionBase.sol index 12b4724d9..52fcb687f 100644 --- a/packages/1155-contracts/src/version/ContractVersionBase.sol +++ b/packages/1155-contracts/src/version/ContractVersionBase.sol @@ -10,6 +10,6 @@ import {IVersionedContract} from "../interfaces/IVersionedContract.sol"; contract ContractVersionBase is IVersionedContract { /// @notice The version of the contract function contractVersion() external pure override returns (string memory) { - return "2.3.2"; + return "2.4.0"; } }