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

fix(upstream): Synced with upstream repo ipfs-service-provider

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "ipfs-bch-wallet-service",
-  "version": "1.9.1",
+  "version": "1.11.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "1.9.1",
+      "version": "1.11.0",
       "license": "MIT",
       "dependencies": {
         "@psf/bch-js": "^4.20.3",
@@ -13,7 +13,7 @@
         "bcryptjs": "^2.4.3",
         "glob": "^7.1.6",
         "ipfs": "0.55.4",
-        "ipfs-coord": "^6.1.2",
+        "ipfs-coord": "^6.1.4",
         "jsonrpc-lite": "^2.2.0",
         "jsonwebtoken": "^8.5.1",
         "jwt-bch-lib": "^1.3.0",
@@ -30,6 +30,7 @@
         "koa2-ratelimit": "^0.9.0",
         "line-reader": "^0.4.0",
         "mongoose": "^5.11.15",
+        "node-fetch": "npm:@achingbrain/node-fetch@^2.6.7",
         "nodemailer": "^6.4.17",
         "passport-local": "^1.0.0",
         "winston": "^3.3.3",
@@ -8027,20 +8028,6 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -9235,10 +9222,7 @@
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/hat/-/hat-0.0.3.tgz",
       "integrity": "sha1-uwFKnmSzeIrtgAWRdBPU/z1QLYo=",
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
+      "optional": true
     },
     "node_modules/he": {
       "version": "1.2.0",
@@ -10015,9 +9999,9 @@
       }
     },
     "node_modules/ipfs-coord": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/ipfs-coord/-/ipfs-coord-6.1.2.tgz",
-      "integrity": "sha512-SimYZFMx+L3k6/RmNwfbME48BdA+RY6fdrwrm2Jf4vwlARTgwjn+Pyl0rS+JklmniWIOFjrgs2yoy07cR3jimQ==",
+      "version": "6.1.4",
+      "resolved": "https://registry.npmjs.org/ipfs-coord/-/ipfs-coord-6.1.4.tgz",
+      "integrity": "sha512-uWSNJIp5JapAlLLaLczcsfZw8UO4jMu+ObA97u0otlU6eA5x2SLJj1nKnl5u1+hpRfBSiMqWGOLNifjThjdTIA==",
       "dependencies": {
         "bch-encrypt-lib": "^2.0.0",
         "orbit-db": "^0.26.1"
@@ -22785,11 +22769,6 @@
         "safer-buffer": "^2.0.2",
         "tweetnacl": "~0.14.0"
       },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
@@ -24143,9 +24122,6 @@
       },
       "bin": {
         "nopt": "bin/nopt.js"
-      },
-      "engines": {
-        "node": "*"
       }
     },
     "node_modules/tough-cookie": {
@@ -31550,13 +31526,6 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "optional": true
-    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -33073,9 +33042,9 @@
       }
     },
     "ipfs-coord": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/ipfs-coord/-/ipfs-coord-6.1.2.tgz",
-      "integrity": "sha512-SimYZFMx+L3k6/RmNwfbME48BdA+RY6fdrwrm2Jf4vwlARTgwjn+Pyl0rS+JklmniWIOFjrgs2yoy07cR3jimQ==",
+      "version": "6.1.4",
+      "resolved": "https://registry.npmjs.org/ipfs-coord/-/ipfs-coord-6.1.4.tgz",
+      "integrity": "sha512-uWSNJIp5JapAlLLaLczcsfZw8UO4jMu+ObA97u0otlU6eA5x2SLJj1nKnl5u1+hpRfBSiMqWGOLNifjThjdTIA==",
       "requires": {
         "bch-encrypt-lib": "^2.0.0",
         "orbit-db": "^0.26.1"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipfs-bch-wallet-service",
-  "version": "1.9.1",
+  "version": "1.11.0",
   "description": "IPFS and REST service providing blockchain access needed by a wallet. ",
   "main": "index.js",
   "scripts": {
@@ -28,7 +28,7 @@
     "bcryptjs": "^2.4.3",
     "glob": "^7.1.6",
     "ipfs": "0.55.4",
-    "ipfs-coord": "^6.1.2",
+    "ipfs-coord": "^6.1.4",
     "jsonrpc-lite": "^2.2.0",
     "jsonwebtoken": "^8.5.1",
     "jwt-bch-lib": "^1.3.0",
@@ -45,6 +45,7 @@
     "koa2-ratelimit": "^0.9.0",
     "line-reader": "^0.4.0",
     "mongoose": "^5.11.15",
+    "node-fetch": "npm:@achingbrain/node-fetch@^2.6.7",
     "nodemailer": "^6.4.17",
     "passport-local": "^1.0.0",
     "winston": "^3.3.3",

production/Dockerfile

@@ -25,32 +25,31 @@ WORKDIR /home/safeuser
 # Switch to user account.
 USER safeuser
 # Prep 'sudo' commands.
-RUN echo 'abcd8765' | sudo -S pwd
+#RUN echo 'abcd8765' | sudo -S pwd
 
 # Clone the rest.bitcoin.com repository
 WORKDIR /home/safeuser
 RUN git clone https://github.com/Permissionless-Software-Foundation/ipfs-bch-wallet-service
-# RUN mv koa-api-boilerplate koa
-# RUN mkdir keys
 
 # Switch to the desired branch. `master` is usually stable,
 # and `stage` has the most up-to-date changes.
 WORKDIR /home/safeuser/ipfs-bch-wallet-service
 
 # For development: switch to unstable branch
-# RUN git checkout unstable
+RUN git checkout ct-unstable
 
 # Install dependencies
+RUN npm install -g node-pre-gyp
 RUN npm install
 
 # Generate the API docs
 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
+RUN mkdir /home/safeuser/.ipfsdata
+#RUN mkdir /home/safeuser/orbitdb
 VOLUME /home/safeuser/ipfsdata
-VOLUME /home/safeuser/orbitdb
+#VOLUME /home/safeuser/orbitdb
 
 # Start the application.
 COPY start-production.sh start-production.sh

production/docker-compose.yml

@@ -22,7 +22,7 @@ bch-wallet-service:
     - '5668:5668' # IPFS TCP Port
     - '5669:5669' # IPFS WS Port
   volumes:
-    - ../ipfsdata:/home/safeuser/ipfsdata
-    - ../orbitdb:/home/safeuser/orbitdb
+    - ../.ipfsdata:/home/safeuser/.ipfsdata
+  #    - ../orbitdb:/home/safeuser/orbitdb
 
   restart: always