Fix tokenURI in ERC721SignatureMint (#232)

* ERC721SignatureMint: fix tokenURI and quantity

* check URI not set

Author: kumaryash90

contracts/base/ERC721Base.sol

@@ -97,7 +97,7 @@ contract ERC721Base is ERC721A, ContractMetadata, Multicall, Ownable, Royalty, B
      */
     function mintTo(address _to, string memory _tokenURI) public virtual {
         require(_canMint(), "Not authorized to mint.");
-        fullURI[nextTokenIdToMint()] = _tokenURI;
+        _setTokenURI(nextTokenIdToMint(), _tokenURI);
         _safeMint(_to, 1, "");
     }
 
@@ -157,6 +157,11 @@ contract ERC721Base is ERC721A, ContractMetadata, Multicall, Ownable, Royalty, B
                         Internal (overrideable) functions
     //////////////////////////////////////////////////////////////*/
 
+    function _setTokenURI(uint256 _tokenId, string memory _tokenURI) internal virtual {
+        require(bytes(fullURI[_tokenId]).length == 0, "URI already set");
+        fullURI[_tokenId] = _tokenURI;
+    }
+
     /// @dev Returns whether contract metadata can be set in the given execution context.
     function _canSetContractURI() internal view virtual override returns (bool) {
         return msg.sender == owner();

contracts/base/ERC721SignatureMint.sol

@@ -54,7 +54,7 @@ contract ERC721SignatureMint is ERC721Base, PrimarySale, SignatureMintERC721 {
         override
         returns (address signer)
     {
-        require(_req.quantity > 0, "Minting zero tokens.");
+        require(_req.quantity == 1, "quantiy must be 1");
 
         uint256 tokenIdToMint = nextTokenIdToMint();
 
@@ -79,7 +79,7 @@ contract ERC721SignatureMint is ERC721Base, PrimarySale, SignatureMintERC721 {
         }
 
         // Mint tokens.
-        _batchMintMetadata(nextTokenIdToMint(), _req.quantity, _req.uri);
+        _setTokenURI(tokenIdToMint, _req.uri);
         _safeMint(receiver, _req.quantity);
 
         emit TokensMintedWithSignature(signer, receiver, tokenIdToMint, _req);

src/test/sdk/base/ERC721Drop.t.sol

@@ -7,7 +7,7 @@ import "@ds-test/test.sol";
 import "./BaseUtilTest.sol";
 import { ERC721Drop } from "contracts/base/ERC721Drop.sol";
 
-contract BaseERC721ERC721DropTest is BaseUtilTest {
+contract BaseERC721DropTest is BaseUtilTest {
     ERC721Drop internal base;
     using TWStrings for uint256;
 

src/test/sdk/base/ERC721SignatureMint.t.sol

@@ -97,7 +97,7 @@ contract BaseERC721SignatureMintTest is BaseUtilTest {
         base.mintWithSignature(_mintrequest, _signature);
 
         assertEq(base.nextTokenIdToMint(), nextTokenId + _mintrequest.quantity);
-        assertEq(base.tokenURI(nextTokenId), string(abi.encodePacked(_mintrequest.uri, nextTokenId.toString())));
+        assertEq(base.tokenURI(nextTokenId), string(abi.encodePacked(_mintrequest.uri)));
         assertEq(base.totalSupply(), currentTotalSupply + _mintrequest.quantity);
         assertEq(base.balanceOf(recipient), currentBalanceOfRecipient + _mintrequest.quantity);
         assertEq(base.ownerOf(nextTokenId), recipient);
@@ -121,7 +121,7 @@ contract BaseERC721SignatureMintTest is BaseUtilTest {
         base.mintWithSignature(_mintrequest, _signature);
 
         assertEq(base.nextTokenIdToMint(), nextTokenId + _mintrequest.quantity);
-        assertEq(base.tokenURI(nextTokenId), string(abi.encodePacked(_mintrequest.uri, nextTokenId.toString())));
+        assertEq(base.tokenURI(nextTokenId), string(abi.encodePacked(_mintrequest.uri)));
         assertEq(base.totalSupply(), currentTotalSupply + _mintrequest.quantity);
         assertEq(base.balanceOf(recipient), currentBalanceOfRecipient + _mintrequest.quantity);
         assertEq(base.ownerOf(nextTokenId), recipient);
@@ -144,7 +144,7 @@ contract BaseERC721SignatureMintTest is BaseUtilTest {
         base.mintWithSignature{ value: 1 }(_mintrequest, _signature);
 
         assertEq(base.nextTokenIdToMint(), nextTokenId + _mintrequest.quantity);
-        assertEq(base.tokenURI(nextTokenId), string(abi.encodePacked(_mintrequest.uri, nextTokenId.toString())));
+        assertEq(base.tokenURI(nextTokenId), string(abi.encodePacked(_mintrequest.uri)));
         assertEq(base.totalSupply(), currentTotalSupply + _mintrequest.quantity);
         assertEq(base.balanceOf(recipient), currentBalanceOfRecipient + _mintrequest.quantity);
         assertEq(base.ownerOf(nextTokenId), recipient);
@@ -162,13 +162,13 @@ contract BaseERC721SignatureMintTest is BaseUtilTest {
         base.mintWithSignature{ value: 0 }(_mintrequest, _signature);
     }
 
-    function test_revert_mintWithSignature_MintingZeroTokens() public {
+    function test_revert_mintWithSignature_QuantityNotOne() public {
         vm.warp(1000);
 
         _mintrequest.quantity = 0;
         _signature = signMintRequest(_mintrequest, privateKey);
 
-        vm.expectRevert("Minting zero tokens.");
+        vm.expectRevert("quantiy must be 1");
         base.mintWithSignature(_mintrequest, _signature);
     }
 }