@zoralabs/protocol-deployments 0.0.2 → 0.0.4

package/package/wagmiGenerated.ts

@@ -665,6 +665,7 @@ export const zoraCreator1155ImplABI = [
     name: "CallFailed",
   },
   { type: "error", inputs: [], name: "Call_TokenIdMismatch" },
+  { type: "error", inputs: [], name: "CallerNotZoraCreator1155" },
   {
     type: "error",
     inputs: [
@@ -763,12 +764,23 @@ export const zoraCreator1155ImplABI = [
   },
   { type: "error", inputs: [], name: "INVALID_ADDRESS_ZERO" },
   { type: "error", inputs: [], name: "INVALID_ETH_AMOUNT" },
+  {
+    type: "error",
+    inputs: [
+      { name: "mintTo", internalType: "address", type: "address" },
+      { name: "merkleProof", internalType: "bytes32[]", type: "bytes32[]" },
+      { name: "merkleRoot", internalType: "bytes32", type: "bytes32" },
+    ],
+    name: "InvalidMerkleProof",
+  },
   { type: "error", inputs: [], name: "InvalidMintSchedule" },
   { type: "error", inputs: [], name: "MintNotYetStarted" },
   { type: "error", inputs: [], name: "Mint_InsolventSaleTransfer" },
   { type: "error", inputs: [], name: "Mint_TokenIDMintNotAllowed" },
   { type: "error", inputs: [], name: "Mint_UnknownCommand" },
   { type: "error", inputs: [], name: "Mint_ValueTransferFail" },
+  { type: "error", inputs: [], name: "MinterContractAlreadyExists" },
+  { type: "error", inputs: [], name: "MinterContractDoesNotExist" },
   { type: "error", inputs: [], name: "NewOwnerNeedsToBeAdmin" },
   {
     type: "error",
@@ -792,6 +804,8 @@ export const zoraCreator1155ImplABI = [
     name: "RendererNotValid",
   },
   { type: "error", inputs: [], name: "Renderer_NotValidRendererContract" },
+  { type: "error", inputs: [], name: "SaleEnded" },
+  { type: "error", inputs: [], name: "SaleHasNotStarted" },
   {
     type: "error",
     inputs: [
@@ -812,6 +826,15 @@ export const zoraCreator1155ImplABI = [
     inputs: [],
     name: "UUPS_UPGRADEABLE_MUST_NOT_BE_CALLED_THROUGH_DELEGATECALL",
   },
+  {
+    type: "error",
+    inputs: [
+      { name: "user", internalType: "address", type: "address" },
+      { name: "limit", internalType: "uint256", type: "uint256" },
+      { name: "requestedAmount", internalType: "uint256", type: "uint256" },
+    ],
+    name: "UserExceedsMintLimit",
+  },
   {
     type: "error",
     inputs: [
@@ -821,6 +844,7 @@ export const zoraCreator1155ImplABI = [
     ],
     name: "UserMissingRoleForToken",
   },
+  { type: "error", inputs: [], name: "WrongValueSent" },
   {
     type: "event",
     anonymous: false,
@@ -2082,6 +2106,7 @@ export const zoraCreator1155PremintExecutorImplABI = [
     name: "CallFailed",
   },
   { type: "error", inputs: [], name: "Call_TokenIdMismatch" },
+  { type: "error", inputs: [], name: "CallerNotZoraCreator1155" },
   {
     type: "error",
     inputs: [
@@ -2138,11 +2163,23 @@ export const zoraCreator1155PremintExecutorImplABI = [
     inputs: [],
     name: "INITIALIZABLE_CONTRACT_IS_NOT_INITIALIZING",
   },
+  {
+    type: "error",
+    inputs: [
+      { name: "mintTo", internalType: "address", type: "address" },
+      { name: "merkleProof", internalType: "bytes32[]", type: "bytes32[]" },
+      { name: "merkleRoot", internalType: "bytes32", type: "bytes32" },
+    ],
+    name: "InvalidMerkleProof",
+  },
+  { type: "error", inputs: [], name: "InvalidMintSchedule" },
   { type: "error", inputs: [], name: "MintNotYetStarted" },
   { type: "error", inputs: [], name: "Mint_InsolventSaleTransfer" },
   { type: "error", inputs: [], name: "Mint_TokenIDMintNotAllowed" },
   { type: "error", inputs: [], name: "Mint_UnknownCommand" },
   { type: "error", inputs: [], name: "Mint_ValueTransferFail" },
+  { type: "error", inputs: [], name: "MinterContractAlreadyExists" },
+  { type: "error", inputs: [], name: "MinterContractDoesNotExist" },
   { type: "error", inputs: [], name: "NewOwnerNeedsToBeAdmin" },
   { type: "error", inputs: [], name: "ONLY_OWNER" },
   { type: "error", inputs: [], name: "ONLY_PENDING_OWNER" },
@@ -2158,6 +2195,8 @@ export const zoraCreator1155PremintExecutorImplABI = [
     name: "ProtocolRewardsWithdrawFailed",
   },
   { type: "error", inputs: [], name: "Renderer_NotValidRendererContract" },
+  { type: "error", inputs: [], name: "SaleEnded" },
+  { type: "error", inputs: [], name: "SaleHasNotStarted" },
   {
     type: "error",
     inputs: [
@@ -2186,6 +2225,15 @@ export const zoraCreator1155PremintExecutorImplABI = [
     ],
     name: "UpgradeToMismatchedContractName",
   },
+  {
+    type: "error",
+    inputs: [
+      { name: "user", internalType: "address", type: "address" },
+      { name: "limit", internalType: "uint256", type: "uint256" },
+      { name: "requestedAmount", internalType: "uint256", type: "uint256" },
+    ],
+    name: "UserExceedsMintLimit",
+  },
   {
     type: "error",
     inputs: [
@@ -2195,6 +2243,7 @@ export const zoraCreator1155PremintExecutorImplABI = [
     ],
     name: "UserMissingRoleForToken",
   },
+  { type: "error", inputs: [], name: "WrongValueSent" },
   {
     type: "event",
     anonymous: false,
@@ -2761,6 +2810,18 @@ export const zoraCreator1155PremintExecutorImplConfig = {
  * - [__View Contract on Sepolia Etherscan__](https://sepolia.etherscan.io/address/0xA5E8d0d4FCed34E86AF6d4E16131C7210Ba8b4b7)
  */
 export const zoraCreatorFixedPriceSaleStrategyABI = [
+  { type: "error", inputs: [], name: "CallerNotZoraCreator1155" },
+  {
+    type: "error",
+    inputs: [
+      { name: "mintTo", internalType: "address", type: "address" },
+      { name: "merkleProof", internalType: "bytes32[]", type: "bytes32[]" },
+      { name: "merkleRoot", internalType: "bytes32", type: "bytes32" },
+    ],
+    name: "InvalidMerkleProof",
+  },
+  { type: "error", inputs: [], name: "MinterContractAlreadyExists" },
+  { type: "error", inputs: [], name: "MinterContractDoesNotExist" },
   { type: "error", inputs: [], name: "SaleEnded" },
   { type: "error", inputs: [], name: "SaleHasNotStarted" },
   {
@@ -3039,6 +3100,7 @@ export const zoraCreatorFixedPriceSaleStrategyConfig = {
  * - [__View Contract on Sepolia Etherscan__](https://sepolia.etherscan.io/address/0x357D8108A77762B41Ea0C4D69fBb1eF4391251eC)
  */
 export const zoraCreatorMerkleMinterStrategyABI = [
+  { type: "error", inputs: [], name: "CallerNotZoraCreator1155" },
   {
     type: "error",
     inputs: [
@@ -3049,6 +3111,8 @@ export const zoraCreatorMerkleMinterStrategyABI = [
     name: "InvalidMerkleProof",
   },
   { type: "error", inputs: [], name: "MerkleClaimsExceeded" },
+  { type: "error", inputs: [], name: "MinterContractAlreadyExists" },
+  { type: "error", inputs: [], name: "MinterContractDoesNotExist" },
   { type: "error", inputs: [], name: "SaleEnded" },
   { type: "error", inputs: [], name: "SaleHasNotStarted" },
   {
@@ -3295,8 +3359,20 @@ export const zoraCreatorMerkleMinterStrategyConfig = {
 export const zoraCreatorRedeemMinterFactoryABI = [
   { stateMutability: "nonpayable", type: "constructor", inputs: [] },
   { type: "error", inputs: [], name: "CallerNotZoraCreator1155" },
+  {
+    type: "error",
+    inputs: [
+      { name: "mintTo", internalType: "address", type: "address" },
+      { name: "merkleProof", internalType: "bytes32[]", type: "bytes32[]" },
+      { name: "merkleRoot", internalType: "bytes32", type: "bytes32" },
+    ],
+    name: "InvalidMerkleProof",
+  },
   { type: "error", inputs: [], name: "MinterContractAlreadyExists" },
   { type: "error", inputs: [], name: "MinterContractDoesNotExist" },
+  { type: "error", inputs: [], name: "SaleEnded" },
+  { type: "error", inputs: [], name: "SaleHasNotStarted" },
+  { type: "error", inputs: [], name: "WrongValueSent" },
   {
     type: "event",
     anonymous: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/protocol-deployments",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "repository": "https://github.com/ourzora/zora-protocol",
   "license": "MIT",
   "main": "./dist/index.js",

package/test/ZoraCreator1155SupplyRoyaltyDeprecation.t.sol

@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.17;
+
+import "forge-std/Test.sol";
+
+import {
+    ForkDeploymentConfig,
+    Deployment,
+    ChainConfig
+} from "@zoralabs/zora-1155-contracts/src/deployment/DeploymentConfig.sol";
+import {ZoraDeployerUtils} from "@zoralabs/zora-1155-contracts/src/deployment/ZoraDeployerUtils.sol";
+
+import {Zora1155Factory} from "@zoralabs/zora-1155-contracts/src/proxies/Zora1155Factory.sol";
+import {ZoraCreator1155FactoryImpl} from "@zoralabs/zora-1155-contracts/src/factory/ZoraCreator1155FactoryImpl.sol";
+import {ZoraCreator1155Impl} from "@zoralabs/zora-1155-contracts/src/nft/ZoraCreator1155Impl.sol";
+import {ICreatorRoyaltiesControl} from "@zoralabs/zora-1155-contracts/src/interfaces/ICreatorRoyaltiesControl.sol";
+import {IMinter1155} from "@zoralabs/zora-1155-contracts/src/interfaces/IMinter1155.sol";
+
+contract ZoraCreator1155SupplyRoyaltyDeprecationTest is Test, ForkDeploymentConfig {
+    address internal creator;
+    string[] internal chains;
+
+    function setUp() public {
+        creator = makeAddr("creator");
+
+        chains = new string[](1);
+        chains[0] = "zora_goerli";
+    }
+
+    function testFork_SupplyRoyaltyDeprecation() public {
+        for (uint256 i; i < chains.length; ++i) {
+            string memory chain = chains[i];
+
+            vm.createSelectFork(vm.rpcUrl(chain));
+
+            Deployment memory deployment = getDeployment();
+            ChainConfig memory chainConfig = getChainConfig();
+
+            ZoraCreator1155FactoryImpl factory = ZoraCreator1155FactoryImpl(deployment.factoryProxy);
+
+            uint32 invalidRoyaltyMintSchedule = 10;
+
+            ICreatorRoyaltiesControl.RoyaltyConfiguration memory royaltyConfig = ICreatorRoyaltiesControl
+                .RoyaltyConfiguration({
+                royaltyBPS: 0,
+                royaltyRecipient: address(0),
+                royaltyMintSchedule: invalidRoyaltyMintSchedule
+            });
+
+            vm.expectRevert(abi.encodeWithSignature("InvalidMintSchedule()"));
+            factory.createContract("mock uri", "mock name", royaltyConfig, payable(creator), new bytes[](0));
+
+            (address newFactoryImpl,,) = ZoraDeployerUtils.deployNew1155AndFactoryImpl({
+                upgradeGateAddress: deployment.upgradeGate,
+                mintFeeRecipient: chainConfig.mintFeeRecipient,
+                protocolRewards: chainConfig.protocolRewards,
+                merkleMinter: IMinter1155(deployment.merkleMintSaleStrategy),
+                redeemMinterFactory: IMinter1155(deployment.redeemMinterFactory),
+                fixedPriceMinter: IMinter1155(deployment.fixedPriceSaleStrategy)
+            });
+
+            ZoraCreator1155FactoryImpl newFactory =
+                ZoraCreator1155FactoryImpl(address(new Zora1155Factory(newFactoryImpl, "")));
+
+            address tokenContractAddress =
+                newFactory.createContract("mock uri", "mock name", royaltyConfig, payable(creator), new bytes[](0));
+
+            ZoraCreator1155Impl tokenContract = ZoraCreator1155Impl(tokenContractAddress);
+
+            // Ensure the specified royalty mint schedule is ignored + set to zero
+            assertEq(tokenContract.getRoyalties(0).royaltyMintSchedule, 0);
+        }
+    }
+}