Version Packages (ourzora#304)

This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and the packages will be published to npm automatically. If you're not ready to do a release yet, that's fine, whenever you add more changesets to main, this PR will be updated. # Releases ## @zoralabs/[email protected] ### Minor Changes - 50a4e09: - 1155 contracts use the MINTs contracts to get the mint fee, mint, and redeem a mint ticket upon minting. - `ZoraCreator1155Impl` adds a new method `mintWithMints` that allows for minting with MINTs that are already owned. ### Patch Changes - 50a4e09: - ZoraCreator1155Impl contract no longer has public facing function `computeFreeMintRewards` and `computePaidMintRewards` - protocol rewards calculation logic has been refactored and moved from the RewardSplits contract to the ZoraCreator1155Impl itself to save on contract size. - ZoraCreator1155Impl rewards splits are percentage based instead of a fixed value. This % is calculated based on the total reward value. And is based on a % value nearly identical to the previous fixed value. - 50a4e09: remove `adminMintBatch` to save contract size - 50a4e09: - To support the MINTs contract passing the first minter as an argument to `premintV2WithSignerContract` - we add the field `firstMinter` to `premintV2WithSignerContract`, and then in the 1155 check that the firstMinter argument is not address(0) since it now can be passed in manually. ## @zoralabs/[email protected] ### Minor Changes - 50a4e09: - 1155 contracts use the MINTs contracts to get the mint fee, mint, and redeem a mint ticket upon minting. - `ZoraCreator1155Impl` adds a new method `mintWithMints` that allows for minting with MINTs that are already owned. ### Patch Changes - 50a4e09: - To support the MINTs contract passing the first minter as an argument to `premintV2WithSignerContract` - we add the field `firstMinter` to `premintV2WithSignerContract`, and then in the 1155 check that the firstMinter argument is not address(0) since it now can be passed in manually. ## @zoralabs/[email protected] ### Patch Changes - 042edbe: Chain ids in published protocol-deployments package are now numbers instead of strings - 50a4e09: Includes MINTs contracts abis and addresses ## @zoralabs/[email protected] ### Patch Changes - 50a4e09: Added sdk method to get total MINT balance - Updated dependencies [042edbe] - Updated dependencies [50a4e09] - @zoralabs/[email protected]
emarai · Apr 8, 2024 · 5c436fb · 5c436fb
1 parent 7aff93d
commit 5c436fb
Show file tree

Hide file tree

Showing 18 changed files with 47 additions and 49 deletions.
diff --git a/.changeset/afraid-months-appear.md b/.changeset/afraid-months-appear.md
diff --git a/.changeset/bright-socks-shake.md b/.changeset/bright-socks-shake.md
diff --git a/.changeset/brown-insects-rush.md b/.changeset/brown-insects-rush.md
diff --git a/.changeset/little-flies-hunt.md b/.changeset/little-flies-hunt.md
diff --git a/.changeset/mean-bugs-walk.md b/.changeset/mean-bugs-walk.md
diff --git a/.changeset/three-books-march.md b/.changeset/three-books-march.md
diff --git a/.changeset/tough-suns-look.md b/.changeset/tough-suns-look.md
diff --git a/packages/1155-contracts/CHANGELOG.md b/packages/1155-contracts/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @zoralabs/zora-1155-contracts
 
+## 2.9.0
+
+### Minor Changes
+
+- 50a4e09: - Zora Creator 1155 contracts use the MINTs contracts to get the mint fee, mint, and redeem a mint ticket upon minting.
+  - `ZoraCreator1155Impl` adds a new method `mintWithMints` that allows for minting with MINTs that are already owned.
+- 50a4e09: - Zora Creator 1155 contracts no longer have a public facing function `computeFreeMintRewards` and `computePaidMintRewards`
+  - protocol rewards calculation logic has been refactored and moved from the RewardSplits contract to the ZoraCreator1155Impl itself to save on contract size.
+  - ZoraCreator1155Impl rewards splits are percentage based instead of a fixed value. This % is calculated based on the total reward value. And is based on a % value nearly identical to the previous fixed value.
+- 50a4e09: remove `adminMintBatch` to save contract size
+- 50a4e09: - To support the MINTs contract passing the first minter as an argument to `premintV2WithSignerContract` - we add the field `firstMinter` to `premintV2WithSignerContract`, and then in the 1155 check that the firstMinter argument is not address(0) since it now can be passed in manually.
+
 ## 2.8.1
 
 ### Patch Changes

diff --git a/packages/1155-contracts/package.json b/packages/1155-contracts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/zora-1155-contracts",
-  "version": "2.8.1",
+  "version": "2.9.0",
   "repository": "[email protected]:ourzora/zora-protocol.git",
   "author": "Iain <[email protected]>",
   "license": "MIT",

diff --git a/packages/1155-contracts/src/version/ContractVersionBase.sol b/packages/1155-contracts/src/version/ContractVersionBase.sol
@@ -9,6 +9,6 @@ import {IVersionedContract} from "@zoralabs/shared-contracts/interfaces/IVersion
 contract ContractVersionBase is IVersionedContract {
     /// @notice The version of the contract
     function contractVersion() external pure override returns (string memory) {
-        return "2.8.1";
+        return "2.9.0";
     }
 }
diff --git a/packages/mints/CHANGELOG.md b/packages/mints/CHANGELOG.md
@@ -0,0 +1,12 @@
+# @zoralabs/mints-contracts
+
+## 0.1.0
+
+### Minor Changes
+
+- 50a4e09: - 1155 contracts use the MINTs contracts to get the mint fee, mint, and redeem a mint ticket upon minting.
+  - `ZoraCreator1155Impl` adds a new method `mintWithMints` that allows for minting with MINTs that are already owned.
+
+### Patch Changes
+
+- 50a4e09: - To support the MINTs contract passing the first minter as an argument to `premintV2WithSignerContract` - we add the field `firstMinter` to `premintV2WithSignerContract`, and then in the 1155 check that the firstMinter argument is not address(0) since it now can be passed in manually.
diff --git a/packages/mints/package.json b/packages/mints/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/mints-contracts",
-  "version": "0.0.2",
+  "version": "0.1.0",
   "repository": "https://github.com/ourzora/zora-protocol.git",
   "license": "MIT",
   "main": "./dist/index.js",

diff --git a/packages/mints/src/version/ContractVersionBase.sol b/packages/mints/src/version/ContractVersionBase.sol
@@ -9,6 +9,6 @@ import {IVersionedContract} from "@zoralabs/shared-contracts/interfaces/IVersion
 contract ContractVersionBase is IVersionedContract {
     /// @notice The version of the contract
     function contractVersion() external pure override returns (string memory) {
-        return "0.1.0-DEV.2";
+        return "0.1.0";
     }
 }
diff --git a/packages/protocol-deployments/CHANGELOG.md b/packages/protocol-deployments/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @zoralabs/protocol-deployments
 
+## 0.1.5
+
+### Patch Changes
+
+- 042edbe: Chain ids in published protocol-deployments package are now numbers instead of strings
+- 50a4e09: Includes MINTs contracts abis and addresses
+
 ## 0.1.4
 
 ### Patch Changes

diff --git a/packages/protocol-deployments/package.json b/packages/protocol-deployments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/protocol-deployments",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "repository": "https://github.com/ourzora/zora-protocol",
   "license": "MIT",
   "type": "module",

diff --git a/packages/protocol-rewards/test/unit/ERC1155Rewards.t.sol b/packages/protocol-rewards/test/unit/ERC1155Rewards.t.sol
@@ -147,7 +147,7 @@ contract ERC1155RewardsTest is ProtocolRewardsTest {
     }
 
     function testRemainderSentToZora(uint256 rewardPrice, uint256 numTokens) public {
-        vm.assume(rewardPrice > 0.0000002 ether && rewardPrice < 2 ether);
+        vm.assume(rewardPrice > 0.0000002 ether && rewardPrice < 100 ether);
         vm.assume(numTokens > 0 && numTokens < 100_000);
 
         uint256 totalReward = mockERC1155.computeTotalReward(rewardPrice, numTokens);

diff --git a/packages/protocol-sdk/CHANGELOG.md b/packages/protocol-sdk/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @zoralabs/protocol-sdk
 
+## 0.5.8
+
+### Patch Changes
+
+- 50a4e09: Added sdk method to get total MINT balance
+- Updated dependencies [042edbe]
+- Updated dependencies [50a4e09]
+  - @zoralabs/protocol-deployments@0.1.5
+
 ## 0.5.7
 
 ### Patch Changes

diff --git a/packages/protocol-sdk/package.json b/packages/protocol-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/protocol-sdk",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "repository": "https://github.com/ourzora/zora-protocol",
   "license": "MIT",
   "type": "module",