fix merge conflict

ourzora · Oct 18, 2023 · 399c958 · 399c958
2 parents 80d5b90 + 7276360
commit 399c958
Show file tree

Hide file tree

Showing 13 changed files with 86 additions and 382 deletions.
diff --git a/.changeset/great-camels-impress.md b/.changeset/great-camels-impress.md
@@ -0,0 +1,5 @@
+---
+"@zoralabs/zora-1155-contracts": minor
+---
+
+Supply royalties are no longer supported
diff --git a/packages/1155-contracts/foundry.toml b/packages/1155-contracts/foundry.toml
@@ -4,25 +4,15 @@ libs = ['_imagine', 'node_modules', 'script']
 allow_paths = ["node_modules/@zoralabs/protocol-rewards"]
 optimizer = true
 optimizer_runs = 50
-out = 'out'
-solc_version = '0.8.17'
-src = 'src'
 via_ir = true
-
-[profile.optimized]
-optimizer = true
-optimizer_runs = 50
-out = 'out'
-script = 'src'
 solc_version = '0.8.17'
+out = 'out'
 src = 'src'
-test = 'src'
-via_ir = true
 
-[profile.fast_compilation]
-optimizer_runs = 50
+[profile.dev]
+optimizer = false
+optimizer_runs = 0
 via_ir = false
-solc_version = '0.8.17'
 
 [rpc_endpoints]
 goerli = "https://eth-goerli.g.alchemy.com/v2/${ALCHEMY_KEY}"

diff --git a/packages/1155-contracts/package.json b/packages/1155-contracts/package.json
@@ -9,7 +9,7 @@
   "type": "module",
   "scripts": {
     "test": "forge test",
-    "dev": "forge test --watch -vvv",
+    "dev": "FOUNDRY_PROFILE=dev forge test --watch -vvv",
     "test:fork": "forge test -vvv --match-test fork",
     "test-gas": "forge test --gas-report",
     "prettier:check": "prettier --check 'src/**/*.sol' 'test/**/*.sol' 'package/**/*.ts' 'wagmi.config.ts'",
@@ -58,7 +58,7 @@
     "tsup": "^7.2.0",
     "tsx": "^3.13.0",
     "typescript": "^5.0.4",
-    "viem": "^1.6.0",
+    "viem": "^1.16.2",
     "vite": "^4.1.4",
     "vitest": "~0.30.1"
   },

diff --git a/packages/1155-contracts/package/batchPublish.test.ts b/packages/1155-contracts/package/batchPublish.test.ts
@@ -193,7 +193,7 @@ function parseCreate1155Receipt(receipt: TransactionReceipt): {
   return { tokenId, contractAddress };
 }
 
-describe("ZoraCreator1155Preminter", () => {
+describe("Zora1155", () => {
   it(
     "can batch publish tokens",
     async () => {

diff --git a/packages/1155-contracts/src/nft/ZoraCreator1155Impl.sol b/packages/1155-contracts/src/nft/ZoraCreator1155Impl.sol
@@ -388,6 +388,7 @@ contract ZoraCreator1155Impl is
                 _requireAdminOrRole(msg.sender, tokenIds[i], PERMISSION_BIT_MINTER);
             }
         }
+
         _mintBatch(recipient, tokenIds, quantities, data);
     }
 
@@ -553,61 +554,36 @@ contract ZoraCreator1155Impl is
         return super.supportsInterface(interfaceId) || interfaceId == type(IZoraCreator1155).interfaceId || ERC1155Upgradeable.supportsInterface(interfaceId);
     }
 
-    function _handleSupplyRoyalty(uint256 tokenId, uint256 mintAmount, bytes memory data) internal returns (uint256 totalRoyaltyMints) {
-        uint256 royaltyMintSchedule = royalties[tokenId].royaltyMintSchedule;
-        if (royaltyMintSchedule == 0) {
-            royaltyMintSchedule = royalties[CONTRACT_BASE_ID].royaltyMintSchedule;
-        }
-        if (royaltyMintSchedule == 0) {
-            // If we still have no schedule, return 0 supply royalty.
-            return 0;
-        }
-        uint256 maxSupply = tokens[tokenId].maxSupply;
-        uint256 totalMinted = tokens[tokenId].totalMinted;
-
-        totalRoyaltyMints = (mintAmount + (totalMinted % royaltyMintSchedule)) / (royaltyMintSchedule - 1);
-        totalRoyaltyMints = MathUpgradeable.min(totalRoyaltyMints, maxSupply - (mintAmount + totalMinted));
-        if (totalRoyaltyMints > 0) {
-            address royaltyRecipient = royalties[tokenId].royaltyRecipient;
-            if (royaltyRecipient == address(0)) {
-                royaltyRecipient = royalties[CONTRACT_BASE_ID].royaltyRecipient;
-            }
-            // If we have no recipient set, return 0 supply royalty.
-            if (royaltyRecipient == address(0)) {
-                return 0;
-            }
-            super._mint(royaltyRecipient, tokenId, totalRoyaltyMints, data);
-        }
-    }
-
     /// Generic 1155 function overrides ///
 
-    /// @notice Mint function that 1) checks quantity and 2) handles supply royalty 3) keeps track of allowed tokens
+    /// @notice Mint function that 1) checks quantity 2) keeps track of allowed tokens
     /// @param to to mint to
     /// @param id token id to mint
     /// @param amount of tokens to mint
     /// @param data as specified by 1155 standard
     function _mint(address to, uint256 id, uint256 amount, bytes memory data) internal virtual override {
-        uint256 supplyRoyaltyMints = _handleSupplyRoyalty(id, amount, data);
-        _requireCanMintQuantity(id, amount + supplyRoyaltyMints);
+        _requireCanMintQuantity(id, amount);
+
+        tokens[id].totalMinted += amount;
 
         super._mint(to, id, amount, data);
-        tokens[id].totalMinted += amount + supplyRoyaltyMints;
     }
 
-    /// @notice Mint batch function that 1) checks quantity and 2) handles supply royalty 3) keeps track of allowed tokens
+    /// @notice Mint batch function that 1) checks quantity and 2) keeps track of allowed tokens
     /// @param to to mint to
     /// @param ids token ids to mint
     /// @param amounts of tokens to mint
     /// @param data as specified by 1155 standard
     function _mintBatch(address to, uint256[] memory ids, uint256[] memory amounts, bytes memory data) internal virtual override {
-        super._mintBatch(to, ids, amounts, data);
+        uint256 numTokens = ids.length;
 
-        for (uint256 i = 0; i < ids.length; ++i) {
-            uint256 supplyRoyaltyMints = _handleSupplyRoyalty(ids[i], amounts[i], data);
-            _requireCanMintQuantity(ids[i], amounts[i] + supplyRoyaltyMints);
-            tokens[ids[i]].totalMinted += amounts[i] + supplyRoyaltyMints;
+        for (uint256 i; i < numTokens; ++i) {
+            _requireCanMintQuantity(ids[i], amounts[i]);
+
+            tokens[ids[i]].totalMinted += amounts[i];
         }
+
+        super._mintBatch(to, ids, amounts, data);
     }
 
     /// @notice Burns a batch of tokens

diff --git a/packages/1155-contracts/src/royalties/CreatorRoyaltiesControl.sol b/packages/1155-contracts/src/royalties/CreatorRoyaltiesControl.sol
@@ -33,12 +33,12 @@ abstract contract CreatorRoyaltiesControl is CreatorRoyaltiesStorageV1, SharedBa
     }
 
     function _updateRoyalties(uint256 tokenId, RoyaltyConfiguration memory configuration) internal {
-        // Don't allow 100% supply royalties
-        if (configuration.royaltyMintSchedule == 1) {
+        // Deprecate supply royalty support
+        if (configuration.royaltyMintSchedule != 0) {
             revert InvalidMintSchedule();
         }
         // Don't allow setting royalties to burn address
-        if (configuration.royaltyRecipient == address(0) && (configuration.royaltyMintSchedule > 0 || configuration.royaltyBPS > 0)) {
+        if (configuration.royaltyRecipient == address(0) && configuration.royaltyBPS > 0) {
             revert InvalidMintSchedule();
         }
         royalties[tokenId] = configuration;

diff --git a/packages/1155-contracts/test/factory/ZoraCreator1155Factory.t.sol b/packages/1155-contracts/test/factory/ZoraCreator1155Factory.t.sol
@@ -77,38 +77,26 @@ contract ZoraCreator1155FactoryTest is Test {
         assertEq(address(minters[2]), address(3));
     }
 
-    function test_createContract(
-        string memory contractURI,
-        string memory name,
-        uint32 royaltyBPS,
-        uint32 royaltyMintSchedule,
-        address royaltyRecipient,
-        address payable admin
-    ) external {
+    function test_createContract(string memory contractURI, string memory name, uint32 royaltyBPS, address royaltyRecipient, address payable admin) external {
         // If the factory is the admin, the admin flag is cleared
         // during multicall breaking a further test assumption.
         // Additionally, this case makes no sense from a user perspective.
         vm.assume(admin != payable(address(factory)));
-        vm.assume(royaltyMintSchedule != 1);
         // Assume royalty recipient is not 0
         vm.assume(royaltyRecipient != payable(address(0)));
         bytes[] memory initSetup = new bytes[](1);
         initSetup[0] = abi.encodeWithSelector(IZoraCreator1155.setupNewToken.selector, "ipfs://asdfadsf", 100);
         address deployedAddress = factory.createContract(
             contractURI,
             name,
-            ICreatorRoyaltiesControl.RoyaltyConfiguration({
-                royaltyBPS: royaltyBPS,
-                royaltyRecipient: royaltyRecipient,
-                royaltyMintSchedule: royaltyMintSchedule
-            }),
+            ICreatorRoyaltiesControl.RoyaltyConfiguration({royaltyBPS: royaltyBPS, royaltyRecipient: royaltyRecipient, royaltyMintSchedule: 0}),
             admin,
             initSetup
         );
         ZoraCreator1155Impl target = ZoraCreator1155Impl(deployedAddress);
 
         ICreatorRoyaltiesControl.RoyaltyConfiguration memory config = target.getRoyalties(0);
-        assertEq(config.royaltyMintSchedule, royaltyMintSchedule);
+        assertEq(config.royaltyMintSchedule, 0);
         assertEq(config.royaltyBPS, royaltyBPS);
         assertEq(config.royaltyRecipient, royaltyRecipient);
         assertEq(target.permissions(0, admin), target.PERMISSION_BIT_ADMIN());
@@ -170,7 +158,7 @@ contract ZoraCreator1155FactoryTest is Test {
         ICreatorRoyaltiesControl.RoyaltyConfiguration memory royaltyConfig = ICreatorRoyaltiesControl.RoyaltyConfiguration({
             royaltyBPS: 10,
             royaltyRecipient: vm.addr(5),
-            royaltyMintSchedule: 100
+            royaltyMintSchedule: 0
         });
         bytes[] memory initSetup = new bytes[](1);
         initSetup[0] = abi.encodeWithSelector(IZoraCreator1155.setupNewToken.selector, "ipfs://asdfadsf", 100);
@@ -220,7 +208,7 @@ contract ZoraCreator1155FactoryTest is Test {
         ICreatorRoyaltiesControl.RoyaltyConfiguration memory royaltyConfig = ICreatorRoyaltiesControl.RoyaltyConfiguration({
             royaltyBPS: 10,
             royaltyRecipient: vm.addr(5),
-            royaltyMintSchedule: 100
+            royaltyMintSchedule: 0
         });
         bytes[] memory initSetup = new bytes[](1);
         initSetup[0] = abi.encodeWithSelector(IZoraCreator1155.setupNewToken.selector, "ipfs://asdfadsf", 100);
@@ -241,7 +229,7 @@ contract ZoraCreator1155FactoryTest is Test {
         ICreatorRoyaltiesControl.RoyaltyConfiguration memory royaltyConfig = ICreatorRoyaltiesControl.RoyaltyConfiguration({
             royaltyBPS: 10,
             royaltyRecipient: vm.addr(5),
-            royaltyMintSchedule: 100
+            royaltyMintSchedule: 0
         });
         bytes[] memory initSetup = new bytes[](1);
         initSetup[0] = abi.encodeWithSelector(IZoraCreator1155.setupNewToken.selector, "ipfs://asdfadsf", 100);

diff --git a/packages/1155-contracts/test/fixtures/Zora1155PremintFixtures.sol b/packages/1155-contracts/test/fixtures/Zora1155PremintFixtures.sol
@@ -18,7 +18,7 @@ library Zora1155PremintFixtures {
     }
 
     function defaultRoyaltyConfig(address royaltyRecipient) internal pure returns (ICreatorRoyaltiesControl.RoyaltyConfiguration memory) {
-        return ICreatorRoyaltiesControl.RoyaltyConfiguration({royaltyBPS: 10, royaltyRecipient: royaltyRecipient, royaltyMintSchedule: 100});
+        return ICreatorRoyaltiesControl.RoyaltyConfiguration({royaltyBPS: 10, royaltyRecipient: royaltyRecipient, royaltyMintSchedule: 0});
     }
 
     function makeDefaultTokenCreationConfig(IMinter1155 fixedPriceMinter, address royaltyRecipient) internal pure returns (TokenCreationConfig memory) {