chore: RNSUnified ownerOf no longer revert when expired & minor chang…

…es (#13)
axieinfinity · Oct 10, 2023 · 96ea8e4 · 96ea8e4
2 parents 0999e7e + 4304d42
commit 96ea8e4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/RNSUnified.sol b/src/RNSUnified.sol
@@ -52,10 +52,10 @@ contract RNSUnified is Initializable, RNSToken {
     _setBaseURI(baseTokenURI);
     _setGracePeriod(gracePeriod);
 
-    _mint(admin, 0x00);
+    _mint(admin, 0x0);
     Record memory record;
-    _recordOf[0x00].mut.expiry = record.mut.expiry = MAX_EXPIRY;
-    emit RecordUpdated(0x00, ModifyingField.Expiry.indicator(), record);
+    _recordOf[0x0].mut.expiry = record.mut.expiry = MAX_EXPIRY;
+    emit RecordUpdated(0x0, ModifyingField.Expiry.indicator(), record);
   }
 
   /// @inheritdoc INSUnified
@@ -217,12 +217,12 @@ contract RNSUnified is Initializable, RNSToken {
       return (false, Unauthorized.selector);
     }
 
-    return (true, 0x00);
+    return (true, 0x0);
   }
 
   /// @dev Override {ERC721-ownerOf}.
   function ownerOf(uint256 tokenId) public view override(ERC721, IERC721) returns (address) {
-    if (_isExpired(tokenId)) revert Expired();
+    if (_isExpired(tokenId)) return address(0x0);
     return super.ownerOf(tokenId);
   }
 
@@ -277,8 +277,8 @@ contract RNSUnified is Initializable, RNSToken {
     (bool allowed, bytes4 errorCode) = canSetRecord(_msgSender(), id, indicator);
     if (!allowed) {
       assembly ("memory-safe") {
-        mstore(0x00, errorCode)
-        revert(0x00, 0x04)
+        mstore(0x0, errorCode)
+        revert(0x0, 0x04)
       }
     }
   }

diff --git a/test/RNSUnified/RNSUnified.ERC721.t.sol b/test/RNSUnified/RNSUnified.ERC721.t.sol
@@ -12,8 +12,7 @@ contract RNSUnified_ERC721_Test is RNSUnifiedTest {
   function testFuzz_WhenExpired_RevokeOwnership_ownerOf(MintParam calldata mintParam) external mintAs(_controller) {
     (uint64 expiry, uint256 id) = _mint(_ronId, mintParam, _noError);
     _warpToExpire(expiry);
-    vm.expectRevert(INSUnified.Expired.selector);
-    _rns.ownerOf(id);
+    assertEq(_rns.ownerOf(id), address(0x00));
   }
 
   function testFuzz_WhenExpired_RevokeApproval_getApproved(address approved, MintParam calldata mintParam)

diff --git a/test/RNSUnified/RNSUnified.t.sol b/test/RNSUnified/RNSUnified.t.sol
@@ -111,7 +111,7 @@ abstract contract RNSUnifiedTest is Test {
 
     vm.warp(block.timestamp + GRACE_PERIOD + 1 seconds);
     vm.startPrank(_admin);
-    (_ronExpiry, _ronId) = _rns.mint(0x00, "ron", address(0), _admin, _rns.MAX_EXPIRY());
+    (_ronExpiry, _ronId) = _rns.mint(0x0, "ron", address(0), _admin, _rns.MAX_EXPIRY());
     _rns.setApprovalForAll(_controller, true);
     vm.stopPrank();
   }