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

Merge remote-tracking branch 'upstream/defiant-dingirma' into fix/flat-schema

Browse source
This commit is contained in:
Taranto 2020-06-01 21:02:44 +01:00
commit db32ad4f16
29 changed files with 2454 additions and 3157 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/wallet.js
View file

@ -104,7 +104,7 @@ function mergeStatus (a, b) {
if (!a) return b
if (!b) return a
return { status: mergeStatusMode(a.status, b.status) }
return { receivedCryptoAtoms: a.receivedCryptoAtoms, status: mergeStatusMode(a.status, b.status) }
}
function mergeStatusMode (a, b) {
@ -122,8 +122,11 @@ function mergeStatusMode (a, b) {
}
function getWalletStatus (settings, tx) {
const fudgeFactorEnabled = configManager.unscoped(settings.config).fudgeFactorActive
const fudgeFactor = fudgeFactorEnabled ? 100 : 0
const walletStatusPromise = fetchWallet(settings, tx.cryptoCode)
.then(r => r.wallet.getStatus(r.account, tx.toAddress, tx.cryptoAtoms, tx.cryptoCode))
.then(r => r.wallet.getStatus(r.account, tx.toAddress, tx.cryptoAtoms.minus(fudgeFactor), tx.cryptoCode))
return Promise.all([
walletStatusPromise,
@ -169,7 +172,7 @@ function getStatus (settings, tx, machineId) {
const status = isAuthorized ? 'authorized' : unauthorizedStatus
return { status }
return { receivedCryptoAtoms: statusRec.receivedCryptoAtoms, status }
})
}