fix: resolve merge conflicts

axieinfinity · Oct 12, 2023 · 0d3f5df · 0d3f5df
1 parent 4229251
commit 0d3f5df
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
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 node) {
     revert("TODO");
   }
 

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

diff --git a/src/resolvers/PublicResolver.sol b/src/resolvers/PublicResolver.sol
@@ -159,7 +159,7 @@ contract PublicResolver is
 
   /// @inheritdoc IPublicResolver
   function isAuthorized(bytes32 node, address account) public view returns (bool authorized) {
-    (authorized,) = _rnsUnified.canSetRecords(account, uint256(node), USER_FIELDS_INDICATOR);
+    (authorized,) = _rnsUnified.canSetRecord(account, uint256(node), USER_FIELDS_INDICATOR);
   }
 
   /// @dev Override {IAddressResolvable-addr}.
@@ -177,7 +177,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 : "";
   }