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

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

@@ -47,6 +47,7 @@ export default {
 
   // 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',
 
   // FullStack.cash account information, used for automatic JWT handling.
   getJwtAtStartup: process.env.GET_JWT_AT_STARTUP ? true : false,
@@ -62,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,
@@ -116,5 +120,5 @@ export default {
   chatPubSubChan: 'psf-ipfs-chat-001',
 
   // IPFS gateway
-  ipfsGateway: process.env.IPFS_GATEWAY ? process.env.IPFS_GATEWAY : 'https://p2wdb-gateway.fullstack.cash/ipfs/'
+  ipfsGateway: process.env.IPFS_GATEWAY ? process.env.IPFS_GATEWAY : 'https://p2wdb-gateway-678.fullstack.cash/ipfs/'
 }

package-lock.json

@@ -9,14 +9,15 @@
       "version": "2.0.2",
       "license": "MIT",
       "dependencies": {
-        "@chris.troutner/retry-queue": "1.0.5",
-        "@psf/bch-js": "^6.4.5",
+        "@chris.troutner/retry-queue": "1.0.8",
+        "@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",
@@ -32,21 +33,20 @@
         "koa-router": "10.0.0",
         "koa-static": "5.0.0",
         "koa2-ratelimit": "0.9.1",
-        "libp2p": "^0.36.2",
+        "libp2p": "0.36.2",
         "line-reader": "0.4.0",
-        "minimal-slp-wallet": "5.2.1",
+        "minimal-slp-wallet": "5.8.9",
         "mongoose": "5.13.14",
         "node-fetch": "npm:@achingbrain/node-fetch@2.6.7",
         "nodemailer": "6.7.5",
-        "p2wdb": "2.2.3",
+        "p2wdb-esm": "2.2.9",
         "passport-local": "1.0.0",
-        "public-ip": "^4.0.4",
+        "public-ip": "4.0.4",
         "winston": "3.3.3",
         "winston-daily-rotate-file": "4.5.0"
       },
       "devDependencies": {
         "apidoc": "0.51.1",
-        "bch-token-sweep": "2.1.2",
         "c8": "7.12.0",
         "chai": "4.3.0",
         "coveralls": "2.11.4",
@@ -58,6 +58,30 @@
         "uuid": "8.3.2"
       }
     },
+    "../p2wdb": {
+      "version": "2.0.0",
+      "extraneous": true,
+      "license": "MIT",
+      "dependencies": {
+        "@chris.troutner/retry-queue-commonjs": "1.0.8",
+        "apidoc": "0.52.0",
+        "axios": "0.24.0"
+      },
+      "devDependencies": {
+        "browserify": "17.0.0",
+        "chai": "4.2.0",
+        "coveralls": "3.1.0",
+        "husky": "4.3.8",
+        "lodash.clonedeep": "4.5.0",
+        "minimal-slp-wallet": "5.2.1",
+        "mocha": "^10.0.0",
+        "nyc": "15.1.0",
+        "semantic-release": "19.0.5",
+        "sinon": "9.2.2",
+        "standard": "16.0.4",
+        "tinyify": "3.0.0"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.18.6",
       "dev": true,
@@ -173,14 +197,39 @@
       }
     },
     "node_modules/@chris.troutner/retry-queue": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@chris.troutner/retry-queue/-/retry-queue-1.0.5.tgz",
-      "integrity": "sha512-autE5GRCXR0xgPqq6qIq1sbUw8j2btxCWlezSvpRJmPVQQZwGhYbeF7euxRbpMmi31kj47iHgG7sb45bD0HY7Q==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@chris.troutner/retry-queue/-/retry-queue-1.0.8.tgz",
+      "integrity": "sha512-ucyUGWTeXhOcXLglwb8alR3dNATPy+3vGea2uQJ0J8jnJufWrUr/NEq4b53op1tOTF029qrun6OmIN6Ls58pqw==",
       "dependencies": {
         "p-queue": "7.3.0",
         "p-retry": "5.1.1"
       }
     },
+    "node_modules/@chris.troutner/retry-queue-commonjs": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@chris.troutner/retry-queue-commonjs/-/retry-queue-commonjs-1.0.8.tgz",
+      "integrity": "sha512-jEHmCKffjIXTm0d/YcRQzCDPbzW2NFTEO72b1vmETnmATO57MmO39F37gEaq7J7lnF5JMxuM3Oq+FWa1L7HXxA==",
+      "dependencies": {
+        "p-queue": "4.0.0",
+        "p-retry": "4.6.2"
+      }
+    },
+    "node_modules/@chris.troutner/retry-queue-commonjs/node_modules/eventemitter3": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
+      "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="
+    },
+    "node_modules/@chris.troutner/retry-queue-commonjs/node_modules/p-queue": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-4.0.0.tgz",
+      "integrity": "sha512-3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg==",
+      "dependencies": {
+        "eventemitter3": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@chris.troutner/retry-queue/node_modules/@types/retry": {
       "version": "0.12.1",
       "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz",
@@ -1046,14 +1095,15 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/@psf/bch-js": {
-      "version": "6.4.5",
-      "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-6.4.5.tgz",
-      "integrity": "sha512-sH72zbJJI5oe9EUMczFQb0jCaNQb8rc3/86E6xXKl3325HCwBqE80BX7JFvZ97Qv1gGxwp/3WROp59v6Dz2NKA==",
+      "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",
@@ -1098,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",
@@ -1132,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"
       }
@@ -2054,19 +2106,62 @@
       }
     },
     "node_modules/bch-consumer": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/bch-consumer/-/bch-consumer-1.3.1.tgz",
-      "integrity": "sha512-8ZoyFp4pLJFAOzM482K22sVL2FpuxhkYRtZuLLsMH9L442mRABjsAP7fTh91W5er40r8RGN/CSKi2TMyUmrY1Q==",
+      "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.4.5",
+        "@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",
@@ -2107,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",
@@ -2214,9 +2311,9 @@
       }
     },
     "node_modules/bch-token-sweep": {
-      "version": "2.1.2",
-      "dev": true,
-      "license": "MIT",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/bch-token-sweep/-/bch-token-sweep-2.2.1.tgz",
+      "integrity": "sha512-f4UGEpPXzea7HQMRSEb6h/amXiwrlsMBAjl1dVYg5//26IDWeG+e3qVNtMJhm00NMZ0BS+LasUa2xlz0UVziZA==",
       "dependencies": {
         "bch-donation": "1.1.2",
         "bignumber.js": "9.0.0"
@@ -5921,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"
@@ -7069,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"
       }
@@ -8019,17 +8118,51 @@
       }
     },
     "node_modules/minimal-slp-wallet": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/minimal-slp-wallet/-/minimal-slp-wallet-5.2.1.tgz",
-      "integrity": "sha512-1m71QxFlSdrfk01BOF0tQCgyTp8SCvvZST8bBOMZTz+iPwerDTbpPk4p3Niv12socT7QIaSf8odSVdFDjyqB8w==",
+      "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.4.5",
+        "@chris.troutner/retry-queue-commonjs": "1.0.8",
+        "@psf/bch-js": "6.7.2",
         "apidoc": "0.51.0",
-        "bch-consumer": "1.3.1",
+        "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",
@@ -8072,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",
@@ -8804,6 +8946,8 @@
     "node_modules/node-fetch": {
       "name": "@achingbrain/node-fetch",
       "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/@achingbrain/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-iTASGs+HTFK5E4ZqcMsHmeJ4zodyq8L38lZV33jwqcBJYoUt3HjN4+ot+O9/0b+ke8ddE7UgOtVuZN/OkV19/g==",
       "license": "MIT",
       "engines": {
         "node": "4.x || >=6.0.0"
@@ -11815,78 +11959,23 @@
         "node": ">=4"
       }
     },
-    "node_modules/p2wdb": {
-      "version": "2.2.3",
-      "license": "MIT",
+    "node_modules/p2wdb-esm": {
+      "version": "2.2.9",
+      "resolved": "https://registry.npmjs.org/p2wdb-esm/-/p2wdb-esm-2.2.9.tgz",
+      "integrity": "sha512-I6Pc/Jj2kQRIpDmvs0LAnIv7ssFm1kz+SW+SRkjHezw84arFeeIMkqaVk8DXnKWKfIqy3asG4E77jVGrD55IRA==",
       "dependencies": {
-        "apidoc": "0.52.0",
+        "@chris.troutner/retry-queue-commonjs": "1.0.8",
         "axios": "0.24.0"
       }
     },
-    "node_modules/p2wdb/node_modules/apidoc": {
-      "version": "0.52.0",
-      "license": "MIT",
-      "os": [
-        "darwin",
-        "freebsd",
-        "linux",
-        "openbsd",
-        "win32"
-      ],
-      "dependencies": {
-        "bootstrap": "3.4.1",
-        "commander": "^8.3.0",
-        "diff-match-patch": "^1.0.5",
-        "esbuild-loader": "^2.16.0",
-        "expose-loader": "^3.1.0",
-        "fs-extra": "^10.0.0",
-        "glob": "^7.2.0",
-        "handlebars": "^4.7.7",
-        "iconv-lite": "^0.6.3",
-        "jquery": "^3.6.0",
-        "klaw-sync": "^6.0.0",
-        "lodash": "^4.17.21",
-        "markdown-it": "^12.2.0",
-        "nodemon": "^2.0.15",
-        "prismjs": "^1.25.0",
-        "semver": "^7.3.5",
-        "style-loader": "^3.3.1",
-        "webpack": "^5.64.2",
-        "webpack-cli": "^4.9.1",
-        "winston": "^3.3.3"
-      },
-      "bin": {
-        "apidoc": "bin/apidoc"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/p2wdb/node_modules/axios": {
+    "node_modules/p2wdb-esm/node_modules/axios": {
       "version": "0.24.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
+      "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
       "dependencies": {
         "follow-redirects": "^1.14.4"
       }
     },
-    "node_modules/p2wdb/node_modules/glob": {
-      "version": "7.2.3",
-      "license": "ISC",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/package-json": {
       "version": "6.5.0",
       "license": "MIT",
@@ -15753,9 +15842,9 @@
       }
     },
     "@chris.troutner/retry-queue": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@chris.troutner/retry-queue/-/retry-queue-1.0.5.tgz",
-      "integrity": "sha512-autE5GRCXR0xgPqq6qIq1sbUw8j2btxCWlezSvpRJmPVQQZwGhYbeF7euxRbpMmi31kj47iHgG7sb45bD0HY7Q==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@chris.troutner/retry-queue/-/retry-queue-1.0.8.tgz",
+      "integrity": "sha512-ucyUGWTeXhOcXLglwb8alR3dNATPy+3vGea2uQJ0J8jnJufWrUr/NEq4b53op1tOTF029qrun6OmIN6Ls58pqw==",
       "requires": {
         "p-queue": "7.3.0",
         "p-retry": "5.1.1"
@@ -15786,6 +15875,30 @@
         }
       }
     },
+    "@chris.troutner/retry-queue-commonjs": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@chris.troutner/retry-queue-commonjs/-/retry-queue-commonjs-1.0.8.tgz",
+      "integrity": "sha512-jEHmCKffjIXTm0d/YcRQzCDPbzW2NFTEO72b1vmETnmATO57MmO39F37gEaq7J7lnF5JMxuM3Oq+FWa1L7HXxA==",
+      "requires": {
+        "p-queue": "4.0.0",
+        "p-retry": "4.6.2"
+      },
+      "dependencies": {
+        "eventemitter3": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
+          "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="
+        },
+        "p-queue": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-4.0.0.tgz",
+          "integrity": "sha512-3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg==",
+          "requires": {
+            "eventemitter3": "^3.1.0"
+          }
+        }
+      }
+    },
     "@colors/colors": {
       "version": "1.5.0"
     },
@@ -16376,14 +16489,14 @@
       "version": "1.1.0"
     },
     "@psf/bch-js": {
-      "version": "6.4.5",
-      "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-6.4.5.tgz",
-      "integrity": "sha512-sH72zbJJI5oe9EUMczFQb0jCaNQb8rc3/86E6xXKl3325HCwBqE80BX7JFvZ97Qv1gGxwp/3WROp59v6Dz2NKA==",
+      "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",
@@ -16430,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",
@@ -16461,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"
@@ -17091,18 +17204,59 @@
       "integrity": "sha512-GzaMlN7pNthrY5BhReVhnfr4Ixx+GUSfyNRHYh0QiMUF0d0+0YaD8MpEdv6AjFBksg/zlqL1fVCBBm6PpTt2Rg=="
     },
     "bch-consumer": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/bch-consumer/-/bch-consumer-1.3.1.tgz",
-      "integrity": "sha512-8ZoyFp4pLJFAOzM482K22sVL2FpuxhkYRtZuLLsMH9L442mRABjsAP7fTh91W5er40r8RGN/CSKi2TMyUmrY1Q==",
+      "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.4.5",
+        "@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",
@@ -17131,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"
@@ -17139,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",
@@ -17210,8 +17364,9 @@
       "requires": {}
     },
     "bch-token-sweep": {
-      "version": "2.1.2",
-      "dev": true,
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/bch-token-sweep/-/bch-token-sweep-2.2.1.tgz",
+      "integrity": "sha512-f4UGEpPXzea7HQMRSEb6h/amXiwrlsMBAjl1dVYg5//26IDWeG+e3qVNtMJhm00NMZ0BS+LasUa2xlz0UVziZA==",
       "requires": {
         "bch-donation": "1.1.2",
         "bignumber.js": "9.0.0"
@@ -19622,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"
@@ -20386,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"
       },
@@ -21061,17 +21218,49 @@
       "dev": true
     },
     "minimal-slp-wallet": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/minimal-slp-wallet/-/minimal-slp-wallet-5.2.1.tgz",
-      "integrity": "sha512-1m71QxFlSdrfk01BOF0tQCgyTp8SCvvZST8bBOMZTz+iPwerDTbpPk4p3Niv12socT7QIaSf8odSVdFDjyqB8w==",
+      "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.4.5",
+        "@chris.troutner/retry-queue-commonjs": "1.0.8",
+        "@psf/bch-js": "6.7.2",
         "apidoc": "0.51.0",
-        "bch-consumer": "1.3.1",
+        "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",
@@ -21101,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",
@@ -21581,7 +21778,9 @@
       }
     },
     "node-fetch": {
-      "version": "npm:@achingbrain/node-fetch@2.6.7"
+      "version": "npm:@achingbrain/node-fetch@2.6.7",
+      "resolved": "https://registry.npmjs.org/@achingbrain/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-iTASGs+HTFK5E4ZqcMsHmeJ4zodyq8L38lZV33jwqcBJYoUt3HjN4+ot+O9/0b+ke8ddE7UgOtVuZN/OkV19/g=="
     },
     "node-forge": {
       "version": "1.3.1"
@@ -23607,54 +23806,22 @@
       "version": "1.0.0",
       "dev": true
     },
-    "p2wdb": {
-      "version": "2.2.3",
+    "p2wdb-esm": {
+      "version": "2.2.9",
+      "resolved": "https://registry.npmjs.org/p2wdb-esm/-/p2wdb-esm-2.2.9.tgz",
+      "integrity": "sha512-I6Pc/Jj2kQRIpDmvs0LAnIv7ssFm1kz+SW+SRkjHezw84arFeeIMkqaVk8DXnKWKfIqy3asG4E77jVGrD55IRA==",
       "requires": {
-        "apidoc": "0.52.0",
+        "@chris.troutner/retry-queue-commonjs": "1.0.8",
         "axios": "0.24.0"
       },
       "dependencies": {
-        "apidoc": {
-          "version": "0.52.0",
-          "requires": {
-            "bootstrap": "3.4.1",
-            "commander": "^8.3.0",
-            "diff-match-patch": "^1.0.5",
-            "esbuild-loader": "^2.16.0",
-            "expose-loader": "^3.1.0",
-            "fs-extra": "^10.0.0",
-            "glob": "^7.2.0",
-            "handlebars": "^4.7.7",
-            "iconv-lite": "^0.6.3",
-            "jquery": "^3.6.0",
-            "klaw-sync": "^6.0.0",
-            "lodash": "^4.17.21",
-            "markdown-it": "^12.2.0",
-            "nodemon": "^2.0.15",
-            "prismjs": "^1.25.0",
-            "semver": "^7.3.5",
-            "style-loader": "^3.3.1",
-            "webpack": "^5.64.2",
-            "webpack-cli": "^4.9.1",
-            "winston": "^3.3.3"
-          }
-        },
         "axios": {
           "version": "0.24.0",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
+          "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
           "requires": {
             "follow-redirects": "^1.14.4"
           }
-        },
-        "glob": {
-          "version": "7.2.3",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.1.1",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
         }
       }
     },

package.json

@@ -28,14 +28,15 @@
   },
   "repository": "Permissionless-Software-Foundation/bch-dex",
   "dependencies": {
-    "@chris.troutner/retry-queue": "1.0.5",
-    "@psf/bch-js": "^6.4.5",
+    "@chris.troutner/retry-queue": "1.0.8",
+    "@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",
@@ -51,21 +52,20 @@
     "koa-router": "10.0.0",
     "koa-static": "5.0.0",
     "koa2-ratelimit": "0.9.1",
-    "libp2p": "^0.36.2",
+    "libp2p": "0.36.2",
     "line-reader": "0.4.0",
-    "minimal-slp-wallet": "5.2.1",
+    "minimal-slp-wallet": "5.8.9",
     "mongoose": "5.13.14",
     "node-fetch": "npm:@achingbrain/node-fetch@2.6.7",
     "nodemailer": "6.7.5",
-    "p2wdb": "2.2.3",
+    "p2wdb-esm": "2.2.9",
     "passport-local": "1.0.0",
-    "public-ip": "^4.0.4",
+    "public-ip": "4.0.4",
     "winston": "3.3.3",
     "winston-daily-rotate-file": "4.5.0"
   },
   "devDependencies": {
     "apidoc": "0.51.1",
-    "bch-token-sweep": "2.1.2",
     "c8": "7.12.0",
     "chai": "4.3.0",
     "coveralls": "2.11.4",

production/docker/bch-dex/Dockerfile

@@ -72,7 +72,10 @@ RUN npm run docs
 #EXPOSE 5010
 
 # Start the application.
-#COPY start-production.sh start-production.sh
 CMD ["./start-production.sh"]
 
 #CMD ["npm", "start"]
+
+# Used for debugging
+#COPY dummy-app.js dummy-app.js
+#CMD ["node", "dummy-app.js"]

production/docker/bch-dex/dummy-app.js

@@ -0,0 +1,4 @@
+setInterval(function () {
+  const now = new Date()
+  console.log(`timestamp: ${now.toLocaleString()}`)
+}, 5000)

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

@@ -24,9 +24,11 @@ export DBURL=mongodb://172.17.0.1:5666/bch-swap-service-prod
 export PORT=5700
 
 # bch-dex specific env vars
-export BCH_DEX=production
+export BCH_DEX=prod
 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.6
+    image: christroutner/bch-dex:v2.2.4
     container_name: bch-dex
     environment:
       CONSUMER_URL: 'https://free-bch.fullstack.cash'
@@ -97,7 +99,7 @@ services:
     #build:
     #  context: ./bch-dex-ui/
     #  dockerfile: Dockerfile
-    image: christroutner/bch-dex-ui:v1.12.0
+    image: christroutner/bch-dex-ui:v1.2.4
     container_name: dex-ui
     environment:
       SERVER: 'http://192.168.2.3'

production/rpi-docker/docker-compose.yml

@@ -70,7 +70,7 @@ services:
     #build:
     # context: ./bch-dex/
     # dockerfile: Dockerfile
-    image: christroutner/bch-dex-rpi:v2.0.6
+    image: christroutner/bch-dex-rpi:v2.0.8
     container_name: bch-dex
     environment:
       #CONSUMER_URL: 'https://free-bch.fullstack.cash'
@@ -95,7 +95,7 @@ services:
     #build:
     #  context: ./bch-dex-ui/
     #  dockerfile: Dockerfile
-    image: christroutner/bch-dex-ui-rpi:v1.2.2
+    image: christroutner/bch-dex-ui-rpi:v1.2.4
     container_name: dex-ui
     logging:
       driver: 'json-file'

production/rpi-docker/p2wdb/start-production.sh

@@ -43,6 +43,6 @@ export IPFS_TCP_PORT=4001
 export IPFS_WS_PORT=4003
 
 # P2WDB specific env vars
-export ORBITDB_NAME=/orbitdb/zdpuAqNiwLiJBfbRK7uihV2hAbNSXj78ufzv5VyQb8GuvRwDh/psf-bch-p2wdb-keyvalue-v3.0.0-0001
+#export ORBITDB_NAME=/orbitdb/zdpuAqNiwLiJBfbRK7uihV2hAbNSXj78ufzv5VyQb8GuvRwDh/psf-bch-p2wdb-keyvalue-v3.0.0-0001
 
 npm start

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/create-wallet.js

@@ -3,7 +3,7 @@
 */
 
 // Public NPM libraries
-import BchWallet from 'minimal-slp-wallet/index'
+import BchWallet from 'minimal-slp-wallet'
 
 import { promises as fs } from 'fs'
 
@@ -16,9 +16,9 @@ async function createWallet () {
     }
 
     // Wait for the wallet to be created.
-    this.bchWallet = new BchWallet(undefined, advancedConfig)
-    await this.bchWallet.walletInfoPromise
-    const walletData = this.bchWallet.walletInfo
+    const bchWallet = new BchWallet(undefined, advancedConfig)
+    await bchWallet.walletInfoPromise
+    const walletData = bchWallet.walletInfo
     walletData.nextAddress = 1
 
     // Save the wallet file to disk.

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-nfts.js

@@ -5,7 +5,7 @@
 */
 
 // Global npm libraries
-import BchWallet from 'minimal-slp-wallet/index.js'
+import BchWallet from 'minimal-slp-wallet'
 
 // Local libraries
 import WalletAdapter from '../../src/adapters/wallet.js'

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/bch.js

@@ -6,7 +6,7 @@
 import BCHJS from '@psf/bch-js'
 
 import MsgLib from 'bch-message-lib'
-import BchWallet from 'minimal-slp-wallet/index.js'
+import BchWallet from 'minimal-slp-wallet'
 
 class Bch {
   constructor () {

src/adapters/ipfs/ipfs-coord.js

@@ -8,7 +8,7 @@
 import IpfsCoord from 'ipfs-coord-esm'
 
 // import BCHJS from '@psf/bch-js';
-import SlpWallet from 'minimal-slp-wallet/index.js'
+import SlpWallet from 'minimal-slp-wallet'
 import publicIp from 'public-ip'
 
 // Local libraries

src/adapters/localdb/models/offer.js

@@ -6,7 +6,7 @@ const Offer = new mongoose.Schema({
   tokenId: { type: String },
   utxoTxid: { type: String },
   utxoVout: { type: Number },
-  ticker: { type: String },
+  ticker: { type: String, default: '' },
   tokenType: { type: Number },
 
   // Trade data

src/adapters/p2wdb-adapter.js

@@ -5,10 +5,11 @@
 // Public npm libraries.
 import axios from 'axios'
 
-import { Write, Read } from 'p2wdb/index.js'
+import P2WDB from 'p2wdb-esm'
 
 // Local libraries
 import config from '../../config/index.js'
+const { Write, Read } = P2WDB
 
 class P2wdbAdapter {
   constructor (localConfig = {}) {

src/adapters/wallet.js

@@ -3,7 +3,8 @@
 */
 
 // Public npm libraries
-import BchWallet from 'minimal-slp-wallet/index.js'
+import BchWallet from 'minimal-slp-wallet'
+import BchTokenSweep from 'bch-token-sweep/index.js'
 
 import bitcoinJs from 'bitcoincashjs-lib'
 
@@ -22,6 +23,8 @@ const WALLET_FILE = `${__dirname.toString()}/../../wallet.json`
 // const P2WDB_TOKEN_ID =
 // '38e97c5d7d3585a2cbf3f9580c82ca33985f9cb0845d4dcce220cb709f9538b0'
 
+const advancedConfig = {}
+
 class WalletAdapter {
   constructor (localConfig = {}) {
     // Encapsulate dependencies
@@ -31,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)
@@ -87,7 +91,8 @@ class WalletAdapter {
         throw new Error('Wallet data is not formatted correctly. Can not read mnemonic in wallet file!')
       }
 
-      const advancedConfig = {}
+      // const advancedConfig = {}
+      console.log(`Using FullStack.cash: ${this.config.useFullStackCash}`)
       if (this.config.useFullStackCash) {
         advancedConfig.interface = 'rest-api'
         advancedConfig.restURL = this.config.apiServer
@@ -511,6 +516,47 @@ class WalletAdapter {
       throw err
     }
   }
+
+  // Given an Order database object, this function sends the tokens from the
+  // HD index where they are stored, back to the root address of the wallet.
+  async reclaimTokens (orderData) {
+    try {
+      // Get the key pair from the Order.
+      const keyPair = await this.getKeyPair(orderData.hdIndex)
+      console.log('keyPair: ', keyPair)
+
+      // Instantiate the wallet using the private key of the Order.
+      // const tempWallet = new this.BchWallet(keyPair.wif, advancedConfig)
+      // await tempWallet.initialize()
+
+      // Send the tokens from the Order to the root address.
+      // const receiver = {
+      //   address: this.bchWallet.walletInfo.address,
+      //   tokenId: orderData.tokenId,
+      //   qty: orderData.numTokens
+      // }
+      // console.log('receiver: ', receiver)
+      //
+      // const txid = await tempWallet.sendTokens(receiver)
+
+      // Sweep the tokens to the root address.
+      const sweeper = new BchTokenSweep(
+        keyPair.wif,
+        this.bchWallet.walletInfo.privateKey,
+        this.bchWallet,
+        550,
+        this.bchWallet.walletInfo.cashAddress
+      )
+      await sweeper.populateObjectFromNetwork()
+      const hex = await sweeper.sweepTo(this.bchWallet.walletInfo.cashAddress)
+      const txid = await this.bchWallet.ar.sendTx(hex)
+
+      return txid
+    } catch (err) {
+      console.error('Error in wallet.js/reclaimTokens()')
+      throw err
+    }
+  }
 }
 
 export default WalletAdapter

src/controllers/rest-api/order/controller.js

@@ -35,6 +35,7 @@ class OrderRESTControllerLib {
       // console.log('body: ', ctx.request.body)
 
       const orderObj = ctx.request.body.order
+      console.log('orderObj: ', orderObj)
 
       const hash = await _this.useCases.order.createOrder(orderObj)
 
@@ -47,6 +48,41 @@ class OrderRESTControllerLib {
     }
   }
 
+  // curl -X GET http://localhost:5700/order/list/all/0
+  async listOrders (ctx) {
+    try {
+      let page = ctx.params.page
+      if (!page) page = 0
+
+      const offers = await _this.useCases.order.listOrders(page)
+
+      ctx.body = offers
+    } catch (err) {
+      console.log('Error in listOrders REST API handler: ', err)
+      _this.handleError(ctx, err)
+    }
+  }
+
+  // Delete an existing order by returning the token to the root address of
+  // the DEX wallet.
+  async deleteOrder (ctx) {
+    try {
+      // console.log('body: ', ctx.request.body)
+
+      const p2wdbHash = ctx.request.body.p2wdbHash
+      // console.log('p2wdbHash: ', p2wdbHash)
+
+      const txid = await _this.useCases.order.deleteOrder(p2wdbHash)
+
+      ctx.body = { txid }
+    } catch (err) {
+      // console.log(`err.message: ${err.message}`)
+      // console.log('err: ', err)
+      // ctx.throw(422, err.message)
+      _this.handleError(ctx, err)
+    }
+  }
+
   // DRY error handler
   handleError (ctx, err) {
     console.log('err', err)

src/controllers/rest-api/order/index.js

@@ -50,6 +50,8 @@ class OrderRouter {
 
     // Define the routes and attach the controller.
     this.router.post('/', _this.orderRESTController.createOrder)
+    this.router.get('/list/all/:page', _this.orderRESTController.listOrders)
+    this.router.post('/delete', _this.orderRESTController.deleteOrder)
 
     // Attach the Controller routes to the Koa app.
     app.use(_this.router.routes())

src/entities/offer.js

@@ -29,7 +29,7 @@ class OfferEntity {
       utxoVout,
       offerStatus,
       makerAddr,
-      // ticker,
+      ticker,
       tokenType
     } = offerData.data
 
@@ -95,7 +95,7 @@ class OfferEntity {
       p2wdbHash: offerData.hash,
       offerStatus: offerStatus || this.offerStatus[0],
       makerAddr,
-      // ticker,
+      ticker,
       tokenType
     }
 

src/use-cases/offer/index.js

@@ -77,20 +77,12 @@ class OfferUseCases {
 
       // Verify that UTXO in offer is unspent. If it is spent, then ignore the
       // offer.
-      // const txid = offerObj.data.utxoTxid
-      // const vout = offerObj.data.utxoVout
-      // const utxoStatus = await this.adapters.bchjs.Blockchain.getTxOut(
-      //   txid,
-      //   vout
-      // )
-      //
       const utxo = {
         tx_hash: offerObj.data.utxoTxid,
         tx_pos: offerObj.data.utxoVout
       }
       // const utxoStatus = await this.adapters.wallet.bchWallet.utxoIsValid(utxo)
       const utxoStatus = await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.utxoIsValid, utxo)
-
       console.log('utxoStatus: ', utxoStatus)
       // if (utxoStatus === null) return false
       if (!utxoStatus) return false
@@ -292,18 +284,11 @@ class OfferUseCases {
       }
 
       // Verify that UTXO for sale is unspent. Abort if it's been spent.
-      // const txid = offerInfo.utxoTxid
-      // const vout = offerInfo.utxoVout
-
       const utxo = {
         tx_hash: offerInfo.utxoTxid,
         tx_pos: offerInfo.utxoVout
       }
       const utxoStatus = await this.adapters.wallet.bchWallet.utxoIsValid(utxo)
-      // const utxoStatus = await this.adapters.bchjs.Blockchain.getTxOut(
-      //   txid,
-      //   vout
-      // )
       console.log('utxoStatus: ', utxoStatus)
       if (!utxoStatus) {
         console.log(`utxo txid: ${offerInfo.utxoTxid}, vout: ${offerInfo.utxoVout}`)
@@ -321,7 +306,7 @@ class OfferUseCases {
       console.log(`utxos: ${JSON.stringify(utxos, null, 2)}`)
 
       // Calculate amount of sats to generate a counter offer.
-      let satsToMove = offerInfo.numTokens * parseInt(offerInfo.rateInBaseUnit)
+      let satsToMove = Math.ceil(offerInfo.numTokens * parseInt(offerInfo.rateInBaseUnit))
       if (isNaN(satsToMove)) {
         throw new Error('Could not calculate the amount of BCH to generate counter offer')
       }
@@ -400,7 +385,7 @@ class OfferUseCases {
         // Sell Offer
 
         // Calculate the sats needed
-        const satsNeeded = offerEntity.numTokens * parseInt(offerEntity.rateInBaseUnit)
+        const satsNeeded = Math.ceil(offerEntity.numTokens * parseInt(offerEntity.rateInBaseUnit))
         if (isNaN(satsNeeded)) {
           throw new Error('Could not calculate sats needed!')
         }
@@ -482,7 +467,7 @@ class OfferUseCases {
       console.log(`txObj: ${JSON.stringify(txObj, null, 2)}`)
 
       // Ensure the 3rd output (vout=2) contains the required amount of BCH.
-      const satsToReceive = orderData.numTokens * parseInt(orderData.rateInBaseUnit)
+      const satsToReceive = Math.ceil(orderData.numTokens * parseInt(orderData.rateInBaseUnit))
       if (isNaN(satsToReceive)) {
         throw new Error('Could not calculate the amount of BCH offered in the Counter Offer')
       }
@@ -569,12 +554,6 @@ class OfferUseCases {
 
         let utxoStatus = null
         try {
-          // Get the status of the UTXO associate with this Offer.
-          // utxoStatus = await this.adapters.bchjs.Blockchain.getTxOut(
-          //   thisOffer.utxoTxid,
-          //   thisOffer.utxoVout
-          // )
-
           // Get the status of the UTXO associate with this Offer.
           const utxo = {
             tx_hash: thisOffer.utxoTxid,
@@ -582,7 +561,8 @@ class OfferUseCases {
           }
           // console.log(`Checking this UTXO: ${JSON.stringify(utxo, null, 2)}`)
 
-          utxoStatus = await this.adapters.wallet.bchWallet.utxoIsValid(utxo)
+          // utxoStatus = await this.adapters.wallet.bchWallet.utxoIsValid(utxo)
+          utxoStatus = await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.utxoIsValid, utxo)
           // console.log('utxoStatus: ', utxoStatus)
         } catch (err) {
           // Handle corner case of bad-data in the Offer model.
@@ -599,7 +579,8 @@ class OfferUseCases {
         }
 
         // If the Offer UTXO is spent, delete the Offer model.
-        if (!utxoStatus) {
+        if (utxoStatus === false) {
+          console.log('utxoStatus: ', utxoStatus)
           console.log(`Spent UTXO detected. Deleting this Offer: ${JSON.stringify(thisOffer, null, 2)}`)
           await thisOffer.remove()
         }

src/use-cases/order.js

@@ -10,6 +10,8 @@ import wlogger from '../adapters/wlogger.js'
 import OrderEntity from '../entities/order.js'
 import config from '../../config/index.js'
 
+const DEFAULT_ENTRIES_PER_PAGE = 20
+
 class OrderLib {
   constructor (localConfig = {}) {
     // console.log('User localConfig: ', localConfig)
@@ -47,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)
@@ -55,7 +61,7 @@ class OrderLib {
       // const tokenData = await this.adapters.wallet.bchWallet.getTxData([entryObj.tokenId])
       const tokenData = await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.getTxData, [entryObj.tokenId])
       // console.log(`tokenData: ${JSON.stringify(tokenData, null, 2)}`)
-      entryObj.ticker = tokenData[0].tokenTicker
+      orderEntity.ticker = tokenData[0].tokenTicker
 
       // Move the tokens to holding address.
       const moveObj = {
@@ -115,6 +121,7 @@ class OrderLib {
 
       // Update the wallet balance
       await this.adapters.wallet.bchWallet.getUtxos()
+      // console.log(`wallet UTXOs: ${JSON.stringify(this.adapters.wallet.bchWallet.utxos.utxoStore, null, 2)}`)
 
       // Ensure the app wallet has enough funds to write to the P2WDB.
       const wif = this.adapters.wallet.bchWallet.walletInfo.privateKey
@@ -216,7 +223,8 @@ class OrderLib {
             tx_hash: thisOrder.utxoTxid,
             tx_pos: thisOrder.utxoVout
           }
-          utxoStatus = await this.adapters.wallet.bchWallet.utxoIsValid(utxo)
+          // utxoStatus = await this.adapters.wallet.bchWallet.utxoIsValid(utxo)
+          utxoStatus = await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.utxoIsValid, utxo)
           // console.log('utxoStatus: ', utxoStatus)
         } catch (err) {
           // Handle corner case of bad-data in the Order model.
@@ -233,7 +241,8 @@ class OrderLib {
         }
 
         // If the Order UTXO is spent, delete the Order model.
-        if (!utxoStatus) {
+        if (utxoStatus === false) {
+          console.log('utxoStatus: ', utxoStatus)
           console.log(`Spent UTXO detected. Deleting this Order: ${JSON.stringify(thisOrder, null, 2)}`)
           await thisOrder.remove()
         }
@@ -243,6 +252,43 @@ class OrderLib {
       throw err
     }
   }
+
+  async listOrders (page = 0) {
+    try {
+      const data = await this.OrderModel.find({})
+      // Sort entries so newest entries show first.
+        .sort('-timestamp')
+      // Skip to the start of the selected page.
+        .skip(page * DEFAULT_ENTRIES_PER_PAGE)
+      // Only return 20 results.
+        .limit(DEFAULT_ENTRIES_PER_PAGE)
+
+      return data
+    } catch (error) {
+      console.error('Error in use-cases/order/listOrders()')
+      throw error
+    }
+  }
+
+  // Delete an Order model by sending the token back to the root address. This
+  // will allow the garbage collectors to delete the Order and the Offer.
+  async deleteOrder (p2wdbHash) {
+    try {
+      console.log('p2wdbHash: ', p2wdbHash)
+
+      // Find the order by the given hash.
+      const order = await this.findOrderByHash(p2wdbHash)
+      console.log('order: ', order)
+
+      // Reclaim the tokens
+      const txid = await this.adapters.wallet.reclaimTokens(order)
+
+      return txid
+    } catch (err) {
+      console.error('Error in use-cases/order/deleteOrder()')
+      throw err
+    }
+  }
 }
 
 export default OrderLib

test/unit/adapters/p2wdb.adapter.unit.js

@@ -8,7 +8,7 @@ import { assert } from 'chai'
 import sinon from 'sinon'
 
 // const BCHJS = require('@psf/bch-js')
-import BchWallet from 'minimal-slp-wallet/index.js'
+import BchWallet from 'minimal-slp-wallet'
 
 // Local libraries.
 import P2wdbAdapter from '../../../src/adapters/p2wdb-adapter.js'

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) {

test/unit/use-cases/order.use-case.unit.js

@@ -103,7 +103,8 @@ describe('#order-use-case', () => {
         buyOrSell: 'sell',
         rateInBaseUnit: 1000,
         minUnitsToExchange: 1250,
-        numTokens: 1
+        numTokens: 1,
+        ticker: 'TEST'
       }
 
       // Mock dependencies and force expected code path

util/orders/getOrders.js

@@ -1,6 +1,6 @@
 import mongoose from 'mongoose'
-import config from '../../config'
-import Order from '../../src/adapters/localdb/models/order'
+import config from '../../config/index.js'
+import Order from '../../src/adapters/localdb/models/order.js'
 
 async function getOrder () {
   // Connect to the Mongo Database.