Sigdrop size additional (#193)

* use string revert statements

* revert back from custom errors to regular reverts

* run prettier

* update tests

* expose totalMinted; size down contract accordingly

* public functions for contract type and version; reduce revert strings

Co-authored-by: Krishang Nadgauda <nkrishang@Krishangs-MBP.lan>

Author: kumaryash90

contracts/feature/DropSinglePhase.sol

@@ -111,7 +111,7 @@ abstract contract DropSinglePhase is IDropSinglePhase {
         }
 
         if (supplyClaimedAlready > _condition.maxClaimableSupply) {
-            revert("max supply claimed already");
+            revert("max supply claimed");
         }
 
         claimCondition = ClaimCondition({

contracts/feature/LazyMint.sol

@@ -40,7 +40,7 @@ abstract contract LazyMint is ILazyMint {
             }
         }
 
-        revert("No batchId for token");
+        revert("Invalid tokenId");
     }
 
     /// @dev Returns the baseURI for a token. The intended metadata URI for the token is baseURI + tokenId.
@@ -53,7 +53,7 @@ abstract contract LazyMint is ILazyMint {
                 return baseURI[indices[i]];
             }
         }
-        revert("No baseURI for token");
+        revert("Invalid tokenId");
     }
 
     /// @dev Sets the base URI for the batch of tokens with the given batchId.

contracts/signature-drop/SignatureDrop.sol

@@ -49,9 +49,6 @@ contract SignatureDrop is
                             State variables
     //////////////////////////////////////////////////////////////*/
 
-    bytes32 public contractType = bytes32("SignatureDrop");
-    uint256 public contractVersion = 2;
-
     /// @dev Only transfers to or from TRANSFER_ROLE holders are valid, when transfers are restricted.
     bytes32 private transferRole;
     /// @dev Only MINTER_ROLE holders can sign off on `MintRequest`s and lazy mint tokens.
@@ -138,6 +135,14 @@ contract SignatureDrop is
         }
     }
 
+    function contractType() public pure returns (bytes32) {
+        return bytes32("SignatureDrop");
+    }
+
+    function contractVersion() public pure returns (uint256) {
+        return 2;
+    }
+
     /*///////////////////////////////////////////////////////////////
                     Lazy minting + delayed-reveal logic
     //////////////////////////////////////////////////////////////*/
@@ -152,7 +157,7 @@ contract SignatureDrop is
         bytes calldata _encryptedBaseURI
     ) external onlyRole(minterRole) returns (uint256 batchId) {
         if (_amount == 0) {
-            revert("Minting zero amount");
+            revert("Zero amt");
         }
 
         uint256 startId = nextTokenIdToMint;
@@ -192,7 +197,7 @@ contract SignatureDrop is
         returns (address signer)
     {
         if (_req.quantity == 0) {
-            revert("Minting zero amount");
+            revert("Zero qty");
         }
 
         uint256 tokenIdToMint = _currentIndex;
@@ -236,7 +241,7 @@ contract SignatureDrop is
     ) internal view override {
         require(isTrustedForwarder(msg.sender) || _msgSender() == tx.origin, "BOT");
         if (_currentIndex + _quantity > nextTokenIdToMint) {
-            revert("Not enough minted tokens.");
+            revert("Not enough minted tokens");
         }
     }
 
@@ -257,7 +262,7 @@ contract SignatureDrop is
 
         if (_currency == CurrencyTransferLib.NATIVE_TOKEN) {
             if (msg.value != totalPrice) {
-                revert("Must send total price.");
+                revert("Must send total price");
             }
         }
 

docs/SignatureDrop.md

@@ -164,7 +164,7 @@ function contractURI() external view returns (string)
 ### contractVersion
 
 ```solidity
-function contractVersion() external view returns (uint256)
+function contractVersion() external pure returns (uint256)
 ```
 
 

src/test/SignatureDrop.t.sol

@@ -344,7 +344,7 @@ contract SignatureDropTest is BaseTest {
 
         sigdrop.lazyMint(100, "ipfs://", "");
 
-        vm.expectRevert("No batchId for token");
+        vm.expectRevert("Invalid tokenId");
         sigdrop.tokenURI(100);
 
         vm.stopPrank();
@@ -744,7 +744,7 @@ contract SignatureDropTest is BaseTest {
             bytes memory signature = signMintRequest(mintrequest, privateKey);
             vm.startPrank(address(deployerSigner));
             vm.warp(mintrequest.validityStartTimestamp);
-            vm.expectRevert("Must send total price.");
+            vm.expectRevert("Must send total price");
             sigdrop.mintWithSignature{ value: 2 }(mintrequest, signature);
             vm.stopPrank();
         }
@@ -903,7 +903,7 @@ contract SignatureDropTest is BaseTest {
         vm.prank(deployerSigner);
         sigdrop.setClaimConditions(conditions[0], false);
 
-        vm.expectRevert("Not enough minted tokens.");
+        vm.expectRevert("Not enough minted tokens");
         vm.prank(getActor(6), getActor(6));
         sigdrop.claim(receiver, 101, address(0), 0, alp, "");
     }
@@ -1082,7 +1082,7 @@ contract SignatureDropTest is BaseTest {
         assertEq(uri, string(abi.encodePacked("ipfs://", "1")));
 
         bytes memory newEncryptedURI = sigdrop.encryptDecrypt("ipfs://secret", "key");
-        vm.expectRevert("Minting zero amount");
+        vm.expectRevert("Zero amt");
         sigdrop.lazyMint(0, "", newEncryptedURI);
 
         vm.stopPrank();