fix: outdated name and address in Public Resolver (#5)

fix: outdated name and address in Public Resolver
axieinfinity · Oct 4, 2023 · 4862664 · 4862664
1 parent 522498e
commit 4862664
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/src/RNSUnified.sol b/src/RNSUnified.sol
@@ -50,6 +50,11 @@ contract RNSUnified is Initializable, RNSToken {
     _mint(admin, 0x00);
   }
 
+  /// @inheritdoc INSUnified
+  function namehash(string memory) external pure returns (uint256) {
+    revert("TODO");
+  }
+
   /// @inheritdoc INSUnified
   function available(uint256 id) public view returns (bool) {
     return block.timestamp > LibSafeRange.add(_expiry(id), _gracePeriod);
@@ -182,7 +187,7 @@ contract RNSUnified is Initializable, RNSToken {
 
   /// @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(0);
     return super.ownerOf(tokenId);
   }
 

diff --git a/src/interfaces/INSUnified.sol b/src/interfaces/INSUnified.sol
@@ -96,6 +96,11 @@ interface INSUnified is IERC721Metadata {
    */
   function RESERVATION_ROLE() external pure returns (bytes32);
 
+  /**
+   * @dev Returns the name hash output of a domain.
+   */
+  function namehash(string memory domain) external view returns (uint256 id);
+
   /**
    * @dev Returns true if the specified name is available for registration.
    * Note: Only available after passing the grace period.

diff --git a/src/resolvers/NameResolvable.sol b/src/resolvers/NameResolvable.sol
@@ -21,7 +21,7 @@ abstract contract NameResolvable is INameResolver, BaseVersion {
   /**
    * @inheritdoc INameResolver
    */
-  function name(bytes32 node) external view virtual override returns (string memory) {
+  function name(bytes32 node) public view virtual override returns (string memory) {
     return _versionName[_recordVersion[node]][node];
   }
 

diff --git a/src/resolvers/PublicResolver.sol b/src/resolvers/PublicResolver.sol
@@ -118,6 +118,7 @@ contract PublicResolver is
 
   /// @inheritdoc IAddressResolver
   function setAddr(bytes32 node, address addr_) external onlyAuthorized(node) {
+    revert("PublicResolver: Cannot set address");
     _setAddr(node, addr_);
   }
 
@@ -169,7 +170,15 @@ contract PublicResolver is
     override(AddressResolvable, IAddressResolver, InterfaceResolvable)
     returns (address payable)
   {
-    return super.addr(node);
+    return payable(_rnsUnified.ownerOf(uint256(node)));
+  }
+
+  /// @dev Override {INameResolver-name}.
+  function name(bytes32 node) public view virtual override(INameResolver, NameResolvable) returns (string memory) {
+    address reversedAddress = _reverseRegistrar.getAddress(node);
+    string memory domainName = super.name(node);
+    uint256 tokenId = _rnsUnified.namehash(domainName);
+    return _rnsUnified.ownerOf(tokenId) == reversedAddress ? domainName : "";
   }
 
   /**