Skip to content

Commit

Permalink
Merge pull request #298 from ourzora/changeset-release/prerelease_col…
Browse files Browse the repository at this point in the history
…laborators

Version Packages (collaborators)
  • Loading branch information
kulkarohan authored Oct 25, 2023
2 parents 2d07f63 + 3431894 commit fd77c07
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 11 deletions.
1 change: 1 addition & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"@zoralabs/protocol-rewards": "1.2.1"
},
"changesets": [
"gorgeous-cups-listen",
"weak-planets-love"
]
}
6 changes: 6 additions & 0 deletions packages/1155-contracts/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @zoralabs/zora-1155-contracts

## 2.2.0-collaborators.1

### Patch Changes

- e288ef8: Update zora testnet deployment for collaborators

## 2.2.0-collaborators.0

### Minor Changes
Expand Down
16 changes: 8 additions & 8 deletions packages/1155-contracts/addresses/999.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"CONTRACT_1155_IMPL": "0xCE00c75B9807A2aA87B2297cA7Dc1C0190137D6F",
"CONTRACT_1155_IMPL_VERSION": "2.1.0",
"CONTRACT_1155_IMPL": "0xAE274f33E694e2cc855298817b62004C3F6A097f",
"CONTRACT_1155_IMPL_VERSION": "2.2.0-collaborators.1",
"UPGRADE_GATE": "0xbC50029836A59A4E5e1Bb8988272F46ebA0F9900",
"FACTORY_IMPL": "0x15ba66e376856F3F6FE53dE9eeAb10dEF10E8C92",
"FACTORY_PROXY": "0x777777C338d93e2C7adf08D102d45CA7CC4Ed021",
"FACTORY_IMPL": "0x9e3c847eEFCE7B476061713FC24BaDB0454EbEdd",
"FACTORY_PROXY": "0x2E6f770Df9dbA4B409d55bC1bAC72B1445eEA87c",
"FIXED_PRICE_SALE_STRATEGY": "0x04E2516A2c207E84a1839755675dfd8eF6302F0a",
"MERKLE_MINT_SALE_STRATEGY": "0xf48172CA3B6068B20eE4917Eb27b5472f1f272C7",
"PREMINTER_IMPL": "0x6E2AbBcd82935bFC68A1d5d2c96372b13b65eD9C",
"PREMINTER_PROXY": "0x7777773606e7e46C8Ba8B98C08f5cD218e31d340",
"PREMINTER_IMPL": "0x849eb65057741A8816fbf2be6F36Ec8D0e420c37",
"PREMINTER_PROXY": "0x61A9F58BC647397A9819f54AC3693bAD6B0F5174",
"REDEEM_MINTER_FACTORY": "0x78964965cF77850224513a367f899435C5B69174",
"timestamp": 1696017248,
"commit": "7a0ae52"
"timestamp": 1698263824,
"commit": "ef5227c"
}
2 changes: 1 addition & 1 deletion packages/1155-contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zoralabs/zora-1155-contracts",
"version": "2.2.0-collaborators.0",
"version": "2.2.0-collaborators.1",
"repository": "git@github.com:ourzora/zora-protocol.git",
"author": "Iain <iain@zora.co>",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions packages/1155-contracts/src/version/ContractVersionBase.sol
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-24T19:43:29.478Z
// Last updated on 2023-10-25T20:40:02.834Z
// 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.2.0-collaborators.0";
return "2.2.0-collaborators.1";
}
}

0 comments on commit fd77c07

Please sign in to comment.