added onion protocol

package.json

@@ -50,12 +50,14 @@
     "@ensdomains/ens-022": "npm:@ensdomains/[email protected]",
     "@ensdomains/ethregistrar": "^1.2.2",
     "@ensdomains/resolver": "^0.1.6",
-    "content-hash": "^2.3.2",
+    "content-hash": "^2.4.1",
     "cross-fetch": "^3.0.2",
     "eth-ens-namehash": "^2.0.8",
     "ethers": "^4.0.30",
     "js-sha3": "^0.8.0",
     "lodash": "^4.17.11",
+    "node-gyp": "^5.0.2",
+    "rebuild": "^0.1.2",
     "web3": "1.0.0-beta.34"
   }
 }

src/utils/contents.js

@@ -1,7 +1,7 @@
-import contentHash from 'content-hash'
+import contentHash from 'content-hash/src'
 import { utils } from 'ethers'
 
-const supportedCodecs = ['ipfs-ns', 'swarm-ns']
+const supportedCodecs = ['ipfs-ns', 'swarm-ns', 'onion', 'onion3']
 
 export function decodeContenthash(encoded) {
   let decoded, protocolType, error
@@ -16,6 +16,10 @@ export function decodeContenthash(encoded) {
         protocolType = 'ipfs'
       } else if (codec === 'swarm-ns') {
         protocolType = 'bzz'
+      } else if (codec === 'onion') {
+        protocolType = 'onion'
+      } else if (codec === 'onion3') {
+        protocolType = 'onion3'
       } else {
         decoded = encoded
       }
@@ -39,7 +43,7 @@ export function encodeContenthash(text) {
   let content, contentType
   let encoded = false
   if (!!text) {
-    let matched = text.match(/^(ipfs|bzz):\/\/(.*)/)
+    let matched = text.match(/^(ipfs|bzz|onion):\/\/(.*)/)
     if (matched) {
       contentType = matched[1]
       content = matched[2]
@@ -50,6 +54,13 @@ export function encodeContenthash(text) {
         encoded = '0x' + contentHash.fromIpfs(content)
       } else if (contentType === 'bzz') {
         encoded = '0x' + contentHash.fromSwarm(content)
+      } else if (contentType === 'onion') {
+        console.log(content.length)
+        if(content.length == 16) {
+          encoded = '0x' + contentHash.encode('onion', content);  
+        } else if(content.length == 56) {
+          encoded = '0x' + contentHash.encode('onion3', content);  
+        }
       } else {
         console.warn('Unsupported protocol or invalid value', {
           contentType,

src/utils/contents.test.js

@@ -50,4 +50,64 @@ describe('test contenthash utility functions', () => {
 
     expect(valid).toBe(false)
   })
+
+  test('encodeContentHash returns encoded hash', () => {
+    const encodedContentHash = encodeContenthash(
+      'onion://3g2upl4pq6kufc4m'
+    )
+
+    expect(encodedContentHash).toBe(
+      '0xbc0333673275706c347071366b756663346d'
+    )
+  })
+
+  test('decodeContentHash returns decoded contenthash', () => {
+    const decoded = decodeContenthash(
+      '0xbc0333673275706c347071366b756663346d'
+    )
+
+    expect(decoded.decoded).toBe(
+      '3g2upl4pq6kufc4m'
+    )
+    expect(decoded.protocolType).toBe('onion')
+    expect(decoded.error).toBe(undefined)
+  })
+
+  test('isValidContent returns true for real contenthash', () => {
+    const valid = isValidContenthash(
+      '0xbc0333673275706c347071366b756663346d'
+    )
+
+    expect(valid).toBe(true)
+  })
+
+  test('encodeContentHash returns encoded hash', () => {
+    const encodedContentHash = encodeContenthash(
+      'onion://p53lf57qovyuvwsc6xnrppyply3vtqm7l6pcobkmyqsiofyeznfu5uqd'
+    )
+
+    expect(encodedContentHash).toBe(
+      '0xbd037035336c663537716f7679757677736336786e72707079706c79337674716d376c3670636f626b6d797173696f6679657a6e667535757164'
+    )
+  })
+
+  test('decodeContentHash returns decoded contenthash', () => {
+    const decoded = decodeContenthash(
+      '0xbd037035336c663537716f7679757677736336786e72707079706c79337674716d376c3670636f626b6d797173696f6679657a6e667535757164'
+    )
+
+    expect(decoded.decoded).toBe(
+      'p53lf57qovyuvwsc6xnrppyply3vtqm7l6pcobkmyqsiofyeznfu5uqd'
+    )
+    expect(decoded.protocolType).toBe('onion3')
+    expect(decoded.error).toBe(undefined)
+  })
+
+  test('isValidContent returns true for real contenthash', () => {
+    const valid = isValidContenthash(
+      '0xbd037035336c663537716f7679757677736336786e72707079706c79337674716d376c3670636f626b6d797173696f6679657a6e667535757164'
+    )
+
+    expect(valid).toBe(true)
+  })
 })

src/utils/records.js

@@ -27,7 +27,7 @@ export function getPlaceholder(recordType, contentType) {
       return 'Enter an Ethereum address'
     case 'content':
       if (contentType === 'contenthash') {
-        return 'Enter a content hash (eg: ipfs://..., bzz://...)'
+        return 'Enter a content hash (eg: ipfs://..., bzz://..., onion://)'
       } else {
         return 'Enter a content'
       }