Merge pull request #61 from Permissionless-Software-Foundation/ct-unstable

Syncing with upstream ipfs-service-provider

.gitignore

@@ -73,3 +73,4 @@ run-dev.sh
 !README.md
 
 wallet.json
+system-user-dev.json

config/system-user-dev.json

@@ -1,6 +1,6 @@
 {
-  "password": "DwaDw2YaKnuFxsSIm32B",
+  "password": "bDZWE3vEO7Ufvil2s8Ko",
   "email": "system@system.com",
-  "id": "66d9e3a45648506e44a77d53",
-  "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjY2ZDllM2E0NTY0ODUwNmU0NGE3N2Q1MyIsImlhdCI6MTcyNTU1NTYyMH0.S_K_06SN7bO-qoG4fi-Q8PHW2NSFBVvHgOG2K0V-CWY"
+  "id": "66e38befd548c285159a7084",
+  "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjY2ZTM4YmVmZDU0OGMyODUxNTlhNzA4NCIsImlhdCI6MTcyNjE4ODUyN30.h31T7o2Si1ZOTgCf91IC4KNdkmaCqs5FNWEXysdnYTg"
 }

package-lock.json

@@ -19,7 +19,7 @@
         "@libp2p/keychain": "4.1.5",
         "@libp2p/logger": "4.0.20",
         "@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",
         "axios": "0.27.2",
@@ -28,7 +28,7 @@
         "datastore-fs": "9.1.7",
         "glob": "7.1.6",
         "helia": "4.2.5",
-        "helia-coord": "1.5.12",
+        "helia-coord": "1.5.14",
         "jsonrpc-lite": "2.2.0",
         "jsonwebtoken": "8.5.1",
         "jwt-bch-lib": "1.3.0",
@@ -2584,9 +2584,9 @@
       "license": "ISC"
     },
     "node_modules/@chris.troutner/retry-queue": {
-      "version": "1.0.8",
-      "resolved": "http://94.130.170.209:4873/@chris.troutner%2fretry-queue/-/retry-queue-1.0.8.tgz",
-      "integrity": "sha512-ucyUGWTeXhOcXLglwb8alR3dNATPy+3vGea2uQJ0J8jnJufWrUr/NEq4b53op1tOTF029qrun6OmIN6Ls58pqw==",
+      "version": "1.0.10",
+      "resolved": "http://94.130.170.209:4873/@chris.troutner%2fretry-queue/-/retry-queue-1.0.10.tgz",
+      "integrity": "sha512-iF+xQl3jyTATAKDVkwY85j4Npihh/MqG99bjrS0cNJDF0XQeUSMVGsdtXR6TFj8YcEgfPvgBdYGOtEFo6tTQpA==",
       "license": "MIT",
       "dependencies": {
         "p-queue": "7.3.0",
@@ -3744,16 +3744,16 @@
       }
     },
     "node_modules/@libp2p/webrtc": {
-      "version": "4.0.34",
-      "resolved": "http://94.130.170.209:4873/@libp2p%2fwebrtc/-/webrtc-4.0.34.tgz",
-      "integrity": "sha512-jUcSMZMLGDw1SaoY9DWxmLa8U0D8cgv37duIX4nm1ro6W3HxXZ8t3z2lHpquynD9FZa0M9PDYPf3/zkRXXWjZw==",
+      "version": "4.1.7",
+      "resolved": "http://94.130.170.209:4873/@libp2p%2fwebrtc/-/webrtc-4.1.7.tgz",
+      "integrity": "sha512-8iXs5m0DyfLKqOJAV/nZrtQz6ryrr5iv8fp6ArbWLm/NOwqHkbXwO30ZpRNRm1qmDvKVQilGpNFEC1z1mgheRg==",
       "license": "Apache-2.0 OR MIT",
       "dependencies": {
         "@chainsafe/libp2p-noise": "^15.0.0",
-        "@libp2p/interface": "^1.4.1",
-        "@libp2p/interface-internal": "^1.2.3",
-        "@libp2p/peer-id": "^4.1.3",
-        "@libp2p/utils": "^5.4.3",
+        "@libp2p/interface": "^1.7.0",
+        "@libp2p/interface-internal": "^1.3.4",
+        "@libp2p/peer-id": "^4.2.4",
+        "@libp2p/utils": "^5.4.9",
         "@multiformats/mafmt": "^12.1.6",
         "@multiformats/multiaddr": "^12.2.3",
         "@multiformats/multiaddr-matcher": "^1.2.1",
@@ -3763,11 +3763,11 @@
         "it-pushable": "^3.2.3",
         "it-stream-types": "^2.0.1",
         "multiformats": "^13.1.0",
-        "multihashes": "^4.0.3",
-        "node-datachannel": "^0.9.0",
+        "node-datachannel": "^0.11.0",
         "p-defer": "^4.0.1",
         "p-event": "^6.0.1",
         "p-timeout": "^6.1.2",
+        "progress-events": "^1.0.0",
         "protons-runtime": "^5.4.0",
         "race-signal": "^1.0.2",
         "react-native-webrtc": "^118.0.7",
@@ -3840,12 +3840,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/@multiformats/base-x": {
-      "version": "4.0.1",
-      "resolved": "http://94.130.170.209:4873/@multiformats%2fbase-x/-/base-x-4.0.1.tgz",
-      "integrity": "sha512-eMk0b9ReBbV23xXU693TAIrLyeO5iTgBZGSJfpqriG8UkYvr/hC9u9pyMlAakDNHWmbhMZCDs6KQO0jzKD8OTw==",
-      "license": "MIT"
-    },
     "node_modules/@multiformats/dns": {
       "version": "1.0.6",
       "resolved": "http://94.130.170.209:4873/@multiformats%2fdns/-/dns-1.0.6.tgz",
@@ -12588,12 +12582,12 @@
       }
     },
     "node_modules/helia-coord": {
-      "version": "1.5.12",
-      "resolved": "http://94.130.170.209:4873/helia-coord/-/helia-coord-1.5.12.tgz",
-      "integrity": "sha512-iNfwUDIA7+Vrk4nUV6K+Va+D3BbZlO28F6X1WXjfZDitMEEuZauRsgMvwMuVmgtQYJ1SUXh10bnrt4kZiyTAMw==",
+      "version": "1.5.14",
+      "resolved": "http://94.130.170.209:4873/helia-coord/-/helia-coord-1.5.14.tgz",
+      "integrity": "sha512-HUd6jYla/bM0tAV2bc5NWQFPBUScBTljoxl2SulvYWcH19k8LAwL5cZjbBJG88/nzC6RwtQFRV1zMQxKjBy/WA==",
       "license": "MIT",
       "dependencies": {
-        "@chris.troutner/retry-queue": "1.0.8",
+        "@chris.troutner/retry-queue": "1.0.10",
         "bch-encrypt-lib": "2.1.1",
         "uuid": "9.0.0"
       },
@@ -17149,20 +17143,6 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "license": "MIT"
     },
-    "node_modules/multibase": {
-      "version": "4.0.6",
-      "resolved": "http://94.130.170.209:4873/multibase/-/multibase-4.0.6.tgz",
-      "integrity": "sha512-x23pDe5+svdLz/k5JPGCVdfn7Q5mZVMBETiC+ORfO+sor9Sgs0smJzAjfTbM5tckeCqnaUuMYoz+k3RXMmJClQ==",
-      "deprecated": "This module has been superseded by the multiformats module",
-      "license": "MIT",
-      "dependencies": {
-        "@multiformats/base-x": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=12.0.0",
-        "npm": ">=6.0.0"
-      }
-    },
     "node_modules/multicast-dns": {
       "version": "7.2.5",
       "resolved": "http://94.130.170.209:4873/multicast-dns/-/multicast-dns-7.2.5.tgz",
@@ -17182,36 +17162,6 @@
       "integrity": "sha512-RWI+nyf0q64vyOxL8LbKtjJMki0sogRL/8axvklNtiTM0iFCVtHwME9w6+0P1/v4dQvsIg8A45oT3ka1t/M/+A==",
       "license": "Apache-2.0 OR MIT"
     },
-    "node_modules/multihashes": {
-      "version": "4.0.3",
-      "resolved": "http://94.130.170.209:4873/multihashes/-/multihashes-4.0.3.tgz",
-      "integrity": "sha512-0AhMH7Iu95XjDLxIeuCOOE4t9+vQZsACyKZ9Fxw2pcsRmlX4iCn1mby0hS0bb+nQOVpdQYWPpnyusw4da5RPhA==",
-      "license": "MIT",
-      "dependencies": {
-        "multibase": "^4.0.1",
-        "uint8arrays": "^3.0.0",
-        "varint": "^5.0.2"
-      },
-      "engines": {
-        "node": ">=12.0.0",
-        "npm": ">=6.0.0"
-      }
-    },
-    "node_modules/multihashes/node_modules/multiformats": {
-      "version": "9.9.0",
-      "resolved": "http://94.130.170.209:4873/multiformats/-/multiformats-9.9.0.tgz",
-      "integrity": "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg==",
-      "license": "(Apache-2.0 AND MIT)"
-    },
-    "node_modules/multihashes/node_modules/uint8arrays": {
-      "version": "3.1.1",
-      "resolved": "http://94.130.170.209:4873/uint8arrays/-/uint8arrays-3.1.1.tgz",
-      "integrity": "sha512-+QJa8QRnbdXVpHYjLoTpJIdCTiw9Ir62nocClWuXIq2JIh4Uta0cQsTSpFL678p2CN8B+XSApwcU+pQEqVpKWg==",
-      "license": "MIT",
-      "dependencies": {
-        "multiformats": "^9.4.2"
-      }
-    },
     "node_modules/murmurhash3js-revisited": {
       "version": "3.0.0",
       "resolved": "http://94.130.170.209:4873/murmurhash3js-revisited/-/murmurhash3js-revisited-3.0.0.tgz",
@@ -17356,9 +17306,9 @@
       }
     },
     "node_modules/node-abi": {
-      "version": "3.65.0",
-      "resolved": "http://94.130.170.209:4873/node-abi/-/node-abi-3.65.0.tgz",
-      "integrity": "sha512-ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA==",
+      "version": "3.67.0",
+      "resolved": "http://94.130.170.209:4873/node-abi/-/node-abi-3.67.0.tgz",
+      "integrity": "sha512-bLn/fU/ALVBE9wj+p4Y21ZJWYFjUXLXPi/IewyLZkx3ApxKDNBWCKdReeKOtD8dWpOdDCeMyLh6ZewzcLsG2Nw==",
       "license": "MIT",
       "dependencies": {
         "semver": "^7.3.5"
@@ -17381,9 +17331,9 @@
       "license": "MIT"
     },
     "node_modules/node-datachannel": {
-      "version": "0.9.2",
-      "resolved": "http://94.130.170.209:4873/node-datachannel/-/node-datachannel-0.9.2.tgz",
-      "integrity": "sha512-sknq4EAJcSNHUMiK6Gru3vtwo8QICiFs5xJyaitJy/ZLSUbikaGrDORpIpdGp8++4AYQOYC5vr9VyA6i01KeJQ==",
+      "version": "0.11.0",
+      "resolved": "http://94.130.170.209:4873/node-datachannel/-/node-datachannel-0.11.0.tgz",
+      "integrity": "sha512-8/vAMms32XxgJ9FIRDXbfmmH1ROm0HBdsa/XteIcUWN4VTQN38UITTkuu6YsfQzN/CQp8YhhnfAEzEadQJ2c6Q==",
       "hasInstallScript": true,
       "license": "MPL 2.0",
       "dependencies": {
@@ -21333,9 +21283,9 @@
       }
     },
     "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "http://94.130.170.209:4873/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "version": "3.0.2",
+      "resolved": "http://94.130.170.209:4873/pump/-/pump-3.0.2.tgz",
+      "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
       "license": "MIT",
       "dependencies": {
         "end-of-stream": "^1.1.0",
@@ -25564,12 +25514,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/varint": {
-      "version": "5.0.2",
-      "resolved": "http://94.130.170.209:4873/varint/-/varint-5.0.2.tgz",
-      "integrity": "sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow==",
-      "license": "MIT"
-    },
     "node_modules/varuint-bitcoin": {
       "version": "1.1.2",
       "resolved": "http://94.130.170.209:4873/varuint-bitcoin/-/varuint-bitcoin-1.1.2.tgz",

package.json

@@ -34,7 +34,7 @@
     "@libp2p/keychain": "4.1.5",
     "@libp2p/logger": "4.0.20",
     "@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",
     "axios": "0.27.2",
@@ -43,7 +43,7 @@
     "datastore-fs": "9.1.7",
     "glob": "7.1.6",
     "helia": "4.2.5",
-    "helia-coord": "1.5.12",
+    "helia-coord": "1.5.14",
     "jsonrpc-lite": "2.2.0",
     "jsonwebtoken": "8.5.1",
     "jwt-bch-lib": "1.3.0",

src/adapters/ipfs/ipfs.js

@@ -21,12 +21,12 @@ import { yamux } from '@chainsafe/libp2p-yamux'
 // import { identifyService } from 'libp2p/identify'
 import { identify } from '@libp2p/identify'
 // import { circuitRelayServer, circuitRelayTransport } from 'libp2p/circuit-relay'
-import { circuitRelayServer, circuitRelayTransport } from '@libp2p/circuit-relay-v2'
+import { circuitRelayServer } from '@libp2p/circuit-relay-v2'
 import { gossipsub } from '@chainsafe/libp2p-gossipsub'
 import { webSockets } from '@libp2p/websockets'
 import { publicIpv4 } from 'public-ip'
 import { multiaddr } from '@multiformats/multiaddr'
-import { webRTC } from '@libp2p/webrtc'
+// import { webRTC } from '@libp2p/webrtc'
 import { keychain } from '@libp2p/keychain'
 import { defaultLogger } from '@libp2p/logger'
 import { unixfs } from '@helia/unixfs'
@@ -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({