From 3abceac55d16e41b37116a8dda565644ed0a9f52 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 5 Jul 2017 22:06:39 -0700
Subject: Fail pending txs with low balance or invalid nonce

---
 app/scripts/controllers/transactions.js | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 52251d66e..3f5834756 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -428,10 +428,28 @@ module.exports = class TransactionController extends EventEmitter {
     const gtBalance = Number.parseInt(txMeta.txParams.value) > Number.parseInt(balance)
     if (!('retryCount' in txMeta)) txMeta.retryCount = 0
 
-    // if the value of the transaction is greater then the balance
-    // or the nonce of the transaction is lower then the accounts nonce
-    // dont resubmit the tx
-    if (gtBalance || txNonce < nonce) return cb()
+    // if the value of the transaction is greater then the balance, fail.
+    if (gtBalance) {
+      txMeta.err = {
+        isWarning: true,
+        message: 'Insufficient balance.',
+      }
+      this.updateTx(txMeta)
+      cb()
+      return log.error(txMeta.err.message)
+    }
+
+    // if the nonce of the transaction is lower then the accounts nonce, fail.
+    if (txNonce < nonce) {
+      txMeta.err = {
+        isWarning: true,
+        message: 'Invalid nonce.',
+      }
+      this.updateTx(txMeta)
+      cb()
+      return log.error(txMeta.err.message)
+    }
+
     // Only auto-submit already-signed txs:
     if (!('rawTx' in txMeta)) return cb()
 
-- 
cgit 


From 07d4e4fe6f31d99a9f15c3862671c5c07831ff2a Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 5 Jul 2017 23:23:57 -0700
Subject: Fix failing test

---
 app/scripts/controllers/transactions.js | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 3f5834756..7946d10d1 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -430,24 +430,18 @@ module.exports = class TransactionController extends EventEmitter {
 
     // if the value of the transaction is greater then the balance, fail.
     if (gtBalance) {
-      txMeta.err = {
-        isWarning: true,
-        message: 'Insufficient balance.',
-      }
-      this.updateTx(txMeta)
+      const message = 'Insufficient balance.'
+      this.setTxStatusFailed(txMeta.id, message)
       cb()
-      return log.error(txMeta.err.message)
+      return log.error(message)
     }
 
     // if the nonce of the transaction is lower then the accounts nonce, fail.
     if (txNonce < nonce) {
-      txMeta.err = {
-        isWarning: true,
-        message: 'Invalid nonce.',
-      }
-      this.updateTx(txMeta)
+      const message = 'Invalid nonce.'
+      this.setTxStatusFailed(txMeta.id, message)
       cb()
-      return log.error(txMeta.err.message)
+      return log.error(message)
     }
 
     // Only auto-submit already-signed txs:
-- 
cgit