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

fix: btc batching methods

Browse source
This commit is contained in:
Sérgio Salgado 2022-02-09 15:39:28 +00:00
parent e1751c8576
commit 384b3153a2
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,10 +84,10 @@ function sendCoinsBatch (account, txs, cryptoCode, feeMultiplier) {
.then(() => calculateFeeDiscount(feeMultiplier)) .then(() => calculateFeeDiscount(feeMultiplier))
.then(newFee => fetch('settxfee', [newFee])) .then(newFee => fetch('settxfee', [newFee]))
.then(() => { .then(() => {
const txAddressAmountPairs = _.map(tx => [tx.address, tx.cryptoAtoms.shiftedBy(-unitScale).toFixed(8)], txs) const txAddressAmountPairs = _.map(tx => [tx.toAddress, BN(tx.cryptoAtoms).shiftedBy(-unitScale).toFixed(8)], txs)
return Promise.all([JSON.stringify(_.fromPairs(txAddressAmountPairs))]) return _.fromPairs(txAddressAmountPairs)
}) })
.then(([obj]) => fetch('sendmany', ['', obj])) .then((obj) => fetch('sendmany', ['', obj]))
.then((txId) => fetch('gettransaction', [txId])) .then((txId) => fetch('gettransaction', [txId]))
.then((res) => _.pick(['fee', 'txid'], res)) .then((res) => _.pick(['fee', 'txid'], res))
.then((pickedObj) => ({ .then((pickedObj) => ({

1
lib/tx-batching.js
View file

@ -48,6 +48,7 @@ function setErroredBatch (batch, errorMsg) {
function getBatchTransactions (batch) { function getBatchTransactions (batch) {
const sql = `SELECT * FROM cash_in_txs WHERE batch_id=$1` const sql = `SELECT * FROM cash_in_txs WHERE batch_id=$1`
return db.manyOrNone(sql, [batch.id]) return db.manyOrNone(sql, [batch.id])
.then(res => _.map(_.mapKeys(_.camelCase), res))
} }
function getBatchesByStatus (statuses) { function getBatchesByStatus (statuses) {