Merge remote-tracking branch 'origin/main' into update_artifacts_abi

ourzora · Oct 11, 2023 · b2b7b08 · b2b7b08
2 parents f79a115 + 2dbf40e
commit b2b7b08
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 10 deletions.
diff --git a/.changeset/tame-keys-mix.md b/.changeset/tame-keys-mix.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @zoralabs/zora-1155-contracts
 
+## 2.0.3
+
+### Patch Changes
+
+- d3ddfbb: fix version packages tests
+
+## 2.0.2
+
+### Patch Changes
+
+- 9207e8f: Deployed determinstic proxies and latest versions to mainnet, goerli, base, base goerli, optimism, optimism goerli
+
 ## 2.0.1
 
 ### Patch Changes

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/zora-1155-contracts",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "repository": "git@github.com:ourzora/creator-contracts.git",
   "author": "Iain <iain@zora.co>",
   "license": "MIT",

diff --git a/src/version/ContractVersionBase.sol b/src/version/ContractVersionBase.sol
@@ -1,5 +1,5 @@
 // This file is automatically generated by code; do not manually update
-// Last updated on 2023-10-05T15:58:32.256Z
+// Last updated on 2023-10-05T22:37:20.442Z
 // 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.1";
+        return "2.0.3";
     }
 }
diff --git a/test/factory/ZoraCreator1155Factory.t.sol b/test/factory/ZoraCreator1155Factory.t.sol
@@ -17,6 +17,7 @@ import {MockContractMetadata} from "../mock/MockContractMetadata.sol";
 import {ProxyShim} from "../../src/utils/ProxyShim.sol";
 
 contract ZoraCreator1155FactoryTest is Test {
+    using stdJson for string;
     address internal zora;
     uint256 internal mintFeeAmount;
 
@@ -47,7 +48,8 @@ contract ZoraCreator1155FactoryTest is Test {
     }
 
     function test_contractVersion() external {
-        assertEq(factory.contractVersion(), "2.0.0");
+        string memory package = vm.readFile("./package.json");
+        assertEq(package.readString(".version"), factory.contractVersion());
     }
 
     function test_contractName() external {

diff --git a/test/nft/ZoraCreator1155.t.sol b/test/nft/ZoraCreator1155.t.sol
@@ -189,7 +189,8 @@ contract ZoraCreator1155Test is Test {
     function test_contractVersion() external {
         init();
 
-        assertEq(target.contractVersion(), "2.0.0");
+        string memory package = vm.readFile("./package.json");
+        assertEq(package.readString(".version"), target.contractVersion());
     }
 
     function test_assumeLastTokenIdMatches() external {