From 62febac87659ddf78a34dd0dac1ee8a38d8c8e77 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 27 Feb 2018 15:14:18 -0800
Subject: refactor retrytx with higher gas price: - create a new tx instead of
 overwriting the tx hash - add a new state 'dropped' to the txStateManager -
 mark duplicate txs as dropped when one gets confirmed in a block

---
 app/scripts/lib/tx-state-manager.js | 38 +++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

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

diff --git a/app/scripts/lib/tx-state-manager.js b/app/scripts/lib/tx-state-manager.js
index 051efd247..25442ce47 100644
--- a/app/scripts/lib/tx-state-manager.js
+++ b/app/scripts/lib/tx-state-manager.js
@@ -1,9 +1,21 @@
 const extend = require('xtend')
 const EventEmitter = require('events')
 const ObservableStore = require('obs-store')
+const createId = require('./random-id')
 const ethUtil = require('ethereumjs-util')
 const txStateHistoryHelper = require('./tx-state-history-helper')
 
+// STATUS METHODS
+  // statuses:
+  //    - `'unapproved'` the user has not responded
+  //    - `'rejected'` the user has responded no!
+  //    - `'approved'` the user has approved the tx
+  //    - `'signed'` the tx is signed
+  //    - `'submitted'` the tx is sent to a server
+  //    - `'confirmed'` the tx has been included in a block.
+  //    - `'failed'` the tx failed for some reason, included on tx data.
+  //    - `'dropped'` the tx nonce was already used
+
 module.exports = class TransactionStateManger extends EventEmitter {
   constructor ({ initState, txHistoryLimit, getNetwork }) {
     super()
@@ -16,6 +28,16 @@ module.exports = class TransactionStateManger extends EventEmitter {
     this.getNetwork = getNetwork
   }
 
+  generateTxMeta (opts) {
+    return extend({
+      id: createId(),
+      time: (new Date()).getTime(),
+      status: 'unapproved',
+      metamaskNetworkId: this.getNetwork(),
+      loadingDefaults: true,
+    }, opts)
+  }
+
   // Returns the number of txs for the current network.
   getTxCount () {
     return this.getTxList().length
@@ -164,16 +186,6 @@ module.exports = class TransactionStateManger extends EventEmitter {
     })
   }
 
-  // STATUS METHODS
-  // statuses:
-  //    - `'unapproved'` the user has not responded
-  //    - `'rejected'` the user has responded no!
-  //    - `'approved'` the user has approved the tx
-  //    - `'signed'` the tx is signed
-  //    - `'submitted'` the tx is sent to a server
-  //    - `'confirmed'` the tx has been included in a block.
-  //    - `'failed'` the tx failed for some reason, included on tx data.
-
   // get::set status
 
   // should return the status of the tx.
@@ -211,6 +223,12 @@ module.exports = class TransactionStateManger extends EventEmitter {
     this._setTxStatus(txId, 'confirmed')
   }
 
+  // should update the status dropped
+  setTxStatusDropped (txId) {
+    this._setTxStatus(txId, 'dropped')
+  }
+
+
   setTxStatusFailed (txId, err) {
     const txMeta = this.getTx(txId)
     txMeta.err = {
-- 
cgit 


From 9fd349d7407d7c33deb317942f7e2835585767c9 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Tue, 13 Mar 2018 09:51:37 -0700
Subject: transactions:state - add a submittedTime stamp so the ui has a better
 grasp of the time of submission

---
 app/scripts/lib/tx-state-manager.js | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/app/scripts/lib/tx-state-manager.js b/app/scripts/lib/tx-state-manager.js
index e75f733aa..ad07c813f 100644
--- a/app/scripts/lib/tx-state-manager.js
+++ b/app/scripts/lib/tx-state-manager.js
@@ -214,7 +214,11 @@ module.exports = class TransactionStateManager extends EventEmitter {
   }
 
   // should update the status of the tx to 'submitted'.
+  // and add a time stamp for when it was called
   setTxStatusSubmitted (txId) {
+    const txMeta = this.getTx(txId)
+    txMeta.submittedTime = (new Date()).getTime()
+    this.updateTx(txMeta, 'txStateManager - add submitted time stamp')
     this._setTxStatus(txId, 'submitted')
   }
 
-- 
cgit