From 842e6ead695d56dfbcfe337420e9e40363101e78 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Wed, 8 Feb 2023 14:33:15 -0800 Subject: [PATCH 1/4] Debugging utxoBulk --- shell-scripts/local-external-ipfs-node.sh | 4 ++-- src/controllers/json-rpc/bch/index.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/shell-scripts/local-external-ipfs-node.sh b/shell-scripts/local-external-ipfs-node.sh index 8bbb1b8..c4098c0 100755 --- a/shell-scripts/local-external-ipfs-node.sh +++ b/shell-scripts/local-external-ipfs-node.sh @@ -18,8 +18,8 @@ export DEBUG_LEVEL=2 # Production settings that use external IPFS node. # https://github.com/christroutner/docker-ipfs export SVC_ENV=production -#export IPFS_HOST=localhost -export IPFS_HOST=172.17.0.1 +export IPFS_HOST=localhost +# export IPFS_HOST=172.17.0.1 export IPFS_API_PORT=5001 # Configure IPFS ports diff --git a/src/controllers/json-rpc/bch/index.js b/src/controllers/json-rpc/bch/index.js index 6ec4fa0..0e506f6 100644 --- a/src/controllers/json-rpc/bch/index.js +++ b/src/controllers/json-rpc/bch/index.js @@ -462,7 +462,7 @@ class BCHRPC { // console.log('createUser rpcData: ', rpcData) const addrs = rpcData.payload.params.addresses - // console.log('addr: ', addr) + console.log('addrs: ', addrs) // Input validation if (!Array.isArray(addrs)) { @@ -484,6 +484,7 @@ class BCHRPC { utxos: data }) } + console.log('result: ', result) const retObj = {} retObj.status = 200 From f42ccafffa507e2416cf9583f40aa2efd7784680 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Wed, 8 Feb 2023 14:52:17 -0800 Subject: [PATCH 2/4] More debugging --- src/controllers/json-rpc/bch/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/controllers/json-rpc/bch/index.js b/src/controllers/json-rpc/bch/index.js index 0e506f6..b6a0fce 100644 --- a/src/controllers/json-rpc/bch/index.js +++ b/src/controllers/json-rpc/bch/index.js @@ -491,6 +491,8 @@ class BCHRPC { retObj.success = true retObj.data = result + console.log('retObj: ', retObj) + return retObj } catch (err) { console.error('Error in JSON RPC BCH utxosBulk()') From 34fa039ced4823c8087cb5b96203d61f38563984 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Wed, 8 Feb 2023 15:08:00 -0800 Subject: [PATCH 3/4] Removing debugging --- src/controllers/json-rpc/bch/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/controllers/json-rpc/bch/index.js b/src/controllers/json-rpc/bch/index.js index b6a0fce..f092853 100644 --- a/src/controllers/json-rpc/bch/index.js +++ b/src/controllers/json-rpc/bch/index.js @@ -462,7 +462,7 @@ class BCHRPC { // console.log('createUser rpcData: ', rpcData) const addrs = rpcData.payload.params.addresses - console.log('addrs: ', addrs) + // console.log('addrs: ', addrs) // Input validation if (!Array.isArray(addrs)) { @@ -484,14 +484,14 @@ class BCHRPC { utxos: data }) } - console.log('result: ', result) + // console.log('result: ', result) const retObj = {} retObj.status = 200 retObj.success = true retObj.data = result - console.log('retObj: ', retObj) + // console.log('retObj: ', retObj) return retObj } catch (err) { From 3539f0af50059d264c6bdd92ff3f4cec4c25f993 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Thu, 6 Apr 2023 06:11:08 -0700 Subject: [PATCH 4/4] fix(deps): Updating dependencies --- package-lock.json | 28 ++++++++++++++-------------- package.json | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index f675921..cb63e30 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,12 +9,12 @@ "version": "2.0.0", "license": "MIT", "dependencies": { - "@psf/bch-js": "6.5.7", + "@psf/bch-js": "6.7.1", "axios": "0.27.2", "bcryptjs": "2.4.3", "glob": "7.1.6", "ipfs": "0.62.3", - "ipfs-coord": "8.0.4", + "ipfs-coord": "8.0.8", "ipfs-http-client": "55.0.0", "jsonrpc-lite": "2.2.0", "jsonwebtoken": "8.5.1", @@ -1445,9 +1445,9 @@ "license": "BSD-3-Clause" }, "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==", + "version": "6.7.1", + "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.7.1.tgz", + "integrity": "sha512-B7qGxgXQ3CtIWyGpBOUIMylBe7Y3fAZl10kDgbYIiNeHw/W5q7nhczl5it1FtqigcwekOnETMMhjZdabZ/A+pw==", "license": "MIT", "dependencies": { "@chris.troutner/bip32-utils": "1.0.5", @@ -7728,9 +7728,9 @@ } }, "node_modules/ipfs-coord": { - "version": "8.0.4", - "resolved": "http://94.130.170.209:4873/ipfs-coord/-/ipfs-coord-8.0.4.tgz", - "integrity": "sha512-jwZsrDlEWSHMnAde8PdyUScTzRlTCIvPAziChoczj5ZOZJIUbxLNkGphBI0xDj2G/LzjPrU1Ko/QZrU+oLFUnw==", + "version": "8.0.8", + "resolved": "http://94.130.170.209:4873/ipfs-coord/-/ipfs-coord-8.0.8.tgz", + "integrity": "sha512-2ivZ7dCIrpS7VBN0DohaGBYRe3bzybkGbl0lOTyNeCUhrrYniC66dAnfdCY8CmpEeXoEYsaW2hLmohz4jDHywQ==", "license": "MIT", "dependencies": { "axios": "0.21.4", @@ -20970,9 +20970,9 @@ "version": "1.1.0" }, "@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==", + "version": "6.7.1", + "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.7.1.tgz", + "integrity": "sha512-B7qGxgXQ3CtIWyGpBOUIMylBe7Y3fAZl10kDgbYIiNeHw/W5q7nhczl5it1FtqigcwekOnETMMhjZdabZ/A+pw==", "requires": { "@chris.troutner/bip32-utils": "1.0.5", "@psf/bip21": "2.0.1", @@ -25362,9 +25362,9 @@ } }, "ipfs-coord": { - "version": "8.0.4", - "resolved": "http://94.130.170.209:4873/ipfs-coord/-/ipfs-coord-8.0.4.tgz", - "integrity": "sha512-jwZsrDlEWSHMnAde8PdyUScTzRlTCIvPAziChoczj5ZOZJIUbxLNkGphBI0xDj2G/LzjPrU1Ko/QZrU+oLFUnw==", + "version": "8.0.8", + "resolved": "http://94.130.170.209:4873/ipfs-coord/-/ipfs-coord-8.0.8.tgz", + "integrity": "sha512-2ivZ7dCIrpS7VBN0DohaGBYRe3bzybkGbl0lOTyNeCUhrrYniC66dAnfdCY8CmpEeXoEYsaW2hLmohz4jDHywQ==", "requires": { "axios": "0.21.4", "bch-encrypt-lib": "2.0.0", diff --git a/package.json b/package.json index 3bd562a..75cba0c 100644 --- a/package.json +++ b/package.json @@ -24,12 +24,12 @@ }, "repository": "Permissionless-Software-Foundation/ipfs-bch-wallet-service", "dependencies": { - "@psf/bch-js": "6.5.7", + "@psf/bch-js": "6.7.1", "axios": "0.27.2", "bcryptjs": "2.4.3", "glob": "7.1.6", "ipfs": "0.62.3", - "ipfs-coord": "8.0.4", + "ipfs-coord": "8.0.8", "ipfs-http-client": "55.0.0", "jsonrpc-lite": "2.2.0", "jsonwebtoken": "8.5.1",