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

Fixing recently sent txs.

Browse Source
This commit is contained in:
Chris Kleeschulte 2017-10-04 08:33:13 -04:00
parent d3515e12c9
commit b6b730ea2a
No known key found for this signature in database
GPG Key ID: 33195D27EF6BDB7F
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/addresses.js
View File

@ -163,7 +163,6 @@ AddressController.prototype.multiutxo = function(req, res) {
} else { } else {
addresses = req.addrs.split(','); addresses = req.addrs.split(',');
} }
async.eachLimit(addresses, 4, function(addr, next) { async.eachLimit(addresses, 4, function(addr, next) {
self._address.getAddressUnspentOutputs(addr, {}, function(err, utxos) { self._address.getAddressUnspentOutputs(addr, {}, function(err, utxos) {
@ -220,6 +219,7 @@ AddressController.prototype._getTransformOptions = function(req) {
AddressController.prototype.multitxs = function(req, res) { AddressController.prototype.multitxs = function(req, res) {
var self = this; var self = this;
console.log(req.body);
var options = { var options = {
from: parseInt(req.query.from) || parseInt(req.body.from) || 0 from: parseInt(req.query.from) || parseInt(req.body.from) || 0
}; };
@ -238,12 +238,15 @@ AddressController.prototype.multitxs = function(req, res) {
if (err) { if (err) {
return self.common.handleErrors(err, res); return self.common.handleErrors(err, res);
} }
res.jsonp({
var ret = {
totalItems: result.totalCount, totalItems: result.totalCount,
from: options.from, from: options.from,
to: Math.min(options.to, result.totalCount), to: Math.min(options.to, result.totalCount),
items: items items: items
}); };
res.jsonp(ret);
}); });
}); });

3
lib/transactions.js
View File

@ -14,6 +14,7 @@ function TxController(node) {
this._block = this.node.services.block; this._block = this.node.services.block;
this._transaction = this.node.services.transaction; this._transaction = this.node.services.transaction;
this._address = this.node.services.address; this._address = this.node.services.address;
this._p2p = this.node.services.p2p;
this._network = this.node.network; this._network = this.node.network;
if (this.node.network === 'livenet') { if (this.node.network === 'livenet') {
this._network = 'main'; this._network = 'main';
@ -324,7 +325,7 @@ TxController.prototype.list = function(req, res) {
TxController.prototype.send = function(req, res) { TxController.prototype.send = function(req, res) {
var self = this; var self = this;
this._transaction.sendTransaction(req.body.rawtx, function(err, txid) { this._p2p.sendTransaction(req.body.rawtx, function(err, txid) {
if(err) { if(err) {
// TODO handle specific errors // TODO handle specific errors
return self.common.handleErrors(err, res); return self.common.handleErrors(err, res);

4
regtest/reorg.js
View File

@ -45,10 +45,6 @@ var SimpleMap = function SimpleMap() {
this.size = 0; this.size = 0;
this.length = 0; this.length = 0;
this.hasNullItems = function() {
return array.length !== _.compact(array).length;
};
this.remove = function(item) { this.remove = function(item) {
var index = object[item]; var index = object[item];
if (index) { if (index) {