Merge pull request #647 from isocolsky/feat/low-fees

WIP: Feat/low fees

lib/server.js

@@ -2590,6 +2590,7 @@ WalletService.prototype._normalizeTxHistory = function(txs) {
       confirmations: tx.confirmations,
       blockheight: tx.blockheight,
       fees: parseInt((tx.fees * 1e8).toFixed(0)),
+      size: tx.size,
       time: t,
       inputs: inputs,
       outputs: outputs,
@@ -2736,6 +2737,10 @@ WalletService.prototype.getTxHistory = function(opts, cb) {
         confirmations: tx.confirmations,
       };
 
+      if (_.isNumber(tx.size) && tx.size > 0) {
+        newTx.feePerKb = +(tx.fees * 1000 / tx.size).toFixed();
+      }
+
       if (opts.includeExtendedInfo) {
         newTx.inputs = _.map(inputs, function(input) {
           return _.pick(input, 'address', 'amount', 'isMine');
@@ -2907,10 +2912,30 @@ WalletService.prototype.getTxHistory = function(opts, cb) {
 
         var finalTxs = decorate(wallet, res.txs.items, addresses, res.txps, res.notes);
 
-        if (res.txs.fromCache)
-          log.debug("History from cache for:", self.walletId, from, to);
+        self.getFeeLevels({
+          network: wallet.network
+        }, function(err, levels) {
+          if (err) {
+            log.warn('Could not fetch fee levels', err);
+          } else {
+            var level = _.find(levels, {
+              level: 'superEconomy'
+            });
+            if (!level || !level.nbBlocks) {
+              log.debug('Cannot compute super economy fee level from blockchain');
+            } else {
+              var minFeePerKb = level.feePerKb;
+              _.each(finalTxs, function(tx) {
+                tx.lowFees = tx.feePerKb < minFeePerKb;
+              });
+            }
+          }
+
+          if (res.txs.fromCache)
+            log.debug("History from cache for:", self.walletId, from, to);
 
-        return cb(null, finalTxs, !!res.txs.fromCache);
+          return cb(null, finalTxs, !!res.txs.fromCache);
+        });
       });
     });
   });

test/integration/server.js

@@ -4139,6 +4139,9 @@ describe('Wallet service', function() {
           }],
         }];
         helpers.stubHistory(txs);
+        helpers.stubFeeLevels({
+          24: 10000,
+        });
         server.editTxNote({
           txid: '123',
           body: 'just some note'
@@ -4341,6 +4344,9 @@ describe('Wallet service', function() {
           }],
         }];
         helpers.stubHistory(txs);
+        helpers.stubFeeLevels({
+          24: 10000,
+        });
         server.getTxHistory({}, function(err, txs) {
           should.not.exist(err);
           should.exist(txs);
@@ -5984,6 +5990,9 @@ describe('Wallet service', function() {
         helpers.createAddresses(server, wallet, 1, 1, function(main, change) {
           mainAddresses = main;
           changeAddresses = change;
+          helpers.stubFeeLevels({
+            24: 10000,
+          });
           done();
         });
       });
@@ -6003,7 +6012,6 @@ describe('Wallet service', function() {
         done();
       });
     });
-
     it('should get tx history for incoming txs', function(done) {
       server._normalizeTxHistory = sinon.stub().returnsArg(0);
       var txs = [{
@@ -6297,6 +6305,79 @@ describe('Wallet service', function() {
         done();
       });
     });
+    it('should set lowFees atribute for sub-superEconomy level fees', function(done) {
+      helpers.stubFeeLevels({
+        24: 10000,
+      });
+      server._normalizeTxHistory = sinon.stub().returnsArg(0);
+      var txs = [{
+        txid: '1',
+        confirmations: 1,
+        fees: 100,
+        time: 20,
+        inputs: [{
+          address: 'external',
+          amount: 500,
+        }],
+        outputs: [{
+          address: mainAddresses[0].address,
+          amount: 200,
+        }],
+        size: 500,
+      }, {
+        txid: '2',
+        confirmations: 1,
+        fees: 6000,
+        time: 20,
+        inputs: [{
+          address: 'external',
+          amount: 500,
+        }],
+        outputs: [{
+          address: mainAddresses[0].address,
+          amount: 200,
+        }],
+        size: 500,
+      }];
+      helpers.stubHistory(txs);
+      server.getTxHistory({}, function(err, txs) {
+        should.not.exist(err);
+        var tx = txs[0];
+        tx.feePerKb.should.equal(200);
+        tx.lowFees.should.be.true;
+        var tx = txs[1];
+        tx.feePerKb.should.equal(12000);
+        tx.lowFees.should.be.false;
+        done();
+      });
+    });
+    it('should get tx history even if fee levels are unavailable', function(done) {
+      blockchainExplorer.estimateFee = sinon.stub().yields('dummy error');
+      server._normalizeTxHistory = sinon.stub().returnsArg(0);
+      var txs = [{
+        txid: '1',
+        confirmations: 1,
+        fees: 100,
+        time: 20,
+        inputs: [{
+          address: 'external',
+          amount: 500,
+        }],
+        outputs: [{
+          address: mainAddresses[0].address,
+          amount: 200,
+        }],
+        size: 500,
+      }];
+      helpers.stubHistory(txs);
+      server.getTxHistory({}, function(err, txs) {
+        should.not.exist(err);
+        var tx = txs[0];
+        tx.feePerKb.should.equal(200);
+        should.not.exist(tx.lowFees);
+        done();
+      });
+    });
   });
 
   describe('#getTxHistory cache', function() {
@@ -6310,6 +6391,9 @@ describe('Wallet service', function() {
         helpers.createAddresses(server, wallet, 1, 1, function(main, change) {
           mainAddresses = main;
           changeAddresses = change;
+          helpers.stubFeeLevels({
+            24: 10000,
+          });
           done();
         });
       });