Sparks contracts (ourzora#501)

* rename mints to sparks

* Sparks - when doing a transfer, if there is a `data` passed, then emit an event that includes that data (ourzora#505)

This would allow us to include mint comments in that `data` field, and know that the comment was made by the executor of the transaction, or the signer of the permit message

* Deployed Sparks contracts (ourzora#506)

<!--- Provide a general summary of your changes in the Title above -->

## Description

<!--- Describe your changes in detail -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here. -->

## Does this change the ABI/API?

- [ ] This changes the ABI/API

<!-- If so, please describe how and what potential impact this may have -->

## What tests did you add/modify to account for these changes

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, tests ran to see how -->
<!--- your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New module / feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I added a changeset to account for this change

## Reviewer Checklist:

- [ ] My review includes a symposis of the changes and potential issues
- [ ] The code style is enforced
- [ ] There are no risky / concerning changes / additions to the PR

* Sparks subgraph (ourzora#507)

Copy of the mints subgraph, less mint comment

* fix foundry config for file access

* rename sparks unwrapper to eth unwrapper

* added changeset

* fix sparks impl address

* fixed sparks proxy addresses

* added a changeset

* fix unwrapper

* added changeset

* fix subgraph deploys

* dont lint wagmi generated

* fix sparks rename

* update version upgrades

* use dynamic mint fee in test

* deployed lowerSupply interface check

* version bump subgraph so it matches whats deployed

* clean up constructor

* clean up changesets

Author: oveddan

.changeset/cold-pillows-join.md

@@ -0,0 +1,5 @@
+---
+"@zoralabs/sparks-contracts": minor
+---
+
+Renamed Mints contracts to Sparks contracts. Removed all collect/collectPremint functions from the sparks manager contract

.changeset/giant-wombats-cheat.md

@@ -0,0 +1,5 @@
+---
+"@zoralabs/protocol-deployments": minor
+---
+
+Publishing Sparks contracts abis and addresses.

.changeset/heavy-geese-warn.md

@@ -0,0 +1,5 @@
+---
+"@zoralabs/zora-1155-contracts": minor
+---
+
+1155 contracts have a hardcoded mint fee of 0.000111 ether, and no longer have a fee that is determined by the MintsManager contract

.github/workflows/contracts.yml

@@ -16,7 +16,7 @@ jobs:
     name: Protocol Rewards
     uses: ./.github/workflows/protocol-rewards.yml
 
-  contracts-mints:
-    name: Mints
-    uses: ./.github/workflows/mints.yml
+  contracts-sparks:
+    name: Sparks
+    uses: ./.github/workflows/sparks.yml
     secrets: inherit

.github/workflows/mints.yml renamed to .github/workflows/sparks.yml

@@ -1,29 +1,29 @@
-name: "Mints"
+name: "Sparks"
 on:
   workflow_call:
 
 jobs:
   build:
     uses: ./.github/workflows/build.yml
     with:
-      package_folder: packages/mints
+      package_folder: packages/sparks
 
   test:
     needs: build
     uses: ./.github/workflows/test.yml
     with:
-      package_folder: packages/mints
-      name: Mints
+      package_folder: packages/sparks
+      name: Sparks
 
   contract_sizes:
     needs: build
     uses: ./.github/workflows/contract_sizes.yml
     with:
-      package_folder: packages/mints
-      name: Mints
+      package_folder: packages/sparks
+      name: Sparks
 
   coverage:
     uses: ./.github/workflows/coverage.yml
     with:
-      package: "mints"
+      package: "sparks"
       files_to_ignore: '"*Ownable*" "*Mock*" "*BatchDataHelper*" "*test*"'

packages/1155-contracts/package.json

@@ -20,8 +20,8 @@
     "dev": "FOUNDRY_PROFILE=dev forge test --watch -vvv",
     "test": "forge test -vv",
     "test-gas": "forge test --gas-report",
-    "prettier:check": "prettier --check 'src/**/*.sol' 'test/**/*.sol' 'package/**/*.ts' 'wagmi.config.ts'",
-    "prettier:write": "prettier --write 'src/**/*.sol' 'test/**/*.sol' 'package/**/*.ts' 'script/**/*.ts' 'wagmi.config.ts'",
+    "prettier:check": "prettier --check 'src/**/*.sol' 'test/**/*.sol' 'package/index.ts' 'wagmi.config.ts'",
+    "prettier:write": "prettier --write 'src/**/*.sol' 'test/**/*.sol' 'package/index.ts' 'wagmi.config.ts'",
     "copy-abis": "yarn tsx script/bundle-abis.ts",
     "lint": "yarn run prettier:check",
     "coverage": "forge coverage --report lcov",
@@ -40,7 +40,6 @@
     "@openzeppelin/contracts": "4.9.2",
     "@types/node": "^20.1.2",
     "@wagmi/cli": "^1.0.1",
-    "@zoralabs/mints-contracts": "*",
     "@zoralabs/openzeppelin-contracts-upgradeable": "4.8.4",
     "@zoralabs/protocol-rewards": "*",
     "@zoralabs/shared-contracts": "*",

packages/1155-contracts/src/interfaces/IZoraCreator1155.sol

@@ -12,7 +12,6 @@ import {IVersionedContract} from "@zoralabs/shared-contracts/interfaces/IVersion
 import {ICreatorRoyaltiesControl} from "../interfaces/ICreatorRoyaltiesControl.sol";
 import {IZoraCreator1155DelegatedCreation} from "./IZoraCreator1155DelegatedCreation.sol";
 import {IMintWithRewardsRecipients} from "./IMintWithRewardsRecipients.sol";
-import {IMintWithMints} from "@zoralabs/mints-contracts/src/IMintWithMints.sol";
 import {IReduceSupply} from "./IReduceSupply.sol";
 
 /*
@@ -47,7 +46,6 @@ interface IZoraCreator1155 is
     IERC1155MetadataURIUpgradeable,
     IZoraCreator1155DelegatedCreation,
     IMintWithRewardsRecipients,
-    IMintWithMints,
     IReduceSupply
 {
     function PERMISSION_BIT_ADMIN() external returns (uint256);

packages/1155-contracts/src/nft/ZoraCreator1155Impl.sol

@@ -37,12 +37,8 @@ import {IZoraCreator1155DelegatedCreation, ISupportsAABasedDelegatedTokenCreatio
 import {IMintWithRewardsRecipients} from "../interfaces/IMintWithRewardsRecipients.sol";
 import {ZoraCreator1155Attribution, DecodedCreatorAttribution, PremintTokenSetup, PremintConfigV2, DelegatedTokenCreation, DelegatedTokenSetup} from "../delegation/ZoraCreator1155Attribution.sol";
 import {ContractCreationConfig, PremintConfig} from "@zoralabs/shared-contracts/entities/Premint.sol";
-import {IZoraMintsMinterManager} from "@zoralabs/mints-contracts/src/interfaces/IZoraMintsMinterManager.sol";
-import {IZoraMints1155} from "@zoralabs/mints-contracts/src/interfaces/IZoraMints1155.sol";
 import {IERC1155} from "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
 import {IERC1155Receiver} from "@openzeppelin/contracts/token/ERC1155/IERC1155Receiver.sol";
-import {IMintWithMints} from "@zoralabs/mints-contracts/src/IMintWithMints.sol";
-import {Redemption} from "@zoralabs/mints-contracts/src/ZoraMintsTypes.sol";
 import {IReduceSupply} from "../interfaces/IReduceSupply.sol";
 
 /// Imagine. Mint. Enjoy.
@@ -80,20 +76,14 @@ contract ZoraCreator1155Impl is
     uint256 public constant PERMISSION_BIT_FUNDS_MANAGER = 2 ** 5;
     /// @notice Factory contract
     IUpgradeGate internal immutable upgradeGate;
-    /// @notice The mint token contract
-    IZoraMintsMinterManager internal immutable mintsManager;
+
+    uint256 constant MINT_FEE = 0.000111 ether;
 
     bytes4 constant ON_ERC1155_RECEIVED_HASH = IERC1155Receiver.onERC1155Received.selector;
     bytes4 constant ON_ERC1155_BATCH_RECEIVED_HASH = IERC1155Receiver.onERC1155BatchReceived.selector;
 
-    constructor(
-        address _mintFeeRecipient,
-        address _upgradeGate,
-        address _protocolRewards,
-        address _mints
-    ) RewardSplits(_protocolRewards, _mintFeeRecipient) initializer {
+    constructor(address _mintFeeRecipient, address _upgradeGate, address _protocolRewards) RewardSplits(_protocolRewards, _mintFeeRecipient) initializer {
         upgradeGate = IUpgradeGate(_upgradeGate);
-        mintsManager = IZoraMintsMinterManager(_mints);
     }
 
     /// @notice Initializes the contract
@@ -229,14 +219,6 @@ contract ZoraCreator1155Impl is
         }
     }
 
-    modifier onlyMints() {
-        if (msg.sender != address(mintsManager.zoraMints1155())) {
-            revert OnlyTransfersFromZoraMints();
-        }
-
-        _;
-    }
-
     /// @notice Modifier checking if the user is an admin or has a role
     /// @dev This reverts if the msg.sender is not an admin for the given token id or contract
     /// @param tokenId tokenId to check
@@ -533,7 +515,7 @@ contract ZoraCreator1155Impl is
         // Require admin from the minter to mint
         _requireAdminOrRole(address(minter), tokenId, PERMISSION_BIT_MINTER);
 
-        uint256 totalReward = mintsManager.getEthPrice() * quantity;
+        uint256 totalReward = MINT_FEE * quantity;
 
         _mintAndHandleRewards(minter, rewardsRecipients, msg.value, totalReward, tokenId, quantity, minterArguments);
     }
@@ -548,50 +530,8 @@ contract ZoraCreator1155Impl is
         }
     }
 
-    /// @notice Mint tokens and payout rewards given a minter contract, minter arguments, and rewards arguments,
-    /// while MINTs are redeemed to pay for the mint fee, instead of paying with ETH directly.
-    /// The MINTs must have been approved to be transferred to this contract from the msg.sender before calling this function.
-    /// Value sent is used for paid mints, if this is a paid mint
-    /// @param mintTokenIds The MINT token IDs that are to be redeemed
-    /// @param quantities The quantities of each MINT token id to redeem
-    /// @param minter The minter contract to use
-    /// @param tokenId The token ID to mint
-    /// @param rewardsRecipients The addresses of rewards arguments - rewardsRecipients[0] = mintReferral, rewardsRecipients[1] = platformReferral
-    /// @param minterArguments The arguments to pass to the minter
-    /// @param quantityMinted The total quantity of tokens minted
-    function mintWithMints(
-        uint256[] calldata mintTokenIds,
-        uint256[] calldata quantities,
-        IMinter1155 minter,
-        uint256 tokenId,
-        address[] memory rewardsRecipients,
-        bytes calldata minterArguments
-    ) external payable returns (uint256 quantityMinted) {
-        // Require admin from the minter to mint
-        _requireAdminOrRole(address(minter), tokenId, PERMISSION_BIT_MINTER);
-
-        quantityMinted = _getTotalMintsQuantity(mintTokenIds, quantities);
-        IZoraMints1155 mints = mintsManager.zoraMints1155();
-        mints.safeBatchTransferFrom(msg.sender, address(this), mintTokenIds, quantities, "");
-        Redemption[] memory redemptions = mints.redeemBatch(mintTokenIds, quantities, address(this));
-
-        uint256 totalEthReward = _getEthRedemptionTotal(redemptions);
-
-        _mintAndHandleRewards(minter, rewardsRecipients, msg.value + totalEthReward, totalEthReward, tokenId, quantityMinted, minterArguments);
-    }
-
-    function _getEthRedemptionTotal(Redemption[] memory redemptions) private pure returns (uint256 totalEth) {
-        for (uint256 i = 0; i < redemptions.length; i++) {
-            if (redemptions[i].tokenAddress != address(0)) {
-                revert NonEthRedemption();
-            }
-
-            totalEth += redemptions[i].valueRedeemed;
-        }
-    }
-
     function mintFee() external view returns (uint256) {
-        return mintsManager.getEthPrice();
+        return MINT_FEE;
     }
 
     /// @notice Get the creator reward recipient address for a specific token.
@@ -712,7 +652,6 @@ contract ZoraCreator1155Impl is
             interfaceId == type(IHasSupportedPremintSignatureVersions).interfaceId ||
             interfaceId == type(ISupportsAABasedDelegatedTokenCreation).interfaceId ||
             interfaceId == type(IMintWithRewardsRecipients).interfaceId ||
-            interfaceId == type(IMintWithMints).interfaceId ||
             interfaceId == type(IReduceSupply).interfaceId;
     }
 
@@ -933,13 +872,4 @@ contract ZoraCreator1155Impl is
         // grant the token creator as admin of the newly created token
         _addPermission(newTokenId, creator, PERMISSION_BIT_ADMIN);
     }
-
-    // /// Allows receiving ERC1155 tokens
-    function onERC1155Received(address, address, uint256, uint256, bytes calldata) external view onlyMints returns (bytes4) {
-        return ON_ERC1155_RECEIVED_HASH;
-    }
-
-    function onERC1155BatchReceived(address, address, uint256[] calldata, uint256[] calldata, bytes calldata) external view onlyMints returns (bytes4) {
-        return ON_ERC1155_BATCH_RECEIVED_HASH;
-    }
 }

packages/1155-contracts/test/factory/ZoraCreator1155Factory.t.sol

@@ -15,24 +15,17 @@ import {Zora1155} from "../../src/proxies/Zora1155.sol";
 import {UpgradeGate} from "../../src/upgrades/UpgradeGate.sol";
 import {MockContractMetadata} from "../mock/MockContractMetadata.sol";
 import {ProxyShim} from "../../src/utils/ProxyShim.sol";
-import {ZoraMintsFixtures} from "../fixtures/ZoraMintsFixtures.sol";
-import {IZoraMintsMinterManager} from "@zoralabs/mints-contracts/src/interfaces/IZoraMintsMinterManager.sol";
-import {IZoraMints1155} from "@zoralabs/mints-contracts/src/interfaces/IZoraMints1155.sol";
 
 contract ZoraCreator1155FactoryTest is Test {
     using stdJson for string;
     address internal zora;
-    uint256 internal mintFeeAmount;
-    uint256 initialTokenId = 777;
-    uint256 initialTokenPrice = 0.000777 ether;
 
     ZoraCreator1155FactoryImpl internal factoryImpl;
     ZoraCreator1155FactoryImpl internal factory;
     UpgradeGate internal upgradeGate;
 
     function setUp() external {
         zora = makeAddr("zora");
-        mintFeeAmount = 0.000777 ether;
 
         upgradeGate = new UpgradeGate();
         upgradeGate.initialize(zora);
@@ -41,8 +34,7 @@ contract ZoraCreator1155FactoryTest is Test {
         Zora1155Factory factoryProxy = new Zora1155Factory(factoryShimAddress, "");
 
         ProtocolRewards protocolRewards = new ProtocolRewards();
-        IZoraMintsMinterManager mints = ZoraMintsFixtures.createMockMints(initialTokenId, initialTokenPrice);
-        ZoraCreator1155Impl zoraCreator1155Impl = new ZoraCreator1155Impl(zora, address(upgradeGate), address(protocolRewards), address(mints));
+        ZoraCreator1155Impl zoraCreator1155Impl = new ZoraCreator1155Impl(zora, address(upgradeGate), address(protocolRewards));
 
         factoryImpl = new ZoraCreator1155FactoryImpl(zoraCreator1155Impl, IMinter1155(address(1)), IMinter1155(address(2)), IMinter1155(address(3)));
         factory = ZoraCreator1155FactoryImpl(address(factoryProxy));
@@ -227,12 +219,7 @@ contract ZoraCreator1155FactoryTest is Test {
         // * create a new version of the erc1155 implementation
         // * create a new factory that points to that new erc1155 implementation,
         // * upgrade the proxy to point to the new factory
-        IZoraCreator1155 newZoraCreator = new ZoraCreator1155Impl(
-            zora,
-            address(factory),
-            address(new ProtocolRewards()),
-            address(ZoraMintsFixtures.createMockMints(initialTokenId, initialTokenPrice))
-        );
+        IZoraCreator1155 newZoraCreator = new ZoraCreator1155Impl(zora, address(factory), address(new ProtocolRewards()));
 
         ZoraCreator1155FactoryImpl newFactoryImpl = new ZoraCreator1155FactoryImpl(
             newZoraCreator,
@@ -281,12 +268,7 @@ contract ZoraCreator1155FactoryTest is Test {
         ZoraCreator1155Impl creatorProxy = ZoraCreator1155Impl(payable(createdAddress));
 
         // 2. upgrade the created contract by creating a new contract and upgrading the existing one to point to it.
-        IZoraCreator1155 newZoraCreator = new ZoraCreator1155Impl(
-            zora,
-            address(0),
-            address(new ProtocolRewards()),
-            address(ZoraMintsFixtures.createMockMints(initialTokenId, initialTokenPrice))
-        );
+        IZoraCreator1155 newZoraCreator = new ZoraCreator1155Impl(zora, address(0), address(new ProtocolRewards()));
 
         address[] memory baseImpls = new address[](1);
         baseImpls[0] = address(factory.zora1155Impl());

packages/1155-contracts/test/fixtures/Zora1155FactoryFixtures.sol

@@ -14,13 +14,9 @@ import {IUpgradeGate} from "../../src/interfaces/IUpgradeGate.sol";
 import {UpgradeGate} from "../../src/upgrades/UpgradeGate.sol";
 
 library Zora1155FactoryFixtures {
-    function setupZora1155Impl(
-        address zora,
-        IUpgradeGate upgradeGate,
-        address mints
-    ) internal returns (ProtocolRewards rewards, ZoraCreator1155Impl zora1155Impl) {
+    function setupZora1155Impl(address zora, IUpgradeGate upgradeGate) internal returns (ProtocolRewards rewards, ZoraCreator1155Impl zora1155Impl) {
         rewards = new ProtocolRewards();
-        zora1155Impl = new ZoraCreator1155Impl(zora, address(upgradeGate), address(rewards), mints);
+        zora1155Impl = new ZoraCreator1155Impl(zora, address(upgradeGate), address(rewards));
     }
 
     function upgradeFactoryProxyToUse1155(
@@ -45,17 +41,15 @@ library Zora1155FactoryFixtures {
     function setupNew1155AndFactory(
         address zora,
         IUpgradeGate upgradeGate,
-        IMinter1155 fixedPriceMinter,
-        address mints
+        IMinter1155 fixedPriceMinter
     ) internal returns (ProtocolRewards rewards, ZoraCreator1155Impl zoraCreator1155Impl, ZoraCreator1155FactoryImpl factoryImpl) {
-        (rewards, zoraCreator1155Impl) = setupZora1155Impl(zora, upgradeGate, mints);
+        (rewards, zoraCreator1155Impl) = setupZora1155Impl(zora, upgradeGate);
         factoryImpl = new ZoraCreator1155FactoryImpl(zoraCreator1155Impl, IMinter1155(address(1)), fixedPriceMinter, IMinter1155(address(3)));
     }
 
     function setup1155AndFactoryProxy(
         address zora,
-        address deployer,
-        address mints
+        address deployer
     )
         internal
         returns (
@@ -69,7 +63,7 @@ library Zora1155FactoryFixtures {
         factoryProxy = setupFactoryProxy(deployer);
         fixedPriceMinter = new ZoraCreatorFixedPriceSaleStrategy();
         upgradeGate = new UpgradeGate();
-        (rewards, zoraCreator1155Impl) = setupZora1155Impl(zora, upgradeGate, mints);
+        (rewards, zoraCreator1155Impl) = setupZora1155Impl(zora, upgradeGate);
         upgradeFactoryProxyToUse1155(factoryProxy, zoraCreator1155Impl, fixedPriceMinter, deployer);
     }
 }