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

Merge pull request #1098 from chaotixkilla/fix-btc-batching-shiftedby

Browse source 
Fix BTC batching promise chain
This commit is contained in:
Rafael Taranto 2022-02-17 10:32:20 +00:00 • committed by GitHub
commit 5aace51618
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(newFee => fetch('settxfee', [newFee]))
.then(() => {
const txAddressAmountPairs = _.map(tx => [tx.address, tx.cryptoAtoms.shiftedBy(-unitScale).toFixed(8)], txs)
return Promise.all([JSON.stringify(_.fromPairs(txAddressAmountPairs))])
const txAddressAmountPairs = _.map(tx => [tx.toAddress, BN(tx.cryptoAtoms).shiftedBy(-unitScale).toFixed(8)], txs)
return _.fromPairs(txAddressAmountPairs)
})
.then(([obj]) => fetch('sendmany', ['', obj]))
.then((obj) => fetch('sendmany', ['', obj]))
.then((txId) => fetch('gettransaction', [txId]))
.then((res) => _.pick(['fee', 'txid'], res))
.then((pickedObj) => ({

1
lib/tx-batching.js
View file

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