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

Minor fixes. New docker image v2.2.4

config/env/common.js

@@ -46,8 +46,8 @@ export default {
   // : 'https://wa-usa-bch-consumer.fullstackcash.nl',
 
   // P2WDB URL that will accept API calls from the p2wdb npm library.
-  // p2wdbUrl: process.env.P2WDB_URL ? process.env.P2WDB_URL : 'https://p2wdb.fullstack.cash',
-  p2wdbUrl: process.env.P2WDB_URL ? process.env.P2WDB_URL : 'http://localhost:5010',
+  p2wdbUrl: process.env.P2WDB_URL ? process.env.P2WDB_URL : 'https://p2wdb.fullstack.cash',
+  // p2wdbUrl: process.env.P2WDB_URL ? process.env.P2WDB_URL : 'http://localhost:5010',
 
   // FullStack.cash account information, used for automatic JWT handling.
   getJwtAtStartup: process.env.GET_JWT_AT_STARTUP ? true : false,
@@ -63,6 +63,9 @@ export default {
   fullstackPassword: process.env.FULLSTACKPASS
     ? process.env.FULLSTACKPASS
     : 'demo',
+  authPass: process.env.FULLSTACK_AUTH_PASS
+    ? process.env.FULLSTACK_AUTH_PASS
+    : '',
 
   // IPFS settings.
   isCircuitRelay: process.env.ENABLE_CIRCUIT_RELAY ? true : false,

production/docker/bch-dex/start-production.sh

@@ -29,6 +29,6 @@ export WEBHOOKSERVICE=http://172.17.0.1:5667/webhook
 export WEBHOOKTARGET=http://172.17.0.1:5700/p2wdb
 export APP_ID=bch-dex-001
 
-export P2WDB_URL=http://172.17.0.1:5667
+#export P2WDB_URL=http://172.17.0.1:5667
 
 npm start

production/docker/docker-compose.yml

@@ -46,11 +46,11 @@ services:
     #build:
     #  context: ./p2wdb/
     #  dockerfile: Dockerfile
-    image: christroutner/p2wdb:v3.1.8
+    image: christroutner/p2wdb:v3.3.3
     container_name: p2wdb
     environment:
       CONSUMER_URL: 'https://free-bch.fullstack.cash'
-      ENABLE_BCH_PAYMENT: 1
+      #ENABLE_BCH_PAYMENT: 1
       DEBUG_LEVEL: 1
     logging:
       driver: 'json-file'
@@ -68,14 +68,14 @@ services:
     volumes:
       - ../data/ipfsdata/p2wdb:/home/safeuser/ipfs-p2wdb-service/.ipfsdata/p2wdb
       - ./p2wdb/start-production.sh:/home/safeuser/ipfs-p2wdb-service/start-production.sh
-      - ../scripts/wallet.json:/home/safeuser/ipfs-p2wdb-service/wallet.json
+      #- ../scripts/wallet.json:/home/safeuser/ipfs-p2wdb-service/wallet.json
     restart: always
 
   bch-dex:
     #build:
     #  context: ./bch-dex/
     #  dockerfile: Dockerfile
-    image: christroutner/bch-dex:v2.2.2
+    image: christroutner/bch-dex:v2.2.4
     container_name: bch-dex
     environment:
       CONSUMER_URL: 'https://free-bch.fullstack.cash'

src/use-cases/order.js

@@ -50,6 +50,7 @@ class OrderLib {
       console.log('orderEntity: ', orderEntity)
 
       // Optimize the wallet to speed up working with it.
+      console.log('Optimizing wallet before creating new order.')
       await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.optimize, {})
 
       // Ensure sufficient tokens exist to create the order.