lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: json-rpc exporting and undefined blockchain dir

Browse source
This commit is contained in:
Sérgio Salgado 2021-11-30 19:35:38 +00:00
parent bbde0fc2b6
commit 50c07c5e8f
7 changed files with 16 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/plugins/common/json-rpc.js
View file

@ -4,8 +4,15 @@ const uuid = require('uuid')
const fs = require('fs') const fs = require('fs')
const _ = require('lodash/fp') const _ = require('lodash/fp')
const request = require('request-promise') 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) { function fetch (account = {}, method, params) {
params = _.defaultTo([], params) params = _.defaultTo([], params)
@ -101,7 +108,7 @@ function parseConf (confPath) {
function rpcConfig (cryptoRec) { function rpcConfig (cryptoRec) {
try { try {
const configPath = coinUtils.configPath(cryptoRec) const configPath = coinUtils.configPath(cryptoRec, blockchainDir)
const config = parseConf(configPath) const config = parseConf(configPath)
return { return {
username: config.rpcuser, username: config.rpcuser,

17
lib/plugins/wallet/bitcoincashd/bitcoincashd.js
View file

@ -1,32 +1,19 @@
const _ = require('lodash/fp') const _ = require('lodash/fp')
const jsonRpc = require('../../common/json-rpc') const jsonRpc = require('../../common/json-rpc')
const options = require('../../../options')
const BN = require('../../../bn') const BN = require('../../../bn')
const E = require('../../../error') const E = require('../../../error')
const { utils: coinUtils } = require('lamassu-coins') const { utils: coinUtils } = require('lamassu-coins')
const cryptoRec = coinUtils.getCryptoCurrency('BCH') const cryptoRec = coinUtils.getCryptoCurrency('BCH')
const configPath = coinUtils.configPath(cryptoRec, options.blockchainDir)
const unitScale = cryptoRec.unitScale const unitScale = cryptoRec.unitScale
const SUPPORTS_BATCHING = false const SUPPORTS_BATCHING = false
function rpcConfig () { const rpcConfig = jsonRpc.rpcConfig(cryptoRec)
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')
}
}
function fetch (method, params) { function fetch (method, params) {
return jsonRpc.fetch(rpcConfig(), method, params) return jsonRpc.fetch(rpcConfig, method, params)
} }
function checkCryptoCode (cryptoCode) { function checkCryptoCode (cryptoCode) {

1
lib/plugins/wallet/bitcoind/bitcoind.js
View file

@ -1,7 +1,6 @@
const _ = require('lodash/fp') const _ = require('lodash/fp')
const jsonRpc = require('../../common/json-rpc') const jsonRpc = require('../../common/json-rpc')
const options = require('../../../options')
const BN = require('../../../bn') const BN = require('../../../bn')
const E = require('../../../error') const E = require('../../../error')
const logger = require('../../../logger') const logger = require('../../../logger')

1
lib/plugins/wallet/dashd/dashd.js
View file

@ -3,7 +3,6 @@ const jsonRpc = require('../../common/json-rpc')
const { utils: coinUtils } = require('lamassu-coins') const { utils: coinUtils } = require('lamassu-coins')
const options = require('../../../options')
const BN = require('../../../bn') const BN = require('../../../bn')
const E = require('../../../error') const E = require('../../../error')

1
lib/plugins/wallet/litecoind/litecoind.js
View file

@ -3,7 +3,6 @@ const jsonRpc = require('../../common/json-rpc')
const { utils: coinUtils } = require('lamassu-coins') const { utils: coinUtils } = require('lamassu-coins')
const options = require('../../../options')
const BN = require('../../../bn') const BN = require('../../../bn')
const E = require('../../../error') const E = require('../../../error')

8
lib/plugins/wallet/monerod/monerod.js
View file

@ -5,14 +5,16 @@ const jsonRpc = require('../../common/json-rpc')
const { COINS, utils } = require('lamassu-coins') const { COINS, utils } = require('lamassu-coins')
const blockchainUtils = require('../../../coin-utils')
const BN = require('../../../bn') const BN = require('../../../bn')
const E = require('../../../error') const E = require('../../../error')
const { logger } = require('../../../blockchain/common') const { logger } = require('../../../blockchain/common')
const options = require('../../../options')
const blockchainDir = options.blockchainDir
const cryptoRec = utils.getCryptoCurrency(COINS.XMR) const cryptoRec = utils.getCryptoCurrency(COINS.XMR)
const configPath = utils.configPath(cryptoRec, blockchainUtils.blockchainDir()) const configPath = utils.configPath(cryptoRec, blockchainDir)
const walletDir = path.resolve(utils.cryptoDir(cryptoRec, blockchainUtils.blockchainDir()), 'wallets') const walletDir = path.resolve(utils.cryptoDir(cryptoRec, blockchainDir), 'wallets')
const unitScale = cryptoRec.unitScale const unitScale = cryptoRec.unitScale
function rpcConfig () { function rpcConfig () {

1
lib/plugins/wallet/zcashd/zcashd.js
View file

@ -4,7 +4,6 @@ const jsonRpc = require('../../common/json-rpc')
const { utils: coinUtils } = require('lamassu-coins') const { utils: coinUtils } = require('lamassu-coins')
const options = require('../../../options')
const BN = require('../../../bn') const BN = require('../../../bn')
const E = require('../../../error') const E = require('../../../error')