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

fix blockcypher bug

Browse source
This commit is contained in:
Josh Harvey 2017-10-21 18:33:20 +03:00
parent 86955da2ad
commit 18a702dbf8
3 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/blockchain_util.js
View file

@ -1,5 +0,0 @@
'use strict';
exports.addressReceived = function addressReceived(address, confirmations, cb) {
cb();
};

11
lib/plugins/zero-conf/blockcypher/blockcypher.js
View file

@ -4,8 +4,10 @@ const _ = require('lodash/fp')
module.exports = {authorize} module.exports = {authorize}
function isHighConfidence (confidence, txref) { function highConfidence (confidence, txref) {
return txref.confirmations > 0 || txref.confidence * 100 >= confidence ? txref.value : 0 if (txref.double_spend) return 0
if (txref.confirmations > 0 || txref.confidence * 100 >= confidence) return txref.value
return 0
} }
function authorize (account, toAddress, cryptoAtoms, cryptoCode) { function authorize (account, toAddress, cryptoAtoms, cryptoCode) {
@ -18,15 +20,14 @@ function authorize (account, toAddress, cryptoAtoms, cryptoCode) {
includeConfidence: true includeConfidence: true
}) })
const confidence = account.confidence const confidence = account.confidenceFactor
const url = `https://api.blockcypher.com/v1/btc/main/addrs/${toAddress}?${query}` const url = `https://api.blockcypher.com/v1/btc/main/addrs/${toAddress}?${query}`
console.log(url)
return axios.get(url) return axios.get(url)
.then(r => { .then(r => {
const data = r.data const data = r.data
const sumTxRefs = txrefs => _.sumBy(txref => isHighConfidence(confidence, txref), txrefs) const sumTxRefs = txrefs => _.sumBy(txref => highConfidence(confidence, txref), txrefs)
const authorizedValue = sumTxRefs(data.txrefs) + sumTxRefs(data.unconfirmed_txrefs) const authorizedValue = sumTxRefs(data.txrefs) + sumTxRefs(data.unconfirmed_txrefs)

2
lib/routes.js
View file

@ -197,7 +197,7 @@ function errorHandler (err, req, res, next) {
const json = {error: err.message} const json = {error: err.message}
logger.error(err) if (statusCode >= 400) logger.error(err)
return res.status(statusCode).json(json) return res.status(statusCode).json(json)
} }