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

fix: move ETH pending balance fix to wallet

Browse source
This commit is contained in:
Sérgio Salgado 2021-02-15 13:30:59 +00:00 • committed by Josh Harvey
parent 9a074438bd
commit caf2c83bfb
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/new-admin/funding.js
View file

@ -51,9 +51,7 @@ function getSingleCoinFunding (settings, fiatCode, cryptoCode) {
const rate = (rates.ask.add(rates.bid)).div(2) const rate = (rates.ask.add(rates.bid)).div(2)
const fundingConfirmedBalance = fundingRec.fundingConfirmedBalance const fundingConfirmedBalance = fundingRec.fundingConfirmedBalance
const fiatConfirmedBalance = computeFiat(rate, cryptoCode, fundingConfirmedBalance) const fiatConfirmedBalance = computeFiat(rate, cryptoCode, fundingConfirmedBalance)
const pending = cryptoCode === 'ETH' const pending = fundingRec.fundingPendingBalance
? fundingRec.fundingPendingBalance - fundingRec.fundingConfirmedBalance
: fundingRec.fundingPendingBalance
const fiatPending = computeFiat(rate, cryptoCode, pending) const fiatPending = computeFiat(rate, cryptoCode, pending)
const fundingAddress = fundingRec.fundingAddress const fundingAddress = fundingRec.fundingAddress
const fundingAddressUrl = coinUtils.buildUrl(cryptoCode, fundingAddress) const fundingAddressUrl = coinUtils.buildUrl(cryptoCode, fundingAddress)

5
lib/plugins/wallet/geth/base.js
View file

@ -71,7 +71,10 @@ function balance (account, cryptoCode) {
.then(() => pendingBalance(defaultAddress(account))) .then(() => pendingBalance(defaultAddress(account)))
} }
const pendingBalance = address => _balance(true, address) const pendingBalance = address => {
const promises = [_balance(true, address), _balance(false, address)]
return Promise.all(promises).then(([pending, confirmed]) => pending - confirmed)
}
const confirmedBalance = address => _balance(false, address) const confirmedBalance = address => _balance(false, address)
function _balance (includePending, address) { function _balance (includePending, address) {