Merge pull request #114 from open-format/fix/ERC721Base-batch-mint-to…

…ken-uri Fix: Only return batchUri when calling tokenURI function
open-format · Dec 4, 2023 · c9c5456 · c9c5456
2 parents b36f218 + ec929a8
commit c9c5456
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.changeset/popular-berries-push.md b/.changeset/popular-berries-push.md
@@ -0,0 +1,5 @@
+---
+"@openformat/contracts": patch
+---
+
+Fix: Only return batchUri when calling tokenURI function on ERC721Base
diff --git a/src/tokens/ERC721/ERC721Base.sol b/src/tokens/ERC721/ERC721Base.sol
@@ -116,7 +116,7 @@ contract ERC721Base is
 
         // tokenURI was stored using batchMintTo
         string memory batchUri = _getBaseURI(_tokenId);
-        return string.concat(batchUri, UintUtils.toString(_tokenId));
+        return batchUri;
     }
 
     /*//////////////////////////////////////////////////////////////

diff --git a/test/tokens/ERC721/ERC721Base.t.sol b/test/tokens/ERC721/ERC721Base.t.sol
@@ -145,13 +145,13 @@ contract ERC721Base__batchMintTo is Setup {
         assertEq(other, erc721Base.ownerOf(2));
     }
 
-    function test_appends_token_id_to_baseURI() public {
+    function test_returns_baseURI() public {
         vm.prank(creator);
         erc721Base.batchMintTo(other, 3, baseURI);
 
-        assertEq(erc721Base.tokenURI(0), string.concat(baseURI, "0"));
-        assertEq(erc721Base.tokenURI(1), string.concat(baseURI, "1"));
-        assertEq(erc721Base.tokenURI(2), string.concat(baseURI, "2"));
+        assertEq(erc721Base.tokenURI(0), baseURI);
+        assertEq(erc721Base.tokenURI(1), baseURI);
+        assertEq(erc721Base.tokenURI(2), baseURI);
     }
 
     function test_can_be_mixed_with_mintTo() public {
@@ -162,8 +162,8 @@ contract ERC721Base__batchMintTo is Setup {
         erc721Base.batchMintTo(other, 2, baseURI);
 
         assertEq(erc721Base.tokenURI(0), tokenURI);
-        assertEq(erc721Base.tokenURI(1), string.concat(baseURI, "1"));
-        assertEq(erc721Base.tokenURI(2), string.concat(baseURI, "2"));
+        assertEq(erc721Base.tokenURI(1), baseURI);
+        assertEq(erc721Base.tokenURI(2), baseURI);
     }
 
     function test_reverts_if_not_authorised() public {