Sigdrop size (#192)

* use string revert statements

* revert back from custom errors to regular reverts

* run prettier

* update tests

* expose totalMinted; size down contract accordingly

* optimize totalMinted

* run prettier

Co-authored-by: Krishang Nadgauda <[email protected]>

Author: kumaryash90

contracts/feature/ContractMetadata.sol

@@ -17,7 +17,7 @@ abstract contract ContractMetadata is IContractMetadata {
     /// @dev Lets a contract admin set the URI for contract-level metadata.
     function setContractURI(string memory _uri) external override {
         if (!_canSetContractURI()) {
-            revert ContractMetadata__NotAuthorized();
+            revert("Not authorized");
         }
 
         _setupContractURI(_uri);

contracts/feature/DelayedReveal.sol

@@ -21,7 +21,7 @@ abstract contract DelayedReveal is IDelayedReveal {
     function getRevealURI(uint256 _batchId, bytes calldata _key) public view returns (string memory revealedURI) {
         bytes memory encryptedURI = encryptedBaseURI[_batchId];
         if (encryptedURI.length == 0) {
-            revert DelayedReveal__NothingToReveal(_batchId);
+            revert("Nothing to reveal");
         }
 
         revealedURI = string(encryptDecrypt(encryptedURI, _key));

contracts/feature/DropSinglePhase.sol

@@ -34,10 +34,6 @@ abstract contract DropSinglePhase is IDropSinglePhase {
      */
     mapping(bytes32 => TWBitMaps.BitMap) private usedAllowlistSpot;
 
-    /*///////////////////////////////////////////////////////////////
-                                Errors
-    //////////////////////////////////////////////////////////////*/
-
     /*///////////////////////////////////////////////////////////////
                             Drop logic
     //////////////////////////////////////////////////////////////*/
@@ -103,7 +99,7 @@ abstract contract DropSinglePhase is IDropSinglePhase {
     /// @dev Lets a contract admin set claim conditions.
     function setClaimConditions(ClaimCondition calldata _condition, bool _resetClaimEligibility) external override {
         if (!_canSetClaimConditions()) {
-            revert DropSinglePhase__NotAuthorized();
+            revert("Not authorized");
         }
 
         bytes32 targetConditionId = conditionId;
@@ -115,7 +111,7 @@ abstract contract DropSinglePhase is IDropSinglePhase {
         }
 
         if (supplyClaimedAlready > _condition.maxClaimableSupply) {
-            revert DropSinglePhase__MaxSupplyClaimedAlready(supplyClaimedAlready);
+            revert("max supply claimed already");
         }
 
         claimCondition = ClaimCondition({
@@ -144,40 +140,27 @@ abstract contract DropSinglePhase is IDropSinglePhase {
         ClaimCondition memory currentClaimPhase = claimCondition;
 
         if (_currency != currentClaimPhase.currency || _pricePerToken != currentClaimPhase.pricePerToken) {
-            revert DropSinglePhase__InvalidCurrencyOrPrice(
-                _currency,
-                currentClaimPhase.currency,
-                _pricePerToken,
-                currentClaimPhase.pricePerToken
-            );
+            revert("Invalid price or currency");
         }
 
         // If we're checking for an allowlist quantity restriction, ignore the general quantity restriction.
         if (
             _quantity == 0 ||
             (verifyMaxQuantityPerTransaction && _quantity > currentClaimPhase.quantityLimitPerTransaction)
         ) {
-            revert DropSinglePhase__InvalidQuantity();
+            revert("Invalid quantity");
         }
 
         if (currentClaimPhase.supplyClaimed + _quantity > currentClaimPhase.maxClaimableSupply) {
-            revert DropSinglePhase__ExceedMaxClaimableSupply(
-                currentClaimPhase.supplyClaimed,
-                currentClaimPhase.maxClaimableSupply
-            );
+            revert("exceeds max supply");
         }
 
         (uint256 lastClaimedAt, uint256 nextValidClaimTimestamp) = getClaimTimestamp(_claimer);
         if (
             currentClaimPhase.startTimestamp > block.timestamp ||
             (lastClaimedAt != 0 && block.timestamp < nextValidClaimTimestamp)
         ) {
-            revert DropSinglePhase__CannotClaimYet(
-                block.timestamp,
-                currentClaimPhase.startTimestamp,
-                lastClaimedAt,
-                nextValidClaimTimestamp
-            );
+            revert("cant claim yet");
         }
     }
 
@@ -196,15 +179,15 @@ abstract contract DropSinglePhase is IDropSinglePhase {
                 keccak256(abi.encodePacked(_claimer, _allowlistProof.maxQuantityInAllowlist))
             );
             if (!validMerkleProof) {
-                revert DropSinglePhase__NotInWhitelist();
+                revert("not in allowlist");
             }
 
             if (usedAllowlistSpot[conditionId].get(merkleProofIndex)) {
-                revert DropSinglePhase__ProofClaimed();
+                revert("proof claimed");
             }
 
             if (_allowlistProof.maxQuantityInAllowlist != 0 && _quantity > _allowlistProof.maxQuantityInAllowlist) {
-                revert DropSinglePhase__InvalidQuantityProof(_allowlistProof.maxQuantityInAllowlist);
+                revert("Invalid qty proof");
             }
         }
     }

contracts/feature/LazyMint.sol

@@ -24,7 +24,7 @@ abstract contract LazyMint is ILazyMint {
     /// @dev Returns the id for the batch of tokens the given tokenId belongs to.
     function getBatchIdAtIndex(uint256 _index) public view returns (uint256) {
         if (_index >= getBaseURICount()) {
-            revert LazyMint__InvalidIndex(_index);
+            revert("Invalid index");
         }
         return batchIds[_index];
     }
@@ -40,7 +40,7 @@ abstract contract LazyMint is ILazyMint {
             }
         }
 
-        revert LazyMint__NoBatchIDForToken(_tokenId);
+        revert("No batchId for token");
     }
 
     /// @dev Returns the baseURI for a token. The intended metadata URI for the token is baseURI + tokenId.
@@ -53,8 +53,7 @@ abstract contract LazyMint is ILazyMint {
                 return baseURI[indices[i]];
             }
         }
-
-        revert LazyMint__NoBaseURIForToken(_tokenId);
+        revert("No baseURI for token");
     }
 
     /// @dev Sets the base URI for the batch of tokens with the given batchId.

contracts/feature/Ownable.sol

@@ -16,7 +16,7 @@ abstract contract Ownable is IOwnable {
     /// @dev Reverts if caller is not the owner.
     modifier onlyOwner() {
         if (msg.sender != _owner) {
-            revert Ownable__NotAuthorized();
+            revert("Not authorized");
         }
         _;
     }
@@ -29,7 +29,7 @@ abstract contract Ownable is IOwnable {
     /// @dev Lets a contract admin set a new owner for the contract. The new owner must be a contract admin.
     function setOwner(address _newOwner) external override {
         if (!_canSetOwner()) {
-            revert Ownable__NotAuthorized();
+            revert("Not authorized");
         }
         _setupOwner(_newOwner);
     }

contracts/feature/Permissions.sol

@@ -34,7 +34,7 @@ contract Permissions is IPermissions {
     function grantRole(bytes32 role, address account) public virtual override {
         _checkRole(_getRoleAdmin[role], msg.sender);
         if (_hasRole[role][account]) {
-            revert Permissions__CanOnlyGrantToNonHolders(account);
+            revert("Can only grant to non holders");
         }
         _setupRole(role, account);
     }
@@ -46,7 +46,7 @@ contract Permissions is IPermissions {
 
     function renounceRole(bytes32 role, address account) public virtual override {
         if (msg.sender != account) {
-            revert Permissions__CanOnlyRenounceForSelf(msg.sender, account);
+            revert("Can only renounce for self");
         }
         _revokeRole(role, account);
     }

contracts/feature/PlatformFee.sol

@@ -24,15 +24,15 @@ abstract contract PlatformFee is IPlatformFee {
     /// @dev Lets a contract admin update the platform fee recipient and bps
     function setPlatformFeeInfo(address _platformFeeRecipient, uint256 _platformFeeBps) external override {
         if (!_canSetPlatformFeeInfo()) {
-            revert PlatformFee__NotAuthorized();
+            revert("Not authorized");
         }
         _setupPlatformFeeInfo(_platformFeeRecipient, _platformFeeBps);
     }
 
     /// @dev Lets a contract admin update the platform fee recipient and bps
     function _setupPlatformFeeInfo(address _platformFeeRecipient, uint256 _platformFeeBps) internal {
         if (_platformFeeBps > 10_000) {
-            revert PlatformFee__ExceedsMaxBps(_platformFeeBps);
+            revert("Exceeds max bps");
         }
 
         platformFeeBps = uint16(_platformFeeBps);

contracts/feature/PrimarySale.sol

@@ -20,7 +20,7 @@ abstract contract PrimarySale is IPrimarySale {
     /// @dev Lets a contract admin set the recipient for all primary sales.
     function setPrimarySaleRecipient(address _saleRecipient) external override {
         if (!_canSetPrimarySaleRecipient()) {
-            revert PrimarySale__NotAuthorized();
+            revert("Not authorized");
         }
         _setupPrimarySaleRecipient(_saleRecipient);
     }

contracts/feature/Royalty.sol

@@ -52,7 +52,7 @@ abstract contract Royalty is IRoyalty {
     /// @dev Lets a contract admin update the default royalty recipient and bps.
     function setDefaultRoyaltyInfo(address _royaltyRecipient, uint256 _royaltyBps) external override {
         if (!_canSetRoyaltyInfo()) {
-            revert Royalty__NotAuthorized();
+            revert("Not authorized");
         }
 
         _setupDefaultRoyaltyInfo(_royaltyRecipient, _royaltyBps);
@@ -61,7 +61,7 @@ abstract contract Royalty is IRoyalty {
     /// @dev Lets a contract admin update the default royalty recipient and bps.
     function _setupDefaultRoyaltyInfo(address _royaltyRecipient, uint256 _royaltyBps) internal {
         if (_royaltyBps > 10_000) {
-            revert Royalty__ExceedsMaxBps(_royaltyBps);
+            revert("Exceeds max bps");
         }
 
         royaltyRecipient = _royaltyRecipient;
@@ -77,7 +77,7 @@ abstract contract Royalty is IRoyalty {
         uint256 _bps
     ) external override {
         if (!_canSetRoyaltyInfo()) {
-            revert Royalty__NotAuthorized();
+            revert("Not authorized");
         }
 
         _setupRoyaltyInfoForToken(_tokenId, _recipient, _bps);
@@ -90,7 +90,7 @@ abstract contract Royalty is IRoyalty {
         uint256 _bps
     ) internal {
         if (_bps > 10_000) {
-            revert Royalty__ExceedsMaxBps(_bps);
+            revert("Exceeds max bps");
         }
 
         royaltyInfoForToken[_tokenId] = RoyaltyInfo({ recipient: _recipient, bps: _bps });

contracts/feature/SignatureMintERC721.sol

@@ -39,11 +39,11 @@ abstract contract SignatureMintERC721 is EIP712, ISignatureMintERC721 {
         (success, signer) = verify(_req, _signature);
 
         if (!success) {
-            revert SignatureMintERC721__InvalidRequest();
+            revert("Invalid req");
         }
 
         if (_req.validityStartTimestamp > block.timestamp || block.timestamp > _req.validityEndTimestamp) {
-            revert SignatureMintERC721__RequestExpired(block.timestamp);
+            revert("Req expired");
         }
 
         minted[_req.uid] = true;