Merge pull request #342 from matiu/feat/tx-order2

better ordering of txs
bitpay · Jul 17, 2015 · 74a96e9 · 74a96e9
2 parents 1735552 + b9ad26a
commit 74a96e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/controllers/addresses.js b/app/controllers/addresses.js
@@ -211,7 +211,6 @@ exports.multitxs = function(req, res, next) {
       }, {
         ignoreCache: req.param('noCache'),
         includeTxInfo: true,
-        dontFillSpent: true,
       });
     }, function(err) { // finished callback
       if (err) return common.handleErrors(err, res);

diff --git a/lib/TransactionDb.js b/lib/TransactionDb.js
@@ -448,8 +448,6 @@ TransactionDb.prototype._parseAddrData = function(k, data, ignoreCache) {
 };
 
 
-// opts.dontFillSpent
-
 TransactionDb.prototype.fromAddr = function(addr, opts, cb) {
   opts = opts || {};
   var self = this;
@@ -475,9 +473,12 @@ TransactionDb.prototype.fromAddr = function(addr, opts, cb) {
     })
     .on('error', cb)
     .on('end', function() {
-      if (opts.dontFillSpent) {
-        return cb(null, ret)
-      }
+
+      // This is a bad idea. ADDR_PREFIX ONLY indexes tx in outputs
+      // it is still necesarry for search for inputs
+      // if (opts.dontFillSpent) {
+      //  return cb(null, ret)
+      //}
 
       async.eachLimit(ret.filter(function(x) {
           return !x.spentIsConfirmed;