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

Optimize wallet on new orders. Use local P2WDB

.gitignore

@@ -69,5 +69,6 @@ ipfs-service-provider.sh
 run-dev.sh
 wallet.json
 data/
+*.zip
 
 !README.md

package-lock.json

@@ -39,7 +39,7 @@
         "mongoose": "5.13.14",
         "node-fetch": "npm:@achingbrain/node-fetch@2.6.7",
         "nodemailer": "6.7.5",
-        "p2wdb-esm": "2.2.8",
+        "p2wdb-esm": "2.2.9",
         "passport-local": "1.0.0",
         "public-ip": "4.0.4",
         "winston": "3.3.3",
@@ -11867,9 +11867,9 @@
       }
     },
     "node_modules/p2wdb-esm": {
-      "version": "2.2.8",
+      "version": "2.2.9",
-      "resolved": "https://registry.npmjs.org/p2wdb-esm/-/p2wdb-esm-2.2.8.tgz",
+      "resolved": "https://registry.npmjs.org/p2wdb-esm/-/p2wdb-esm-2.2.9.tgz",
-      "integrity": "sha512-wqTj6HaUdSMDFjp9a2lAGUembGtLxDxBH+PNUNnCHG1RSrLsrFrYFzMc48RlW9BGWybqypstrhORHrlZ30aygA==",
+      "integrity": "sha512-I6Pc/Jj2kQRIpDmvs0LAnIv7ssFm1kz+SW+SRkjHezw84arFeeIMkqaVk8DXnKWKfIqy3asG4E77jVGrD55IRA==",
       "dependencies": {
         "@chris.troutner/retry-queue-commonjs": "1.0.8",
         "axios": "0.24.0"
@@ -23631,9 +23631,9 @@
       "dev": true
     },
     "p2wdb-esm": {
-      "version": "2.2.8",
+      "version": "2.2.9",
-      "resolved": "https://registry.npmjs.org/p2wdb-esm/-/p2wdb-esm-2.2.8.tgz",
+      "resolved": "https://registry.npmjs.org/p2wdb-esm/-/p2wdb-esm-2.2.9.tgz",
-      "integrity": "sha512-wqTj6HaUdSMDFjp9a2lAGUembGtLxDxBH+PNUNnCHG1RSrLsrFrYFzMc48RlW9BGWybqypstrhORHrlZ30aygA==",
+      "integrity": "sha512-I6Pc/Jj2kQRIpDmvs0LAnIv7ssFm1kz+SW+SRkjHezw84arFeeIMkqaVk8DXnKWKfIqy3asG4E77jVGrD55IRA==",
       "requires": {
         "@chris.troutner/retry-queue-commonjs": "1.0.8",
         "axios": "0.24.0"

package.json

@@ -58,7 +58,7 @@
     "mongoose": "5.13.14",
     "node-fetch": "npm:@achingbrain/node-fetch@2.6.7",
     "nodemailer": "6.7.5",
-    "p2wdb-esm": "2.2.8",
+    "p2wdb-esm": "2.2.9",
     "passport-local": "1.0.0",
     "public-ip": "4.0.4",
     "winston": "3.3.3",

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

@@ -29,4 +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
+
 npm start

production/docker/docker-compose.yml

@@ -50,6 +50,7 @@ services:
     container_name: p2wdb
     environment:
       CONSUMER_URL: 'https://free-bch.fullstack.cash'
+      ENABLE_BCH_PAYMENT: 1
       DEBUG_LEVEL: 1
     logging:
       driver: 'json-file'
@@ -67,13 +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
     restart: always
 
   bch-dex:
-    #build:
+    build:
-    #  context: ./bch-dex/
+      context: ./bch-dex/
-    #  dockerfile: Dockerfile
+      dockerfile: Dockerfile
-    image: christroutner/bch-dex:v2.0.12
+    #image: christroutner/bch-dex:v2.0.12
     container_name: bch-dex
     environment:
       CONSUMER_URL: 'https://free-bch.fullstack.cash'

src/use-cases/order.js

@@ -49,6 +49,9 @@ class OrderLib {
       const orderEntity = this.orderEntity.inputValidate(entryObj)
       console.log('orderEntity: ', orderEntity)
 
+      // Optimize the wallet to speed up working with it.
+      await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.optimize, {})
+
       // Ensure sufficient tokens exist to create the order.
       // await this.ensureFunds(orderEntity)
       await this.retryQueue.addToQueue(this.ensureFunds, orderEntity)

test/unit/mocks/adapters/wallet.js

@@ -37,6 +37,7 @@ class MockBchWallet {
     this.getTokenData = async () => {}
     this.initialize = async () => {}
     this.utxoIsValid = async () => {}
+    this.optimize = async () => {}
 
     // Environment variable is used by wallet-balance.unit.js to force an error.
     if (process.env.NO_UTXO) {