From 96fa29ffbce841977ae02acaba2d8114436262d4 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Mon, 12 Jun 2017 16:11:37 -0700
Subject: put tx resubmission on the block event

---
 app/scripts/controllers/transactions.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'app/scripts')

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index faccf1ab1..bf24523cc 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -9,7 +9,6 @@ const createId = require('../lib/random-id')
 const denodeify = require('denodeify')
 
 const RETRY_LIMIT = 200
-const RESUBMIT_INTERVAL = 10000 // Ten seconds
 
 module.exports = class TransactionController extends EventEmitter {
   constructor (opts) {
@@ -26,6 +25,7 @@ module.exports = class TransactionController extends EventEmitter {
     this.query = opts.ethQuery
     this.txProviderUtils = new TxProviderUtil(this.query)
     this.blockTracker.on('block', this.checkForTxInBlock.bind(this))
+    this.blockTracker.on('block', this.continuallyResubmitPendingTxs.bind(this))
     this.signEthTx = opts.signTransaction
     this.nonceLock = Semaphore(1)
 
@@ -34,8 +34,6 @@ module.exports = class TransactionController extends EventEmitter {
     this.store.subscribe(() => this._updateMemstore())
     this.networkStore.subscribe(() => this._updateMemstore())
     this.preferencesStore.subscribe(() => this._updateMemstore())
-
-    this.continuallyResubmitPendingTxs()
   }
 
   getState () {
@@ -411,16 +409,13 @@ module.exports = class TransactionController extends EventEmitter {
 
   continuallyResubmitPendingTxs () {
     const pending = this.getTxsByMetaData('status', 'submitted')
+    // only try resubmitting if their are transactions to resubmit
+    if (!pending.length) return
     const resubmit = denodeify(this.resubmitTx.bind(this))
     Promise.all(pending.map(txMeta => resubmit(txMeta)))
     .catch((reason) => {
       log.info('Problem resubmitting tx', reason)
     })
-    .then(() => {
-      global.setTimeout(() => {
-        this.continuallyResubmitPendingTxs()
-      }, RESUBMIT_INTERVAL)
-    })
   }
 
   resubmitTx (txMeta, cb) {
-- 
cgit 


From ae7c296669ad5c81e85071de071e2b0f2b1d4463 Mon Sep 17 00:00:00 2001
From: Thomas Huang <thomas.b.huang@gmail.com>
Date: Mon, 12 Jun 2017 17:44:11 -0700
Subject: Fix networkState in chain id

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

(limited to 'app/scripts')

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index faccf1ab1..d4603aafa 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -212,7 +212,7 @@ module.exports = class TransactionController extends EventEmitter {
 
   getChainId () {
     const networkState = this.networkStore.getState()
-    const getChainId = parseInt(networkState.network)
+    const getChainId = parseInt(networkState)
     if (Number.isNaN(getChainId)) {
       return 0
     } else {
-- 
cgit 


From ec3383c16275f8d4594323b7b4ec38b447844e68 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 13 Jun 2017 09:50:01 -0700
Subject: rename continuallyResubmitPendingTxs to resubmitPendingTxs

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

(limited to 'app/scripts')

diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index bf24523cc..9f621747f 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -25,7 +25,7 @@ module.exports = class TransactionController extends EventEmitter {
     this.query = opts.ethQuery
     this.txProviderUtils = new TxProviderUtil(this.query)
     this.blockTracker.on('block', this.checkForTxInBlock.bind(this))
-    this.blockTracker.on('block', this.continuallyResubmitPendingTxs.bind(this))
+    this.blockTracker.on('block', this.resubmitPendingTxs.bind(this))
     this.signEthTx = opts.signTransaction
     this.nonceLock = Semaphore(1)
 
@@ -407,7 +407,7 @@ module.exports = class TransactionController extends EventEmitter {
     this.memStore.updateState({ unapprovedTxs, selectedAddressTxList })
   }
 
-  continuallyResubmitPendingTxs () {
+  resubmitPendingTxs () {
     const pending = this.getTxsByMetaData('status', 'submitted')
     // only try resubmitting if their are transactions to resubmit
     if (!pending.length) return
-- 
cgit