From c7b9e3fb1878cebbab26d5343cc18084a601c6bb Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 11 Jul 2017 12:18:07 -0700
Subject: Improve insufficient balance checking in retry loop

---
 app/scripts/lib/tx-utils.js | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'app/scripts/lib/tx-utils.js')

diff --git a/app/scripts/lib/tx-utils.js b/app/scripts/lib/tx-utils.js
index 149d93102..4e780fcc0 100644
--- a/app/scripts/lib/tx-utils.js
+++ b/app/scripts/lib/tx-utils.js
@@ -118,6 +118,15 @@ module.exports = class txProviderUtils {
     }
   }
 
+  sufficientBalance (tx, hexBalance) {
+    const balance = hexToBn(hexBalance)
+    const value = hexToBn(tx.value)
+    const gasLimit = hexToBn(tx.gas)
+    const gasPrice = hexToBn(tx.gasPrice)
+
+    const maxCost = value.add(gasLimit.mul(gasPrice))
+    return balance.gte(maxCost)
+  }
 
 }
 
-- 
cgit 


From 231ad48564758895bace7b0e750cdfa5577128f8 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 11 Jul 2017 12:52:56 -0700
Subject: Use txParams

---
 app/scripts/lib/tx-utils.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/scripts/lib/tx-utils.js')

diff --git a/app/scripts/lib/tx-utils.js b/app/scripts/lib/tx-utils.js
index 4e780fcc0..aa0cb624f 100644
--- a/app/scripts/lib/tx-utils.js
+++ b/app/scripts/lib/tx-utils.js
@@ -118,11 +118,11 @@ module.exports = class txProviderUtils {
     }
   }
 
-  sufficientBalance (tx, hexBalance) {
+  sufficientBalance (txParams, hexBalance) {
     const balance = hexToBn(hexBalance)
-    const value = hexToBn(tx.value)
-    const gasLimit = hexToBn(tx.gas)
-    const gasPrice = hexToBn(tx.gasPrice)
+    const value = hexToBn(txParams.value)
+    const gasLimit = hexToBn(txParams.gas)
+    const gasPrice = hexToBn(txParams.gasPrice)
 
     const maxCost = value.add(gasLimit.mul(gasPrice))
     return balance.gte(maxCost)
-- 
cgit 


From 7eccf5905a830853bbb1932dde9a7f4536d43f55 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Thu, 13 Jul 2017 15:25:43 -0400
Subject: make publishTransaction and signTransaction async methods

---
 app/scripts/lib/tx-utils.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'app/scripts/lib/tx-utils.js')

diff --git a/app/scripts/lib/tx-utils.js b/app/scripts/lib/tx-utils.js
index aa0cb624f..8f6943937 100644
--- a/app/scripts/lib/tx-utils.js
+++ b/app/scripts/lib/tx-utils.js
@@ -106,8 +106,13 @@ module.exports = class txProviderUtils {
     return ethTx
   }
 
-  publishTransaction (rawTx, cb) {
-    this.query.sendRawTransaction(rawTx, cb)
+  publishTransaction (rawTx) {
+    return new Promise((resolve, reject) => {
+      this.query.sendRawTransaction(rawTx, (err, ress) => {
+        if (err) reject(err)
+        else resolve(ress)
+      })
+    })
   }
 
   validateTxParams (txParams, cb) {
-- 
cgit