From 50c07c5e8f0c61c85919901b9c6930ee12bcd7bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Tue, 30 Nov 2021 19:35:38 +0000 Subject: [PATCH] fix: json-rpc exporting and undefined blockchain dir --- lib/plugins/common/json-rpc.js | 11 +++++++++-- lib/plugins/wallet/bitcoincashd/bitcoincashd.js | 17 ++--------------- lib/plugins/wallet/bitcoind/bitcoind.js | 1 - lib/plugins/wallet/dashd/dashd.js | 1 - lib/plugins/wallet/litecoind/litecoind.js | 1 - lib/plugins/wallet/monerod/monerod.js | 8 +++++--- lib/plugins/wallet/zcashd/zcashd.js | 1 - 7 files changed, 16 insertions(+), 24 deletions(-) diff --git a/lib/plugins/common/json-rpc.js b/lib/plugins/common/json-rpc.js index d716d18e..de3c7129 100644 --- a/lib/plugins/common/json-rpc.js +++ b/lib/plugins/common/json-rpc.js @@ -4,8 +4,15 @@ const uuid = require('uuid') const fs = require('fs') const _ = require('lodash/fp') const request = require('request-promise') +const { utils: coinUtils } = require('lamassu-coins') -module.exports = {fetch, fetchDigest, parseConf} +const options = require('../../../options') + +const blockchainDir = options.blockchainDir + +module.exports = { + fetch, fetchDigest, parseConf, rpcConfig +} function fetch (account = {}, method, params) { params = _.defaultTo([], params) @@ -101,7 +108,7 @@ function parseConf (confPath) { function rpcConfig (cryptoRec) { try { - const configPath = coinUtils.configPath(cryptoRec) + const configPath = coinUtils.configPath(cryptoRec, blockchainDir) const config = parseConf(configPath) return { username: config.rpcuser, diff --git a/lib/plugins/wallet/bitcoincashd/bitcoincashd.js b/lib/plugins/wallet/bitcoincashd/bitcoincashd.js index 7ba5871e..00a37f73 100644 --- a/lib/plugins/wallet/bitcoincashd/bitcoincashd.js +++ b/lib/plugins/wallet/bitcoincashd/bitcoincashd.js @@ -1,32 +1,19 @@ const _ = require('lodash/fp') const jsonRpc = require('../../common/json-rpc') -const options = require('../../../options') const BN = require('../../../bn') const E = require('../../../error') const { utils: coinUtils } = require('lamassu-coins') const cryptoRec = coinUtils.getCryptoCurrency('BCH') -const configPath = coinUtils.configPath(cryptoRec, options.blockchainDir) const unitScale = cryptoRec.unitScale const SUPPORTS_BATCHING = false -function rpcConfig () { - try { - const config = jsonRpc.parseConf(configPath) - return { - username: config.rpcuser, - password: config.rpcpassword, - port: config.rpcport || cryptoRec.defaultPort - } - } catch (err) { - throw new Error('wallet is currently not installed') - } -} +const rpcConfig = jsonRpc.rpcConfig(cryptoRec) function fetch (method, params) { - return jsonRpc.fetch(rpcConfig(), method, params) + return jsonRpc.fetch(rpcConfig, method, params) } function checkCryptoCode (cryptoCode) { diff --git a/lib/plugins/wallet/bitcoind/bitcoind.js b/lib/plugins/wallet/bitcoind/bitcoind.js index a5d5256d..51d48910 100644 --- a/lib/plugins/wallet/bitcoind/bitcoind.js +++ b/lib/plugins/wallet/bitcoind/bitcoind.js @@ -1,7 +1,6 @@ const _ = require('lodash/fp') const jsonRpc = require('../../common/json-rpc') -const options = require('../../../options') const BN = require('../../../bn') const E = require('../../../error') const logger = require('../../../logger') diff --git a/lib/plugins/wallet/dashd/dashd.js b/lib/plugins/wallet/dashd/dashd.js index 79c773b7..bb5d848a 100644 --- a/lib/plugins/wallet/dashd/dashd.js +++ b/lib/plugins/wallet/dashd/dashd.js @@ -3,7 +3,6 @@ const jsonRpc = require('../../common/json-rpc') const { utils: coinUtils } = require('lamassu-coins') -const options = require('../../../options') const BN = require('../../../bn') const E = require('../../../error') diff --git a/lib/plugins/wallet/litecoind/litecoind.js b/lib/plugins/wallet/litecoind/litecoind.js index 1b4c6236..7b238f90 100644 --- a/lib/plugins/wallet/litecoind/litecoind.js +++ b/lib/plugins/wallet/litecoind/litecoind.js @@ -3,7 +3,6 @@ const jsonRpc = require('../../common/json-rpc') const { utils: coinUtils } = require('lamassu-coins') -const options = require('../../../options') const BN = require('../../../bn') const E = require('../../../error') diff --git a/lib/plugins/wallet/monerod/monerod.js b/lib/plugins/wallet/monerod/monerod.js index e29f90fd..ff69c384 100644 --- a/lib/plugins/wallet/monerod/monerod.js +++ b/lib/plugins/wallet/monerod/monerod.js @@ -5,14 +5,16 @@ const jsonRpc = require('../../common/json-rpc') const { COINS, utils } = require('lamassu-coins') -const blockchainUtils = require('../../../coin-utils') const BN = require('../../../bn') const E = require('../../../error') const { logger } = require('../../../blockchain/common') +const options = require('../../../options') + +const blockchainDir = options.blockchainDir const cryptoRec = utils.getCryptoCurrency(COINS.XMR) -const configPath = utils.configPath(cryptoRec, blockchainUtils.blockchainDir()) -const walletDir = path.resolve(utils.cryptoDir(cryptoRec, blockchainUtils.blockchainDir()), 'wallets') +const configPath = utils.configPath(cryptoRec, blockchainDir) +const walletDir = path.resolve(utils.cryptoDir(cryptoRec, blockchainDir), 'wallets') const unitScale = cryptoRec.unitScale function rpcConfig () { diff --git a/lib/plugins/wallet/zcashd/zcashd.js b/lib/plugins/wallet/zcashd/zcashd.js index b37d0dd3..5979cbe8 100644 --- a/lib/plugins/wallet/zcashd/zcashd.js +++ b/lib/plugins/wallet/zcashd/zcashd.js @@ -4,7 +4,6 @@ const jsonRpc = require('../../common/json-rpc') const { utils: coinUtils } = require('lamassu-coins') -const options = require('../../../options') const BN = require('../../../bn') const E = require('../../../error')