Merge remote-tracking branch 'private/main' into add_lavamoat

emarai · Dec 14, 2023 · ea3571b · ea3571b
2 parents 631aa69 + e990b9d
commit ea3571b
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 251 deletions.
diff --git a/.changeset/stale-ants-taste.md b/.changeset/stale-ants-taste.md
@@ -0,0 +1,6 @@
+---
+"@zoralabs/zora-1155-contracts": minor
+"@zoralabs/protocol-rewards": patch
+---
+
+Remove platform referral from RewardsSplits, and revert mint fee change to 0.000777 ether.  Use new signature for 1155 for `mint` which takes an array of reward recipients
diff --git a/packages/1155-contracts/src/nft/ZoraCreator1155Impl.sol b/packages/1155-contracts/src/nft/ZoraCreator1155Impl.sol
@@ -434,11 +434,6 @@ contract ZoraCreator1155Impl is
         _requireAdminOrRole(address(minter), tokenId, PERMISSION_BIT_MINTER);
 
         address mintReferral = address(0);
-        address platformReferral = address(0);
-
-        if (rewardsRecipients.length > 1) {
-            platformReferral = rewardsRecipients[1];
-        }
 
         if (rewardsRecipients.length > 0) {
             mintReferral = rewardsRecipients[0];
@@ -451,8 +446,7 @@ contract ZoraCreator1155Impl is
             getCreatorRewardRecipient(tokenId),
             createReferrals[tokenId],
             mintReferral,
-            firstMinters[tokenId],
-            platformReferral
+            firstMinters[tokenId]
         );
 
         // Execute commands returned from minter

diff --git a/packages/1155-contracts/test/minters/fixed-price/ZoraCreatorFixedPriceSaleStrategy.t.sol b/packages/1155-contracts/test/minters/fixed-price/ZoraCreatorFixedPriceSaleStrategy.t.sol
@@ -342,7 +342,7 @@ contract ZoraCreatorFixedPriceSaleStrategyTest is Test {
 
         vm.startPrank(tokenRecipient);
 
-        target.mintWithRewards{value: 1.00111 ether}(fixedPrice, newTokenId, 1, abi.encode(tokenRecipient, ""), address(0));
+        target.mintWithRewards{value: 1.000777 ether}(fixedPrice, newTokenId, 1, abi.encode(tokenRecipient, ""), address(0));
 
         vm.stopPrank();
     }

diff --git a/packages/1155-contracts/test/nft/ZoraCreator1155.t.sol b/packages/1155-contracts/test/nft/ZoraCreator1155.t.sol
@@ -67,7 +67,6 @@ contract ZoraCreator1155Test is Test {
     address internal mintReferral;
     address internal createReferral;
     address internal zora;
-    address internal sourceReferral;
     address[] internal rewardsRecipients;
 
     event Purchased(address indexed sender, address indexed minter, uint256 indexed tokenId, uint256 quantity, uint256 value);
@@ -91,11 +90,9 @@ contract ZoraCreator1155Test is Test {
         mintReferral = makeAddr("mintReferral");
         createReferral = makeAddr("createReferral");
         zora = makeAddr("zora");
-        sourceReferral = makeAddr("sourceReferral");
 
-        rewardsRecipients = new address[](2);
+        rewardsRecipients = new address[](1);
         rewardsRecipients[0] = mintReferral;
-        rewardsRecipients[1] = sourceReferral;
 
         address adminAddress;
         (adminAddress, adminKey) = makeAddrAndKey("admin");
@@ -709,7 +706,7 @@ contract ZoraCreator1155Test is Test {
     }
 
     function test_mintFee_returnsMintFee() public {
-        assertEq(target.mintFee(), 0.00111 ether);
+        assertEq(target.mintFee(), 0.000777 ether);
     }
 
     function test_FreeMintRewards(uint256 quantity) public {
@@ -735,10 +732,7 @@ contract ZoraCreator1155Test is Test {
 
         assertEq(protocolRewards.balanceOf(recipient), 0);
         assertEq(protocolRewards.balanceOf(fundsRecipient), settings.creatorReward + settings.firstMinterReward);
-        assertEq(
-            protocolRewards.balanceOf(zora),
-            settings.zoraReward + settings.mintReferralReward + settings.createReferralReward + settings.platformReferralReward
-        );
+        assertEq(protocolRewards.balanceOf(zora), settings.zoraReward + settings.mintReferralReward + settings.createReferralReward);
     }
 
     function test_FreeMintRewardsWithCreateReferral(uint256 quantity) public {
@@ -765,7 +759,7 @@ contract ZoraCreator1155Test is Test {
         assertEq(protocolRewards.balanceOf(recipient), 0);
         assertEq(protocolRewards.balanceOf(fundsRecipient), settings.creatorReward + settings.firstMinterReward);
         assertEq(protocolRewards.balanceOf(createReferral), settings.createReferralReward);
-        assertEq(protocolRewards.balanceOf(zora), settings.zoraReward + settings.mintReferralReward + settings.platformReferralReward);
+        assertEq(protocolRewards.balanceOf(zora), settings.zoraReward + settings.mintReferralReward);
     }
 
     function test_FreeMintRewardsWithMintReferral(uint256 quantity) public {
@@ -792,7 +786,7 @@ contract ZoraCreator1155Test is Test {
         assertEq(protocolRewards.balanceOf(recipient), 0);
         assertEq(protocolRewards.balanceOf(fundsRecipient), settings.creatorReward + settings.firstMinterReward);
         assertEq(protocolRewards.balanceOf(mintReferral), settings.mintReferralReward);
-        assertEq(protocolRewards.balanceOf(zora), settings.zoraReward + settings.createReferralReward + settings.platformReferralReward);
+        assertEq(protocolRewards.balanceOf(zora), settings.zoraReward + settings.createReferralReward);
     }
 
     function test_FreeMintRewardsWithCreateAndMintReferral(uint256 quantity) public {
@@ -820,7 +814,7 @@ contract ZoraCreator1155Test is Test {
         assertEq(protocolRewards.balanceOf(fundsRecipient), settings.creatorReward + settings.firstMinterReward);
         assertEq(protocolRewards.balanceOf(createReferral), settings.createReferralReward);
         assertEq(protocolRewards.balanceOf(mintReferral), settings.mintReferralReward);
-        assertEq(protocolRewards.balanceOf(zora), settings.zoraReward + settings.platformReferralReward);
+        assertEq(protocolRewards.balanceOf(zora), settings.zoraReward);
     }
 
     function testRevert_InsufficientEthForFreeMintRewards(uint256 quantity) public {
@@ -881,10 +875,7 @@ contract ZoraCreator1155Test is Test {
         assertEq(address(target).balance, totalSale);
 
         assertEq(protocolRewards.balanceOf(admin), settings.firstMinterReward);
-        assertEq(
-            protocolRewards.balanceOf(zora),
-            settings.zoraReward + settings.mintReferralReward + settings.createReferralReward + settings.platformReferralReward
-        );
+        assertEq(protocolRewards.balanceOf(zora), settings.zoraReward + settings.mintReferralReward + settings.createReferralReward);
     }
 
     function test_PaidMintRewardsWithMintReferral(uint256 quantity, uint256 salePrice) public {
@@ -930,7 +921,7 @@ contract ZoraCreator1155Test is Test {
 
         assertEq(protocolRewards.balanceOf(mintReferral), settings.mintReferralReward);
         assertEq(protocolRewards.balanceOf(admin), settings.firstMinterReward);
-        assertEq(protocolRewards.balanceOf(zora), settings.zoraReward + settings.createReferralReward + settings.platformReferralReward);
+        assertEq(protocolRewards.balanceOf(zora), settings.zoraReward + settings.createReferralReward);
     }
 
     function test_PaidMintRewardsWithCreateReferral(uint256 quantity, uint256 salePrice) public {
@@ -975,7 +966,7 @@ contract ZoraCreator1155Test is Test {
         assertEq(address(target).balance, totalSale);
         assertEq(protocolRewards.balanceOf(admin), settings.firstMinterReward);
         assertEq(protocolRewards.balanceOf(createReferral), settings.createReferralReward);
-        assertEq(protocolRewards.balanceOf(zora), settings.zoraReward + settings.mintReferralReward + settings.platformReferralReward);
+        assertEq(protocolRewards.balanceOf(zora), settings.zoraReward + settings.mintReferralReward);
     }
 
     function test_PaidMintRewardsWithCreateAndMintReferral(uint256 quantity, uint256 salePrice) public {
@@ -1021,7 +1012,7 @@ contract ZoraCreator1155Test is Test {
         assertEq(protocolRewards.balanceOf(admin), settings.firstMinterReward);
         assertEq(protocolRewards.balanceOf(mintReferral), settings.mintReferralReward);
         assertEq(protocolRewards.balanceOf(createReferral), settings.createReferralReward);
-        assertEq(protocolRewards.balanceOf(zora), settings.zoraReward + settings.platformReferralReward);
+        assertEq(protocolRewards.balanceOf(zora), settings.zoraReward);
     }
 
     function testRevert_InsufficientEthForPaidMintRewards(uint256 quantity, uint256 salePrice) public {
@@ -1167,7 +1158,7 @@ contract ZoraCreator1155Test is Test {
         assertEq(protocolRewards.balanceOf(address(uint160(mintRecipient))), 0);
         assertEq(protocolRewards.balanceOf(rewardRecipient), settings.mintReferralReward);
         assertEq(protocolRewards.balanceOf(fundsRecipient), settings.creatorReward + settings.firstMinterReward);
-        assertEq(protocolRewards.balanceOf(zora), settings.zoraReward + settings.createReferralReward + settings.platformReferralReward);
+        assertEq(protocolRewards.balanceOf(zora), settings.zoraReward + settings.createReferralReward);
     }
 
     function test_SetCreatorRewardRecipientForToken() public {
@@ -1591,7 +1582,6 @@ contract ZoraCreator1155Test is Test {
         assertEq(protocolRewards.balanceOf(recipient), 0);
         assertEq(protocolRewards.balanceOf(fundsRecipient), settings.creatorReward + settings.firstMinterReward);
         assertEq(protocolRewards.balanceOf(zora), settings.zoraReward + settings.createReferralReward);
-        assertEq(protocolRewards.balanceOf(sourceReferral), settings.platformReferralReward);
         assertEq(protocolRewards.balanceOf(mintReferral), settings.mintReferralReward);
     }
 
@@ -1637,7 +1627,6 @@ contract ZoraCreator1155Test is Test {
         assertEq(address(target).balance, totalSale);
         assertEq(protocolRewards.balanceOf(admin), settings.firstMinterReward);
         assertEq(protocolRewards.balanceOf(zora), settings.zoraReward + settings.createReferralReward);
-        assertEq(protocolRewards.balanceOf(sourceReferral), settings.platformReferralReward);
         assertEq(protocolRewards.balanceOf(mintReferral), settings.mintReferralReward);
     }
 

diff --git a/packages/1155-contracts/test/premint/Zora1155PremintExecutorProxy.t.sol b/packages/1155-contracts/test/premint/Zora1155PremintExecutorProxy.t.sol
@@ -27,7 +27,7 @@ contract Zora1155PremintExecutorProxyTest is Test, IHasContractName {
     address internal zora;
     Zora1155Factory internal factoryProxy;
     ZoraCreator1155FactoryImpl factoryAtProxy;
-    uint256 internal mintFeeAmount = 0.00111 ether;
+    uint256 internal mintFeeAmount = 0.000777 ether;
     ZoraCreator1155PremintExecutorImpl preminterAtProxy;
 
     IZoraCreator1155PremintExecutor.MintArguments defaultMintArguments;

diff --git a/packages/1155-contracts/test/premint/ZoraCreator1155PremintExecutor.t.sol b/packages/1155-contracts/test/premint/ZoraCreator1155PremintExecutor.t.sol
@@ -10,6 +10,7 @@ import {Zora1155} from "../../src/proxies/Zora1155.sol";
 import {IZoraCreator1155Errors} from "../../src/interfaces/IZoraCreator1155Errors.sol";
 import {IZoraCreator1155} from "../../src/interfaces/IZoraCreator1155.sol";
 import {IMinter1155} from "../../src/interfaces/IMinter1155.sol";
+import {IMinterErrors} from "../../src/interfaces/IMinterErrors.sol";
 import {ICreatorRoyaltiesControl} from "../../src/interfaces/ICreatorRoyaltiesControl.sol";
 import {ZoraCreatorFixedPriceSaleStrategy} from "../../src/minters/fixed-price/ZoraCreatorFixedPriceSaleStrategy.sol";
 import {Zora1155Factory} from "../../src/proxies/Zora1155Factory.sol";
@@ -33,7 +34,7 @@ contract ZoraCreator1155PreminterTest is Test {
     ZoraCreator1155FactoryImpl factory;
 
     ICreatorRoyaltiesControl.RoyaltyConfiguration internal defaultRoyaltyConfig;
-    uint256 internal mintFeeAmount = 0.00111 ether;
+    uint256 internal mintFeeAmount = 0.000777 ether;
 
     // setup contract config
     uint256 internal creatorPrivateKey;
@@ -472,45 +473,6 @@ contract ZoraCreator1155PreminterTest is Test {
         assertEq(mintReferral.balance, mintReferralReward * quantityToMint);
     }
 
-    function test_platformReferral_getsMintReferralReward() public {
-        PremintConfigV2 memory premintConfig = makeDefaultPremintConfigV2();
-
-        address platformReferral = makeAddr("platformReferral ");
-
-        address minter = makeAddr("minter");
-
-        ContractCreationConfig memory contractConfig = makeDefaultContractCreationConfig();
-
-        uint256 quantityToMint = 4;
-
-        bytes memory signature = _signPremint(preminter.getContractAddress(contractConfig), premintConfig, creatorPrivateKey, block.chainid);
-
-        address[] memory mintRewardsRecipients = new address[](2);
-        mintRewardsRecipients[1] = platformReferral;
-
-        IZoraCreator1155PremintExecutor.MintArguments memory mintArguments = IZoraCreator1155PremintExecutor.MintArguments({
-            mintRecipient: minter,
-            mintComment: "",
-            mintRewardsRecipients: mintRewardsRecipients
-        });
-
-        uint256 mintCost = (mintFeeAmount + premintConfig.tokenConfig.pricePerToken) * quantityToMint;
-
-        vm.deal(minter, mintCost);
-        vm.prank(minter);
-        preminter.premintV2{value: mintCost}(contractConfig, premintConfig, signature, quantityToMint, mintArguments);
-
-        // now get balance of mintReferral in ProtocolRewards - it should be mint referral reward amount * quantityToMint
-        uint256 platformReferralReward = 0.000111 ether * quantityToMint;
-
-        assertEq(rewards.balanceOf(platformReferral), platformReferralReward);
-
-        vm.prank(platformReferral);
-        rewards.withdraw(platformReferral, platformReferralReward);
-
-        assertEq(platformReferral.balance, platformReferralReward);
-    }
-
     function testCreateTokenPerUid() public {
         ContractCreationConfig memory contractConfig = makeDefaultContractCreationConfig();
         PremintConfigV2 memory premintConfig = makeDefaultPremintConfigV2();
@@ -967,7 +929,7 @@ contract ZoraCreator1155PreminterTest is Test {
 
         uint256 mintFee = preminter.mintFee(contractAddress);
 
-        assertEq(mintFee, 0.00111 ether);
+        assertEq(mintFee, 0.000777 ether);
     }
 
     function test_mintFee_onNewContracts_returnsNewMintFee() external {
@@ -982,7 +944,7 @@ contract ZoraCreator1155PreminterTest is Test {
 
         uint256 mintFee = preminter.mintFee(contractAddress);
 
-        assertEq(mintFee, 0.00111 ether);
+        assertEq(mintFee, 0.000777 ether);
     }
 
     function _signAndExecutePremint(

diff --git a/packages/protocol-rewards/src/abstract/ERC1155/ERC1155Rewards.sol b/packages/protocol-rewards/src/abstract/ERC1155/ERC1155Rewards.sol
@@ -14,8 +14,7 @@ abstract contract ERC1155Rewards is RewardSplits {
         address creator,
         address createReferral,
         address mintReferral,
-        address firstMinter,
-        address platformReferral
+        address firstMinter
     ) internal returns (uint256) {
         uint256 totalReward = computeTotalReward(numTokens);
 
@@ -27,11 +26,11 @@ abstract contract ERC1155Rewards is RewardSplits {
         if (msgValue < totalReward) {
             revert INVALID_ETH_AMOUNT();
         } else if (msgValue == totalReward) {
-            _depositFreeMintRewards(totalReward, numTokens, creator, createReferral, mintReferral, firstMinter, platformReferral);
+            _depositFreeMintRewards(totalReward, numTokens, creator, createReferral, mintReferral, firstMinter);
 
             return 0;
         } else {
-            _depositPaidMintRewards(totalReward, numTokens, createReferral, mintReferral, firstMinter, platformReferral);
+            _depositPaidMintRewards(totalReward, numTokens, createReferral, mintReferral, firstMinter);
 
             unchecked {
                 return msgValue - totalReward;

diff --git a/packages/protocol-rewards/src/abstract/ERC721/ERC721Rewards.sol b/packages/protocol-rewards/src/abstract/ERC721/ERC721Rewards.sol
@@ -15,8 +15,7 @@ abstract contract ERC721Rewards is RewardSplits {
         address creator,
         address createReferral,
         address mintReferral,
-        address firstMinter,
-        address platformReferral
+        address firstMinter
     ) internal {
         uint256 totalReward = computeTotalReward(numTokens);
 
@@ -25,15 +24,15 @@ abstract contract ERC721Rewards is RewardSplits {
                 revert INVALID_ETH_AMOUNT();
             }
 
-            _depositFreeMintRewards(totalReward, numTokens, creator, createReferral, mintReferral, firstMinter, platformReferral);
+            _depositFreeMintRewards(totalReward, numTokens, creator, createReferral, mintReferral, firstMinter);
         } else {
             uint256 totalSale = numTokens * salePrice;
 
             if (msgValue != (totalReward + totalSale)) {
                 revert INVALID_ETH_AMOUNT();
             }
 
-            _depositPaidMintRewards(totalReward, numTokens, createReferral, mintReferral, firstMinter, platformReferral);
+            _depositPaidMintRewards(totalReward, numTokens, createReferral, mintReferral, firstMinter);
         }
     }
 }