RanchiMall/flosight-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #316 from matiu/feat/unsync-500

Browse Source 
Feat/unsync 500
This commit is contained in:
Gustavo Maximiliano Cortez 2015-05-27 10:08:36 -03:00
commit b9d2d44007
7 changed files with 159 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
app/controllers/addresses.js
View File

@ -11,6 +11,18 @@ var async = require('async');
var tDb = require('../../lib/TransactionDb').default();
var checkSync = function(req, res) {
if (req.historicSync) {
var i = req.historicSync.info()
if (i.status !== 'finished') {
common.notReady(req, res, i.syncPercentage);
return false;
}
}
return true;
};
var getAddr = function(req, res, next) {
var a;
try {
@ -47,6 +59,7 @@ var getAddrs = function(req, res, next) {
};
exports.show = function(req, res, next) {
if (!checkSync(req, res)) return;
var a = getAddr(req, res, next);
if (a) {
@ -56,13 +69,18 @@ exports.show = function(req, res, next) {
} else {
return res.jsonp(a.getObj());
}
}, {txLimit: req.query.noTxList?0:-1, ignoreCache: req.param('noCache')});
}, {
txLimit: req.query.noTxList ? 0 : -1,
ignoreCache: req.param('noCache')
});
}
};
exports.utxo = function(req, res, next) {
if (!checkSync(req, res)) return;
var a = getAddr(req, res, next);
if (a) {
a.update(function(err) {
@ -71,11 +89,15 @@ exports.utxo = function(req, res, next) {
else {
return res.jsonp(a.unspent);
}
}, {onlyUnspent:1, ignoreCache: req.param('noCache')});
}, {
onlyUnspent: 1,
ignoreCache: req.param('noCache')
});
}
};
exports.multiutxo = function(req, res, next) {
if (!checkSync(req, res)) return;
var as = getAddrs(req, res, next);
if (as) {
var utxos = [];
@ -84,7 +106,10 @@ exports.multiutxo = function(req, res, next) {
if (err) callback(err);
utxos = utxos.concat(a.unspent);
callback();
}, {onlyUnspent:1, ignoreCache: req.param('noCache')});
}, {
onlyUnspent: 1,
ignoreCache: req.param('noCache')
});
}, function(err) { // finished callback
if (err) return common.handleErrors(err, res);
res.jsonp(utxos);
@ -93,6 +118,7 @@ exports.multiutxo = function(req, res, next) {
};
exports.multitxs = function(req, res, next) {
if (!checkSync(req, res)) return;
function processTxs(txs, from, to, cb) {
txs = _.uniq(_.flatten(txs), 'txid');
@ -109,9 +135,11 @@ exports.multitxs = function(req, res, next) {
}
var txIndex = {};
_.each(txs, function (tx) { txIndex[tx.txid] = tx; });
_.each(txs, function(tx) {
txIndex[tx.txid] = tx;
});
async.each(txs, function (tx, callback) {
async.each(txs, function(tx, callback) {
tDb.fromIdWithInfo(tx.txid, function(err, tx) {
if (err) console.log(err);
if (tx && tx.info) {
@ -119,7 +147,7 @@ exports.multitxs = function(req, res, next) {
}
callback();
});
}, function (err) {
}, function(err) {
if (err) return cb(err);
var transactions = _.pluck(txs, 'info');
@ -146,10 +174,13 @@ exports.multitxs = function(req, res, next) {
if (err) callback(err);
txs.push(a.transactions);
callback();
}, {ignoreCache: req.param('noCache'), includeTxInfo: true});
}, {
ignoreCache: req.param('noCache'),
includeTxInfo: true
});
}, function(err) { // finished callback
if (err) return common.handleErrors(err, res);
processTxs(txs, from, to, function (err, transactions) {
processTxs(txs, from, to, function(err, transactions) {
if (err) return common.handleErrors(err, res);
res.jsonp(transactions);
});
@ -158,6 +189,7 @@ exports.multitxs = function(req, res, next) {
};
exports.balance = function(req, res, next) {
if (!checkSync(req, res)) return;
var a = getAddr(req, res, next);
if (a)
a.update(function(err) {
@ -166,10 +198,13 @@ exports.balance = function(req, res, next) {
} else {
return res.jsonp(a.balanceSat);
}
}, {ignoreCache: req.param('noCache')});
}, {
ignoreCache: req.param('noCache')
});
};
exports.totalReceived = function(req, res, next) {
if (!checkSync(req, res)) return;
var a = getAddr(req, res, next);
if (a)
a.update(function(err) {
@ -178,10 +213,13 @@ exports.totalReceived = function(req, res, next) {
} else {
return res.jsonp(a.totalReceivedSat);
}
}, {ignoreCache: req.param('noCache')});
}, {
ignoreCache: req.param('noCache')
});
};
exports.totalSent = function(req, res, next) {
if (!checkSync(req, res)) return;
var a = getAddr(req, res, next);
if (a)
a.update(function(err) {
@ -190,10 +228,13 @@ exports.totalSent = function(req, res, next) {
} else {
return res.jsonp(a.totalSentSat);
}
}, {ignoreCache: req.param('noCache')});
}, {
ignoreCache: req.param('noCache')
});
};
exports.unconfirmedBalance = function(req, res, next) {
if (!checkSync(req, res)) return;
var a = getAddr(req, res, next);
if (a)
a.update(function(err) {
@ -202,5 +243,7 @@ exports.unconfirmedBalance = function(req, res, next) {
} else {
return res.jsonp(a.unconfirmedBalanceSat);
}
}, {ignoreCache: req.param('noCache')});
}, {
ignoreCache: req.param('noCache')
});
};

3
app/controllers/common.js
View File

@ -1,5 +1,8 @@
'use strict';
exports.notReady = function (err, res, p) {
res.status(503).send('Server not yet ready. Sync Percentage:' + p);
};
exports.handleErrors = function (err, res) {
if (err) {

11
app/controllers/status.js
View File

@ -12,10 +12,6 @@ var Status = require('../models/Status'),
*/
exports.show = function(req, res) {
if (! req.query.q) {
res.status(400).send('Bad Request');
}
else {
var option = req.query.q;
var statusObject = new Status();
@ -28,9 +24,6 @@ exports.show = function(req, res) {
};
switch(option) {
case 'getInfo':
statusObject.getInfo(returnJsonp);
break;
case 'getDifficulty':
statusObject.getDifficulty(returnJsonp);
break;
@ -43,9 +36,9 @@ exports.show = function(req, res) {
case 'getBestBlockHash':
statusObject.getBestBlockHash(returnJsonp);
break;
case 'getInfo':
default:
res.status(400).send('Bad Request');
}
statusObject.getInfo(returnJsonp);
}
};

50
app/models/Address.js
View File

@ -21,7 +21,7 @@ function Address(addrStr) {
this.unconfirmedBalanceSat = 0;
this.txApperances = 0;
this.unconfirmedTxApperances= 0;
this.unconfirmedTxApperances = 0;
this.seen = {};
// TODO store only txids? +index? +all?
@ -103,7 +103,8 @@ Address.prototype._addTxItem = function(txItem, txList, includeInfo) {
}
};
var add=0, addSpend=0;
var add = 0,
addSpend = 0;
var v = txItem.value_sat;
var seen = this.seen;
@ -112,35 +113,38 @@ Address.prototype._addTxItem = function(txItem, txList, includeInfo) {
seen[txItem.txid] = 1;
add = 1;
addTx({ txid: txItem.txid, ts: txItem.ts });
addTx({
txid: txItem.txid,
ts: txItem.ts
});
}
// Spent tx
if (txItem.spentTxId && !seen[txItem.spentTxId] ) {
addTx({ txid: txItem.spentTxId, ts: txItem.spentTs });
seen[txItem.spentTxId]=1;
addSpend=1;
if (txItem.spentTxId && !seen[txItem.spentTxId]) {
addTx({
txid: txItem.spentTxId,
ts: txItem.spentTs
});
seen[txItem.spentTxId] = 1;
addSpend = 1;
}
if (txItem.isConfirmed) {
this.txApperances += add;
this.totalReceivedSat += v;
if (! txItem.spentTxId ) {
if (!txItem.spentTxId) {
//unspent
this.balanceSat += v;
}
else if(!txItem.spentIsConfirmed) {
} else if (!txItem.spentIsConfirmed) {
// unspent
this.balanceSat += v;
this.unconfirmedBalanceSat -= v;
this.unconfirmedTxApperances += addSpend;
}
else {
} else {
// spent
this.totalSentSat += v;
this.txApperances += addSpend;
}
}
else {
} else {
this.unconfirmedBalanceSat += v;
this.unconfirmedTxApperances += add;
}
@ -156,29 +160,29 @@ Address.prototype.update = function(next, opts) {
if (!self.addrStr) return next();
opts = opts || {};
if (! ('ignoreCache' in opts) )
if (!('ignoreCache' in opts))
opts.ignoreCache = config.ignoreCache;
// should collect txList from address?
var txList = opts.txLimit === 0 ? null: [];
var txList = opts.txLimit === 0 ? null : [];
var tDb = TransactionDb;
var bDb = BlockDb;
tDb.fromAddr(self.addrStr, opts, function(err,txOut){
tDb.fromAddr(self.addrStr, opts, function(err, txOut) {
if (err) return next(err);
bDb.fillConfirmations(txOut, function(err) {
if (err) return next(err);
tDb.cacheConfirmations(txOut, function(err) {
// console.log('[Address.js.161:txOut:]',txOut); //TODO
// console.log('[Address.js.161:txOut:]',txOut); //TODO
if (err) return next(err);
if (opts.onlyUnspent) {
txOut = txOut.filter(function(x){
txOut = txOut.filter(function(x) {
return !x.spentTxId;
});
tDb.fillScriptPubKey(txOut, function() {
self.unspent = txOut.map(function(x){
self.unspent = txOut.map(function(x) {
return {
address: self.addrStr,
txid: x.txid,
@ -192,9 +196,8 @@ Address.prototype.update = function(next, opts) {
});
return next();
});
}
else {
txOut.forEach(function(txItem){
} else {
txOut.forEach(function(txItem) {
self._addTxItem(txItem, txList, opts.includeTxInfo);
});
if (txList)
@ -208,4 +211,3 @@ Address.prototype.update = function(next, opts) {
};
module.exports = require('soop')(Address);

4
config/express.js
View File

@ -26,8 +26,8 @@ module.exports = function(app, historicSync, peerSync) {
app.set('json spaces', 0);
app.enable('jsonp callback');
app.use(config.apiPrefix + '/sync', setHistoric);
app.use(config.apiPrefix + '/peer', setPeer);
app.use(config.apiPrefix, setHistoric);
app.use(config.apiPrefix, setPeer);
app.use(express.logger('dev'));
app.use(express.json());
app.use(express.urlencoded());

12
insight.js
View File

@ -131,18 +131,6 @@ if (config.enableRatelimiter) {
require('./plugins/ratelimiter').init(expressApp, config.ratelimiter);
}
if (config.enableMailbox) {
require('./plugins/mailbox').init(ios, config.mailbox);
}
if (config.enableCleaner) {
require('./plugins/cleaner').init(config.cleaner);
}
if (config.enableMonitor) {
require('./plugins/monitor').init(config.monitor);
}
if (config.enableEmailstore) {
require('./plugins/emailstore').init(config.emailstore);
}

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "insight-bitcore-api",
"description": "An open-source bitcoin blockchain API. The Insight API provides you with a convenient, powerful and simple way to query and broadcast data on the bitcoin network and build your own services with it.",
"version": "0.2.12",
"version": "0.2.13",
"author": {
"name": "Ryan X Charles",
"email": "ryan@bitpay.com"