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

fix(upstream): Syncing with upstream ipfs-service-provider

.gitignore

@@ -67,5 +67,6 @@ ipfsdata
 .ipfsdata
 ipfs-service-provider.sh
 start-bch-wallet-service.sh
+data/
 
 !README.md

README.md

@@ -78,3 +78,5 @@ Snapshots pinned to IPFS will be listed here.
 ## License
 
 [MIT](./LICENSE.md)
+
+a

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipfs-bch-wallet-service",
-  "version": "1.11.3",
+  "version": "1.11.4",
   "description": "IPFS and REST service providing blockchain access needed by a wallet. ",
   "main": "index.js",
   "scripts": {
@@ -27,8 +27,8 @@
     "axios": "^0.21.1",
     "bcryptjs": "^2.4.3",
     "glob": "^7.1.6",
-    "ipfs": "0.55.4",
-    "ipfs-coord": "^6.4.1",
+    "@chris.troutner/ipfs": "2.0.2",
+    "ipfs-coord": "^6.6.3",
     "jsonrpc-lite": "^2.2.0",
     "jsonwebtoken": "^8.5.1",
     "jwt-bch-lib": "^1.3.0",

production/docker-compose.yml

@@ -1,28 +0,0 @@
-# Start the testnet server with the command 'docker-compose up -d'
-
-bch-wallet-mongodb:
-  image: mongo
-  container_name: mongo-bch-service
-  ports:
-    - '5555:27017' # <host port>:<container port>
-  volumes:
-    - ./database:/data/db
-  command: mongod --logpath=/dev/null # -- quiet
-  restart: always
-
-bch-wallet-service:
-  build: ./
-  dockerfile: Dockerfile
-  container_name: bch-wallet-service
-  links:
-    - bch-wallet-mongodb
-  ports:
-    # <host port>:<container port>
-    - '5001:5001' # REST API
-    - '5668:5668' # IPFS TCP Port
-    - '5669:5669' # IPFS WS Port
-  volumes:
-    - ./data/.ipfsdata:/home/safeuser/ipfs-service-provider/.ipfsdata
-  #    - ../orbitdb:/home/safeuser/orbitdb
-
-  restart: always

production/docker/Dockerfile

@@ -3,7 +3,7 @@
 
 #IMAGE BUILD COMMANDS
 # ct-base-ubuntu = ubuntu 18.04 + nodejs v10 LTS
-FROM christroutner/ct-base-ubuntu
+FROM christroutner/ct-base-ubuntu:latest
 MAINTAINER Chris Troutner <chris.troutner@gmail.com>
 
 #Create the user 'safeuser' and add them to the sudo group.
@@ -48,7 +48,7 @@ RUN npm run docs
 # Calling out the directorys that should be mounted as external volumes.
 RUN mkdir /home/safeuser/.ipfsdata
 #RUN mkdir /home/safeuser/orbitdb
-VOLUME /home/safeuser/ipfsdata
+#VOLUME /home/safeuser/ipfsdata
 #VOLUME /home/safeuser/orbitdb
 
 # Start the application.

production/docker/docker-compose.yml

@@ -0,0 +1,31 @@
+# Start the service with the command 'docker-compose up -d'
+
+version: '2'
+services:
+  bch-wallet-mongodb:
+    image: mongo
+    container_name: mongo-bch-service
+    ports:
+      - '5555:27017' # <host port>:<container port>
+    volumes:
+      - ../data/mongodb:/data/db
+    command: mongod --logpath=/dev/null # -- quiet
+    restart: always
+
+  bch-wallet-service:
+    build: ./
+    container_name: bch-wallet-service
+    logging:
+      driver: 'json-file'
+      options:
+        max-size: '10m'
+        max-file: '10'
+    links:
+      - bch-wallet-mongodb
+    ports:
+      # <host port>:<container port>
+      - '5001:5001' # REST API
+      - '5668:5668' # IPFS TCP Port
+      - '5669:5669' # IPFS WS Port
+    volumes:
+      - ../data/ipfsdata:/home/safeuser/ipfs-service-provider/.ipfsdata

src/adapters/ipfs/ipfs.js

@@ -5,7 +5,8 @@
 */
 
 // Global npm libraries
-const IPFS = require('ipfs')
+// const IPFS = require('ipfs')
+const IPFS = require('@chris.troutner/ipfs')
 
 // Local libraries
 const config = require('../../../config')

src/controllers/json-rpc/index.js

@@ -58,7 +58,7 @@ class JSONRPC {
 
       // Attempt to parse the incoming data as a JSON RPC string.
       const parsedData = _this.jsonrpc.parse(str)
-      // console.log('parsedData: ', parsedData)
+      console.log('parsedData: ', parsedData)
 
       // Exit quietly if the incoming string is an invalid JSON RPC string.
       if (parsedData.type === 'invalid') {