Merge pull request ensdomains#24 from ensdomains/resolvercleanup

Move bytesToAddress and addressToBytes into addr resolver
Devilla · Jul 22, 2021 · 67ddfca · 67ddfca
2 parents 2572c7e + 2d4b2a7
commit 67ddfca
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/contracts/resolvers/ResolverBase.sol b/contracts/resolvers/ResolverBase.sol
@@ -12,18 +12,4 @@ abstract contract ResolverBase {
         require(isAuthorised(node));
         _;
     }
-
-    function bytesToAddress(bytes memory b) internal pure returns(address payable a) {
-        require(b.length == 20);
-        assembly {
-            a := div(mload(add(b, 32)), exp(256, 12))
-        }
-    }
-
-    function addressToBytes(address a) internal pure returns(bytes memory b) {
-        b = new bytes(20);
-        assembly {
-            mstore(add(b, 32), mul(a, exp(256, 12)))
-        }
-    }
 }
diff --git a/contracts/resolvers/profiles/AddrResolver.sol b/contracts/resolvers/profiles/AddrResolver.sol
@@ -49,4 +49,18 @@ abstract contract AddrResolver is ResolverBase {
     function supportsInterface(bytes4 interfaceID) virtual override public pure returns(bool) {
         return interfaceID == ADDR_INTERFACE_ID || interfaceID == ADDRESS_INTERFACE_ID || super.supportsInterface(interfaceID);
     }
+
+    function bytesToAddress(bytes memory b) internal pure returns(address payable a) {
+        require(b.length == 20);
+        assembly {
+            a := div(mload(add(b, 32)), exp(256, 12))
+        }
+    }
+
+    function addressToBytes(address a) internal pure returns(bytes memory b) {
+        b = new bytes(20);
+        assembly {
+            mstore(add(b, 32), mul(a, exp(256, 12)))
+        }
+    }
 }