Merge pull request #3831 from MetaMask/i#3770

some more transaction validation bug fixes

2 files changed, 28 insertions, 2 deletions

diff --git a/test/unit/tx-controller-test.js b/test/unit/tx-controller-test.js
index 712097fce..6bd010e7a 100644
--- a/test/unit/tx-controller-test.js
+++ b/test/unit/tx-controller-test.js
@@ -162,7 +162,7 @@ describe('Transaction Controller', function () {
   describe('#addUnapprovedTransaction', function () {
 
     it('should add an unapproved transaction and return a valid txMeta', function (done) {
-      txController.addUnapprovedTransaction({})
+      txController.addUnapprovedTransaction({ from: '0x1678a085c290ebd122dc42cba69373b5953b831d' })
       .then((txMeta) => {
         assert(('id' in txMeta), 'should have a id')
         assert(('time' in txMeta), 'should have a time stamp')
@@ -182,7 +182,7 @@ describe('Transaction Controller', function () {
         assert(txMetaFromEmit, 'txMeta is falsey')
         done()
       })
-      txController.addUnapprovedTransaction({})
+      txController.addUnapprovedTransaction({ from: '0x1678a085c290ebd122dc42cba69373b5953b831d' })
       .catch(done)
     })
 
@@ -213,6 +213,7 @@ describe('Transaction Controller', function () {
   describe('#validateTxParams', function () {
     it('does not throw for positive values', function (done) {
       var sample = {
+        from: '0x1678a085c290ebd122dc42cba69373b5953b831d',
         value: '0x01',
       }
       txController.txGasUtil.validateTxParams(sample).then(() => {
@@ -222,6 +223,7 @@ describe('Transaction Controller', function () {
 
     it('returns error for negative values', function (done) {
       var sample = {
+        from: '0x1678a085c290ebd122dc42cba69373b5953b831d',
         value: '-0x01',
       }
       txController.txGasUtil.validateTxParams(sample)
diff --git a/test/unit/tx-gas-util-test.js b/test/unit/tx-gas-util-test.js
index d9a12d1c3..15d412c72 100644
--- a/test/unit/tx-gas-util-test.js
+++ b/test/unit/tx-gas-util-test.js
@@ -29,4 +29,28 @@ describe('Tx Gas Util', function () {
     }
     assert.throws(() => { txGasUtil.validateRecipient(zeroRecipientTxParams) }, Error, 'Invalid recipient address')
   })
+
+  it('should error when from is not a hex string', function () {
+
+    // where from is undefined
+    const txParams = {}
+    assert.throws(() => { txGasUtil.validateFrom(txParams) }, Error, `Invalid from address ${txParams.from} not a string`)
+
+    // where from is array
+    txParams.from = []
+    assert.throws(() => { txGasUtil.validateFrom(txParams) }, Error, `Invalid from address ${txParams.from} not a string`)
+
+    // where from is a object
+    txParams.from = {}
+    assert.throws(() => { txGasUtil.validateFrom(txParams) }, Error, `Invalid from address ${txParams.from} not a string`)
+
+    // where from is a invalid address
+    txParams.from = 'im going to fail'
+    assert.throws(() => { txGasUtil.validateFrom(txParams) }, Error, `Invalid from address`)
+
+    // should run
+    txParams.from ='0x1678a085c290ebd122dc42cba69373b5953b831d'
+    txGasUtil.validateFrom(txParams)
+    })
+
 })