Merge remote-tracking branch 'upstream/master' into ct-unstable

README.md

@@ -24,9 +24,9 @@ This repository is one step in a longer path. Here are the major milestones of t
 
 ## Requirements
 
-- node **^16.20.2**
-- npm **^8.19.4**
-- Docker **^20.10.8**
+- node **^20.16.0**
+- npm **^10.8.1**
+- Docker **^24.0.7**
 - Docker Compose **^1.27.4**
 
 ## Installation

package.json

@@ -36,7 +36,7 @@
     "@libp2p/logger": "4.0.20",
     "@libp2p/mplex": "10.0.16",
     "@libp2p/tcp": "9.1.5",
-    "@libp2p/webrtc": "4.0.34",
+    "@libp2p/webrtc": "4.1.7",
     "@libp2p/websockets": "8.2.0",
     "@multiformats/multiaddr": "12.3.0",
     "@psf/bch-js": "6.7.3",
@@ -46,7 +46,7 @@
     "datastore-fs": "9.1.7",
     "glob": "7.1.6",
     "helia": "4.2.5",
-    "helia-coord": "1.5.11",
+    "helia-coord": "1.5.14",
     "jsonrpc-lite": "2.2.0",
     "jsonwebtoken": "8.5.1",
     "jwt-bch-lib": "1.3.0",
@@ -63,7 +63,7 @@
     "koa2-ratelimit": "0.9.1",
     "libp2p": "1.9.1",
     "line-reader": "0.4.0",
-    "minimal-slp-wallet": "5.11.1",
+    "minimal-slp-wallet": "5.12.0",
     "mongoose": "5.13.14",
     "node-fetch": "npm:@achingbrain/node-fetch@2.6.7",
     "nodemailer": "6.7.5",

src/adapters/ipfs/ipfs.js

@@ -175,25 +175,15 @@ class IpfsAdapter {
         console.log('Helia (IPFS) node IS NOT configured as Circuit Relay')
       }
 
-      // Configure transports
-      let transports
-      if (process.env.CONNECT_PREF === 'direct') {
-        transports = [
-          tcp(),
-          webSockets(),
-          webRTC()
-        ]
-      } else {
-        transports = [
-          tcp(),
-          webSockets(),
-          circuitRelayTransport({
-            discoverRelays: 3,
-            reservationConcurrency: 3
-          }),
-          webRTC()
-        ]
-      }
+      const transports = [
+        tcp(),
+        webSockets(),
+        circuitRelayTransport({
+          discoverRelays: 3,
+          reservationConcurrency: 3
+        }),
+        webRTC()
+      ]
 
       // libp2p is the networking layer that underpins Helia
       const libp2p = await this.createLibp2p({