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

Merge remote-tracking branch 'origin/release-8.1.10' into chore/merge-8.10-into-9-20240206

Browse source
This commit is contained in:
Rafael Taranto 2024-02-06 08:35:59 +00:00
commit d5d433c4d8
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/blockexplorers/mempool.space.js
View file

@ -1,8 +1,8 @@
const axios = require("axios"); const axios = require("axios");
const getEstimateFeeBtc = () => { const getSatBEstimateFee = () => {
return axios.get('https://mempool.space/api/v1/fees/recommended') return axios.get('https://mempool.space/api/v1/fees/recommended')
.then(r => r.data.hourFee) .then(r => r.data.hourFee)
} }
module.exports = { getEstimateFeeBtc } module.exports = { getSatBEstimateFee }

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

@ -1,6 +1,6 @@
const _ = require('lodash/fp') const _ = require('lodash/fp')
const jsonRpc = require('../../common/json-rpc') const jsonRpc = require('../../common/json-rpc')
const { getEstimateFeeBtc } = require('../../../blockexplorers/mempool.space') const { getSatBEstimateFee } = require('../../../blockexplorers/mempool.space')
const BN = require('../../../bn') const BN = require('../../../bn')
const E = require('../../../error') const E = require('../../../error')
@ -56,14 +56,14 @@ function balance (account, cryptoCode, settings, operatorId) {
} }
function estimateFee () { function estimateFee () {
return getEstimateFeeBtc() return getSatBEstimateFee()
.then(result => BN(result)) .then(result => BN(result))
.catch(err => { .catch(err => {
logger.error('failure estimating fes', err) logger.error('failure estimating fes', err)
}) })
} }
function calculateFeeDiscount (feeMultiplier = 1) { function calculateFeeDiscount (feeMultiplier = 1, unitScale) {
// 0 makes bitcoind do automatic fee selection // 0 makes bitcoind do automatic fee selection
const AUTOMATIC_FEE = 0 const AUTOMATIC_FEE = 0
return estimateFee() return estimateFee()
@ -72,7 +72,8 @@ function calculateFeeDiscount (feeMultiplier = 1) {
logger.info('failure estimating fee, using bitcoind automatic fee selection') logger.info('failure estimating fee, using bitcoind automatic fee selection')
return AUTOMATIC_FEE return AUTOMATIC_FEE
} }
const newFee = estimatedFee.times(feeMultiplier) // transform from sat/vB to BTC/kvB and apply the multipler
const newFee = estimatedFee.shiftedBy(-unitScale+3).times(feeMultiplier)
if (newFee.lt(0.00001) || newFee.gt(0.1)) { if (newFee.lt(0.00001) || newFee.gt(0.1)) {
logger.info('fee outside safety parameters, defaulting to automatic fee selection') logger.info('fee outside safety parameters, defaulting to automatic fee selection')
return AUTOMATIC_FEE return AUTOMATIC_FEE
@ -86,7 +87,7 @@ function sendCoins (account, tx, settings, operatorId, feeMultiplier) {
const coins = cryptoAtoms.shiftedBy(-unitScale).toFixed(8) const coins = cryptoAtoms.shiftedBy(-unitScale).toFixed(8)
return checkCryptoCode(cryptoCode) return checkCryptoCode(cryptoCode)
.then(() => calculateFeeDiscount(feeMultiplier)) .then(() => calculateFeeDiscount(feeMultiplier, unitScale))
.then(newFee => fetch('settxfee', [newFee])) .then(newFee => fetch('settxfee', [newFee]))
.then(() => fetch('sendtoaddress', [toAddress, coins])) .then(() => fetch('sendtoaddress', [toAddress, coins]))
.then((txId) => fetch('gettransaction', [txId])) .then((txId) => fetch('gettransaction', [txId]))
@ -102,7 +103,7 @@ function sendCoins (account, tx, settings, operatorId, feeMultiplier) {
function sendCoinsBatch (account, txs, cryptoCode, feeMultiplier) { function sendCoinsBatch (account, txs, cryptoCode, feeMultiplier) {
return checkCryptoCode(cryptoCode) return checkCryptoCode(cryptoCode)
.then(() => calculateFeeDiscount(feeMultiplier)) .then(() => calculateFeeDiscount(feeMultiplier, unitScale))
.then(newFee => fetch('settxfee', [newFee])) .then(newFee => fetch('settxfee', [newFee]))
.then(() => _.reduce((acc, value) => ({ .then(() => _.reduce((acc, value) => ({
...acc, ...acc,
@ -214,7 +215,6 @@ module.exports = {
newFunding, newFunding,
cryptoNetwork, cryptoNetwork,
fetchRBF, fetchRBF,
estimateFee,
sendCoinsBatch, sendCoinsBatch,
checkBlockchainStatus, checkBlockchainStatus,
getTxHashesByAddress, getTxHashesByAddress,

2
new-lamassu-admin/src/pages/Transactions/DetailsCard.js
View file

@ -91,7 +91,7 @@ const getCryptoAmount = tx =>
const getCryptoFeeAmount = tx => { const getCryptoFeeAmount = tx => {
const feeAmount = coinUtils const feeAmount = coinUtils
.toUnit(new BigNumber(tx.cryptoAtoms), tx.cryptoCode) .toUnit(new BigNumber(tx.fee), tx.cryptoCode)
.toNumber() .toNumber()
return new BigNumber(feeAmount) return new BigNumber(feeAmount)