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

fix: remove unnecessary config load and fee calculation

Browse source
This commit is contained in:
José Oliveira 2021-10-28 21:12:52 +01:00
parent 8c948d08c7
commit c200b0824a
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -60,7 +60,7 @@ function estimateFee () {
function calculateFeeDiscount (feeMultiplier) {
// 0 makes bitcoind do automatic fee selection
const AUTOMATIC_FEE = 0
if (!feeMultiplier) return AUTOMATIC_FEE
if (!feeMultiplier || feeMultiplier.eq(1)) return AUTOMATIC_FEE
return estimateFee()
.then(estimatedFee => {
if (!estimatedFee) return AUTOMATIC_FEE

7
lib/wallet.js
View file

@ -60,11 +60,8 @@ function _balance (settings, cryptoCode) {
function sendCoins (settings, tx) {
return fetchWallet(settings, tx.cryptoCode)
.then(r => {
return loadLatestConfig()
.then(config => {
const feeMultiplier = config[`wallets_${tx.cryptoCode}_feeMultiplier`]
return r.wallet.sendCoins(r.account, tx, settings, r.operatorId, feeMultiplier)
})
const feeMultiplier = settings[`wallets_${tx.cryptoCode}_feeMultiplier`]
return r.wallet.sendCoins(r.account, tx, settings, r.operatorId, feeMultiplier)
.then(res => {
mem.clear(module.exports.balance)
return res