Merge pull request ipfs#824 from ipfs/feat/update-libp2p

feat: Update to latest libp2p

Author: daviddias

package.json

@@ -75,7 +75,7 @@
     "expose-loader": "^0.7.3",
     "form-data": "^2.1.2",
     "gulp": "^3.9.1",
-    "interface-ipfs-core": "~0.26.1",
+    "interface-ipfs-core": "~0.26.2",
     "ipfsd-ctl": "~0.20.0",
     "left-pad": "^1.1.3",
     "lodash": "^4.17.4",
@@ -91,18 +91,18 @@
     "transform-loader": "^0.2.4"
   },
   "dependencies": {
-    "async": "^2.2.0",
+    "async": "^2.3.0",
     "bl": "^1.2.0",
     "boom": "^4.3.1",
-    "cids": "^0.4.2",
+    "cids": "^0.5.0",
     "debug": "^2.6.3",
     "fsm-event": "^2.1.0",
     "glob": "^7.1.1",
-    "hapi": "^16.1.0",
+    "hapi": "^16.1.1",
     "hapi-set-header": "^1.0.2",
-    "hoek": "^4.1.0",
-    "ipfs-api": "^13.0.0",
-    "ipfs-bitswap": "~0.12.0",
+    "hoek": "^4.1.1",
+    "ipfs-api": "^14.0.0",
+    "ipfs-bitswap": "~0.13.0",
     "ipfs-block": "~0.6.0",
     "ipfs-block-service": "~0.9.0",
     "ipfs-multipart": "~0.1.0",
@@ -111,10 +111,10 @@
     "ipfs-unixfs-engine": "~0.19.1",
     "ipld-resolver": "~0.11.0",
     "isstream": "^0.1.2",
-    "joi": "^10.3.1",
-    "libp2p-floodsub": "~0.8.0",
-    "libp2p-ipfs-browser": "~0.22.0",
-    "libp2p-ipfs-nodejs": "~0.22.0",
+    "joi": "^10.4.1",
+    "libp2p-floodsub": "~0.9.0",
+    "libp2p-ipfs-browser": "~0.23.0",
+    "libp2p-ipfs-nodejs": "~0.23.0",
     "lodash.flatmap": "^4.5.0",
     "lodash.get": "^4.4.2",
     "lodash.has": "^4.5.2",
@@ -127,9 +127,9 @@
     "multihashes": "~0.4.5",
     "once": "^1.4.0",
     "path-exists": "^3.0.0",
-    "peer-book": "~0.3.2",
-    "peer-id": "~0.8.5",
-    "peer-info": "~0.8.5",
+    "peer-book": "~0.4.0",
+    "peer-id": "~0.8.7",
+    "peer-info": "~0.9.2",
     "promisify-es6": "^1.0.2",
     "pull-file": "^1.0.0",
     "pull-paramap": "^1.2.1",

src/cli/commands/swarm/addrs.js

@@ -17,8 +17,9 @@ module.exports = {
       }
 
       res.forEach((peer) => {
-        const count = peer.multiaddrs.length
+        const count = peer.multiaddrs.size
         console.log(`${peer.id.toB58String()} (${count})`)
+
         peer.multiaddrs.forEach((addr) => {
           const res = addr.decapsulate('ipfs').toString()
           console.log(`\t${res}`)

src/core/components/id.js

@@ -13,6 +13,7 @@ module.exports = function id (self) {
       id: self._peerInfo.id.toB58String(),
       publicKey: self._peerInfo.id.pubKey.bytes.toString('base64'),
       addresses: self._peerInfo.multiaddrs
+                               .toArray()
                                .map((ma) => ma.toString())
                                .sort(),
       agentVersion: 'js-ipfs',

src/core/components/pre-start.js

@@ -18,9 +18,7 @@ module.exports = function preStart (self) {
       (config, cb) => {
         const privKey = config.Identity.PrivKey
 
-        peerId.createFromPrivKey(privKey, (err, id) => {
-          cb(err, config, id)
-        })
+        peerId.createFromPrivKey(privKey, (err, id) => cb(err, config, id))
       },
       (config, id, cb) => {
         self._peerInfo = new PeerInfo(id)
@@ -29,12 +27,10 @@ module.exports = function preStart (self) {
           let ma = multiaddr(addr)
 
           if (!mafmt.IPFS.matches(ma)) {
-            ma = ma.encapsulate(
-              '/ipfs/' + self._peerInfo.id.toB58String()
-            )
+            ma = ma.encapsulate('/ipfs/' + self._peerInfo.id.toB58String())
           }
 
-          self._peerInfo.multiaddr.add(ma)
+          self._peerInfo.multiaddrs.add(ma)
         })
 
         cb()

src/core/components/swarm.js

@@ -29,7 +29,7 @@ module.exports = function swarm (self) {
       const peerList = flatMap(keys, (id) => {
         const peer = peers[id]
 
-        return peer.multiaddrs.map((addr) => {
+        return peer.multiaddrs.toArray().map((addr) => {
           const res = {
             addr: addr,
             peer: peers[id]
@@ -53,6 +53,8 @@ module.exports = function swarm (self) {
       }
 
       const peers = values(self._peerInfoBook.getAll())
+        .filter((peer) => peer.isConnected())
+
       callback(null, peers)
     }),
 
@@ -61,7 +63,7 @@ module.exports = function swarm (self) {
         return callback(OFFLINE_ERROR)
       }
 
-      callback(null, self._libp2pNode.peerInfo.multiaddrs)
+      callback(null, self._libp2pNode.peerInfo.multiaddrs.toArray())
     }),
 
     connect: promisify((maddr, callback) => {
@@ -88,9 +90,6 @@ module.exports = function swarm (self) {
       self._libp2pNode.hangUp(maddr, callback)
     }),
 
-    filters: promisify((callback) => {
-      // TODO
-      throw new Error('Not implemented')
-    })
+    filters: promisify((callback) => callback(new Error('Not implemented')))
   }
 }

src/http-api/resources/swarm.js

@@ -71,7 +71,8 @@ exports.addrs = {
 
       const addrs = {}
       peers.forEach((peer) => {
-        addrs[peer.id.toB58String()] = peer.multiaddrs.map((addr) => addr.toString())
+        addrs[peer.id.toB58String()] = peer.multiaddrs.toArray()
+          .map((addr) => addr.toString())
       })
 
       return reply({

test/core/bitswap.spec.js

@@ -36,7 +36,6 @@ function makeBlock (cb) {
 
 describe('bitswap', () => {
   let inProcNode // Node spawned inside this process
-  // let swarmAddrsBak
 
   beforeEach((done) => {
     const repo = createTempRepo()
@@ -73,50 +72,34 @@ describe('bitswap', () => {
     inProcNode.on('start', () => done())
   })
 
-  afterEach((done) => {
-    inProcNode.on('stop', () => done())
-    inProcNode.stop()
-  })
+  afterEach((done) => inProcNode.stop(() => done()))
 
   describe('connections', () => {
     function wire (targetNode, dialerNode, done) {
       targetNode.id((err, identity) => {
         expect(err).to.not.exist()
         const addr = identity.addresses
-          .map((addr) => {
-            const ma = multiaddr(addr.toString().split('ipfs')[0])
-            return ma
-          })
-          .filter((addr) => {
-            return _.includes(addr.protoNames(), 'ws')
-          })[0]
-
-        let targetAddr
-        if (addr) {
-          targetAddr = addr.encapsulate(multiaddr(`/ipfs/${identity.id}`)).toString()
-          targetAddr = targetAddr.replace('0.0.0.0', '127.0.0.1')
-        } else {
-          // Note: the browser doesn't have a websockets listening addr
+          .map((addr) => multiaddr(addr.toString().split('ipfs')[0]))
+          .filter((addr) => _.includes(addr.protoNames(), 'ws'))[0]
 
-          // What we really need is a way to dial to a peerId only and another
-          // to dial to peerInfo
+        if (!addr) {
+          // Note: the browser doesn't have a websockets listening addr
           return done()
-          // targetAddr = multiaddr(`/ip4/127.0.0.1/tcp/0/ws/ipfs/${identity.id}`).toString()
         }
 
+        const targetAddr = addr
+          .encapsulate(multiaddr(`/ipfs/${identity.id}`)).toString()
+          .replace('0.0.0.0', '127.0.0.1')
+
         dialerNode.swarm.connect(targetAddr, done)
       })
     }
 
     function connectNodes (remoteNode, ipn, done) {
       series([
-        (cb) => {
-          wire(remoteNode, ipn, cb)
-        },
+        (cb) => wire(remoteNode, ipn, cb),
         (cb) => setTimeout(() => {
-          // need timeout so we wait for identify
-          // to happen.
-
+          // need timeout so we wait for identify to happen.
           // This call is just to ensure identify happened
           wire(ipn, remoteNode, cb)
         }, 300)
@@ -129,9 +112,7 @@ describe('bitswap', () => {
       const apiUrl = `/ip4/127.0.0.1/tcp/31${num}`
       const remoteNode = new API(apiUrl)
 
-      connectNodes(remoteNode, inProcNode, (err) => {
-        done(err, remoteNode)
-      })
+      connectNodes(remoteNode, inProcNode, (err) => done(err, remoteNode))
     }
 
     describe('fetches a remote block', () => {