Updating to v3.0

Merging changes before branching

.gitignore

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

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,

package-lock.json

@@ -10,14 +10,14 @@
       "license": "MIT",
       "dependencies": {
         "@chris.troutner/retry-queue": "1.0.8",
-        "@psf/bch-js": "6.5.1",
+        "@psf/bch-js": "6.7.3",
         "axios": "0.27.2",
         "bch-message-lib": "2.2.1",
         "bch-token-sweep": "2.2.1",
         "bcryptjs": "2.4.3",
         "bitcoincashjs-lib": "3.3.3",
         "glob": "7.1.6",
-        "ipfs-coord-esm": "9.1.3",
+        "ipfs-coord-esm": "9.1.7",
         "ipfs-http-client": "58.0.0",
         "jsonrpc-lite": "2.2.0",
         "jsonwebtoken": "8.5.1",
@@ -35,11 +35,11 @@
         "koa2-ratelimit": "0.9.1",
         "libp2p": "0.36.2",
         "line-reader": "0.4.0",
-        "minimal-slp-wallet": "5.4.3",
+        "minimal-slp-wallet": "5.8.9",
         "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",
@@ -1095,14 +1095,15 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/@psf/bch-js": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-6.5.1.tgz",
-      "integrity": "sha512-W52V6NCte/LJZ2TMJwXorq2FdwMMzjS94sh4slebrcUp6oHiAG+/NouQ4ID/I1DEJQlQnQpf2j3zxveCimDERQ==",
+      "version": "6.7.3",
+      "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.7.3.tgz",
+      "integrity": "sha512-z6oJvPAXxSObPhqUAxCkCuPL2bp3Bs1oyhBZpQ5SR6cbJzcOMhuI4bHho2srH5agSCU+bbjehBMRGvo18eGW0A==",
+      "license": "MIT",
       "dependencies": {
         "@chris.troutner/bip32-utils": "1.0.5",
         "@psf/bip21": "2.0.1",
         "@psf/bitcoincash-ops": "2.0.0",
-        "@psf/bitcoincashjs-lib": "4.0.2",
+        "@psf/bitcoincashjs-lib": "4.0.3",
         "@psf/coininfo": "4.0.0",
         "axios": "0.26.1",
         "bc-bip68": "1.0.5",
@@ -1147,9 +1148,10 @@
       "integrity": "sha512-M3PWqRpeJq6rli2NqWGbas76z9TrdGOmNuDFACBWBMctPucEAsFQY2AmyFHRSa7hEwythwvrPh9AG/n6ehmEog=="
     },
     "node_modules/@psf/bitcoincashjs-lib": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@psf/bitcoincashjs-lib/-/bitcoincashjs-lib-4.0.2.tgz",
-      "integrity": "sha512-fTy9mW4H0NkQ+dojGtf+nPduA27F3V2YpBi5licYUVjdVRD/xpUCTgEN1cYRAupOaeDH/AYOWT0MWLkbQSTxAQ==",
+      "version": "4.0.3",
+      "resolved": "http://94.130.170.209:4873/@psf%2fbitcoincashjs-lib/-/bitcoincashjs-lib-4.0.3.tgz",
+      "integrity": "sha512-sJYi7jYUqR7S+Z8TjN3W/5Lcju7xcIBxYLhIEpnOF+jR9kMt0ftpVjQBt8vVsJZUD8ArL9bf59oDETjdOUcdGQ==",
+      "license": "MIT",
       "dependencies": {
         "@psf/bitcoincash-ops": "^2.0.0",
         "@psf/pushdata-bitcoin": "^1.2.2",
@@ -1181,8 +1183,9 @@
     },
     "node_modules/@psf/pushdata-bitcoin": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@psf/pushdata-bitcoin/-/pushdata-bitcoin-1.2.2.tgz",
+      "resolved": "http://94.130.170.209:4873/@psf%2fpushdata-bitcoin/-/pushdata-bitcoin-1.2.2.tgz",
       "integrity": "sha512-e1qkZLJFU6Ldg7TMBgSkiR5U1NfpRgSIr2ppk8BeED/Q9wUc9DEVAjXfPMD65xgXdqnlyFEtLbpPMWwyydMVUQ==",
+      "license": "MIT",
       "dependencies": {
         "@psf/bitcoincash-ops": "^2.0.0"
       }
@@ -2103,19 +2106,62 @@
       }
     },
     "node_modules/bch-consumer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/bch-consumer/-/bch-consumer-1.4.0.tgz",
-      "integrity": "sha512-olftYKtCgT+81fnEL0iSArmeRANw1SZjSwwYsZV7t9CJZjtMXBSXJDCaQoAzUAXNRMtICB3uxAKD1MWuBznZuw==",
+      "version": "1.4.3",
+      "resolved": "http://94.130.170.209:4873/bch-consumer/-/bch-consumer-1.4.3.tgz",
+      "integrity": "sha512-35KnmJEU9ta4mHm1uu6tz9+8wtZBUUI0sb4BdKO8q+uSeQjUZIctSxauZfh06TmdWlY5G5TMiH7yBCcYZTdPyA==",
+      "license": "MIT",
       "dependencies": {
-        "@psf/bch-js": "6.5.1",
+        "@psf/bch-js": "6.5.7",
         "apidoc": "0.51.0",
         "axios": "0.25.0"
       }
     },
+    "node_modules/bch-consumer/node_modules/@psf/bch-js": {
+      "version": "6.5.7",
+      "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.5.7.tgz",
+      "integrity": "sha512-V9UweiRCCU4UzM51Ct2Szhpv6V0B686t5ZjMHNkPu8zyJ9+H7mQfteeQECHK5j38QHvLchfUOif5WWQxP6GRVQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@chris.troutner/bip32-utils": "1.0.5",
+        "@psf/bip21": "2.0.1",
+        "@psf/bitcoincash-ops": "2.0.0",
+        "@psf/bitcoincashjs-lib": "4.0.3",
+        "@psf/coininfo": "4.0.0",
+        "axios": "0.26.1",
+        "bc-bip68": "1.0.5",
+        "bchaddrjs-slp": "0.2.5",
+        "bigi": "1.4.2",
+        "bignumber.js": "9.0.0",
+        "bip-schnorr": "0.3.0",
+        "bip38": "2.0.2",
+        "bip39": "3.0.2",
+        "bip66": "1.1.5",
+        "bitcoinjs-message": "2.0.0",
+        "bs58": "4.0.1",
+        "ecashaddrjs": "1.0.7",
+        "ini": "1.3.8",
+        "randombytes": "2.0.6",
+        "safe-buffer": "5.1.2",
+        "satoshi-bitcoin": "1.0.4",
+        "slp-mdm": "0.0.6",
+        "slp-parser": "0.0.4",
+        "wif": "2.0.6"
+      }
+    },
+    "node_modules/bch-consumer/node_modules/@psf/bch-js/node_modules/axios": {
+      "version": "0.26.1",
+      "resolved": "http://94.130.170.209:4873/axios/-/axios-0.26.1.tgz",
+      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
+      "license": "MIT",
+      "dependencies": {
+        "follow-redirects": "^1.14.8"
+      }
+    },
     "node_modules/bch-consumer/node_modules/apidoc": {
       "version": "0.51.0",
-      "resolved": "https://registry.npmjs.org/apidoc/-/apidoc-0.51.0.tgz",
+      "resolved": "http://94.130.170.209:4873/apidoc/-/apidoc-0.51.0.tgz",
       "integrity": "sha512-3P4srhm6NA+kE/YRM4qL5jESElpQQJL+Z8n7hyr4uC+1DSwGzmE6adXPVxuT/hpDyShrqmRlHk8hf40RSqEsNw==",
+      "license": "MIT",
       "os": [
         "darwin",
         "freebsd",
@@ -2156,16 +2202,18 @@
     },
     "node_modules/bch-consumer/node_modules/axios": {
       "version": "0.25.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
+      "resolved": "http://94.130.170.209:4873/axios/-/axios-0.25.0.tgz",
       "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
+      "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.14.7"
       }
     },
     "node_modules/bch-consumer/node_modules/glob": {
       "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "resolved": "http://94.130.170.209:4873/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -5970,9 +6018,10 @@
       }
     },
     "node_modules/ipfs-coord-esm": {
-      "version": "9.1.3",
-      "resolved": "https://registry.npmjs.org/ipfs-coord-esm/-/ipfs-coord-esm-9.1.3.tgz",
-      "integrity": "sha512-p/Gol69pU/KnfGX21gGirngLkOTvrcuZgRo5te0TAeaRID0nm8hpacCF0KB8HKLfbEIRMvZ0tO0TEM1XE/XHmQ==",
+      "version": "9.1.7",
+      "resolved": "http://94.130.170.209:4873/ipfs-coord-esm/-/ipfs-coord-esm-9.1.7.tgz",
+      "integrity": "sha512-jHktLj/RG7zFp3bFsQagAA6RAG1uU+8xPACAyz9EBeQDeun12gz8boZr7HSibgcgB6l8sjgwYfA3Obijc20Ijw==",
+      "license": "MIT",
       "dependencies": {
         "bch-encrypt-lib": "2.0.0",
         "uuid": "9.0.0"
@@ -7118,7 +7167,8 @@
     },
     "node_modules/jwt-bch-lib": {
       "version": "1.3.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/jwt-bch-lib/-/jwt-bch-lib-1.3.0.tgz",
+      "integrity": "sha512-CZs3jUHJlWvConvoTeLDogDEwUysKeojYJxfUhbwJKJrtDCSfi3ZWbsZZ8WN30Xs28aZPDB+qlHPJlTXQmup0w==",
       "dependencies": {
         "axios": "^0.21.1"
       }
@@ -8068,17 +8118,51 @@
       }
     },
     "node_modules/minimal-slp-wallet": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/minimal-slp-wallet/-/minimal-slp-wallet-5.4.3.tgz",
-      "integrity": "sha512-l9shPcWUHJhmHa6iJs917XNVQR0jaLHgww0fC78ubRokW0Zhea2jO9FNJLi74T8Nd8StCg1pVAlS+MKszU3swQ==",
+      "version": "5.8.9",
+      "resolved": "http://94.130.170.209:4873/minimal-slp-wallet/-/minimal-slp-wallet-5.8.9.tgz",
+      "integrity": "sha512-HN6vyCxLVMU4Iv/TfBy5bKHBva12bJ/Xn8ni8AzSbsGSeb4Iz90If3wqlpR9bIw80bL/b2ts4vnwKH9WBvDdQQ==",
+      "license": "MIT",
       "dependencies": {
-        "@psf/bch-js": "6.5.1",
+        "@chris.troutner/retry-queue-commonjs": "1.0.8",
+        "@psf/bch-js": "6.7.2",
         "apidoc": "0.51.0",
-        "bch-consumer": "1.4.0",
+        "bch-consumer": "1.4.3",
         "bch-donation": "1.1.2",
         "crypto-js": "4.0.0"
       }
     },
+    "node_modules/minimal-slp-wallet/node_modules/@psf/bch-js": {
+      "version": "6.7.2",
+      "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.7.2.tgz",
+      "integrity": "sha512-IANBPHaAkvvmZlhS7DYv94KzOCTws4aSasySKE4tctQu1mGnhKZbR9vVB366vk8UeU8fQUjgtr2RjYCajnT6tw==",
+      "license": "MIT",
+      "dependencies": {
+        "@chris.troutner/bip32-utils": "1.0.5",
+        "@psf/bip21": "2.0.1",
+        "@psf/bitcoincash-ops": "2.0.0",
+        "@psf/bitcoincashjs-lib": "4.0.3",
+        "@psf/coininfo": "4.0.0",
+        "axios": "0.26.1",
+        "bc-bip68": "1.0.5",
+        "bchaddrjs-slp": "0.2.5",
+        "bigi": "1.4.2",
+        "bignumber.js": "9.0.0",
+        "bip-schnorr": "0.3.0",
+        "bip38": "2.0.2",
+        "bip39": "3.0.2",
+        "bip66": "1.1.5",
+        "bitcoinjs-message": "2.0.0",
+        "bs58": "4.0.1",
+        "ecashaddrjs": "1.0.7",
+        "ini": "1.3.8",
+        "randombytes": "2.0.6",
+        "safe-buffer": "5.1.2",
+        "satoshi-bitcoin": "1.0.4",
+        "slp-mdm": "0.0.6",
+        "slp-parser": "0.0.4",
+        "wif": "2.0.6"
+      }
+    },
     "node_modules/minimal-slp-wallet/node_modules/apidoc": {
       "version": "0.51.0",
       "resolved": "https://registry.npmjs.org/apidoc/-/apidoc-0.51.0.tgz",
@@ -8121,6 +8205,15 @@
         "node": ">=14.0.0"
       }
     },
+    "node_modules/minimal-slp-wallet/node_modules/axios": {
+      "version": "0.26.1",
+      "resolved": "http://94.130.170.209:4873/axios/-/axios-0.26.1.tgz",
+      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
+      "license": "MIT",
+      "dependencies": {
+        "follow-redirects": "^1.14.8"
+      }
+    },
     "node_modules/minimal-slp-wallet/node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -11867,9 +11960,9 @@
       }
     },
     "node_modules/p2wdb-esm": {
-      "version": "2.2.8",
-      "resolved": "https://registry.npmjs.org/p2wdb-esm/-/p2wdb-esm-2.2.8.tgz",
-      "integrity": "sha512-wqTj6HaUdSMDFjp9a2lAGUembGtLxDxBH+PNUNnCHG1RSrLsrFrYFzMc48RlW9BGWybqypstrhORHrlZ30aygA==",
+      "version": "2.2.9",
+      "resolved": "https://registry.npmjs.org/p2wdb-esm/-/p2wdb-esm-2.2.9.tgz",
+      "integrity": "sha512-I6Pc/Jj2kQRIpDmvs0LAnIv7ssFm1kz+SW+SRkjHezw84arFeeIMkqaVk8DXnKWKfIqy3asG4E77jVGrD55IRA==",
       "dependencies": {
         "@chris.troutner/retry-queue-commonjs": "1.0.8",
         "axios": "0.24.0"
@@ -16396,14 +16489,14 @@
       "version": "1.1.0"
     },
     "@psf/bch-js": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-6.5.1.tgz",
-      "integrity": "sha512-W52V6NCte/LJZ2TMJwXorq2FdwMMzjS94sh4slebrcUp6oHiAG+/NouQ4ID/I1DEJQlQnQpf2j3zxveCimDERQ==",
+      "version": "6.7.3",
+      "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.7.3.tgz",
+      "integrity": "sha512-z6oJvPAXxSObPhqUAxCkCuPL2bp3Bs1oyhBZpQ5SR6cbJzcOMhuI4bHho2srH5agSCU+bbjehBMRGvo18eGW0A==",
       "requires": {
         "@chris.troutner/bip32-utils": "1.0.5",
         "@psf/bip21": "2.0.1",
         "@psf/bitcoincash-ops": "2.0.0",
-        "@psf/bitcoincashjs-lib": "4.0.2",
+        "@psf/bitcoincashjs-lib": "4.0.3",
         "@psf/coininfo": "4.0.0",
         "axios": "0.26.1",
         "bc-bip68": "1.0.5",
@@ -16450,9 +16543,9 @@
       "integrity": "sha512-M3PWqRpeJq6rli2NqWGbas76z9TrdGOmNuDFACBWBMctPucEAsFQY2AmyFHRSa7hEwythwvrPh9AG/n6ehmEog=="
     },
     "@psf/bitcoincashjs-lib": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@psf/bitcoincashjs-lib/-/bitcoincashjs-lib-4.0.2.tgz",
-      "integrity": "sha512-fTy9mW4H0NkQ+dojGtf+nPduA27F3V2YpBi5licYUVjdVRD/xpUCTgEN1cYRAupOaeDH/AYOWT0MWLkbQSTxAQ==",
+      "version": "4.0.3",
+      "resolved": "http://94.130.170.209:4873/@psf%2fbitcoincashjs-lib/-/bitcoincashjs-lib-4.0.3.tgz",
+      "integrity": "sha512-sJYi7jYUqR7S+Z8TjN3W/5Lcju7xcIBxYLhIEpnOF+jR9kMt0ftpVjQBt8vVsJZUD8ArL9bf59oDETjdOUcdGQ==",
       "requires": {
         "@psf/bitcoincash-ops": "^2.0.0",
         "@psf/pushdata-bitcoin": "^1.2.2",
@@ -16481,7 +16574,7 @@
     },
     "@psf/pushdata-bitcoin": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@psf/pushdata-bitcoin/-/pushdata-bitcoin-1.2.2.tgz",
+      "resolved": "http://94.130.170.209:4873/@psf%2fpushdata-bitcoin/-/pushdata-bitcoin-1.2.2.tgz",
       "integrity": "sha512-e1qkZLJFU6Ldg7TMBgSkiR5U1NfpRgSIr2ppk8BeED/Q9wUc9DEVAjXfPMD65xgXdqnlyFEtLbpPMWwyydMVUQ==",
       "requires": {
         "@psf/bitcoincash-ops": "^2.0.0"
@@ -17111,18 +17204,59 @@
       "integrity": "sha512-GzaMlN7pNthrY5BhReVhnfr4Ixx+GUSfyNRHYh0QiMUF0d0+0YaD8MpEdv6AjFBksg/zlqL1fVCBBm6PpTt2Rg=="
     },
     "bch-consumer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/bch-consumer/-/bch-consumer-1.4.0.tgz",
-      "integrity": "sha512-olftYKtCgT+81fnEL0iSArmeRANw1SZjSwwYsZV7t9CJZjtMXBSXJDCaQoAzUAXNRMtICB3uxAKD1MWuBznZuw==",
+      "version": "1.4.3",
+      "resolved": "http://94.130.170.209:4873/bch-consumer/-/bch-consumer-1.4.3.tgz",
+      "integrity": "sha512-35KnmJEU9ta4mHm1uu6tz9+8wtZBUUI0sb4BdKO8q+uSeQjUZIctSxauZfh06TmdWlY5G5TMiH7yBCcYZTdPyA==",
       "requires": {
-        "@psf/bch-js": "6.5.1",
+        "@psf/bch-js": "6.5.7",
         "apidoc": "0.51.0",
         "axios": "0.25.0"
       },
       "dependencies": {
+        "@psf/bch-js": {
+          "version": "6.5.7",
+          "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.5.7.tgz",
+          "integrity": "sha512-V9UweiRCCU4UzM51Ct2Szhpv6V0B686t5ZjMHNkPu8zyJ9+H7mQfteeQECHK5j38QHvLchfUOif5WWQxP6GRVQ==",
+          "requires": {
+            "@chris.troutner/bip32-utils": "1.0.5",
+            "@psf/bip21": "2.0.1",
+            "@psf/bitcoincash-ops": "2.0.0",
+            "@psf/bitcoincashjs-lib": "4.0.3",
+            "@psf/coininfo": "4.0.0",
+            "axios": "0.26.1",
+            "bc-bip68": "1.0.5",
+            "bchaddrjs-slp": "0.2.5",
+            "bigi": "1.4.2",
+            "bignumber.js": "9.0.0",
+            "bip-schnorr": "0.3.0",
+            "bip38": "2.0.2",
+            "bip39": "3.0.2",
+            "bip66": "1.1.5",
+            "bitcoinjs-message": "2.0.0",
+            "bs58": "4.0.1",
+            "ecashaddrjs": "1.0.7",
+            "ini": "1.3.8",
+            "randombytes": "2.0.6",
+            "safe-buffer": "5.1.2",
+            "satoshi-bitcoin": "1.0.4",
+            "slp-mdm": "0.0.6",
+            "slp-parser": "0.0.4",
+            "wif": "2.0.6"
+          },
+          "dependencies": {
+            "axios": {
+              "version": "0.26.1",
+              "resolved": "http://94.130.170.209:4873/axios/-/axios-0.26.1.tgz",
+              "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
+              "requires": {
+                "follow-redirects": "^1.14.8"
+              }
+            }
+          }
+        },
         "apidoc": {
           "version": "0.51.0",
-          "resolved": "https://registry.npmjs.org/apidoc/-/apidoc-0.51.0.tgz",
+          "resolved": "http://94.130.170.209:4873/apidoc/-/apidoc-0.51.0.tgz",
           "integrity": "sha512-3P4srhm6NA+kE/YRM4qL5jESElpQQJL+Z8n7hyr4uC+1DSwGzmE6adXPVxuT/hpDyShrqmRlHk8hf40RSqEsNw==",
           "requires": {
             "bootstrap": "3.4.1",
@@ -17151,7 +17285,7 @@
         },
         "axios": {
           "version": "0.25.0",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
+          "resolved": "http://94.130.170.209:4873/axios/-/axios-0.25.0.tgz",
           "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
           "requires": {
             "follow-redirects": "^1.14.7"
@@ -17159,7 +17293,7 @@
         },
         "glob": {
           "version": "7.2.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+          "resolved": "http://94.130.170.209:4873/glob/-/glob-7.2.3.tgz",
           "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -19643,9 +19777,9 @@
       "version": "2.0.1"
     },
     "ipfs-coord-esm": {
-      "version": "9.1.3",
-      "resolved": "https://registry.npmjs.org/ipfs-coord-esm/-/ipfs-coord-esm-9.1.3.tgz",
-      "integrity": "sha512-p/Gol69pU/KnfGX21gGirngLkOTvrcuZgRo5te0TAeaRID0nm8hpacCF0KB8HKLfbEIRMvZ0tO0TEM1XE/XHmQ==",
+      "version": "9.1.7",
+      "resolved": "http://94.130.170.209:4873/ipfs-coord-esm/-/ipfs-coord-esm-9.1.7.tgz",
+      "integrity": "sha512-jHktLj/RG7zFp3bFsQagAA6RAG1uU+8xPACAyz9EBeQDeun12gz8boZr7HSibgcgB6l8sjgwYfA3Obijc20Ijw==",
       "requires": {
         "bch-encrypt-lib": "2.0.0",
         "uuid": "9.0.0"
@@ -20407,6 +20541,8 @@
     },
     "jwt-bch-lib": {
       "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/jwt-bch-lib/-/jwt-bch-lib-1.3.0.tgz",
+      "integrity": "sha512-CZs3jUHJlWvConvoTeLDogDEwUysKeojYJxfUhbwJKJrtDCSfi3ZWbsZZ8WN30Xs28aZPDB+qlHPJlTXQmup0w==",
       "requires": {
         "axios": "^0.21.1"
       },
@@ -21082,17 +21218,49 @@
       "dev": true
     },
     "minimal-slp-wallet": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/minimal-slp-wallet/-/minimal-slp-wallet-5.4.3.tgz",
-      "integrity": "sha512-l9shPcWUHJhmHa6iJs917XNVQR0jaLHgww0fC78ubRokW0Zhea2jO9FNJLi74T8Nd8StCg1pVAlS+MKszU3swQ==",
+      "version": "5.8.9",
+      "resolved": "http://94.130.170.209:4873/minimal-slp-wallet/-/minimal-slp-wallet-5.8.9.tgz",
+      "integrity": "sha512-HN6vyCxLVMU4Iv/TfBy5bKHBva12bJ/Xn8ni8AzSbsGSeb4Iz90If3wqlpR9bIw80bL/b2ts4vnwKH9WBvDdQQ==",
       "requires": {
-        "@psf/bch-js": "6.5.1",
+        "@chris.troutner/retry-queue-commonjs": "1.0.8",
+        "@psf/bch-js": "6.7.2",
         "apidoc": "0.51.0",
-        "bch-consumer": "1.4.0",
+        "bch-consumer": "1.4.3",
         "bch-donation": "1.1.2",
         "crypto-js": "4.0.0"
       },
       "dependencies": {
+        "@psf/bch-js": {
+          "version": "6.7.2",
+          "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.7.2.tgz",
+          "integrity": "sha512-IANBPHaAkvvmZlhS7DYv94KzOCTws4aSasySKE4tctQu1mGnhKZbR9vVB366vk8UeU8fQUjgtr2RjYCajnT6tw==",
+          "requires": {
+            "@chris.troutner/bip32-utils": "1.0.5",
+            "@psf/bip21": "2.0.1",
+            "@psf/bitcoincash-ops": "2.0.0",
+            "@psf/bitcoincashjs-lib": "4.0.3",
+            "@psf/coininfo": "4.0.0",
+            "axios": "0.26.1",
+            "bc-bip68": "1.0.5",
+            "bchaddrjs-slp": "0.2.5",
+            "bigi": "1.4.2",
+            "bignumber.js": "9.0.0",
+            "bip-schnorr": "0.3.0",
+            "bip38": "2.0.2",
+            "bip39": "3.0.2",
+            "bip66": "1.1.5",
+            "bitcoinjs-message": "2.0.0",
+            "bs58": "4.0.1",
+            "ecashaddrjs": "1.0.7",
+            "ini": "1.3.8",
+            "randombytes": "2.0.6",
+            "safe-buffer": "5.1.2",
+            "satoshi-bitcoin": "1.0.4",
+            "slp-mdm": "0.0.6",
+            "slp-parser": "0.0.4",
+            "wif": "2.0.6"
+          }
+        },
         "apidoc": {
           "version": "0.51.0",
           "resolved": "https://registry.npmjs.org/apidoc/-/apidoc-0.51.0.tgz",
@@ -21122,6 +21290,14 @@
             "winston": "^3.3.3"
           }
         },
+        "axios": {
+          "version": "0.26.1",
+          "resolved": "http://94.130.170.209:4873/axios/-/axios-0.26.1.tgz",
+          "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
+          "requires": {
+            "follow-redirects": "^1.14.8"
+          }
+        },
         "glob": {
           "version": "7.2.3",
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -23631,9 +23807,9 @@
       "dev": true
     },
     "p2wdb-esm": {
-      "version": "2.2.8",
-      "resolved": "https://registry.npmjs.org/p2wdb-esm/-/p2wdb-esm-2.2.8.tgz",
-      "integrity": "sha512-wqTj6HaUdSMDFjp9a2lAGUembGtLxDxBH+PNUNnCHG1RSrLsrFrYFzMc48RlW9BGWybqypstrhORHrlZ30aygA==",
+      "version": "2.2.9",
+      "resolved": "https://registry.npmjs.org/p2wdb-esm/-/p2wdb-esm-2.2.9.tgz",
+      "integrity": "sha512-I6Pc/Jj2kQRIpDmvs0LAnIv7ssFm1kz+SW+SRkjHezw84arFeeIMkqaVk8DXnKWKfIqy3asG4E77jVGrD55IRA==",
       "requires": {
         "@chris.troutner/retry-queue-commonjs": "1.0.8",
         "axios": "0.24.0"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bch-dex",
-  "version": "2.0.2",
+  "version": "3.0.0",
   "description": "A DEX on BCH for trading SLP tokens.",
   "main": "index.js",
   "type": "module",
@@ -29,14 +29,14 @@
   "repository": "Permissionless-Software-Foundation/bch-dex",
   "dependencies": {
     "@chris.troutner/retry-queue": "1.0.8",
-    "@psf/bch-js": "6.5.1",
+    "@psf/bch-js": "6.7.3",
     "axios": "0.27.2",
     "bch-message-lib": "2.2.1",
     "bch-token-sweep": "2.2.1",
     "bcryptjs": "2.4.3",
     "bitcoincashjs-lib": "3.3.3",
     "glob": "7.1.6",
-    "ipfs-coord-esm": "9.1.3",
+    "ipfs-coord-esm": "9.1.7",
     "ipfs-http-client": "58.0.0",
     "jsonrpc-lite": "2.2.0",
     "jsonwebtoken": "8.5.1",
@@ -54,11 +54,11 @@
     "koa2-ratelimit": "0.9.1",
     "libp2p": "0.36.2",
     "line-reader": "0.4.0",
-    "minimal-slp-wallet": "5.4.3",
+    "minimal-slp-wallet": "5.8.9",
     "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

@@ -46,10 +46,11 @@ services:
     #build:
     #  context: ./p2wdb/
     #  dockerfile: Dockerfile
-    image: christroutner/p2wdb:v3.1.8
+    image: christroutner/p2wdb:v4.1.3
     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:
     #  context: ./bch-dex/
     #  dockerfile: Dockerfile
-    image: christroutner/bch-dex:v2.0.12
+    image: christroutner/bch-dex:v2.2.4
     container_name: bch-dex
     environment:
       CONSUMER_URL: 'https://free-bch.fullstack.cash'

production/scripts/bulk-sweep-wallet.js

@@ -0,0 +1,153 @@
+/*
+  This script is similar ot sweep-wallet.js, but it can do a much faster (bulk)
+  scanning of addresses. However, this requires a subscription to a FullStack.cash
+  or access to a web2 Cash Stack.
+
+  This script will scan 20 addresses at a time. If a balance is found in any
+  of the addresses, it will sweep the funds from that address.
+*/
+/*
+// Public npm libraries
+import BchTokenSweep from 'bch-token-sweep/index.js'
+
+// Local libraries
+import WalletAdapter from '../../src/adapters/wallet.js'
+import BCHJS from '@psf/bch-js'
+import JwtLib from 'jwt-bch-lib'
+
+// Constants
+// const EMTPY_ADDR_CUTOFF = 100
+const LAST_ADDR_INDEX = 100
+
+if (!process.env.BCHJSTOKEN) {
+  console.log('You will need a JWT token from FullStack.cash to execute this script. Export it to the BCHJSTOKEN environment variable and try again.')
+  exit(0)
+}
+
+async function sweepFunds () {
+  try {
+    // Configure the wallet library to use a FullStack.cash or a local Cash Stack
+    const walletLib = new WalletAdapter()
+    walletLib.config.useFullStackCash = true
+    walletLib.config.apiServer = 'http://192.168.2.129:3000/v5/'
+
+    // const walletInfo = await walletLib.openWallet()
+    const walletInfo = await openWallet(walletLib)
+    const wallet = await walletLib.instanceWallet(walletInfo)
+    console.log('walletInfo: ', walletInfo)
+
+    const rootAddr = walletInfo.cashAddress
+    const rootWif = walletInfo.privateKey
+    console.log(`Sweeping all funds into root address ${rootAddr}...`)
+
+    // Instantiate bch-js, and use the JWT token saved to environment variable.
+
+    // Generate an HD tree
+    // const bchjs = wallet.bchjs
+    const bchjs = new BCHJS()
+    const rootSeed = await bchjs.Mnemonic.toSeed(walletInfo.mnemonic)
+    const masterHDNode = bchjs.HDNode.fromSeed(rootSeed)
+
+    const emptyAddrCnt = 0
+    const hdIndex = 1
+
+    // Divide all the addresses by 20, since that's how many will be checked at once.
+    const numOfLoops = Math.ceil(LAST_ADDR_INDEX / 20)
+
+    for (let i = 1; i < numOfLoops; i++) {
+      const startIndex = i
+      const stopIndex = i * 20
+      console.log(`startIndex: ${startIndex}, stopIndex: ${stopIndex}`)
+
+      // Generate the next block of 20 key pairs to scan.
+      const addrsToScan = []
+      const wifsToScan = []
+      for (let j = startIndex; j < stopIndex; j++) {
+        // Generate a keypair from the HD wallet.
+        const childNode = masterHDNode.derivePath(`m/44'/245'/0'/0/${j}`)
+        const cashAddress = bchjs.HDNode.toCashAddress(childNode)
+        const wifToSweep = bchjs.HDNode.toWIF(childNode)
+
+        addrsToScan.push(cashAddress)
+        wifsToScan.push(wifToSweep)
+      }
+      console.log(`Scanning these addresses for a balance: ${JSON.stringify(addrsToScan, null, 2)}`)
+
+      // Scan a block of 20 addresses for a balance.
+      const balances = await bchjs.Electrumx.balance(addrsToScan)
+      console.log(`balances: ${JSON.stringify(balances, null, 2)}`)
+
+      // Scan through the results and look for a balance.
+      for (let j = 0; j < balances.balances.length; j++) {
+        const thisBalance = balances.balances[j]
+
+        // const combinedBal = thisBalance.balance.confirmed + thisBalance.balance.
+
+        // if(thisBalance.)
+      }
+    }
+
+    // do {
+    //   // Generate a keypair from the HD wallet.
+    //   const childNode = masterHDNode.derivePath(`m/44'/245'/0'/0/${hdIndex}`)
+    //   const cashAddress = bchjs.HDNode.toCashAddress(childNode)
+    //   const wifToSweep = bchjs.HDNode.toWIF(childNode)
+    //
+    //   console.log(`\nSweeping ${cashAddress} with private key ${wifToSweep}`)
+    //
+    //   try {
+    //     // Sweep tokens from address
+    //     const sweeper = new BchTokenSweep(
+    //       wifToSweep,
+    //       rootWif,
+    //       wallet,
+    //       550,
+    //       rootAddr
+    //     )
+    //     await sweeper.populateObjectFromNetwork()
+    //
+    //     const hex = await sweeper.sweepTo(rootAddr)
+    //     // console.log(`hex: ${hex}`)
+    //
+    //     const txid = await sweeper.blockchain.broadcast(hex)
+    //
+    //     // console.log('Transaction ID', txid)
+    //     console.log(`Swept HD index ${hdIndex}. TXID: ${txid}`)
+    //
+    //     emptyAddrCnt = 0
+    //
+    //     // Wait between loop iterations.
+    //     await bchjs.Util.sleep(3000)
+    //   } catch (err) {
+    //     console.log(`error message with index ${hdIndex}: ${err.message}`)
+    //     // console.log(err)
+    //     emptyAddrCnt++
+    //   }
+    //
+    //   hdIndex++
+    // } while (emptyAddrCnt < EMTPY_ADDR_CUTOFF)
+    //
+    // console.log(`${EMTPY_ADDR_CUTOFF} empty addresses detected. Exiting.`)
+    //
+    // console.log('\n\nDo not forget to reset the nextAddress property in the wallet.json file!\n\n')
+  } catch (err) {
+    console.error('Error in sweepFunds(): ', err)
+  }
+}
+sweepFunds()
+
+// Open the wallet file, or create one if the file doesn't exist.
+// Does not instance the wallet. The output of this function is expected to
+// be passed to instanceWallet().
+async function openWallet (walletLib) {
+  try {
+    // console.log('this.WALLET_FILE: ', this.WALLET_FILE)
+    const walletData = await walletLib.jsonFiles.readJSON('./wallet.json')
+
+    return walletData
+  } catch (err) {
+    console.error('Error in openWallet()')
+    throw err
+  }
+}
+*/

production/scripts/fullstack-sweep-wallet.js

@@ -0,0 +1,111 @@
+/*
+  This script is the same as sweep-wallet.js, but it requires a FullStack.cash
+  account, which makes the scanning much faster.
+*/
+
+// Public npm libraries
+// const BCHJS = require('@psf/bch-js')
+import BchTokenSweep from 'bch-token-sweep/index.js'
+
+// Local libraries
+import WalletAdapter from '../../src/adapters/wallet.js'
+
+// Constants
+// const EMTPY_ADDR_CUTOFF = 10
+const START_INDEX = 1
+const LAST_ADDR_INDEX = 100
+
+if (!process.env.BCHJSTOKEN) {
+  console.log('You will need a JWT token from FullStack.cash to execute this script. Export it to the BCHJSTOKEN environment variable and try again.')
+  process.exit(0)
+}
+
+async function sweepFunds () {
+  try {
+    // Configure the wallet library to use a FullStack.cash or a local Cash Stack
+    const walletLib = new WalletAdapter()
+    walletLib.config.useFullStackCash = true
+    // walletLib.config.apiServer = 'http://192.168.2.129:3000/v5/'
+    walletLib.config.apiServer = 'https://api.fullstack.cash/v5/'
+
+    // Open the wallet files.
+    const walletInfo = await openWallet(walletLib)
+    const wallet = await walletLib.instanceWallet(walletInfo)
+    console.log('walletInfo: ', walletInfo)
+
+    const rootAddr = walletInfo.cashAddress
+    const rootWif = walletInfo.privateKey
+    console.log(`Sweeping all funds into root address ${rootAddr}...`)
+
+    // Generate an HD tree
+    const bchjs = wallet.bchjs
+    const rootSeed = await bchjs.Mnemonic.toSeed(walletInfo.mnemonic)
+    const masterHDNode = bchjs.HDNode.fromSeed(rootSeed)
+
+    let emptyAddrCnt = 0
+    let hdIndex = START_INDEX
+
+    do {
+      // Generate a keypair from the HD wallet.
+      const childNode = masterHDNode.derivePath(`m/44'/245'/0'/0/${hdIndex}`)
+      const cashAddress = bchjs.HDNode.toCashAddress(childNode)
+      const wifToSweep = bchjs.HDNode.toWIF(childNode)
+
+      console.log(`\nSweeping ${cashAddress} with private key ${wifToSweep}`)
+
+      try {
+        // Sweep tokens from address
+        const sweeper = new BchTokenSweep(
+          wifToSweep,
+          rootWif,
+          wallet,
+          550,
+          rootAddr
+        )
+        await sweeper.populateObjectFromNetwork()
+
+        const hex = await sweeper.sweepTo(rootAddr)
+        // console.log(`hex: ${hex}`)
+
+        const txid = await sweeper.blockchain.broadcast(hex)
+
+        // console.log('Transaction ID', txid)
+        console.log(`Swept HD index ${hdIndex}. TXID: ${txid}`)
+
+        emptyAddrCnt = 0
+
+        // Wait between loop iterations.
+        await bchjs.Util.sleep(3000)
+      } catch (err) {
+        console.log(`error message with index ${hdIndex}: ${err.message}`)
+        // console.log(err)
+        emptyAddrCnt++
+      }
+
+      hdIndex++
+      // } while (emptyAddrCnt < EMTPY_ADDR_CUTOFF)
+      // console.log(`${EMTPY_ADDR_CUTOFF} empty addresses detected. Exiting.`)
+    } while (hdIndex < LAST_ADDR_INDEX)
+    console.log(`Last index of ${LAST_ADDR_INDEX} reached. emptyAddrCnt: ${emptyAddrCnt}`)
+
+    console.log('\n\nDo not forget to reset the nextAddress property in the wallet.json file!\n\n')
+  } catch (err) {
+    console.error('Error in sweepFunds(): ', err)
+  }
+}
+sweepFunds()
+
+// Open the wallet file, or create one if the file doesn't exist.
+// Does not instance the wallet. The output of this function is expected to
+// be passed to instanceWallet().
+async function openWallet (walletLib) {
+  try {
+    // console.log('this.WALLET_FILE: ', this.WALLET_FILE)
+    const walletData = await walletLib.jsonFiles.readJSON('./wallet.json')
+
+    return walletData
+  } catch (err) {
+    console.error('Error in openWallet()')
+    throw err
+  }
+}

production/scripts/list-addrs.js

@@ -0,0 +1,67 @@
+/*
+  This script is the same as sweep-wallet.js, but instead of sweeping the keys,
+  it simply lists out the addresses in the HD keychain. This is hany when trying
+  to figure out which address a token was sent to.
+*/
+
+// Public npm libraries
+
+// Local libraries
+import WalletAdapter from '../../src/adapters/wallet.js'
+
+// Constants
+const START_INDEX = 1
+const LAST_ADDR_INDEX = 100
+
+async function listAddrs () {
+  try {
+    // Configure the wallet library to use a FullStack.cash or a local Cash Stack
+    const walletLib = new WalletAdapter()
+
+    // Open the wallet files.
+    const walletInfo = await openWallet(walletLib)
+    const wallet = await walletLib.instanceWallet(walletInfo)
+    console.log('walletInfo: ', walletInfo)
+
+    const rootAddr = walletInfo.cashAddress
+    // const rootWif = walletInfo.privateKey
+    console.log(`Sweeping all funds into root address ${rootAddr}...`)
+
+    // Generate an HD tree
+    const bchjs = wallet.bchjs
+    const rootSeed = await bchjs.Mnemonic.toSeed(walletInfo.mnemonic)
+    const masterHDNode = bchjs.HDNode.fromSeed(rootSeed)
+
+    let hdIndex = START_INDEX
+
+    do {
+      // Generate a keypair from the HD wallet.
+      const childNode = masterHDNode.derivePath(`m/44'/245'/0'/0/${hdIndex}`)
+      const cashAddress = bchjs.HDNode.toCashAddress(childNode)
+      // const wifToSweep = bchjs.HDNode.toWIF(childNode)
+
+      console.log(`HD Index ${hdIndex}: ${cashAddress}`)
+
+      hdIndex++
+    } while (hdIndex < LAST_ADDR_INDEX)
+    console.log(`Last index of ${LAST_ADDR_INDEX} reached.`)
+  } catch (err) {
+    console.error('Error in sweepFunds(): ', err)
+  }
+}
+listAddrs()
+
+// Open the wallet file, or create one if the file doesn't exist.
+// Does not instance the wallet. The output of this function is expected to
+// be passed to instanceWallet().
+async function openWallet (walletLib) {
+  try {
+    // console.log('this.WALLET_FILE: ', this.WALLET_FILE)
+    const walletData = await walletLib.jsonFiles.readJSON('./wallet.json')
+
+    return walletData
+  } catch (err) {
+    console.error('Error in openWallet()')
+    throw err
+  }
+}

production/scripts/sweep-wallet.js

@@ -2,8 +2,6 @@
   This script will travers the HD wallet and sweep funds and tokens back
   into the root address (index 0). That root address needs to have funds
   to pay for the transactions.
-
-  This script will sweep BCH and fungible (Type 1) tokens, but not NFTs.
 */
 
 // Public npm libraries

src/adapters/wallet.js

@@ -34,6 +34,7 @@ class WalletAdapter {
     this.bitcoinJs = bitcoinJs
     this.BchWallet = BchWallet
     this.bchWallet = {} // Will be replaced when initialized.
+    // this.advancedConfig = localConfig.advancedConfig
 
     // Bind the 'this' object
     this.moveTokens = this.moveTokens.bind(this)

src/use-cases/order.js

@@ -49,6 +49,10 @@ class OrderLib {
       const orderEntity = this.orderEntity.inputValidate(entryObj)
       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.
       // 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) {