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

fix(minimal-slp-wallet): Updating to v5.5.5
2026-09-22 01:02:00 -07:00 · 2022-12-05 10:32:38 -08:00 · 2022-12-05 10:27:37 -08:00 · 2022-12-05 09:51:54 -08:00 · 2022-12-05 09:43:14 -08:00 · 2022-12-05 09:39:52 -08:00
7 changed files with 198 additions and 29 deletions
@@ -69,5 +69,6 @@ ipfs-service-provider.sh
 run-dev.sh
 wallet.json
 data/
+*.zip

 !README.md
@@ -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.5.5",
        "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",
@@ -2103,15 +2103,54 @@
      }
    },
    "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.1",
+      "resolved": "https://registry.npmjs.org/bch-consumer/-/bch-consumer-1.4.1.tgz",
+      "integrity": "sha512-sRXcM4vNGoC+jUfm2t6z37a9FBZvJJ0/6DUbRtzY7lZad4PXDY34wZ7xYvDfCUUuarTk9epp5sVyWxZowQRIOA==",
      "dependencies": {
-        "@psf/bch-js": "6.5.1",
+        "@psf/bch-js": "6.5.3",
        "apidoc": "0.51.0",
        "axios": "0.25.0"
      }
    },
+    "node_modules/bch-consumer/node_modules/@psf/bch-js": {
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-6.5.3.tgz",
+      "integrity": "sha512-38UB7NRrVzslZydWZWnB8FVWr5UpxG0cs0Xb1zmovfyOnp96XrAXfWLEuNKstAkpLApegeMY055b7vaKop/wRQ==",
+      "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/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": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
+      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
+      "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",
@@ -8068,17 +8107,49 @@
      }
    },
    "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.5.5",
+      "resolved": "https://registry.npmjs.org/minimal-slp-wallet/-/minimal-slp-wallet-5.5.5.tgz",
+      "integrity": "sha512-2L0AsMqaQVz939UNUWXnI+9+pzUEaxPSZfXgYQc2hErpk0+XvysnLTjWvT1DOgB1Cqg5Edy6Q02mRxOdXCJO+w==",
      "dependencies": {
-        "@psf/bch-js": "6.5.1",
+        "@chris.troutner/retry-queue-commonjs": "1.0.8",
+        "@psf/bch-js": "6.5.3",
        "apidoc": "0.51.0",
-        "bch-consumer": "1.4.0",
+        "bch-consumer": "1.4.1",
        "bch-donation": "1.1.2",
        "crypto-js": "4.0.0"
      }
    },
+    "node_modules/minimal-slp-wallet/node_modules/@psf/bch-js": {
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-6.5.3.tgz",
+      "integrity": "sha512-38UB7NRrVzslZydWZWnB8FVWr5UpxG0cs0Xb1zmovfyOnp96XrAXfWLEuNKstAkpLApegeMY055b7vaKop/wRQ==",
+      "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/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 +8192,14 @@
        "node": ">=14.0.0"
      }
    },
+    "node_modules/minimal-slp-wallet/node_modules/axios": {
+      "version": "0.26.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
+      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
+      "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 +11946,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"
@@ -17111,15 +17190,56 @@
      "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.1",
+      "resolved": "https://registry.npmjs.org/bch-consumer/-/bch-consumer-1.4.1.tgz",
+      "integrity": "sha512-sRXcM4vNGoC+jUfm2t6z37a9FBZvJJ0/6DUbRtzY7lZad4PXDY34wZ7xYvDfCUUuarTk9epp5sVyWxZowQRIOA==",
      "requires": {
-        "@psf/bch-js": "6.5.1",
+        "@psf/bch-js": "6.5.3",
        "apidoc": "0.51.0",
        "axios": "0.25.0"
      },
      "dependencies": {
+        "@psf/bch-js": {
+          "version": "6.5.3",
+          "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-6.5.3.tgz",
+          "integrity": "sha512-38UB7NRrVzslZydWZWnB8FVWr5UpxG0cs0Xb1zmovfyOnp96XrAXfWLEuNKstAkpLApegeMY055b7vaKop/wRQ==",
+          "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/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": "https://registry.npmjs.org/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",
@@ -21082,17 +21202,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.5.5",
+      "resolved": "https://registry.npmjs.org/minimal-slp-wallet/-/minimal-slp-wallet-5.5.5.tgz",
+      "integrity": "sha512-2L0AsMqaQVz939UNUWXnI+9+pzUEaxPSZfXgYQc2hErpk0+XvysnLTjWvT1DOgB1Cqg5Edy6Q02mRxOdXCJO+w==",
      "requires": {
-        "@psf/bch-js": "6.5.1",
+        "@chris.troutner/retry-queue-commonjs": "1.0.8",
+        "@psf/bch-js": "6.5.3",
        "apidoc": "0.51.0",
-        "bch-consumer": "1.4.0",
+        "bch-consumer": "1.4.1",
        "bch-donation": "1.1.2",
        "crypto-js": "4.0.0"
      },
      "dependencies": {
+        "@psf/bch-js": {
+          "version": "6.5.3",
+          "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-6.5.3.tgz",
+          "integrity": "sha512-38UB7NRrVzslZydWZWnB8FVWr5UpxG0cs0Xb1zmovfyOnp96XrAXfWLEuNKstAkpLApegeMY055b7vaKop/wRQ==",
+          "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/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 +21274,14 @@
            "winston": "^3.3.3"
          }
        },
+        "axios": {
+          "version": "0.26.1",
+          "resolved": "https://registry.npmjs.org/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 +23791,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"
@@ -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.5.5",
    "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",
@@ -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
@@ -50,6 +50,7 @@ services:
    container_name: p2wdb
    environment:
      CONSUMER_URL: 'https://free-bch.fullstack.cash'
+      ENABLE_BCH_PAYMENT: 1
      DEBUG_LEVEL: 1
    logging:
      driver: 'json-file'
@@ -67,13 +68,14 @@ services:
    volumes:
      - ../data/ipfsdata/p2wdb:/home/safeuser/ipfs-p2wdb-service/.ipfsdata/p2wdb
      - ./p2wdb/start-production.sh:/home/safeuser/ipfs-p2wdb-service/start-production.sh
+      - ../scripts/wallet.json:/home/safeuser/ipfs-p2wdb-service/wallet.json
    restart: always

  bch-dex:
    #build:
    #  context: ./bch-dex/
    #  dockerfile: Dockerfile
-    image: christroutner/bch-dex:v2.0.12
+    image: christroutner/bch-dex:v2.2.2
    container_name: bch-dex
    environment:
      CONSUMER_URL: 'https://free-bch.fullstack.cash'
@@ -49,6 +49,9 @@ class OrderLib {
      const orderEntity = this.orderEntity.inputValidate(entryObj)
      console.log('orderEntity: ', orderEntity)

+      // Optimize the wallet to speed up working with it.
+      await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.optimize, {})
+
      // Ensure sufficient tokens exist to create the order.
      // await this.ensureFunds(orderEntity)
      await this.retryQueue.addToQueue(this.ensureFunds, orderEntity)
@@ -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) {
Author	SHA1	Message	Date
Chris Troutner	d94b527780	Merge pull request #67 from Permissionless-Software-Foundation/ct-unstable fix(minimal-slp-wallet): Updating to v5.5.5	2022-12-05 10:32:38 -08:00
Chris Troutner	f0e8a05f08	fix(minimal-slp-wallet): Updating to v5.5.5	2022-12-05 10:27:37 -08:00
Chris Troutner	278b4127e1	fix(docker): Bumping bch-dex container to v2.2.2	2022-12-05 09:51:54 -08:00
Chris Troutner	87b3d7519c	Merge pull request #66 from Permissionless-Software-Foundation/ct-unstable Optimize wallet on new orders. Use local P2WDB	2022-12-05 09:43:14 -08:00
Chris Troutner	ed4e75c9ad	fix(docker): Using local P2WDB rather than p2wdb.fullstack.cash	2022-12-05 09:39:52 -08:00
Chris Troutner	b0cc5a6e0b	fix(order): Optimizing wallet before creating new orders	2022-12-05 09:38:28 -08:00
Chris Troutner	6b4139a29e	Merge pull request #65 from Permissionless-Software-Foundation/ct-unstable fix(docker): Disabling P2WDB payment service by default	2022-12-03 13:35:13 -08:00
Chris Troutner	925242262a	fix(docker): Disabling P2WDB payment service by default	2022-12-03 13:32:13 -08:00
Chris Troutner	74fe77009c	fix(timer): Setting time controller to fire every 10 minutes	2022-12-03 13:27:47 -08:00
Chris Troutner	51f7905dad	fix(p2wdb-esm): Upgrading to v2.2.9	2022-12-02 21:10:18 -08:00