From 91fa460158370f8bf46029e5c0ab31a5390a477a Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Mon, 9 May 2022 09:26:17 -0700 Subject: [PATCH 1/5] fix(production scripts): Improvement to sweep-wallet.js --- production/scripts/sweep-wallet.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/production/scripts/sweep-wallet.js b/production/scripts/sweep-wallet.js index 251ba6d..ca29612 100644 --- a/production/scripts/sweep-wallet.js +++ b/production/scripts/sweep-wallet.js @@ -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 + } +} From 805cac97d9b5acf2d2b8a8c1cf244db88006cc1a Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Mon, 9 May 2022 09:33:39 -0700 Subject: [PATCH 2/5] fix(startup): Listing web3 server at startup --- bin/server.js | 5 ++++- config/env/common.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/server.js b/bin/server.js index 614f82d..66370ce 100644 --- a/bin/server.js +++ b/bin/server.js @@ -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 diff --git a/config/env/common.js b/config/env/common.js index e2ae8c3..bc2b038 100644 --- a/config/env/common.js +++ b/config/env/common.js @@ -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, From d5de76729dea703581be170643b2a6a8cac5f10d Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Mon, 9 May 2022 09:35:31 -0700 Subject: [PATCH 3/5] fix(production): Switching p2wdb to debug level 1 --- production/docker/docker-compose.yml | 1 + production/docker/p2wdb/start-production.sh | 3 ++- production/rpi-docker/docker-compose.yml | 1 + production/rpi-docker/p2wdb/start-production.sh | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/production/docker/docker-compose.yml b/production/docker/docker-compose.yml index f6acb73..3e8a22e 100644 --- a/production/docker/docker-compose.yml +++ b/production/docker/docker-compose.yml @@ -50,6 +50,7 @@ services: container_name: p2wdb environment: CONSUMER_URL: 'https://free-bch.fullstack.cash' + DEBUG_LEVEL: 1 logging: driver: 'json-file' options: diff --git a/production/docker/p2wdb/start-production.sh b/production/docker/p2wdb/start-production.sh index 3e80c54..343cd66 100755 --- a/production/docker/p2wdb/start-production.sh +++ b/production/docker/p2wdb/start-production.sh @@ -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 diff --git a/production/rpi-docker/docker-compose.yml b/production/rpi-docker/docker-compose.yml index ec384d2..6cb5d62 100644 --- a/production/rpi-docker/docker-compose.yml +++ b/production/rpi-docker/docker-compose.yml @@ -51,6 +51,7 @@ services: container_name: p2wdb environment: CONSUMER_URL: 'https://free-bch.fullstack.cash' + DEBUG_LEVEL: 1 logging: driver: 'json-file' options: diff --git a/production/rpi-docker/p2wdb/start-production.sh b/production/rpi-docker/p2wdb/start-production.sh index 3e80c54..343cd66 100755 --- a/production/rpi-docker/p2wdb/start-production.sh +++ b/production/rpi-docker/p2wdb/start-production.sh @@ -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 From 58e934eeab0249a18e2f1f173dae9e4f49679c91 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Mon, 9 May 2022 12:04:05 -0700 Subject: [PATCH 4/5] fix(docker): Uploaded new PC images --- production/docker/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/production/docker/docker-compose.yml b/production/docker/docker-compose.yml index 3e8a22e..e2b25f0 100644 --- a/production/docker/docker-compose.yml +++ b/production/docker/docker-compose.yml @@ -46,7 +46,7 @@ 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' @@ -72,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' From 92a35b220ffafed84e7f64b571f8744e4123ff93 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Mon, 9 May 2022 17:38:48 -0700 Subject: [PATCH 5/5] fix(RPi): Updating docker images --- package-lock.json | 67 +++++++++++++++++------- production/rpi-docker/docker-compose.yml | 4 +- 2 files changed, 49 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6775b05..b77e713 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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, diff --git a/production/rpi-docker/docker-compose.yml b/production/rpi-docker/docker-compose.yml index 6cb5d62..78daa0a 100644 --- a/production/rpi-docker/docker-compose.yml +++ b/production/rpi-docker/docker-compose.yml @@ -47,7 +47,7 @@ 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' @@ -73,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'