fix: remove bs58 and add buffer

ipfs/js-ipfs#2924

Author: hugomrdias

package.json

@@ -41,7 +41,7 @@
     "coverage-publish": "aegir coverage --upload"
   },
   "dependencies": {
-    "bs58": "^4.0.1",
+    "buffer": "^5.6.0",
     "cids": "~0.8.0",
     "iso-url": "~0.4.7",
     "mafmt": "^7.1.0",
@@ -51,6 +51,7 @@
   },
   "devDependencies": {
     "aegir": "^21.4.5",
+    "bs58": "^4.0.1",
     "chai": "^4.2.0",
     "pre-commit": "^1.2.2"
   },

src/index.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const base58 = require('bs58')
+const { Buffer } = require('buffer')
 const multihash = require('multihashes')
 const multibase = require('multibase')
 const Multiaddr = require('multiaddr')
@@ -24,8 +24,7 @@ const fqdnWithTld = /^(([a-z0-9]|[a-z0-9][a-z0-9-]*[a-z0-9])\.)+([a-z0-9]|[a-z0-
 function isMultihash (hash) {
   const formatted = convertToString(hash)
   try {
-    const buffer = Buffer.from(base58.decode(formatted))
-    multihash.decode(buffer)
+    multihash.decode(multibase.decode('z' + formatted))
     return true
   } catch (e) {
     return false
@@ -134,7 +133,7 @@ function isString (input) {
 
 function convertToString (input) {
   if (Buffer.isBuffer(input)) {
-    return base58.encode(input)
+    return multibase.encode('base58btc', input).toString().slice(1)
   }
 
   if (isString(input)) {

test/test-cid.spec.js

@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
+const { Buffer } = require('buffer')
 const base58 = require('bs58')
 const expect = require('chai').expect
 const isIPFS = require('../src/index')

test/test-multiaddr.spec.js

@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
+const { Buffer } = require('buffer')
 const expect = require('chai').expect
 const Multiaddr = require('multiaddr')
 const isIPFS = require('../src/index')

test/test-multihash.spec.js

@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
+const { Buffer } = require('buffer')
 const base58 = require('bs58')
 const expect = require('chai').expect
 const isIPFS = require('../src/index')

test/test-path.spec.js

@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
+const { Buffer } = require('buffer')
 const base58 = require('bs58')
 const isIPFS = require('../src/index')
 const expect = require('chai').expect

test/test-subdomain.spec.js

@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
+const { Buffer } = require('buffer')
 const base58 = require('bs58')
 const isIPFS = require('../src/index')
 const expect = require('chai').expect

test/test-url.spec.js

@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
+const { Buffer } = require('buffer')
 const base58 = require('bs58')
 const expect = require('chai').expect
 const isIPFS = require('../src/index')