Merge pull request #1882 from MetaMask/tx-cont-fixes

Tx cont fixes

1 files changed, 6 insertions, 1 deletions

diff --git a/app/scripts/lib/util.js b/app/scripts/lib/util.js
index 70390e95c..6dee9edf0 100644
--- a/app/scripts/lib/util.js
+++ b/app/scripts/lib/util.js
@@ -1,5 +1,6 @@
 const ethUtil = require('ethereumjs-util')
-const BN = ethUtil.BN
+const assert = require('assert')
+const BN = require('bn.js')
 
 module.exports = {
   getStack,
@@ -15,6 +16,10 @@ function getStack () {
 }
 
 function sufficientBalance (txParams, hexBalance) {
+  // validate hexBalance is a hex string
+  assert.equal(typeof hexBalance, 'string', 'sufficientBalance - hexBalance is not a hex string')
+  assert.equal(hexBalance.slice(0, 2), '0x', 'sufficientBalance - hexBalance is not a hex string')
+
   const balance = hexToBn(hexBalance)
   const value = hexToBn(txParams.value)
   const gasLimit = hexToBn(txParams.gas)