Merge pull request #17 from dappnode/v0.1.5

Decode IPFS contenthash using CID and multihash libraries

Author: eduadiez

build/src/package-lock.json

@@ -14,6 +14,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "bs58": "^4.0.1",
+    "cids": "^0.5.7",
     "dotenv": "^5.0.1",
     "http-proxy": "^1.17.0",
     "multicodec": "^0.4.0",

build/src/package.json

@@ -1,4 +1,5 @@
 const Web3 = require('web3');
+const CID = require('cids');
 const multihash = require('multihashes');
 const multicodec = require('multicodec');
 
@@ -77,8 +78,12 @@ exports.getContent = async (name) => {
                 if(contenthash !== '0x'){
                     const contentHashEncoded = Buffer.from(contenthash.slice(2),'hex');
                     console.log('content codec: ' + multicodec.getCodec(contentHashEncoded))
-                    content = multicodec.getCodec(contentHashEncoded).startsWith('ipfs') ?  '/ipfs/' + multicodec.rmPrefix(contentHashEncoded) : null
-                    console.log('content decoded: ' + content)
+                    let value = multicodec.getCodec(contentHashEncoded).startsWith('ipfs') ? multicodec.rmPrefix(contentHashEncoded) : null
+                    if(value){
+                        let cid = new CID(value);	
+                        content = '/ipfs/' + multihash.toB58String(cid.multihash)
+                        console.log('content decoded: ' + content)
+                    }
                     break
                 }
             /* this part is deprecated, it is maintained to preserve compatibility */

build/src/src/ens.js

@@ -30,9 +30,9 @@ describe('ens', () => {
         assert.equal(content, '/ipfs/QmSpuwejUGjREmgsvm8eq3ZdsS7mVTHCRPZmLiUq84S9x8');
     }).timeout(timeout);
 
-    it('should return the IPFS hash of eduadiez.eth', async () => {
-        const content = await ens.getContent('eduadiez.eth');
-        assert.equal(content, '/ipfs/QmYCMDy9fCwbxQ1sHtUG318AMunHGcfUGeuAKYvHvGyEd4');
+    it('should return the IPFS hash of eth2dai.eduadiez.eth', async () => {
+        const content = await ens.getContent('eth2dai.eduadiez.eth');
+        assert.equal(content, '/ipfs/QmZoHo1wi4G9VHX6xLmMBRdFpdHMkHnsqVXqV6Vsng9m8j');
     }).timeout(timeout);
 
   })

build/src/test/ens.test.js

@@ -1,6 +1,6 @@
 {
   "name": "ethforward.dnp.dappnode.eth",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Dappnode package responsible for providing .eth address resolve through ENS",
   "avatar": "/ipfs/QmX2VK8wUfUfXetnCbYqhR6hwLV8W6XLcxRBRFWZhNq1tN",
   "type": "dncore",

dappnode_package.json

@@ -9,7 +9,7 @@ networks:
 services:
     ethforward.dnp.dappnode.eth:
         build: ./build
-        image: 'ethforward.dnp.dappnode.eth:0.1.4'
+        image: 'ethforward.dnp.dappnode.eth:0.1.5'
         container_name: DAppNodeCore-ethforward.dnp.dappnode.eth
         restart: always
         dns: 172.33.1.2