1 files changed, 34 insertions, 18 deletions
diff --git a/app/scripts/lib/ens-ipfs/resolver.js b/app/scripts/lib/ens-ipfs/resolver.js
index b98566190..a0af263bc 100644
--- a/app/scripts/lib/ens-ipfs/resolver.js
+++ b/app/scripts/lib/ens-ipfs/resolver.js
@@ -1,9 +1,9 @@
 const namehash = require('eth-ens-namehash')
-const multihash = require('multihashes')
 const Eth = require('ethjs-query')
 const EthContract = require('ethjs-contract')
-const registrarAbi = require('./contracts/registrar')
+const registryAbi = require('./contracts/registry')
 const resolverAbi = require('./contracts/resolver')
+const contentHash = require('content-hash')
 
 module.exports = resolveEnsToIpfsContentId
 
@@ -12,37 +12,47 @@ async function resolveEnsToIpfsContentId ({ provider, name }) {
   const eth = new Eth(provider)
   const hash = namehash.hash(name)
   const contract = new EthContract(eth)
-  // lookup registrar
+  // lookup registry
   const chainId = Number.parseInt(await eth.net_version(), 10)
-  const registrarAddress = getRegistrarForChainId(chainId)
-  if (!registrarAddress) {
-    throw new Error(`EnsIpfsResolver - no known ens-ipfs registrar for chainId "${chainId}"`)
+  const registryAddress = getRegistryForChainId(chainId)
+  if (!registryAddress) {
+    throw new Error(`EnsIpfsResolver - no known ens-ipfs registry for chainId "${chainId}"`)
   }
-  const Registrar = contract(registrarAbi).at(registrarAddress)
+  const Registry = contract(registryAbi).at(registryAddress)
   // lookup resolver
-  const resolverLookupResult = await Registrar.resolver(hash)
+  const resolverLookupResult = await Registry.resolver(hash)
   const resolverAddress = resolverLookupResult[0]
   if (hexValueIsEmpty(resolverAddress)) {
     throw new Error(`EnsIpfsResolver - no resolver found for name "${name}"`)
   }
   const Resolver = contract(resolverAbi).at(resolverAddress)
-  // lookup content id
-  const contentLookupResult = await Resolver.content(hash)
-  const contentHash = contentLookupResult[0]
-  if (hexValueIsEmpty(contentHash)) {
-    throw new Error(`EnsIpfsResolver - no content ID found for name "${name}"`)
+
+  const isEIP1577Compliant = await Resolver.supportsInterface('0xbc1c58d1')
+  const isLegacyResolver = await Resolver.supportsInterface('0xd8389dc5')
+  if (isEIP1577Compliant[0]) {
+    const contentLookupResult = await Resolver.contenthash(hash)
+    const rawContentHash = contentLookupResult[0]
+    const decodedContentHash = contentHash.decode(rawContentHash)
+    const type = contentHash.getCodec(rawContentHash)
+    return {type: type, hash: decodedContentHash}
+  }
+  if (isLegacyResolver[0]) {
+    // lookup content id
+    const contentLookupResult = await Resolver.content(hash)
+    const content = contentLookupResult[0]
+    if (hexValueIsEmpty(content)) {
+      throw new Error(`EnsIpfsResolver - no content ID found for name "${name}"`)
+    }
+    return {type: 'swarm-ns', hash: content.slice(2)}
   }
-  const nonPrefixedHex = contentHash.slice(2)
-  const buffer = multihash.fromHexString(nonPrefixedHex)
-  const contentId = multihash.toB58String(multihash.encode(buffer, 'sha2-256'))
-  return contentId
+  throw new Error(`EnsIpfsResolver - the resolver for name "${name}" is not standard, it should either supports contenthash() or content()`)
 }
 
 function hexValueIsEmpty (value) {
   return [undefined, null, '0x', '0x0', '0x0000000000000000000000000000000000000000000000000000000000000000'].includes(value)
 }
 
-function getRegistrarForChainId (chainId) {
+function getRegistryForChainId (chainId) {
   switch (chainId) {
     // mainnet
     case 1:
@@ -50,5 +60,11 @@ function getRegistrarForChainId (chainId) {
     // ropsten
     case 3:
       return '0x112234455c3a32fd11230c42e7bccd4a84e02010'
+    // rinkeby
+    case 4:
+      return '0xe7410170f87102df0055eb195163a03b7f2bff4a'
+    // goerli
+    case 5:
+      return '0x112234455c3a32fd11230c42e7bccd4a84e02010'
   }
 }