remove signature minting from Drop bases (#222)

* remove signature minting from Drop bases

* update tests

* run prettier

Author: kumaryash90

contracts/base/ERC1155Drop.sol

@@ -9,7 +9,6 @@ import "../extension/Ownable.sol";
 import "../extension/Royalty.sol";
 import "../extension/BatchMintMetadata.sol";
 import "../extension/PrimarySale.sol";
-import "../extension/SignatureMintERC1155.sol";
 import "../extension/DropSinglePhase1155.sol";
 import "../extension/LazyMint.sol";
 import "../extension/DelayedReveal.sol";
@@ -19,19 +18,25 @@ import "../lib/TWStrings.sol";
 
 /**
  *      BASE:      ERC1155Base
- *      EXTENSION: SignatureMintERC1155, DropSinglePhase1155
+ *      EXTENSION: DropSinglePhase1155
  *
- *  The `ERC1155Drop` contract uses the `ERC1155Base` contract, along with the `SignatureMintERC1155` and `DropSinglePhase1155` extension.
+ *  The `ERC1155Base` smart contract implements the ERC1155 NFT standard.
+ *  It includes the following additions to standard ERC1155 logic:
  *
- *  The 'signature minting' mechanism in the `SignatureMintERC1155` extension is a way for a contract admin to authorize
- *  an external party's request to mint tokens on the admin's contract. At a high level, this means you can authorize
- *  some external party to mint tokens on your contract, and specify what exactly will be minted by that external party.
+ *      - Contract metadata for royalty support on platforms such as OpenSea that use
+ *        off-chain information to distribute roaylties.
+ *
+ *      - Ownership of the contract, with the ability to restrict certain functions to
+ *        only be called by the contract's owner.
+ *
+ *      - Multicall capability to perform multiple actions atomically
+ *
+ *      - EIP 2981 compliance for royalty support on NFT marketplaces.
  *
  *  The `drop` mechanism in the `DropSinglePhase1155` extension is a distribution mechanism for lazy minted tokens. It lets
  *  you set restrictions such as a price to charge, an allowlist etc. when an address atttempts to mint lazy minted tokens.
  *
- *  The `ERC721Drop` contract lets you lazy mint tokens, and distribute those lazy minted tokens via signature minting, or
- *  via the drop mechanism.
+ *  The `ERC721Drop` contract lets you lazy mint tokens, and distribute those lazy minted tokens via the drop mechanism.
  */
 
 contract ERC1155Drop is
@@ -42,7 +47,6 @@ contract ERC1155Drop is
     Multicall,
     BatchMintMetadata,
     PrimarySale,
-    SignatureMintERC1155,
     LazyMint,
     DelayedReveal,
     DropSinglePhase1155
@@ -96,54 +100,6 @@ contract ERC1155Drop is
         }
     }
 
-    /*//////////////////////////////////////////////////////////////
-                        Signature minting logic
-    //////////////////////////////////////////////////////////////*/
-
-    /**
-     *  @notice           Mints tokens according to the provided mint request.
-     *
-     *  @param _req       The payload / mint request.
-     *  @param _signature The signature produced by an account signing the mint request.
-     */
-    function mintWithSignature(MintRequest calldata _req, bytes calldata _signature)
-        external
-        payable
-        virtual
-        override
-        returns (address signer)
-    {
-        require(_req.quantity > 0, "Minting zero tokens.");
-
-        uint256 tokenIdToMint = _req.tokenId;
-        require(tokenIdToMint < nextTokenIdToMint(), "Claiming invalid tokenId.");
-
-        // Verify and process payload.
-        signer = _processRequest(_req, _signature);
-
-        /**
-         *  Get receiver of tokens.
-         *
-         *  Note: If `_req.to == address(0)`, a `mintWithSignature` transaction sitting in the
-         *        mempool can be frontrun by copying the input data, since the minted tokens
-         *        will be sent to the `_msgSender()` in this case.
-         */
-        address receiver = _req.to == address(0) ? msg.sender : _req.to;
-
-        // Collect price
-        collectPriceOnClaim(_req.primarySaleRecipient, _req.quantity, _req.currency, _req.pricePerToken);
-
-        // Set royalties, if applicable.
-        if (_req.royaltyRecipient != address(0) && _req.royaltyBps != 0) {
-            _setupRoyaltyInfoForToken(tokenIdToMint, _req.royaltyRecipient, _req.royaltyBps);
-        }
-
-        // Mint tokens.
-        _mint(receiver, tokenIdToMint, _req.quantity, "");
-
-        emit TokensMintedWithSignature(signer, receiver, tokenIdToMint, _req);
-    }
-
     /*///////////////////////////////////////////////////////////////
                         Delayed reveal logic
     //////////////////////////////////////////////////////////////*/
@@ -322,9 +278,4 @@ contract ERC1155Drop is
     function _canReveal() internal view virtual returns (bool) {
         return msg.sender == owner();
     }
-
-    /// @dev Returns whether a given address is authorized to sign mint requests.
-    function _canSignMintRequest(address _signer) internal view virtual override returns (bool) {
-        return _signer == owner();
-    }
 }

contracts/base/ERC20Drop.sol

@@ -7,35 +7,31 @@ import "../extension/ContractMetadata.sol";
 import "../extension/Multicall.sol";
 import "../extension/Ownable.sol";
 import "../extension/PrimarySale.sol";
-import { SignatureMintERC20 } from "../extension/SignatureMintERC20.sol";
 import "../extension/DropSinglePhase.sol";
 
 import "../lib/CurrencyTransferLib.sol";
 
 /**
  *      BASE:      ERC20
- *      EXTENSION: SignatureMintERC20, DropSinglePhase
+ *      EXTENSION: DropSinglePhase
  *
- *  The `ERC20Drop` contract uses the `ERC20Base` contract, along with the `SignatureMintERC20` and `DropSinglePhase` extensions.
+ *  The `ERC20Drop` smart contract implements the ERC20 standard.
+ *  It includes the following additions to standard ERC20 logic:
  *
- *  The 'signature minting' mechanism in the `SignatureMintERC20` extension is a way for a contract admin to authorize
- *  an external party's request to mint tokens on the admin's contract. At a high level, this means you can authorize
- *  some external party to mint tokens on your contract, and specify what exactly will be minted by that external party.
+ *      - Ownership of the contract, with the ability to restrict certain functions to
+ *        only be called by the contract's owner.
+ *
+ *      - Multicall capability to perform multiple actions atomically
+ *
+ *      - EIP 2612 compliance: See {ERC20-permit} method, which can be used to change an account's ERC20 allowance by
+ *                             presenting a message signed by the account.
  *
  *  The `drop` mechanism in the `DropSinglePhase` extension is a distribution mechanism for tokens. It lets
  *  you set restrictions such as a price to charge, an allowlist etc. when an address atttempts to mint tokens.
  *
  */
 
-contract ERC20Drop is
-    ContractMetadata,
-    Multicall,
-    Ownable,
-    ERC20Permit,
-    PrimarySale,
-    SignatureMintERC20,
-    DropSinglePhase
-{
+contract ERC20Drop is ContractMetadata, Multicall, Ownable, ERC20Permit, PrimarySale, DropSinglePhase {
     /*//////////////////////////////////////////////////////////////
                             Constructor
     //////////////////////////////////////////////////////////////*/
@@ -51,45 +47,6 @@ contract ERC20Drop is
         _setupPrimarySaleRecipient(_primarySaleRecipient);
     }
 
-    /*//////////////////////////////////////////////////////////////
-                        Signature minting logic
-    //////////////////////////////////////////////////////////////*/
-
-    /**
-     *  @notice           Mints tokens according to the provided mint request.
-     *
-     *  @param _req       The payload / mint request.
-     *  @param _signature The signature produced by an account signing the mint request.
-     */
-    function mintWithSignature(MintRequest calldata _req, bytes calldata _signature)
-        external
-        payable
-        virtual
-        returns (address signer)
-    {
-        require(_req.quantity > 0, "Minting zero tokens.");
-
-        // Verify and process payload.
-        signer = _processRequest(_req, _signature);
-
-        /**
-         *  Get receiver of tokens.
-         *
-         *  Note: If `_req.to == address(0)`, a `mintWithSignature` transaction sitting in the
-         *        mempool can be frontrun by copying the input data, since the minted tokens
-         *        will be sent to the `_msgSender()` in this case.
-         */
-        address receiver = _req.to == address(0) ? msg.sender : _req.to;
-
-        // Collect price
-        collectPriceOnClaim(_req.primarySaleRecipient, _req.quantity, _req.currency, _req.pricePerToken);
-
-        // Mint tokens.
-        _mint(receiver, _req.quantity);
-
-        emit TokensMintedWithSignature(signer, receiver, _req);
-    }
-
     /*//////////////////////////////////////////////////////////////
                             ERC20 logic
     //////////////////////////////////////////////////////////////*/
@@ -162,11 +119,6 @@ contract ERC20Drop is
         return msg.sender == owner();
     }
 
-    /// @dev Returns whether a given address is authorized to sign mint requests.
-    function _canSignMintRequest(address _signer) internal view virtual override returns (bool) {
-        return _signer == owner();
-    }
-
     /// @dev Returns whether primary sale recipient can be set in the given execution context.
     function _canSetPrimarySaleRecipient() internal view virtual override returns (bool) {
         return msg.sender == owner();

contracts/base/ERC20DropVote.sol

@@ -7,35 +7,31 @@ import "../extension/ContractMetadata.sol";
 import "../extension/Multicall.sol";
 import "../extension/Ownable.sol";
 import "../extension/PrimarySale.sol";
-import { SignatureMintERC20 } from "../extension/SignatureMintERC20.sol";
 import "../extension/DropSinglePhase.sol";
 
 import "../lib/CurrencyTransferLib.sol";
 
 /**
  *      BASE:      ERC20Votes
- *      EXTENSION: SignatureMintERC20, DropSinglePhase
+ *      EXTENSION: DropSinglePhase
  *
- *  The `ERC20Drop` contract uses the `ERC20Vote` contract, along with the `SignatureMintERC20` and `DropSinglePhase` extensions.
+ *  The `ERC20Drop` contract uses the `DropSinglePhase` extensions, along with `ERC20Votes`.
+ *  It implements the ERC20 standard, along with the following additions to standard ERC20 logic:
  *
- *  The 'signature minting' mechanism in the `SignatureMintERC20` extension is a way for a contract admin to authorize
- *  an external party's request to mint tokens on the admin's contract. At a high level, this means you can authorize
- *  some external party to mint tokens on your contract, and specify what exactly will be minted by that external party.
+ *      - Ownership of the contract, with the ability to restrict certain functions to
+ *        only be called by the contract's owner.
+ *
+ *      - Multicall capability to perform multiple actions atomically
+ *
+ *      - EIP 2612 compliance: See {ERC20-permit} method, which can be used to change an account's ERC20 allowance by
+ *                             presenting a message signed by the account.
  *
  *  The `drop` mechanism in the `DropSinglePhase` extension is a distribution mechanism tokens. It lets
  *  you set restrictions such as a price to charge, an allowlist etc. when an address atttempts to mint tokens.
  *
  */
 
-contract ERC20DropVote is
-    ContractMetadata,
-    Multicall,
-    Ownable,
-    ERC20Votes,
-    PrimarySale,
-    SignatureMintERC20,
-    DropSinglePhase
-{
+contract ERC20DropVote is ContractMetadata, Multicall, Ownable, ERC20Votes, PrimarySale, DropSinglePhase {
     /*//////////////////////////////////////////////////////////////
                             Constructor
     //////////////////////////////////////////////////////////////*/
@@ -51,45 +47,6 @@ contract ERC20DropVote is
         _setupPrimarySaleRecipient(_primarySaleRecipient);
     }
 
-    /*//////////////////////////////////////////////////////////////
-                        Signature minting logic
-    //////////////////////////////////////////////////////////////*/
-
-    /**
-     *  @notice           Mints tokens according to the provided mint request.
-     *
-     *  @param _req       The payload / mint request.
-     *  @param _signature The signature produced by an account signing the mint request.
-     */
-    function mintWithSignature(MintRequest calldata _req, bytes calldata _signature)
-        external
-        payable
-        virtual
-        returns (address signer)
-    {
-        require(_req.quantity > 0, "Minting zero tokens.");
-
-        // Verify and process payload.
-        signer = _processRequest(_req, _signature);
-
-        /**
-         *  Get receiver of tokens.
-         *
-         *  Note: If `_req.to == address(0)`, a `mintWithSignature` transaction sitting in the
-         *        mempool can be frontrun by copying the input data, since the minted tokens
-         *        will be sent to the `_msgSender()` in this case.
-         */
-        address receiver = _req.to == address(0) ? msg.sender : _req.to;
-
-        // Collect price
-        collectPriceOnClaim(_req.primarySaleRecipient, _req.quantity, _req.currency, _req.pricePerToken);
-
-        // Mint tokens.
-        _mint(receiver, _req.quantity);
-
-        emit TokensMintedWithSignature(signer, receiver, _req);
-    }
-
     /*//////////////////////////////////////////////////////////////
                             ERC20 logic
     //////////////////////////////////////////////////////////////*/
@@ -162,11 +119,6 @@ contract ERC20DropVote is
         return msg.sender == owner();
     }
 
-    /// @dev Returns whether a given address is authorized to sign mint requests.
-    function _canSignMintRequest(address _signer) internal view virtual override returns (bool) {
-        return _signer == owner();
-    }
-
     /// @dev Returns whether primary sale recipient can be set in the given execution context.
     function _canSetPrimarySaleRecipient() internal view virtual override returns (bool) {
         return msg.sender == owner();