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

chore: deploy #281

Merged
merged 4 commits into from
Oct 19, 2023
Merged

chore: deploy #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fecfe6b
Version Packages
github-actions[bot] Oct 18, 2023
6c83912
Merge pull request #275 from ourzora/changeset-release/main
kulkarohan Oct 18, 2023
a7acd49
chore: testnet deploy
kulkarohan Oct 19, 2023
fc24b3a
chore: add changeset
kulkarohan Oct 19, 2023
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: 0 additions & 5 deletions .changeset/great-camels-impress.md
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/weak-planets-love.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@zoralabs/zora-1155-contracts": minor
---

Add support for multiple creator reward recipients on a shared contract
6 changes: 6 additions & 0 deletions packages/1155-contracts/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions packages/1155-contracts/addresses/999.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/1155-contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zoralabs/zora-1155-contracts",
"version": "2.0.4",
"version": "2.1.0",
"repository": "[email protected]:ourzora/zora-protocol.git",
"author": "Iain <[email protected]>",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions packages/1155-contracts/src/version/ContractVersionBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -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";
}
}