Merge branch 'release-testnet/v0.2.0' into implement-feature/public-r…

…esolver/resolve-merge-conflict
axieinfinity · Oct 12, 2023 · 9bc4899 · 9bc4899
2 parents d0d536a + 57803a6
commit 9bc4899
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/src/RNSReverseRegistrar.sol b/src/RNSReverseRegistrar.sol
@@ -110,12 +110,7 @@ contract RNSReverseRegistrar is Initializable, Ownable, IReverseRegistrar {
   /**
    * @inheritdoc IReverseRegistrar
    */
-  function setNameForAddr(address addr, string memory name)
-    public
-    live
-    onlyAuthorized(addr)
-    returns (bytes32 node)
-  {
+  function setNameForAddr(address addr, string memory name) public live onlyAuthorized(addr) returns (bytes32 node) {
     node = computeNode(addr);
     INSUnified rnsUnified = _rnsUnified;
     if (rnsUnified.ownerOf(uint256(node)) != address(this)) {

diff --git a/src/RNSUnified.sol b/src/RNSUnified.sol
@@ -59,7 +59,7 @@ contract RNSUnified is Initializable, RNSToken {
   }
 
   /// @inheritdoc INSUnified
-  function namehash(string memory) external pure returns (uint256) {
+  function namehash(string memory) external pure returns (bytes32) {
     revert("TODO");
   }
 

diff --git a/src/interfaces/INSUnified.sol b/src/interfaces/INSUnified.sol
@@ -107,7 +107,7 @@ interface INSUnified is IAccessControlEnumerable, IERC721Metadata {
   /**
    * @dev Returns the name hash output of a domain.
    */
-  function namehash(string memory domain) external view returns (uint256 id);
+  function namehash(string memory domain) external view returns (bytes32);
 
   /**
    * @dev Returns true if the specified name is available for registration.

diff --git a/src/resolvers/PublicResolver.sol b/src/resolvers/PublicResolver.sol
@@ -116,7 +116,7 @@ contract PublicResolver is
   }
 
   /// @inheritdoc IAddressResolver
-  function setAddr(bytes32 node, address /* addr_ */) external view onlyAuthorized(node) {
+  function setAddr(bytes32 node, address /* addr_ */ ) external view onlyAuthorized(node) {
     revert("PublicResolver: Cannot set address");
   }
 
@@ -175,7 +175,7 @@ contract PublicResolver is
   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);
+    uint256 tokenId = uint256(_rnsUnified.namehash(domainName));
     return _rnsUnified.ownerOf(tokenId) == reversedAddress ? domainName : "";
   }