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

fix(rpi): updating UI docker container
2026-09-22 01:02:00 -07:00 · 2022-05-17 07:10:37 -07:00 · 2022-05-17 07:07:43 -07:00 · 2022-05-10 10:54:53 -07:00 · 2022-05-09 17:38:48 -07:00 · 2022-05-09 12:04:05 -07:00
9 changed files with 81 additions and 31 deletions
@@ -56,7 +56,10 @@ class Server {
      })

      console.log(`Starting environment: ${config.env}`)
-      console.log(`Debug level: ${config.debugLevel}`)
+      console.log(`Debug level: ${config.debugLevel}\n`)
+      console.log(`Using this web3 CashStack service: ${config.consumerUrl}`)
+      console.log('Alternative web services listed here: https://gist.github.com/christroutner/63c5513782181f8b8ea3eb89f7cadeb6')
+      console.log('This app is built on top of the CashStack. Find out more: https://CashStack.info\n')

      // MIDDLEWARE START

@@ -97,7 +97,7 @@ module.exports = {
  // BCH Mnemonic for generating encryption keys and payment address
  mnemonic: process.env.MNEMONIC ? process.env.MNEMONIC : '',

-  debugLevel: process.env.DEBUG_LEVEL ? parseInt(process.env.DEBUG_LEVEL) : 2,
+  debugLevel: process.env.DEBUG_LEVEL ? parseInt(process.env.DEBUG_LEVEL) : 1,

  // Settings for production, using external go-ipfs node.
  isProduction: process.env.SVC_ENV === 'production' ? true : false,
@@ -5241,14 +5241,6 @@
        "headless": "https://github.com/paulkernfeld/node-headless/tarball/master"
      }
    },
-    "node_modules/electron-eval/node_modules/headless": {
-      "version": "1.1.0",
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
    "node_modules/electron-fetch": {
      "version": "1.7.4",
      "license": "MIT",
@@ -9246,6 +9238,8 @@
    "node_modules/ipfs-cli/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"
@@ -9771,6 +9765,8 @@
    "node_modules/ipfs-core-config/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"
@@ -9954,6 +9950,8 @@
    "node_modules/ipfs-core-utils/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"
@@ -10518,6 +10516,8 @@
    "node_modules/ipfs-core/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"
@@ -10812,6 +10812,8 @@
    "node_modules/ipfs-daemon/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"
@@ -11071,6 +11073,8 @@
    "node_modules/ipfs-http-client/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"
@@ -19438,6 +19442,22 @@
        "node": ">=4"
      }
    },
+    "node_modules/prettier": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz",
+      "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==",
+      "dev": true,
+      "peer": true,
+      "bin": {
+        "prettier": "bin-prettier.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
    "node_modules/prettier-linter-helpers": {
      "version": "1.0.0",
      "dev": true,
@@ -27013,12 +27033,6 @@
        "electron": "^1.6.11",
        "headless": "https://github.com/paulkernfeld/node-headless/tarball/master",
        "ndjson": "^1.5.0"
-      },
-      "dependencies": {
-        "headless": {
-          "version": "1.1.0",
-          "optional": true
-        }
      }
    },
    "electron-fetch": {
@@ -29628,7 +29642,8 @@
          }
        },
        "node-fetch": {
-          "version": "npm:@achingbrain/node-fetch@2.6.7"
+          "version": "https://registry.npmjs.org/@achingbrain/node-fetch/-/node-fetch-2.6.7.tgz",
+          "integrity": "sha512-iTASGs+HTFK5E4ZqcMsHmeJ4zodyq8L38lZV33jwqcBJYoUt3HjN4+ot+O9/0b+ke8ddE7UgOtVuZN/OkV19/g=="
        },
        "uint8arrays": {
          "version": "3.0.0",
@@ -30201,7 +30216,8 @@
          }
        },
        "node-fetch": {
-          "version": "npm:@achingbrain/node-fetch@2.6.7"
+          "version": "https://registry.npmjs.org/@achingbrain/node-fetch/-/node-fetch-2.6.7.tgz",
+          "integrity": "sha512-iTASGs+HTFK5E4ZqcMsHmeJ4zodyq8L38lZV33jwqcBJYoUt3HjN4+ot+O9/0b+ke8ddE7UgOtVuZN/OkV19/g=="
        },
        "peer-id": {
          "version": "0.15.4",
@@ -30629,7 +30645,8 @@
          }
        },
        "node-fetch": {
-          "version": "npm:@achingbrain/node-fetch@2.6.7"
+          "version": "https://registry.npmjs.org/@achingbrain/node-fetch/-/node-fetch-2.6.7.tgz",
+          "integrity": "sha512-iTASGs+HTFK5E4ZqcMsHmeJ4zodyq8L38lZV33jwqcBJYoUt3HjN4+ot+O9/0b+ke8ddE7UgOtVuZN/OkV19/g=="
        },
        "peer-id": {
          "version": "0.15.4",
@@ -30780,7 +30797,8 @@
          }
        },
        "node-fetch": {
-          "version": "npm:@achingbrain/node-fetch@2.6.7"
+          "version": "https://registry.npmjs.org/@achingbrain/node-fetch/-/node-fetch-2.6.7.tgz",
+          "integrity": "sha512-iTASGs+HTFK5E4ZqcMsHmeJ4zodyq8L38lZV33jwqcBJYoUt3HjN4+ot+O9/0b+ke8ddE7UgOtVuZN/OkV19/g=="
        },
        "uint8arrays": {
          "version": "3.0.0",
@@ -30992,7 +31010,8 @@
          }
        },
        "node-fetch": {
-          "version": "npm:@achingbrain/node-fetch@2.6.7"
+          "version": "https://registry.npmjs.org/@achingbrain/node-fetch/-/node-fetch-2.6.7.tgz",
+          "integrity": "sha512-iTASGs+HTFK5E4ZqcMsHmeJ4zodyq8L38lZV33jwqcBJYoUt3HjN4+ot+O9/0b+ke8ddE7UgOtVuZN/OkV19/g=="
        },
        "peer-id": {
          "version": "0.15.4",
@@ -31210,7 +31229,8 @@
          }
        },
        "node-fetch": {
-          "version": "npm:@achingbrain/node-fetch@2.6.7"
+          "version": "https://registry.npmjs.org/@achingbrain/node-fetch/-/node-fetch-2.6.7.tgz",
+          "integrity": "sha512-iTASGs+HTFK5E4ZqcMsHmeJ4zodyq8L38lZV33jwqcBJYoUt3HjN4+ot+O9/0b+ke8ddE7UgOtVuZN/OkV19/g=="
        },
        "timeout-abort-controller": {
          "version": "2.0.0",
@@ -36990,6 +37010,13 @@
    "prepend-http": {
      "version": "2.0.0"
    },
+    "prettier": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.2.tgz",
+      "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==",
+      "dev": true,
+      "peer": true
+    },
    "prettier-linter-helpers": {
      "version": "1.0.0",
      "dev": true,
@@ -46,10 +46,11 @@ services:
    #build:
    #  context: ./p2wdb/
    #  dockerfile: Dockerfile
-    image: christroutner/p2wdb-bch-dex:v1.6.2
+    image: christroutner/p2wdb-bch-dex:v1.7.0
    container_name: p2wdb
    environment:
      CONSUMER_URL: 'https://free-bch.fullstack.cash'
+      DEBUG_LEVEL: 1
    logging:
      driver: 'json-file'
      options:
@@ -71,7 +72,7 @@ services:
    #build:
    #  context: ./bch-dex/
    #  dockerfile: Dockerfile
-    image: christroutner/bch-dex:v1.7.0
+    image: christroutner/bch-dex:v1.7.1
    container_name: bch-dex
    environment:
      CONSUMER_URL: 'https://free-bch.fullstack.cash'
@@ -16,7 +16,8 @@ export COORD_NAME=generic-p2wdb-production
 #export CR_DOMAIN=subdomain.yourdomain.com

 # Debug level. 0 = minimal info. 2 = max info.
-export DEBUG_LEVEL=2
+# This value set by docker-compose.yml
+#export DEBUG_LEVEL=1

 # Log-in information for retrieving a JWT token from FullStack.cash.
 export FULLSTACKLOGIN=demo@demo.com
@@ -68,6 +68,6 @@ FROM nginx
 EXPOSE 80

 # Copy the files built in the first container to the new NGINX container.
-COPY --from=builder /home/safeuser/bch-dex-ui2/public /usr/share/nginx/html
+COPY --from=builder /home/safeuser/bch-dex-ui/public /usr/share/nginx/html

 #USER safeuser
@@ -47,10 +47,11 @@ services:
    #build:
    #  context: ./p2wdb/
    #  dockerfile: Dockerfile
-    image: christroutner/pwd-bch-dex-rpi:v1.6.2
+    image: christroutner/pwd-bch-dex-rpi:v1.7.1
    container_name: p2wdb
    environment:
      CONSUMER_URL: 'https://free-bch.fullstack.cash'
+      DEBUG_LEVEL: 1
    logging:
      driver: 'json-file'
      options:
@@ -72,7 +73,7 @@ services:
    #build:
    #  context: ./bch-dex/
    #  dockerfile: Dockerfile
-    image: christroutner/bch-dex-rpi:v1.7.0
+    image: christroutner/bch-dex-rpi:v1.7.1
    container_name: bch-dex
    environment:
      CONSUMER_URL: 'https://free-bch.fullstack.cash'
@@ -95,7 +96,7 @@ services:
    #build:
    #  context: ./bch-dex-ui/
    #  dockerfile: Dockerfile
-    image: christroutner/bch-dex-ui-rpi:v1.6.4
+    image: christroutner/bch-dex-ui-rpi:v1.7.3
    container_name: dex-ui
    logging:
      driver: 'json-file'
@@ -16,7 +16,8 @@ export COORD_NAME=generic-p2wdb-production
 #export CR_DOMAIN=subdomain.yourdomain.com

 # Debug level. 0 = minimal info. 2 = max info.
-export DEBUG_LEVEL=2
+# This value set by docker-compose.yml
+#export DEBUG_LEVEL=1

 # Log-in information for retrieving a JWT token from FullStack.cash.
 export FULLSTACKLOGIN=demo@demo.com
@@ -18,7 +18,8 @@ async function sweepFunds () {
  try {
    // Open the wallet files.
    const walletLib = new WalletAdapter()
-    const walletInfo = await walletLib.openWallet()
+    // const walletInfo = await walletLib.openWallet()
+    const walletInfo = await openWallet(walletLib)
    const wallet = await walletLib.instanceWallet(walletInfo)
    console.log('walletInfo: ', walletInfo)

@@ -82,3 +83,18 @@ async function sweepFunds () {
  }
 }
 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
+  }
+}
Author	SHA1	Message	Date
Chris Troutner	3f2a12f6ec	Merge pull request #31 from Permissionless-Software-Foundation/ct-unstable fix(rpi): updating UI docker container	2022-05-17 07:10:37 -07:00
Chris Troutner	c1b687efd1	fix(rpi): updating UI docker container	2022-05-17 07:07:43 -07:00
Chris Troutner	faf5a83eb6	Merge pull request #30 from Permissionless-Software-Foundation/ct-unstable Several small tweeks	2022-05-10 10:54:53 -07:00
Chris Troutner	92a35b220f	fix(RPi): Updating docker images	2022-05-09 17:38:48 -07:00
Chris Troutner	58e934eeab	fix(docker): Uploaded new PC images	2022-05-09 12:04:05 -07:00
Chris Troutner	d5de76729d	fix(production): Switching p2wdb to debug level 1	2022-05-09 09:35:31 -07:00
Chris Troutner	805cac97d9	fix(startup): Listing web3 server at startup	2022-05-09 09:33:39 -07:00
Chris Troutner	91fa460158	fix(production scripts): Improvement to sweep-wallet.js	2022-05-09 09:26:17 -07:00