deps: update all deps and fix linting

* deps(dev): bump aegir from 38.1.8 to 39.0.8 Bumps [aegir](https://github.com/ipfs/aegir) from 38.1.8 to 39.0.8. - [Release notes](https://github.com/ipfs/aegir/releases) - [Changelog](https://github.com/ipfs/aegir/blob/master/CHANGELOG.md) - [Commits](ipfs/aegir@v38.1.8...v39.0.8) --- updated-dependencies: - dependency-name: aegir dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * chore: update all deps and fix linting --------- 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]>
ipfs · May 24, 2023 · 4cdba4f · 4cdba4f
1 parent 90efbd3
commit 4cdba4f
Show file tree

Hide file tree

Showing 18 changed files with 147 additions and 145 deletions.
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "release": "npm run docs:no-publish && aegir run release && npm run docs"
   },
   "devDependencies": {
-    "aegir": "^38.1.0"
+    "aegir": "^39.0.8"
   },
   "type": "module",
   "workspaces": [

diff --git a/packages/interop/package.json b/packages/interop/package.json
@@ -52,29 +52,31 @@
     "test:electron-main": "aegir test -t electron-main"
   },
   "devDependencies": {
-    "@chainsafe/libp2p-gossipsub": "^6.1.0",
-    "@chainsafe/libp2p-noise": "^11.0.0",
-    "@chainsafe/libp2p-yamux": "^3.0.5",
+    "@chainsafe/libp2p-gossipsub": "^8.0.0",
+    "@chainsafe/libp2p-noise": "^12.0.1",
+    "@chainsafe/libp2p-yamux": "^4.0.2",
     "@helia/interface": "^1.0.0",
     "@helia/ipns": "^1.0.0",
+    "@libp2p/interface-libp2p": "^3.2.0",
     "@libp2p/interface-peer-id": "^2.0.1",
-    "@libp2p/kad-dht": "^8.0.0",
+    "@libp2p/interface-pubsub": "^4.0.1",
+    "@libp2p/kad-dht": "^9.3.4",
     "@libp2p/peer-id": "^2.0.1",
     "@libp2p/peer-id-factory": "^2.0.1",
-    "@libp2p/tcp": "^6.1.2",
-    "@libp2p/websockets": "^5.0.3",
-    "aegir": "^38.1.0",
+    "@libp2p/tcp": "^7.0.1",
+    "@libp2p/websockets": "^6.0.1",
+    "aegir": "^39.0.8",
     "blockstore-core": "^4.0.1",
     "datastore-core": "^9.0.3",
-    "go-ipfs": "^0.19.0",
+    "go-ipfs": "^0.20.0",
     "helia": "^1.0.0",
     "ipfsd-ctl": "^13.0.0",
     "ipns": "^6.0.0",
-    "it-all": "^2.0.0",
+    "it-all": "^3.0.2",
     "it-last": "^3.0.1",
-    "it-map": "^2.0.0",
+    "it-map": "^3.0.3",
     "kubo-rpc-client": "^3.0.0",
-    "libp2p": "^0.43.2",
+    "libp2p": "^0.45.3",
     "merge-options": "^3.0.4",
     "multiformats": "^11.0.1",
     "uint8arrays": "^4.0.3",

diff --git a/packages/interop/test/dht.spec.ts b/packages/interop/test/dht.spec.ts
@@ -1,31 +1,33 @@
 /* eslint-env mocha */
 
-import { expect } from 'aegir/chai'
-import { createHeliaNode } from './fixtures/create-helia.js'
-import { createKuboNode } from './fixtures/create-kubo.js'
-import type { Helia } from '@helia/interface'
-import type { Controller } from 'ipfsd-ctl'
-import { sha256 } from 'multiformats/hashes/sha2'
-import { CID } from 'multiformats/cid'
-import * as raw from 'multiformats/codecs/raw'
-import type { IPNS } from '@helia/ipns'
 import { ipns } from '@helia/ipns'
 import { dht } from '@helia/ipns/routing'
-import last from 'it-last'
-import { kadDHT } from '@libp2p/kad-dht'
-import { ipnsValidator } from 'ipns/validator'
-import { ipnsSelector } from 'ipns/selector'
+import { type KadDHT, kadDHT } from '@libp2p/kad-dht'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
-import { sortClosestPeers } from './fixtures/create-peer-ids.js'
-import type { PeerId } from 'kubo-rpc-client/dist/src/types.js'
+import { expect } from 'aegir/chai'
+import { ipnsSelector } from 'ipns/selector'
+import { ipnsValidator } from 'ipns/validator'
+import last from 'it-last'
+import { identifyService } from 'libp2p/identify'
+import { CID } from 'multiformats/cid'
+import * as raw from 'multiformats/codecs/raw'
+import { sha256 } from 'multiformats/hashes/sha2'
 import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { waitFor } from './fixtures/wait-for.js'
-import { connect } from './fixtures/connect.js'
 import { isElectronMain } from 'wherearewe'
+import { connect } from './fixtures/connect.js'
+import { createHeliaNode } from './fixtures/create-helia.js'
+import { createKuboNode } from './fixtures/create-kubo.js'
+import { sortClosestPeers } from './fixtures/create-peer-ids.js'
+import { waitFor } from './fixtures/wait-for.js'
+import type { Helia } from '@helia/interface'
+import type { IPNS } from '@helia/ipns'
+import type { Libp2p } from '@libp2p/interface-libp2p'
+import type { Controller } from 'ipfsd-ctl'
+import type { PeerId } from 'kubo-rpc-client/dist/src/types.js'
 
 describe('dht routing', () => {
-  let helia: Helia
+  let helia: Helia<Libp2p<{ dht: KadDHT }>>
   let kubo: Controller
   let name: IPNS
 
@@ -46,14 +48,19 @@ describe('dht routing', () => {
     value = CID.createV1(raw.code, digest)
 
     helia = await createHeliaNode({
-      dht: kadDHT({
-        validators: {
-          ipns: ipnsValidator
-        },
-        selectors: {
-          ipns: ipnsSelector
-        }
-      })
+      services: {
+        identify: identifyService(),
+        dht: kadDHT({
+          validators: {
+            ipns: ipnsValidator
+          },
+          selectors: {
+            ipns: ipnsSelector
+          },
+          // skips waiting for the initial self-query to find peers
+          allowQueryWithZeroPeers: true
+        })
+      }
     })
     kubo = await createKuboNode()
 
@@ -86,7 +93,7 @@ describe('dht routing', () => {
     await waitFor(async () => {
       let found = false
 
-      for await (const event of helia.libp2p.dht.findPeer(kubo.peer.id)) {
+      for await (const event of helia.libp2p.services.dht.findPeer(kubo.peer.id)) {
         if (event.name === 'FINAL_PEER') {
           found = true
         }

diff --git a/packages/interop/test/fixtures/create-helia.browser.ts b/packages/interop/test/fixtures/create-helia.browser.ts
@@ -1,18 +1,15 @@
-import { createHelia } from 'helia'
-import { createLibp2p } from 'libp2p'
-import { webSockets } from '@libp2p/websockets'
-import { all } from '@libp2p/websockets/filters'
 import { noise } from '@chainsafe/libp2p-noise'
 import { yamux } from '@chainsafe/libp2p-yamux'
+import { webSockets } from '@libp2p/websockets'
+import { all } from '@libp2p/websockets/filters'
 import { MemoryBlockstore } from 'blockstore-core'
 import { MemoryDatastore } from 'datastore-core'
+import { createHelia } from 'helia'
+import { createLibp2p, type Libp2pOptions } from 'libp2p'
 import type { Helia } from '@helia/interface'
-import { kadDHT } from '@libp2p/kad-dht'
-import { gossipsub } from '@chainsafe/libp2p-gossipsub'
-import { ipnsValidator } from 'ipns/validator'
-import { ipnsSelector } from 'ipns/selector'
+import type { Libp2p } from '@libp2p/interface-libp2p'
 
-export async function createHeliaNode (): Promise<Helia> {
+export async function createHeliaNode <T extends { identify: any }> (config: Libp2pOptions<T> = {}): Promise<Helia<Libp2p<T>>> {
   const blockstore = new MemoryBlockstore()
   const datastore = new MemoryDatastore()
 
@@ -29,19 +26,11 @@ export async function createHeliaNode (): Promise<Helia> {
     streamMuxers: [
       yamux()
     ],
-    dht: kadDHT({
-      validators: {
-        ipns: ipnsValidator
-      },
-      selectors: {
-        ipns: ipnsSelector
-      }
-    }),
-    pubsub: gossipsub(),
     datastore,
-    nat: {
-      enabled: false
-    }
+    connectionGater: {
+      denyDialMultiaddr: async () => false
+    },
+    ...config
   })
 
   const helia = await createHelia({

diff --git a/packages/interop/test/fixtures/create-helia.ts b/packages/interop/test/fixtures/create-helia.ts
@@ -1,13 +1,13 @@
-import { createHelia } from 'helia'
-import { createLibp2p, Libp2pOptions } from 'libp2p'
-import { tcp } from '@libp2p/tcp'
 import { noise } from '@chainsafe/libp2p-noise'
 import { yamux } from '@chainsafe/libp2p-yamux'
+import { tcp } from '@libp2p/tcp'
 import { MemoryBlockstore } from 'blockstore-core'
 import { MemoryDatastore } from 'datastore-core'
+import { createHelia } from 'helia'
+import { createLibp2p, type Libp2p, type Libp2pOptions } from 'libp2p'
 import type { Helia } from '@helia/interface'
 
-export async function createHeliaNode (config: Libp2pOptions = {}): Promise<Helia> {
+export async function createHeliaNode <T extends { identify: any }> (config: Libp2pOptions<T> = {}): Promise<Helia<Libp2p<T>>> {
   const blockstore = new MemoryBlockstore()
   const datastore = new MemoryDatastore()
 
@@ -27,9 +27,6 @@ export async function createHeliaNode (config: Libp2pOptions = {}): Promise<Heli
       yamux()
     ],
     datastore,
-    nat: {
-      enabled: false
-    },
     ...config
   })
 

diff --git a/packages/interop/test/fixtures/create-kubo.ts b/packages/interop/test/fixtures/create-kubo.ts
@@ -1,10 +1,10 @@
 
 // @ts-expect-error no types
 import * as goIpfs from 'go-ipfs'
-import { Controller, ControllerOptions, createController } from 'ipfsd-ctl'
+import { type Controller, type ControllerOptions, createController } from 'ipfsd-ctl'
 import * as kuboRpcClient from 'kubo-rpc-client'
-import { isElectronMain, isNode } from 'wherearewe'
 import mergeOptions from 'merge-options'
+import { isElectronMain, isNode } from 'wherearewe'
 
 export async function createKuboNode (options: ControllerOptions<'go'> = {}): Promise<Controller> {
   const opts = mergeOptions({
@@ -24,5 +24,5 @@ export async function createKuboNode (options: ControllerOptions<'go'> = {}): Pr
     }
   }, options)
 
-  return await createController(opts)
+  return createController(opts)
 }
diff --git a/packages/interop/test/fixtures/create-peer-ids.ts b/packages/interop/test/fixtures/create-peer-ids.ts
@@ -1,9 +1,9 @@
-import { xor as uint8ArrayXor } from 'uint8arrays/xor'
-import { compare as uint8ArrayCompare } from 'uint8arrays/compare'
 import all from 'it-all'
 import map from 'it-map'
-import type { PeerId } from '@libp2p/interface-peer-id'
 import { sha256 } from 'multiformats/hashes/sha2'
+import { compare as uint8ArrayCompare } from 'uint8arrays/compare'
+import { xor as uint8ArrayXor } from 'uint8arrays/xor'
+import type { PeerId } from '@libp2p/interface-peer-id'
 
 /**
  * Sort peers by distance to the KadID of the passed buffer
@@ -33,7 +33,7 @@ export async function sortClosestPeers (buf: Uint8Array, peers: PeerId[]): Promi
  * Creates a DHT ID by hashing a Peer ID
  */
 export async function convertPeerId (peerId: PeerId): Promise<Uint8Array> {
-  return await convertBuffer(peerId.toBytes())
+  return convertBuffer(peerId.toBytes())
 }
 
 /**

diff --git a/packages/interop/test/pubsub.spec.ts b/packages/interop/test/pubsub.spec.ts
@@ -1,37 +1,43 @@
 /* eslint-env mocha */
 
+import { gossipsub } from '@chainsafe/libp2p-gossipsub'
+import { ipns } from '@helia/ipns'
+import { pubsub } from '@helia/ipns/routing'
+import { peerIdFromKeys } from '@libp2p/peer-id'
 import { expect } from 'aegir/chai'
-import { createHeliaNode } from './fixtures/create-helia.js'
-import { createKuboNode } from './fixtures/create-kubo.js'
-import type { Helia } from '@helia/interface'
-import type { Controller } from 'ipfsd-ctl'
-import { sha256 } from 'multiformats/hashes/sha2'
+import last from 'it-last'
+import { identifyService } from 'libp2p/identify'
+import { base36 } from 'multiformats/bases/base36'
 import { CID } from 'multiformats/cid'
 import * as raw from 'multiformats/codecs/raw'
 import { identity } from 'multiformats/hashes/identity'
-import { base36 } from 'multiformats/bases/base36'
-import type { IPNS } from '@helia/ipns'
-import { ipns } from '@helia/ipns'
-import { pubsub } from '@helia/ipns/routing'
-import last from 'it-last'
-import { peerIdFromKeys } from '@libp2p/peer-id'
-import { gossipsub } from '@chainsafe/libp2p-gossipsub'
-import { waitFor } from './fixtures/wait-for.js'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
+import { sha256 } from 'multiformats/hashes/sha2'
 import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
+import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
+import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { connect } from './fixtures/connect.js'
+import { createHeliaNode } from './fixtures/create-helia.js'
+import { createKuboNode } from './fixtures/create-kubo.js'
+import { waitFor } from './fixtures/wait-for.js'
+import type { Helia } from '@helia/interface'
+import type { IPNS } from '@helia/ipns'
+import type { PubSub } from '@libp2p/interface-pubsub'
+import type { Controller } from 'ipfsd-ctl'
+import type { Libp2p } from 'libp2p'
 
 const LIBP2P_KEY_CODEC = 0x72
 
 describe('pubsub routing', () => {
-  let helia: Helia
+  let helia: Helia<Libp2p<{ pubsub: PubSub }>>
   let kubo: Controller
   let name: IPNS
 
   beforeEach(async () => {
     helia = await createHeliaNode({
-      pubsub: gossipsub()
+      services: {
+        identify: identifyService(),
+        pubsub: gossipsub()
+      }
     })
     kubo = await createKuboNode({
       ipfsOptions: {
@@ -130,7 +136,7 @@ describe('pubsub routing', () => {
 
     // wait for helia to be subscribed to the topic for record updates
     await waitFor(async () => {
-      return helia.libp2p.pubsub.getTopics().includes(subscriptionName)
+      return helia.libp2p.services.pubsub.getTopics().includes(subscriptionName)
     }, {
       timeout: 30000,
       message: 'Helia did not register for record updates'

diff --git a/packages/ipns/package.json b/packages/ipns/package.json
@@ -160,9 +160,8 @@
   },
   "dependencies": {
     "@libp2p/interface-content-routing": "^2.1.0",
-    "@libp2p/interface-dht": "^2.0.1",
     "@libp2p/interface-peer-id": "^2.0.1",
-    "@libp2p/interface-pubsub": "^3.0.6",
+    "@libp2p/interface-pubsub": "^4.0.1",
     "@libp2p/interfaces": "^3.3.1",
     "@libp2p/logger": "^2.0.6",
     "@libp2p/peer-id": "^2.0.1",
@@ -178,7 +177,7 @@
   },
   "devDependencies": {
     "@libp2p/peer-id-factory": "^2.0.1",
-    "aegir": "^38.1.0",
+    "aegir": "^39.0.8",
     "datastore-core": "^9.0.3",
     "sinon": "^15.0.1",
     "sinon-ts": "^1.0.0"