deps!: bump libp2p from 0.43.4 to 0.45.1 (#579)

* deps(dev): bump libp2p from 0.43.4 to 0.45.1

Bumps [libp2p](https://github.com/libp2p/js-libp2p) from 0.43.4 to 0.45.1.
- [Release notes](https://github.com/libp2p/js-libp2p/releases)
- [Changelog](https://github.com/libp2p/js-libp2p/blob/master/CHANGELOG.md)
- [Commits](libp2p/js-libp2p@v0.43.4...v0.45.1)

---
updated-dependencies:
- dependency-name: libp2p
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore: update deps and fix tests

* chore: remove unused dep

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: achingbrain <[email protected]>

Author: dependabot[bot]

package.json

@@ -143,8 +143,8 @@
     "docs": "aegir docs"
   },
   "dependencies": {
-    "@libp2p/interface-connection": "^3.0.1",
-    "@libp2p/interface-libp2p": "^1.1.1",
+    "@libp2p/interface-connection": "^5.1.0",
+    "@libp2p/interface-libp2p": "^3.1.0",
     "@libp2p/interface-peer-id": "^2.0.0",
     "@libp2p/interface-peer-info": "^1.0.8",
     "@libp2p/interface-registrar": "^2.0.8",
@@ -154,8 +154,8 @@
     "@libp2p/tracked-map": "^3.0.0",
     "@multiformats/multiaddr": "^12.1.0",
     "@vascosantos/moving-average": "^1.1.0",
-    "abortable-iterator": "^4.0.2",
-    "any-signal": "^3.0.0",
+    "abortable-iterator": "^5.0.1",
+    "any-signal": "^4.1.1",
     "blockstore-core": "^4.0.0",
     "interface-blockstore": "^5.0.0",
     "interface-store": "^5.1.0",
@@ -175,12 +175,12 @@
     "varint-decoder": "^1.0.0"
   },
   "devDependencies": {
-    "@chainsafe/libp2p-noise": "^11.0.0",
-    "@libp2p/kad-dht": "^8.0.6",
-    "@libp2p/mplex": "^7.0.0",
+    "@chainsafe/libp2p-noise": "^12.0.0",
+    "@libp2p/kad-dht": "^9.3.3",
+    "@libp2p/mplex": "^8.0.3",
     "@libp2p/peer-id": "^2.0.0",
     "@libp2p/peer-id-factory": "^2.0.0",
-    "@libp2p/tcp": "^6.0.0",
+    "@libp2p/tcp": "^7.0.1",
     "@nodeutils/defaults-deep": "^1.1.0",
     "@types/lodash.difference": "^4.5.7",
     "@types/lodash.flatten": "^4.4.7",
@@ -194,14 +194,13 @@
     "iso-random-stream": "^2.0.0",
     "it-all": "^3.0.1",
     "it-drain": "^3.0.1",
-    "libp2p": "^0.43.3",
+    "libp2p": "^0.45.1",
     "lodash.difference": "^4.5.0",
     "lodash.flatten": "^4.4.0",
     "lodash.range": "^3.2.0",
     "lodash.without": "^4.4.0",
     "p-defer": "^4.0.0",
     "p-event": "^5.0.1",
-    "p-wait-for": "^5.0.0",
     "protons": "^7.0.2",
     "sinon": "^15.0.1",
     "stats-lite": "^2.2.0",

src/bitswap.ts

@@ -258,9 +258,7 @@ export class DefaultBitswap implements Bitswap {
     // a race condition, so register for incoming block notifications as well
     // as trying to get it from the datastore
     const controller = new AbortController()
-    const signal = (options.signal != null)
-      ? anySignal([options.signal, controller.signal])
-      : controller.signal
+    const signal = anySignal([controller.signal, options.signal])
 
     try {
       const block = await Promise.race([
@@ -279,6 +277,7 @@ export class DefaultBitswap implements Bitswap {
       // since we have the block we can now abort any outstanding attempts to
       // fetch it
       controller.abort()
+      signal.clear()
     }
   }
 

src/network.ts

@@ -252,7 +252,6 @@ export class Network {
     }
 
     options.onProgress?.(new CustomProgressEvent<PeerId>('bitswap:network:dial', peer))
-    // @ts-expect-error types are not aligned
     return this._libp2p.dial(peer, options)
   }
 

test/bitswap.ts

@@ -5,19 +5,19 @@ import { expect } from 'aegir/chai'
 import { MemoryBlockstore } from 'blockstore-core/memory'
 import drain from 'it-drain'
 import { CID } from 'multiformats/cid'
-import pWaitFor from 'p-wait-for'
 import sinon from 'sinon'
 import { DefaultBitswap } from '../src/bitswap.js'
 import { BitswapMessage as Message } from '../src/message/index.js'
 import { createLibp2pNode } from './utils/create-libp2p-node.js'
 import { orderedFinish } from './utils/helpers.js'
 import { makeBlocks } from './utils/make-blocks.js'
 import type { Libp2p } from '@libp2p/interface-libp2p'
+import type { DualKadDHT } from '@libp2p/kad-dht'
 
 /**
  * Creates a repo + libp2pNode + Bitswap with or without DHT
  */
-async function createThing (dht: boolean): Promise<{ libp2pNode: Libp2p, bitswap: DefaultBitswap }> {
+async function createThing (dht: boolean): Promise<{ libp2pNode: Libp2p<{ dht: DualKadDHT }>, bitswap: DefaultBitswap }> {
   const libp2pNode = await createLibp2pNode({
     DHT: dht
   })
@@ -167,7 +167,7 @@ describe('bitswap without DHT', function () {
 describe('bitswap with DHT', function () {
   this.timeout(60 * 1000)
 
-  let nodes: Array<{ libp2pNode: Libp2p, bitswap: DefaultBitswap }>
+  let nodes: Array<{ libp2pNode: Libp2p<{ dht: DualKadDHT }>, bitswap: DefaultBitswap }>
 
   before(async () => {
     nodes = await Promise.all([
@@ -184,13 +184,6 @@ describe('bitswap with DHT', function () {
       nodes[0].libp2pNode.dial(ma1),
       nodes[1].libp2pNode.dial(ma2)
     ])
-
-    // wait until dht routing tables are updated
-    await Promise.all([
-      pWaitFor(() => nodes[0].libp2pNode.dht?.lan?.routingTable?.size != null && nodes[0].libp2pNode.dht?.lan?.routingTable?.size >= 1),
-      pWaitFor(() => nodes[1].libp2pNode.dht?.lan?.routingTable?.size != null && nodes[1].libp2pNode.dht?.lan?.routingTable?.size >= 2),
-      pWaitFor(() => nodes[2].libp2pNode.dht?.lan?.routingTable?.size != null && nodes[2].libp2pNode.dht?.lan?.routingTable?.size >= 1)
-    ])
   })
 
   after(async () => {
@@ -203,11 +196,11 @@ describe('bitswap with DHT', function () {
   it('put a block in 2, get it in 0', async () => {
     const [block] = await makeBlocks(1)
 
-    if (nodes[2].libp2pNode.dht == null) {
+    if (nodes[2].libp2pNode.services.dht == null) {
       throw new Error('DHT was not configured')
     }
 
-    const provideSpy = sinon.spy(nodes[2].libp2pNode.dht, 'provide')
+    const provideSpy = sinon.spy(nodes[2].libp2pNode.services.dht, 'provide')
     await nodes[2].bitswap.put(block.cid, block.block)
 
     // wait for the DHT to finish providing

test/network/network.node.ts

@@ -104,7 +104,9 @@ describe('network', () => {
   })
 
   it('connectTo success', async () => {
-    await p2pA.peerStore.addressBook.add(p2pB.peerId, p2pB.getMultiaddrs())
+    await p2pA.peerStore.merge(p2pB.peerId, {
+      multiaddrs: p2pB.getMultiaddrs()
+    })
     await networkA.connectTo(p2pB.peerId)
   })
 
@@ -200,7 +202,9 @@ describe('network', () => {
 
     // In a real network scenario, peers will be discovered and their addresses
     // will be added to the addressBook before bitswap kicks in
-    await p2pA.peerStore.addressBook.set(p2pB.peerId, p2pB.getMultiaddrs())
+    await p2pA.peerStore.patch(p2pB.peerId, {
+      multiaddrs: p2pB.getMultiaddrs()
+    })
 
     bitswapMockB._receiveMessage = async (peerId, msgReceived) => { // eslint-disable-line require-await
       // cannot do deep comparison on objects as one has Buffers and one has Uint8Arrays
@@ -236,7 +240,9 @@ describe('network', () => {
 
     // In a real network scenario, peers will be discovered and their addresses
     // will be added to the addressBook before bitswap kicks in
-    await p2pA.peerStore.addressBook.set(p2pC.peerId, p2pC.getMultiaddrs())
+    await p2pA.peerStore.patch(p2pC.peerId, {
+      multiaddrs: p2pC.getMultiaddrs()
+    })
 
     bitswapMockC._receiveMessage = async (peerId, msgReceived) => { // eslint-disable-line require-await
       // cannot do deep comparison on objects as one has Buffers and one has Uint8Arrays
@@ -265,7 +271,9 @@ describe('network', () => {
 
     // In a real network scenario, peers will be discovered and their addresses
     // will be added to the addressBook before bitswap kicks in
-    await p2pA.peerStore.addressBook.set(p2pB.peerId, p2pB.getMultiaddrs())
+    await p2pA.peerStore.patch(p2pB.peerId, {
+      multiaddrs: p2pB.getMultiaddrs()
+    })
 
     const deferred = pDefer()
 

test/utils/create-libp2p-node.ts

@@ -1,20 +1,31 @@
 
 import { noise } from '@chainsafe/libp2p-noise'
-import { kadDHT } from '@libp2p/kad-dht'
+import { type DualKadDHT, kadDHT } from '@libp2p/kad-dht'
 import { mplex } from '@libp2p/mplex'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import { tcp } from '@libp2p/tcp'
 // @ts-expect-error no types
 import defaultsDeep from '@nodeutils/defaults-deep'
 import { createLibp2p, type Libp2pOptions } from 'libp2p'
-import type { Libp2p } from '@libp2p/interface-libp2p'
+import { identifyService } from 'libp2p/identify'
+import type { Libp2p, ServiceMap } from '@libp2p/interface-libp2p'
 
 export interface NodeOptions extends Libp2pOptions {
   DHT?: boolean
 }
 
-export async function createLibp2pNode (options: NodeOptions = {}): Promise<Libp2p> {
-  const node = await createLibp2p(defaultsDeep({
+export async function createLibp2pNode (options: NodeOptions = {}): Promise<Libp2p<{ dht: DualKadDHT }>> {
+  const services: ServiceMap = {
+    identify: identifyService()
+  }
+
+  if (options.DHT === true) {
+    services.dht = kadDHT({
+      clientMode: false
+    })
+  }
+
+  const node = await createLibp2p<{ dht: DualKadDHT }>(defaultsDeep({
     peerId: await createEd25519PeerId(),
     addresses: {
       listen: ['/ip4/0.0.0.0/tcp/0']
@@ -28,11 +39,7 @@ export async function createLibp2pNode (options: NodeOptions = {}): Promise<Libp
     connectionEncryption: [
       noise()
     ],
-    dht: options.DHT === true
-      ? kadDHT({
-        clientMode: false
-      })
-      : undefined
+    services
   }, options))
 
   await node.start()

test/utils/mocks.ts

@@ -151,10 +151,7 @@ export const genBitswapNetwork = async (n: number, enableDHT: boolean = false):
     peers.map(async (peerId, i) => {
       const libp2p = await createLibp2pNode({
         peerId,
-        DHT: enableDHT,
-        nat: {
-          enabled: false
-        }
+        DHT: enableDHT
       })
 
       await libp2p.start()
@@ -180,7 +177,9 @@ export const genBitswapNetwork = async (n: number, enableDHT: boolean = false):
 
       const netB = netArray[j]
 
-      await netA.libp2p.peerStore.addressBook.set(netB.libp2p.peerId, netB.libp2p.getMultiaddrs())
+      await netA.libp2p.peerStore.patch(netB.libp2p.peerId, {
+        multiaddrs: netB.libp2p.getMultiaddrs()
+      })
     }
   }