From 5e6962342df488073de61314fa4dfae9b7870fb8 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 8 Aug 2017 21:08:30 -0700
Subject: tx controller - fix getBalance fn

---
 app/scripts/controllers/transactions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/scripts/controllers/transactions.js')

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 28130c164..8b5c6dde2 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -40,7 +40,7 @@ module.exports = class TransactionController extends EventEmitter {
     this.pendingTxTracker = new PendingTransactionTracker({
       provider: this.provider,
       nonceTracker: this.nonceTracker,
-      getBalance: async (address) => {
+      getBalance: (address) => {
         const account = this.ethStore.getState().accounts[address]
         if (!account) return
         return account.balance
-- 
cgit v1.2.3


From 25f9746dabb4ecc736a5cdd7b01b2d8a6c8151de Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 8 Aug 2017 21:09:28 -0700
Subject: tx controller - fix error serialization

---
 app/scripts/controllers/transactions.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'app/scripts/controllers/transactions.js')

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 8b5c6dde2..58c468e22 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -382,9 +382,12 @@ module.exports = class TransactionController extends EventEmitter {
     this._setTxStatus(txId, 'confirmed')
   }
 
-  setTxStatusFailed (txId, reason) {
+  setTxStatusFailed (txId, err) {
     const txMeta = this.getTx(txId)
-    txMeta.err = reason
+    txMeta.err = {
+      message: err.toString(),
+      stack: err.stack,
+    }
     this.updateTx(txMeta)
     this._setTxStatus(txId, 'failed')
   }
-- 
cgit v1.2.3