fix types

package.json

@@ -62,15 +62,15 @@
     "it-pair": "^1.0.0",
     "it-pipe": "^1.1.0",
     "it-pushable": "^1.4.2",
-    "libp2p-crypto": "^0.19.0",
-    "libp2p-tcp": "^0.15.0",
-    "multiaddr": "^8.1.2",
+    "libp2p-crypto": "fluencelabs/js-libp2p-crypto",
+    "libp2p-tcp": "fluencelabs/js-libp2p-tcp",
+    "multiaddr": "^9.0.1",
     "multibase": "^4.0.2",
     "multihashes": "^4.0.2",
     "p-defer": "^3.0.0",
     "p-limit": "^3.1.0",
     "p-wait-for": "^3.2.0",
-    "peer-id": "^0.14.2",
+    "peer-id": "fluencelabs/js-peer-id",
     "protons": "^2.0.0",
     "sinon": "^10.0.0",
     "streaming-iterables": "^5.0.4",

src/connection/connection.js

@@ -240,7 +240,7 @@ module.exports = Connection
  * @param {{ direction: any; timeline: any; multiplexer?: string | undefined; encryption?: string | undefined; }} stat
  */
 function validateArgs (localAddr, localPeer, remotePeer, newStream, close, getStreams, stat) {
-  if (localAddr && !multiaddr.isMultiaddr(localAddr)) {
+  if (localAddr && !multiaddr.Multiaddr.isMultiaddr(localAddr)) {
     throw errCode(new Error('localAddr must be an instance of multiaddr'), 'ERR_INVALID_PARAMETERS')
   }
 

src/content-routing/types.d.ts

@@ -1,7 +1,7 @@
 export = ContentRouting;
 
 import PeerId from 'peer-id'
-import Multiaddr from 'multiaddr'
+import { Multiaddr } from 'multiaddr'
 import CID from 'cids'
 
 declare class ContentRouting {

src/peer-discovery/tests/index.js

@@ -55,7 +55,7 @@ module.exports = (common) => {
         expect(PeerId.isPeerId(id)).to.eql(true)
         expect(multiaddrs).to.exist()
 
-        multiaddrs.forEach((m) => expect(multiaddr.isMultiaddr(m)).to.eql(true))
+        multiaddrs.forEach((m) => expect(multiaddr.Multiaddr.isMultiaddr(m)).to.eql(true))
 
         defer.resolve()
       })

src/peer-routing/types.d.ts

@@ -1,7 +1,7 @@
 export = PeerRouting;
 
 import PeerId from 'peer-id'
-import Multiaddr from 'multiaddr'
+import { Multiaddr } from 'multiaddr'
 
 declare class PeerRouting {
   constructor (options?: Object);

src/transport/types.d.ts

@@ -1,6 +1,6 @@
 import BufferList from 'bl'
 import events from 'events'
-import Multiaddr from 'multiaddr'
+import { Multiaddr } from 'multiaddr'
 import Connection from '../connection/connection'
 import { Sink } from '../stream-muxer/types'
 

test/connection/compliance.spec.js

@@ -17,8 +17,8 @@ describe('compliance tests', () => {
      * @param {*} properties
      */
     async setup (properties) {
-      const localAddr = multiaddr('/ip4/127.0.0.1/tcp/8080')
-      const remoteAddr = multiaddr('/ip4/127.0.0.1/tcp/8081')
+      const localAddr = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/8080')
+      const remoteAddr = new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/8081')
       const [localPeer, remotePeer] = await Promise.all([
         PeerId.createFromJSON(peers[0]),
         PeerId.createFromJSON(peers[1])

test/peer-discovery/mock-discovery.js

@@ -41,7 +41,7 @@ class MockDiscovery extends EventEmitter {
     this._timer = setTimeout(() => {
       this.emit('peer', {
         id: peerId,
-        multiaddrs: [multiaddr('/ip4/127.0.0.1/tcp/8000')]
+        multiaddrs: [new multiaddr.Multiaddr('/ip4/127.0.0.1/tcp/8000')]
       })
     }, this.options.discoveryDelay || 1000)
   }