Use a single change address for reliability

kyledrake · Mar 16, 2014 · af2674f · af2674f
2 parents 88a37a9 + 6d2ebff
commit af2674f
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 35 deletions.
diff --git a/lib/coinpunk/server/db/redis.js b/lib/coinpunk/server/db/redis.js
@@ -90,21 +90,15 @@ DB.prototype = {
 
     this.redis.hgetall(serverKey, function(err, res) {
       if(err)
-        callback('database error: '+err);
+        return callback('database error: '+err);
 
-      if(res && res.payloadHash != undefined && res.payloadHash != 'undefined' && payload.originalPayloadHash != undefined && payload.originalPayloadHash != res.payloadHash) {
-        self.getWallet(serverKey, function(err, wallet) {
-          return callback('outOfSync', {wallet: wallet});
-        });
-      } else {
-        if(payload.newPayloadHash)
-          payload.payloadHash = payload.newPayloadHash;
+      if(payload.newPayloadHash)
+        payload.payloadHash = payload.newPayloadHash;
 
-        delete payload.originalPayloadHash;
-        delete payload.newPayloadHash;
+      delete payload.originalPayloadHash;
+      delete payload.newPayloadHash;
 
-        self.redis.hmset(serverKey, payload, callback);
-      }
+      self.redis.hmset(serverKey, payload, callback);
     });
 
   },

diff --git a/public/js/all.js b/public/js/all.js
diff --git a/public/js/coinpunk/controllers/accounts.js b/public/js/coinpunk/controllers/accounts.js
@@ -116,6 +116,7 @@ coinpunk.controllers.Accounts.prototype.create = function() {
 
     var wallet = new coinpunk.Wallet();
     var address   = wallet.createNewAddress('Default');
+    var change    = wallet.createNewAddress('change', true);
     var walletKey = wallet.createWalletKey(email, password);
 
     coinpunk.wallet = wallet;

diff --git a/public/js/coinpunk/controllers/tx.js b/public/js/coinpunk/controllers/tx.js
@@ -16,12 +16,27 @@ coinpunk.controllers.Tx.prototype.details = function(txHash) {
 coinpunk.controllers.Tx.prototype.send = function() {
   var self = this;
 
-  this.getUnspent(function(resp) {
-    coinpunk.router.render('view', 'tx/send', {balance: coinpunk.wallet.safeUnspentBalance()}, function(id) {
-      self.updateExchangeRates(id, false);
-      $('#'+id+" [rel='tooltip']").tooltip();
-    });
+  if(coinpunk.wallet.getChangeAddress())
+    return renderPage();
+
+  var changeAddress = coinpunk.wallet.createNewAddress('change', true);
+
+  this.saveWallet({override: true, address: changeAddress}, function(response) {
+    if(response.result != 'ok') {
+      return coinpunk.router.route('signout');
+    }
+
+    renderPage();
   });
+
+  function renderPage() {
+    self.getUnspent(function(resp) {
+      coinpunk.router.render('view', 'tx/send', {balance: coinpunk.wallet.safeUnspentBalance()}, function(id) {
+        self.updateExchangeRates(id, false);
+        $('#'+id+" [rel='tooltip']").tooltip();
+      });
+    });
+  };
 };
 
 coinpunk.controllers.Tx.prototype.sendExchangeUpdate = function() {
@@ -110,20 +125,15 @@ coinpunk.controllers.Tx.prototype.create = function() {
     return;
   }
 
-  var changeAddress = $('#changeAddress').val();
-
-  if(changeAddress == '')
-    changeAddress = coinpunk.wallet.createNewAddress('change', true);
+  var rawtx = coinpunk.wallet.createSend(amount, calculatedFee, address, coinpunk.wallet.getChangeAddress());
 
-  var rawtx = coinpunk.wallet.createSend(amount, calculatedFee, address, changeAddress);
-
-  self.saveWallet({override: true, address: changeAddress}, function(response) {
+  self.saveWallet({override: true}, function(response) {
     if(response.result == 'error' && response.messages[0] == 'Invalid session key') {
       self.displayErrors(['Fatal error: invalid session key, tx was not sent, logging out'], errorsDiv);
-      delete coinpunk.wallet;
+      coinpunk.router.route('signout');
     } else if(response.result != 'ok') {
       self.displayErrors(['An unknown error has occured, tx was not sent. Logging out. Please try again later.'], errorsDiv);
-      delete coinpunk.wallet;
+      coinpunk.router.route('signout');
     } else {
       $.post('/api/tx/send', {tx: rawtx}, function(resp) {
         if(resp.error) {
@@ -132,7 +142,7 @@ coinpunk.controllers.Tx.prototype.create = function() {
           return self.saveWallet({override: true}, function(walletResponse) {
             if(response.result != 'ok') {
               self.displayErrors(['An unknown error has occured, tx was not sent and could not revert tx info. Logging out. Please reload and try again later.'], errorsDiv);
-              delete coinpunk.wallet;
+              coinpunk.router.route('signout');
             }
             self.displayErrors([resp.error.message], errorsDiv);
             sendButton.removeClass('disabled');
@@ -173,14 +183,9 @@ coinpunk.controllers.Tx.prototype.calculateFee = function() {
   if(address == '' || amount == '')
     return;
 
-  var changeAddress = $('#changeAddress').val();
+  var changeAddress = coinpunk.wallet.getChangeAddress();
   var calculatedFee = $('#calculatedFee').val();
 
-  if(changeAddress == '') {
-    changeAddress = coinpunk.wallet.createNewAddress('change', true);
-    $('#changeAddress').val(changeAddress);
-  }
-
   var calculatedFee = coinpunk.wallet.calculateFee(amount, address, changeAddress);
   $('#calculatedFee').val(calculatedFee);
   $('#fee').text(coinpunk.wallet.calculateFee(amount, address, changeAddress)+' BTC');

diff --git a/public/js/coinpunk/models/wallet.js b/public/js/coinpunk/models/wallet.js
@@ -92,6 +92,15 @@ coinpunk.Wallet = function(walletKey, walletId) {
     }
     return addrs;
   };
+
+  this.deleteChangeAddress = function() {
+    var newKeyPairs = [];
+    for(var i=0; i<keyPairs.length; i++) {
+      if(keyPairs[i].isChange != true)
+        newKeyPairs.push(keyPairs[i]);
+    }
+    keyPairs = newKeyPairs;
+  };
 
   this.receiveAddressHashes = function() {
     var addrHashes = [];
@@ -103,6 +112,16 @@ coinpunk.Wallet = function(walletKey, walletId) {
     return addrHashes;
   };
 
+  this.getChangeAddress = function() {
+    var addrHashes = [];
+    for(var i=0; i<keyPairs.length; i++) {
+      if(keyPairs[i].isChange == true)
+        return keyPairs[i].address;
+    }
+
+    return null;
+  };
+
   this.changeAddressHashes = function() {
     var addrHashes = [];
     for(var i=0; i<keyPairs.length; i++) {