Merge pull request #709 from yemel/feature/not-spend-unconfirmed

Add validation and tests for spendUnconfirmed = false

config.js

@@ -89,7 +89,7 @@ var defaultConfig = {
   wallet: {
     requiredCopayers: 2,
     totalCopayers: 3,
-    spendUnconfirmed: 1,
+    spendUnconfirmed: true,
     verbose: 1,
     reconnectDelay: 5000,
   },

js/models/core/Wallet.js

@@ -647,7 +647,8 @@ Wallet.prototype.getUnspent = function(cb) {
 
     for (var i in unspentList) {
       var u = unspentList[i];
-      if (!uu[u.txid + ',' + u.vout])
+      var name = u.txid + ',' + u.vout;
+      if (!uu[name] && (self.spendUnconfirmed || u.confirmations >= 1))
         safeUnspendList.push(u);
     }
 

js/services/controllerUtils.js

@@ -292,6 +292,15 @@ angular.module('copayApp.services')
           });
         });
       });
+
+      if (!$rootScope.wallet.spendUnconfirmed && !Socket.isListeningBlocks()) {
+        Socket.emit('subscribe', 'inv');
+        Socket.on('block', function(block) {
+          root.updateBalance(function() {
+              $rootScope.$digest();
+          });
+        });
+      }
     };
     return root;
   });

js/services/socket.js

@@ -38,6 +38,7 @@ angular.module('copayApp.services').factory('Socket',
         var ret = {};
 
         var addrList = listeners
+          .filter(function(i) { return i.event != 'block'; })
           .map(function(i) {return i.event;});
 
         for (var i in addrList) {
@@ -45,6 +46,9 @@ angular.module('copayApp.services').factory('Socket',
         }
         return ret;
       },
+      isListeningBlocks: function() {
+        return listeners.filter(function(i) { return i.event == 'block'; }).length > 0;
+      },
       emit: function(event, data, callback) {
         socket.emit(event, data, function() {
           var args = arguments;

test/mocks/FakeBlockchain.js

@@ -30,6 +30,20 @@ FakeBlockchain.prototype.getUnspent = function(addresses, cb) {
   }]);
 };
 
+FakeBlockchain.prototype.getUnspent2 = function(addresses, cb) {
+  if (!addresses || !addresses.length) return cb(null, []);
+  return cb(null, this.u || [{
+    'address': 'mji7zocy8QzYywQakwWf99w9bCT6orY1C1',
+    'txid': '0be0fb4579911be829e3077202e1ab47fcc12cf3ab8f8487ccceae768e1f95fa',
+    'vout': 0,
+    'ts': 1402323949,
+    'scriptPubKey': '21032ca453c1d9a93b7de8cf3d44d7bb8d52a45dbdf8fff63f69de4e51b740bb1da3ac',
+    'amount': 25.0001,
+    'confirmations': 1,
+    'confirmationsFromCache': false
+  }]);
+};
+
 FakeBlockchain.prototype.sendRawTransaction = function(rawtx, cb) {
   var txid = '0be0fb4579911be829e3077202e1ab47fcc12cf3ab8f8487ccceae768e1f95fa';
   return cb(txid);

test/test.Wallet.js

@@ -26,7 +26,7 @@ describe('Wallet model', function() {
   var config = {
     requiredCopayers: 3,
     totalCopayers: 5,
-    spendUnconfirmed: 1,
+    spendUnconfirmed: true,
     reconnectDelay: 100,
     networkName: 'testnet',
   };
@@ -42,9 +42,9 @@ describe('Wallet model', function() {
     w.getNetworkName().should.equal('testnet');
   });
 
-  var createW = function(netKey, N) {
+  var createW = function(netKey, N, conf) {
 
-    var c = JSON.parse(JSON.stringify(config));
+    var c = JSON.parse(JSON.stringify(conf || config));
     if (!N) N = c.totalCopayers;
 
     if (netKey) c.netKey = netKey;
@@ -122,10 +122,10 @@ describe('Wallet model', function() {
     "confirmations": 7
   }];
 
-  var createW2 = function(privateKeys, N) {
+  var createW2 = function(privateKeys, N, conf) {
     if (!N) N = 3;
     var netKey = 'T0FbU2JLby0=';
-    var w = createW(netKey, N);
+    var w = createW(netKey, N, conf);
     should.exist(w);
 
     var pkr = w.publicKeyRing;
@@ -467,6 +467,31 @@ describe('Wallet model', function() {
     });
   });
 
+  it('#getUnspent should honor spendUnconfirmed = false', function(done) {
+    var conf = JSON.parse(JSON.stringify(config));
+    conf.spendUnconfirmed = false;
+    var w = createW2(null, null, conf);
+    w.getBalance(function(err, balance, balanceByAddr, safeBalance) {
+      balance.should.equal(2500010000);
+      safeBalance.should.equal(0);
+      balanceByAddr.mji7zocy8QzYywQakwWf99w9bCT6orY1C1.should.equal(2500010000);
+      done();
+    });
+  });
+
+  it('#getUnspent and spendUnconfirmed should count transactions with 1 confirmations', function(done) {
+    var conf = JSON.parse(JSON.stringify(config));
+    conf.spendUnconfirmed = false;
+    var w = createW2(null, null, conf);
+    w.blockchain.getUnspent = w.blockchain.getUnspent2;
+    w.getBalance(function(err, balance, balanceByAddr, safeBalance) {
+      balance.should.equal(2500010000);
+      safeBalance.should.equal(2500010000);
+      balanceByAddr.mji7zocy8QzYywQakwWf99w9bCT6orY1C1.should.equal(2500010000);
+      done();
+    });
+  });
+
   var roundErrorChecks = [{
       unspent: [1.0001],
       balance: 100010000

test/unit/services/servicesSpec.js

@@ -41,6 +41,14 @@ describe("Unit: Socket Service", function() {
     expect(Object.keys(ret)).to.have.length(2);
   }));
 
+  it('Socket should support block event', inject(function(Socket) {
+    expect(Socket.isListeningBlocks()).to.be.false;
+    Socket.on('block', function() {});
+    expect(Socket.isListeningBlocks()).to.be.true;
+    Socket.removeAllListeners();
+    expect(Socket.isListeningBlocks()).to.be.false;
+  }));
+
   it('Socket should support #removeAllListeners', inject(function(Socket) {
     Socket.on('a', function() {});
     Socket.on('b', function() {});