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

feat: support new advanced wallet settings

Browse source
This commit is contained in:
José Oliveira 2022-02-17 21:50:31 +00:00
parent 4120d58a1b
commit ba72786dcb
7 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/wallet.js
View file

@ -3,7 +3,6 @@ const mem = require('mem')
const hkdf = require('futoin-hkdf')
const configManager = require('./new-config-manager')
const { loadLatestConfig } = require('./new-settings-loader')
const pify = require('pify')
const fs = pify(require('fs'))
@ -63,7 +62,8 @@ function _balance (settings, cryptoCode) {
function sendCoins (settings, tx) {
return fetchWallet(settings, tx.cryptoCode)
.then(r => {
const feeMultiplier = settings[`wallets_${tx.cryptoCode}_feeMultiplier`]
const feeMultiplier = configManager.getWalletSettings(tx.cryptoCode, settings.config).feeMultiplier
console.log('** DEBUG MINERS FEE ** - Fee multiplier: ', feeMultiplier)
return r.wallet.sendCoins(r.account, tx, settings, r.operatorId, feeMultiplier)
.then(res => {
mem.clear(module.exports.balance)
@ -81,7 +81,7 @@ function sendCoins (settings, tx) {
function sendCoinsBatch (settings, txs, cryptoCode) {
return fetchWallet(settings, cryptoCode)
.then(r => {
const feeMultiplier = settings[`wallets_${cryptoCode}_feeMultiplier`]
const feeMultiplier = configManager.getWalletSettings(cryptoCode, settings.config).feeMultiplier
return r.wallet.sendCoinsBatch(r.account, txs, cryptoCode, feeMultiplier)
.then(res => {
mem.clear(module.exports.balance)
@ -233,7 +233,9 @@ function isStrictAddress (settings, cryptoCode, toAddress) {
}
function supportsBatching (settings, cryptoCode) {
return Promise.resolve(!!configManager.getWalletSettings(cryptoCode, settings.config).allowTransactionBatching)
return fetchWallet(settings, cryptoCode).then(r => {
return Promise.resolve(!!r.wallet.supportsBatching && !!configManager.getWalletSettings(cryptoCode, settings.config).allowTransactionBatching)
})
}
function checkBlockchainStatus (settings, cryptoCode) {