From fecfe6b30cbb6a60e0da7a6caca44d0dd22d1a0a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 18 Oct 2023 17:43:11 +0000 Subject: [PATCH 1/3] Version Packages --- .changeset/great-camels-impress.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/great-camels-impress.md diff --git a/.changeset/great-camels-impress.md b/.changeset/great-camels-impress.md deleted file mode 100644 index 9672b1f6f..000000000 --- a/.changeset/great-camels-impress.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@zoralabs/zora-1155-contracts": minor ---- - -Supply royalties are no longer supported diff --git a/packages/1155-contracts/CHANGELOG.md b/packages/1155-contracts/CHANGELOG.md index f6f7e6532..b160707b8 100644 --- a/packages/1155-contracts/CHANGELOG.md +++ b/packages/1155-contracts/CHANGELOG.md @@ -1,5 +1,11 @@ # @zoralabs/zora-1155-contracts +## 2.1.0 + +### Minor Changes + +- 9495c34: Supply royalties are no longer supported + ## 2.0.4 ### Patch Changes diff --git a/packages/1155-contracts/package.json b/packages/1155-contracts/package.json index 75d5cef34..1d39084b5 100644 --- a/packages/1155-contracts/package.json +++ b/packages/1155-contracts/package.json @@ -1,6 +1,6 @@ { "name": "@zoralabs/zora-1155-contracts", - "version": "2.0.4", + "version": "2.1.0", "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 613681690..93eacb140 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-10-13T15:34:50.319Z +// Last updated on 2023-10-18T17:43:11.859Z // 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.0.4"; + return "2.1.0"; } } From a7acd49212b99e1e75ddb1df2b4361e176bbca20 Mon Sep 17 00:00:00 2001 From: Rohan Kulkarni Date: Wed, 18 Oct 2023 22:44:54 -0400 Subject: [PATCH 2/3] chore: testnet deploy --- packages/1155-contracts/addresses/999.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/1155-contracts/addresses/999.json b/packages/1155-contracts/addresses/999.json index 2dfccad6d..5e1217289 100644 --- a/packages/1155-contracts/addresses/999.json +++ b/packages/1155-contracts/addresses/999.json @@ -1,7 +1,7 @@ { - "CONTRACT_1155_IMPL": "0x486709A6BeDBD8476d7bCF73F1ab42579A1A7d78", - "CONTRACT_1155_IMPL_VERSION": "2.0.0", - "FACTORY_IMPL": "0x366A36c10E1C851dcfA7804fB313dEA8E3488335", + "CONTRACT_1155_IMPL": "0xCE00c75B9807A2aA87B2297cA7Dc1C0190137D6F", + "CONTRACT_1155_IMPL_VERSION": "2.1.0", + "FACTORY_IMPL": "0x15ba66e376856F3F6FE53dE9eeAb10dEF10E8C92", "FACTORY_PROXY": "0x777777C338d93e2C7adf08D102d45CA7CC4Ed021", "FIXED_PRICE_SALE_STRATEGY": "0x04E2516A2c207E84a1839755675dfd8eF6302F0a", "MERKLE_MINT_SALE_STRATEGY": "0xf48172CA3B6068B20eE4917Eb27b5472f1f272C7", From fc24b3aeed07e6594ebee5832185f7f6530301dc Mon Sep 17 00:00:00 2001 From: Rohan Kulkarni Date: Wed, 18 Oct 2023 22:55:01 -0400 Subject: [PATCH 3/3] chore: add changeset --- .changeset/weak-planets-love.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/weak-planets-love.md diff --git a/.changeset/weak-planets-love.md b/.changeset/weak-planets-love.md new file mode 100644 index 000000000..8503c2d45 --- /dev/null +++ b/.changeset/weak-planets-love.md @@ -0,0 +1,5 @@ +--- +"@zoralabs/zora-1155-contracts": minor +--- + +Add support for multiple creator reward recipients on a shared contract