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

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

bin/server.js

@@ -47,6 +47,9 @@ class Server {
         useNewUrlParser: true
       })
 
+      console.log(`Starting environment: ${config.env}`)
+      console.log(`Debug level: ${config.debugLevel}`)
+
       // MIDDLEWARE START
 
       app.use(convert(logger()))
@@ -68,7 +71,7 @@ class Server {
       // Attach REST API and JSON RPC controllers to the app.
       const Controllers = require('../src/controllers')
       const controllers = new Controllers()
-      await controllers.attachControllers(app)
+      await controllers.attachRESTControllers(app)
 
       app.controllers = controllers
 
@@ -94,6 +97,9 @@ class Server {
         )
       }
 
+      // Attach the other IPFS controllers
+      await controllers.attachControllers(app)
+
       return app
     } catch (err) {
       console.error('Could not start server. Error: ', err)

config/env/common.js

@@ -76,5 +76,7 @@ module.exports = {
   ipfsWsPort: process.env.IPFS_WS_PORT ? process.env.IPFS_WS_PORT : 5669,
 
   // BCH Mnemonic for generating encryption keys and payment address
-  mnemonic: process.env.MNEMONIC ? process.env.MNEMONIC : ''
+  mnemonic: process.env.MNEMONIC ? process.env.MNEMONIC : '',
+
+  debugLevel: process.env.DEBUG_LEVEL ? parseInt(process.env.DEBUG_LEVEL) : 2
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipfs-bch-wallet-service",
-  "version": "1.11.1",
+  "version": "1.11.4",
   "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.6",
+    "ipfs-coord": "^6.5.0",
     "jsonrpc-lite": "^2.2.0",
     "jsonwebtoken": "^8.5.1",
     "jwt-bch-lib": "^1.3.0",

production/docker/Dockerfile

@@ -23,7 +23,7 @@ WORKDIR /home/safeuser
 #RUN runuser -l safeuser -c "npm config set prefix '~/.npm-global'"
 
 # Switch to user account.
-USER safeuser
+#USER safeuser
 # Prep 'sudo' commands.
 #RUN echo 'abcd8765' | sudo -S pwd
 
@@ -39,7 +39,7 @@ WORKDIR /home/safeuser/ipfs-bch-wallet-service
 RUN git checkout ct-unstable
 
 # Install dependencies
-RUN npm install -g node-pre-gyp
+RUN npm install -g @mapbox/node-pre-gyp
 RUN npm install
 
 # Generate the API docs

production/docker/docker-compose.yml

@@ -6,7 +6,7 @@ bch-wallet-mongodb:
   ports:
     - '5555:27017' # <host port>:<container port>
   volumes:
-    - ./database:/data/db
+    - ../data/database:/data/db
   command: mongod --logpath=/dev/null # -- quiet
   restart: always
 
@@ -22,7 +22,6 @@ bch-wallet-service:
     - '5668:5668' # IPFS TCP Port
     - '5669:5669' # IPFS WS Port
   volumes:
-    - ../.ipfsdata:/home/safeuser/.ipfsdata
-  #    - ../orbitdb:/home/safeuser/orbitdb
+    - ../data/ipfsdata:/home/safeuser/ipfs-service-provider/.ipfsdata
 
   restart: always

production/docker/start-production.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# BEGIN: Optional configuration settings
+
+# This mnemonic is used to set up persistent public key for e2ee
+# Replace this with your own 12-word mnemonic.
+export MNEMONIC="olive two muscle bottom coral ancient wait legend bronze useful process session"
+
+# The human readable name this IPFS node identifies as.
+export COORD_NAME=ipfs-service-provider-generic
+
+# Allow this node to function as a circuit relay. It must not be behind a firewall.
+#export ENABLE_CIRCUIT_RELAY=true
+
+# Debug level. 0 = minimal info. 2 = max info.
+export DEBUG_LEVEL=1
+
+# END: Optional configuration settings
+
+
+# Production database connection string.
+export DBURL=mongodb://172.17.0.1:5555/ipfs-service-prod
+
+# Customize these environment variables for your own installation.
+export AUTHSERVER=https://auth.fullstack.cash
+export APISERVER=https://api.fullstack.cash/v5/
+export FULLSTACKLOGIN=demo@demo.com
+export FULLSTACKPASS=demo
+
+# Ports
+export PORT=5001 # REST API
+export IPFS_TCP_PORT=5668 # IPSF TCP Port
+export IPFS_WS_PORT=5669 # IPFS WS Port
+
+export SVC_ENV=production
+npm start

production/start-production.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# Customize these environment variables for your own installation.
-export AUTHSERVER=https://auth.fullstack.cash
-export APISERVER=https://api.fullstack.cash/v5/
-export FULLSTACKLOGIN=demo@demo.com
-export FULLSTACKPASS=demo
-
-# Ports
-export PORT=5001 # REST API
-export IPFS_TCP_PORT=5668 # IPSF TCP Port
-export IPFS_WS_PORT=5669 # IPFS WS Port
-
-# Production database connection string.
-export DBURL=mongodb://172.17.0.1:5555/ipfs-service-prod
-
-#export ENABLE_CIRCUIT_RELAY=1
-
-export SVC_ENV=production
-npm start

src/adapters/ipfs/ipfs-coord.js

@@ -54,7 +54,8 @@ class IpfsCoordAdapter {
       isCircuitRelay: this.config.isCircuitRelay,
       apiInfo: this.config.apiInfo,
       announceJsonLd: this.config.announceJsonLd,
-      mnemonic: this.config.mnemonic
+      mnemonic: this.config.mnemonic,
+      debugLevel: this.config.debugLevel
     })
 
     // Wait for the ipfs-coord library to signal that it is ready.

src/controllers/index.js

@@ -36,7 +36,7 @@ class Controllers {
     await this.adapters.start()
 
     // Attach the REST controllers to the Koa app.
-    this.attachRESTControllers(app)
+    // this.attachRESTControllers(app)
 
     this.attachRPCControllers()
   }

test/e2e/manual/consumer/lib/test-utils.js

@@ -45,12 +45,17 @@ class TestUtils {
   async sendRPC (ipfsId, cmdStr) {
     try {
       // Send the RPC command to the server/service.
-      await this.ipfsCoord.ipfs.orbitdb.sendToDb(ipfsId, cmdStr)
+      // await this.ipfsCoord.ipfs.orbitdb.sendToDb(ipfsId, cmdStr)
+      await this.ipfsCoord.useCases.peer.sendPrivateMessage(
+        ipfsId,
+        cmdStr,
+        this.ipfsCoord.thisNode
+      )
 
       let retData
 
       // This event is triggered when the response comes back.
-      this.eventEmitter.on('rpcData', inData => {
+      this.eventEmitter.on('rpcData', (inData) => {
         retData = inData
       })
 
@@ -98,11 +103,8 @@ class TestUtils {
         apiInfo: 'none',
         announceJsonLd: announceJsonLd
       })
-      await this.ipfsCoord.ipfs.start()
-      // some ipfs-coord versions do not have this function
-      if (this.ipfsCoord.isReady) {
-        await this.ipfsCoord.isReady()
-      }
+
+      await this.ipfsCoord.start()
 
       // Wait to let ipfs-coord connect to subnet peers.
       await this.bchjs.Util.sleep(30000)
@@ -126,10 +128,17 @@ class TestUtils {
       //   'ipfs-coord peer info: ',
       //   this.ipfsCoord.ipfs.peers.state.peers[ipfsId]
       // )
-      if (!this.ipfsCoord.ipfs.peers.state.peers[ipfsId]) {
+
+      const peers = this.ipfsCoord.thisNode.peerList
+      // console.log('peers: ', peers)
+      // console.log('Target peer in peerList? ', peers.includes(ipfsId))
+
+      // if (!this.ipfsCoord.ipfs.peers.state.peers[ipfsId]) {
+      if (!peers.includes(ipfsId)) {
         throw new Error('Could not find UUT in ipfs-coord list of peers.')
       }
     } catch (err) {
+      console.log(err)
       console.error('Error in connectToUut()')
       console.log(
         'Is the service running? Did you update the test-data.json file?'
@@ -215,7 +224,10 @@ class TestUtils {
       const result = await this.sendRPC(ipfsId, cmdStr)
       // console.log('result: ', result)
 
-      if (result.result.value.status && Array.isArray(result.result.value.transactions)) {
+      if (
+        result.result.value.status &&
+        Array.isArray(result.result.value.transactions)
+      ) {
         console.log('E2E TEST: transactions test passed.')
         return true
       } else {

test/e2e/manual/consumer/test-data.json

@@ -1,4 +1,4 @@
 {
-  "uutAddr": "/ip4/192.168.43.115/tcp/5668/p2p/QmVBWvFxao7smhRjUUh1q8rNAEwMqbg4X3dqsQDMSjUpmx",
-  "uutId": "QmfUjMqUeXSCzNkFGrzvf79yvV62dtjsnwtBSYKx3wegXw"
+  "uutAddr": "/ip4/127.0.0.1/tcp/5701/p2p/QmWkjYRRTaxVEuGK8ip2X3trVyJShFs6U9g1h9x6fK5mZ2",
+  "uutId": "QmWkjYRRTaxVEuGK8ip2X3trVyJShFs6U9g1h9x6fK5mZ2"
 }