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

Syncing upstream ipfs-service-provider
Merge branch 'master' of https://github.com/Permissionless-Software-Foundation/ipfs-service-provider into ct-unstable
2026-09-21 16:52:03 -07:00 · 2022-01-02 19:15:52 -08:00 · 2022-01-02 19:14:28 -08:00 · 2022-01-02 19:13:44 -08:00 · 2022-01-02 19:00:50 -08:00 · 2022-01-01 21:06:35 -08:00
4 changed files with 45 additions and 10 deletions
@@ -14,7 +14,7 @@
        "bcryptjs": "2.4.3",
        "glob": "7.1.6",
        "ipfs": "0.60.0",
-        "ipfs-coord": "6.8.5",
+        "ipfs-coord": "6.8.10",
        "ipfs-http-client": "55.0.0",
        "jsonrpc-lite": "2.2.0",
        "jsonwebtoken": "8.5.1",
@@ -58,6 +58,39 @@
        "uuid": "8.3.2"
      }
    },
+    "../ipfs-coord": {
+      "version": "6.0.0",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "axios": "0.21.4",
+        "bch-encrypt-lib": "2.0.0",
+        "orbit-db": "0.28.0"
+      },
+      "devDependencies": {
+        "@psf/bch-js": "4.20.10",
+        "apidoc": "0.25.0",
+        "chai": "4.2.0",
+        "coveralls": "3.1.0",
+        "eslint": "7.17.0",
+        "eslint-config-prettier": "7.1.0",
+        "eslint-config-standard": "16.0.2",
+        "eslint-plugin-node": "11.1.0",
+        "eslint-plugin-prettier": "3.3.1",
+        "eslint-plugin-standard": "4.0.0",
+        "husky": "4.3.6",
+        "lodash.clonedeep": "4.5.0",
+        "mocha": "8.4.0",
+        "nyc": "15.1.0",
+        "semantic-release": "17.4.4",
+        "sinon": "9.2.2",
+        "standard": "16.0.3"
+      },
+      "peerDependencies": {
+        "ipfs": "0.60.0",
+        "ipfs-http-client": "55.0.0"
+      }
+    },
    "node_modules/@assemblyscript/loader": {
      "version": "0.9.4",
      "resolved": "http://94.130.170.209:4873/@assemblyscript%2floader/-/loader-0.9.4.tgz",
@@ -10388,9 +10421,9 @@
      }
    },
    "node_modules/ipfs-coord": {
-      "version": "6.8.5",
-      "resolved": "http://94.130.170.209:4873/ipfs-coord/-/ipfs-coord-6.8.5.tgz",
-      "integrity": "sha512-IQR++uPZuHKOxrT49raHho/CwQe1tKe2Q1Ed0hGDfarXJTtfmMmNH3jGSecyd5BYZNeugL67BnGuvoYrZFY7AA==",
+      "version": "6.8.10",
+      "resolved": "http://94.130.170.209:4873/ipfs-coord/-/ipfs-coord-6.8.10.tgz",
+      "integrity": "sha512-04nlX4AkfqLuuLzpMcHnpv++iOETLRkzFA2GfAmY90r99HynfHt3DypP6loVdAnD34iWgD+tLhKNQ7QQM7cgfQ==",
      "license": "MIT",
      "dependencies": {
        "axios": "0.21.4",
@@ -33891,9 +33924,9 @@
      }
    },
    "ipfs-coord": {
-      "version": "6.8.5",
-      "resolved": "http://94.130.170.209:4873/ipfs-coord/-/ipfs-coord-6.8.5.tgz",
-      "integrity": "sha512-IQR++uPZuHKOxrT49raHho/CwQe1tKe2Q1Ed0hGDfarXJTtfmMmNH3jGSecyd5BYZNeugL67BnGuvoYrZFY7AA==",
+      "version": "6.8.10",
+      "resolved": "http://94.130.170.209:4873/ipfs-coord/-/ipfs-coord-6.8.10.tgz",
+      "integrity": "sha512-04nlX4AkfqLuuLzpMcHnpv++iOETLRkzFA2GfAmY90r99HynfHt3DypP6loVdAnD34iWgD+tLhKNQ7QQM7cgfQ==",
      "requires": {
        "axios": "0.21.4",
        "bch-encrypt-lib": "2.0.0",
@@ -28,7 +28,7 @@
    "bcryptjs": "2.4.3",
    "glob": "7.1.6",
    "ipfs": "0.60.0",
-    "ipfs-coord": "6.8.5",
+    "ipfs-coord": "6.8.10",
    "ipfs-http-client": "55.0.0",
    "jsonrpc-lite": "2.2.0",
    "jsonwebtoken": "8.5.1",
@@ -14,7 +14,7 @@ services:
    restart: always

  ipfs-bch-wallet:
-    image: ipfs/go-ipfs:latest
+    image: ipfs/go-ipfs:v0.11.0
    container_name: ipfs-bch-wallet
    environment:
      MY_ENV_VAR: 'placeholder'
@@ -14,6 +14,7 @@
 const IPFSembedded = require('ipfs')
 const IPFSexternal = require('ipfs-http-client')
 const fs = require('fs')
+const http = require('http')

 // Local libraries
 const config = require('../../../config')
@@ -74,7 +75,8 @@ class IpfsAdapter {

      const ipfsOptionsExternal = {
        host: this.config.ipfsHost,
-        port: this.config.ipfsApiPort
+        port: this.config.ipfsApiPort,
+        agent: http.Agent({ keepAlive: true, maxSockets: 2000 })
      }

      let ipfsOptions = ipfsOptionsEmbedded
Author	SHA1	Message	Date
Chris Troutner	803496fbc3	Merge pull request #57 from Permissionless-Software-Foundation/ct-unstable Syncing upstream ipfs-service-provider	2022-01-02 19:15:52 -08:00
Chris Troutner	c49ab4f58b	Merge branch 'master' of https://github.com/Permissionless-Software-Foundation/ipfs-service-provider into ct-unstable	2022-01-02 19:14:28 -08:00
Chris Troutner	4670bd22af	Merge pull request #72 from Permissionless-Software-Foundation/ct-unstable fix(pubsub): Applying fix for pubsub in external node	2022-01-02 19:13:44 -08:00
Chris Troutner	b3e7c63e61	fix(pubsub): Applying fix for pubsub in external node	2022-01-02 19:00:50 -08:00
Chris Troutner	421ca359f2	Merge pull request #56 from Permissionless-Software-Foundation/ct-unstable Syncing with upstream ipfs-service-provider	2022-01-01 21:06:35 -08:00
Chris Troutner	4e6559ac96	Merge branch 'master' of https://github.com/Permissionless-Software-Foundation/ipfs-service-provider into ct-unstable	2022-01-01 21:04:33 -08:00
Chris Troutner	1fcc92e10d	Merge pull request #71 from Permissionless-Software-Foundation/ct-unstable fix(ipsf-coord): Updating to v6.8.10	2022-01-01 21:01:14 -08:00
Chris Troutner	f332aece98	fix(ipsf-coord): Updating to v6.8.10	2022-01-01 20:58:56 -08:00
Chris Troutner	4112b34205	Merge pull request #55 from Permissionless-Software-Foundation/ct-unstable Syncing with upstream ipfs-service-provider	2022-01-01 20:47:11 -08:00
Chris Troutner	30d0a62455	Merge branch 'master' of https://github.com/Permissionless-Software-Foundation/ipfs-service-provider into ct-unstable	2022-01-01 20:44:41 -08:00
Chris Troutner	89f24e9940	Merge pull request #70 from Permissionless-Software-Foundation/ct-unstable fix(ipfs-coord): Switching to private network. Updating ipfs-coord	2022-01-01 20:40:23 -08:00
Chris Troutner	25a75dc369	fix(ipfs-coord): Switching to private network. Updating ipfs-coord to v6.8.9	2022-01-01 20:25:40 -08:00
Chris Troutner	f36ce14087	fix(ipfs-coord): Updating v6.8.8	2022-01-01 18:58:47 -08:00
Chris Troutner	df45792f47	fix(ipfs-coord): Updating to v6.8.7	2022-01-01 18:43:24 -08:00
Chris Troutner	9e71e33ccd	Merge pull request #69 from Permissionless-Software-Foundation/ct-unstable fix(ipfs-coord): Updating to v6.8.6	2022-01-01 18:20:30 -08:00
Chris Troutner	c7b0b0c1d5	fix(ipfs-coord): Updating to v6.8.6	2022-01-01 18:19:07 -08:00
Chris Troutner	e475e5f4c3	Downgrading ipfs-http-client	2022-01-01 16:41:56 -08:00
Chris Troutner	7fff41b702	fix(production): Fixing typo in docker-compose.yml	2022-01-01 06:51:54 -08:00
Chris Troutner	a7f7fc4e14	Merge pull request #54 from Permissionless-Software-Foundation/ct-unstable Syncing with upstream ipfs-service-provider	2022-01-01 06:48:33 -08:00
Chris Troutner	83ad0d8bfa	Merge branch 'master' into ct-unstable	2022-01-01 06:44:04 -08:00
Chris Troutner	ac4aaca66e	fix(production): Explictly using ipfs v0.11.0 docker container	2022-01-01 06:43:16 -08:00
Chris Troutner	0748106637	Merge pull request #68 from Permissionless-Software-Foundation/ct-unstable fix(production): using explcit v0.11.0 ipfs docker container	2022-01-01 06:41:36 -08:00
Chris Troutner	27dcc219b9	fix(production): using explcit v0.11.0 ipfs docker container	2022-01-01 06:40:15 -08:00