Browse Source

Change zero address revert message in the balanceOf function of ERC721 and ERC1155 (#3314)

Amin Bashiri 3 years ago
parent
commit
742e85be7c

+ 1 - 1
contracts/token/ERC1155/ERC1155.sol

@@ -68,7 +68,7 @@ contract ERC1155 is Context, ERC165, IERC1155, IERC1155MetadataURI {
      * - `account` cannot be the zero address.
      */
     function balanceOf(address account, uint256 id) public view virtual override returns (uint256) {
-        require(account != address(0), "ERC1155: balance query for the zero address");
+        require(account != address(0), "ERC1155: address zero is not a valid owner");
         return _balances[id][account];
     }
 

+ 1 - 1
contracts/token/ERC721/ERC721.sol

@@ -60,7 +60,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
      * @dev See {IERC721-balanceOf}.
      */
     function balanceOf(address owner) public view virtual override returns (uint256) {
-        require(owner != address(0), "ERC721: balance query for the zero address");
+        require(owner != address(0), "ERC721: address zero is not a valid owner");
         return _balances[owner];
     }
 

+ 2 - 2
test/token/ERC1155/ERC1155.behavior.js

@@ -23,7 +23,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
       it('reverts when queried about the zero address', async function () {
         await expectRevert(
           this.token.balanceOf(ZERO_ADDRESS, firstTokenId),
-          'ERC1155: balance query for the zero address',
+          'ERC1155: address zero is not a valid owner',
         );
       });
 
@@ -106,7 +106,7 @@ function shouldBehaveLikeERC1155 ([minter, firstTokenHolder, secondTokenHolder,
             [firstTokenHolder, secondTokenHolder, ZERO_ADDRESS],
             [firstTokenId, secondTokenId, unknownTokenId],
           ),
-          'ERC1155: balance query for the zero address',
+          'ERC1155: address zero is not a valid owner',
         );
       });
 

+ 1 - 1
test/token/ERC721/ERC721.behavior.js

@@ -46,7 +46,7 @@ function shouldBehaveLikeERC721 (errorPrefix, owner, newOwner, approved, another
       context('when querying the zero address', function () {
         it('throws', async function () {
           await expectRevert(
-            this.token.balanceOf(ZERO_ADDRESS), 'ERC721: balance query for the zero address',
+            this.token.balanceOf(ZERO_ADDRESS), 'ERC721: address zero is not a valid owner',
           );
         });
       });