chore: update to new multiformats

package.json

@@ -10,7 +10,7 @@
     "test": "npm run test:node && npm run test:browser",
     "test:node": "aegir test --ts -t node",
     "test:browser": "aegir test -t browser",
-    "build": "aegir build",
+    "prepare": "aegir build",
     "release": "aegir release",
     "release-minor": "aegir release --type minor",
     "release-major": "aegir release --type major",
@@ -34,11 +34,10 @@
     "./src/resolvers/dns.js": "./src/resolvers/dns.browser.js"
   },
   "dependencies": {
-    "cids": "^1.0.0",
     "dns-over-http-resolver": "^1.0.0",
     "err-code": "^3.0.1",
     "is-ip": "^3.1.0",
-    "multibase": "^4.0.2",
+    "multiformats": "^9.0.2",
     "uint8arrays": "^2.1.3",
     "varint": "^6.0.0"
   },

src/convert.js

@@ -2,8 +2,8 @@
 
 const ip = require('./ip')
 const protocols = require('./protocols-table')
-const CID = require('cids')
-const multibase = require('multibase')
+const { CID } = require('multiformats/cid')
+const { base32 } = require('multiformats/bases/base32')
 const varint = require('varint')
 const uint8ArrayToString = require('uint8arrays/to-string')
 const uint8ArrayFromString = require('uint8arrays/from-string')
@@ -163,8 +163,22 @@ function bytes2str (buf) {
  * @param {string | Uint8Array | CID} hash
  */
 function mh2bytes (hash) {
+  let cid
+
+  if (typeof hash === 'string') {
+    cid = CID.parse(hash)
+  } else if (hash instanceof Uint8Array) {
+    cid = CID.decode(hash)
+  } else {
+    cid = CID.asCID(cid)
+  }
+
+  if (!cid) {
+    throw new Error('Invalid CID')
+  }
+
   // the address is a varint prefixed multihash string representation
-  const mh = new CID(hash).multihash
+  const mh = cid.multihash.bytes
   const size = Uint8Array.from(varint.encode(mh.length))
   return uint8ArrayConcat([size, mh], size.length + mh.length)
 }
@@ -199,7 +213,7 @@ function onion2bytes (str) {
   }
 
   // onion addresses do not include the multibase prefix, add it before decoding
-  const buf = multibase.decode('b' + addr[0])
+  const buf = base32.decode('b' + addr[0])
 
   // onion port number
   const port = parseInt(addr[1], 10)
@@ -222,7 +236,7 @@ function onion32bytes (str) {
     throw new Error('failed to parse onion addr: ' + addr[0] + ' not a Tor onion3 address.')
   }
   // onion addresses do not include the multibase prefix, add it before decoding
-  const buf = multibase.decode('b' + addr[0])
+  const buf = base32.decode('b' + addr[0])
 
   // onion port number
   const port = parseInt(addr[1], 10)

src/index.js

@@ -3,7 +3,7 @@
 const codec = require('./codec')
 const protocols = require('./protocols-table')
 const varint = require('varint')
-const CID = require('cids')
+const { CID } = require('multiformats/cid')
 const errCode = require('err-code')
 const inspect = Symbol.for('nodejs.util.inspect.custom')
 const uint8ArrayToString = require('uint8arrays/to-string')
@@ -314,7 +314,7 @@ class Multiaddr {
       const tuple = tuples.pop()
       if (tuple && tuple[1]) {
         // Get multihash, unwrap from CID if needed
-        return uint8ArrayToString(new CID(tuple[1]).multihash, 'base58btc')
+        return uint8ArrayToString(CID.parse(tuple[1]).multihash.bytes, 'base58btc')
       } else {
         return null
       }