aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/transactions
diff options
context:
space:
mode:
authorWhymarrh Whitby <whymarrh.whitby@gmail.com>2019-08-01 04:17:11 +0800
committerFrankie <frankie.diamond@gmail.com>2019-08-01 04:17:11 +0800
commit4d88e1cf862c3ae174780cd888d7703685db23e7 (patch)
tree93f7cd0e7bbcb42c7be310f0e6b12230eace9492 /app/scripts/controllers/transactions
parente9c7df28ed88f6dc3a5074cf873f3920429d1803 (diff)
downloadtangerine-wallet-browser-4d88e1cf862c3ae174780cd888d7703685db23e7.tar.gz
tangerine-wallet-browser-4d88e1cf862c3ae174780cd888d7703685db23e7.tar.zst
tangerine-wallet-browser-4d88e1cf862c3ae174780cd888d7703685db23e7.zip
Enable indent linting via ESLint (#6936)
* Enable indent linting via ESLint * yarn run lint:fix
Diffstat (limited to 'app/scripts/controllers/transactions')
-rw-r--r--app/scripts/controllers/transactions/index.js26
-rw-r--r--app/scripts/controllers/transactions/lib/tx-state-history-helper.js8
-rw-r--r--app/scripts/controllers/transactions/lib/util.js10
-rw-r--r--app/scripts/controllers/transactions/pending-tx-tracker.js4
-rw-r--r--app/scripts/controllers/transactions/tx-state-manager.js10
5 files changed, 29 insertions, 29 deletions
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index c4371c25b..a33b46851 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -129,7 +129,7 @@ class TransactionController extends EventEmitter {
}
}
-/**
+ /**
Adds a tx to the txlist
@emits ${txMeta.id}:unapproved
*/
@@ -220,7 +220,7 @@ class TransactionController extends EventEmitter {
return txMeta
}
-/**
+ /**
adds the tx gas defaults: gas && gasPrice
@param txMeta {Object} - the txMeta object
@returns {Promise<object>} resolves with txMeta
@@ -495,9 +495,9 @@ class TransactionController extends EventEmitter {
this.txStateManager.updateTx(txMeta, 'transactions#setTxHash')
}
-//
-// PRIVATE METHODS
-//
+ //
+ // PRIVATE METHODS
+ //
/** maps methods for convenience*/
_mapMethods () {
/** @returns the state in transaction controller */
@@ -537,14 +537,14 @@ class TransactionController extends EventEmitter {
loadingDefaults: true,
}).forEach((tx) => {
this.addTxGasDefaults(tx)
- .then((txMeta) => {
- txMeta.loadingDefaults = false
- this.txStateManager.updateTx(txMeta, 'transactions: gas estimation for tx on boot')
- }).catch((error) => {
- tx.loadingDefaults = false
- this.txStateManager.updateTx(tx, 'failed to estimate gas during boot cleanup.')
- this.txStateManager.setTxStatusFailed(tx.id, error)
- })
+ .then((txMeta) => {
+ txMeta.loadingDefaults = false
+ this.txStateManager.updateTx(txMeta, 'transactions: gas estimation for tx on boot')
+ }).catch((error) => {
+ tx.loadingDefaults = false
+ this.txStateManager.updateTx(tx, 'failed to estimate gas during boot cleanup.')
+ this.txStateManager.setTxStatusFailed(tx.id, error)
+ })
})
this.txStateManager.getFilteredTxList({
diff --git a/app/scripts/controllers/transactions/lib/tx-state-history-helper.js b/app/scripts/controllers/transactions/lib/tx-state-history-helper.js
index 4562568e9..76fc5c35b 100644
--- a/app/scripts/controllers/transactions/lib/tx-state-history-helper.js
+++ b/app/scripts/controllers/transactions/lib/tx-state-history-helper.js
@@ -17,10 +17,10 @@ function migrateFromSnapshotsToDiffs (longHistory) {
return (
longHistory
// convert non-initial history entries into diffs
- .map((entry, index) => {
- if (index === 0) return entry
- return generateHistoryEntry(longHistory[index - 1], entry)
- })
+ .map((entry, index) => {
+ if (index === 0) return entry
+ return generateHistoryEntry(longHistory[index - 1], entry)
+ })
)
}
diff --git a/app/scripts/controllers/transactions/lib/util.js b/app/scripts/controllers/transactions/lib/util.js
index 5a8a0cefe..0d2ddddef 100644
--- a/app/scripts/controllers/transactions/lib/util.js
+++ b/app/scripts/controllers/transactions/lib/util.js
@@ -26,7 +26,7 @@ const normalizers = {
gasPrice: gasPrice => addHexPrefix(gasPrice),
}
- /**
+/**
normalizes txParams
@param txParams {object}
@returns {object} normalized txParams
@@ -40,7 +40,7 @@ function normalizeTxParams (txParams, LowerCase) {
return normalizedTxParams
}
- /**
+/**
validates txParams
@param txParams {object}
*/
@@ -59,7 +59,7 @@ function validateTxParams (txParams) {
}
}
- /**
+/**
validates the from field in txParams
@param txParams {object}
*/
@@ -68,7 +68,7 @@ function validateFrom (txParams) {
if (!isValidAddress(txParams.from)) throw new Error('Invalid from address')
}
- /**
+/**
validates the to field in txParams
@param txParams {object}
*/
@@ -85,7 +85,7 @@ function validateRecipient (txParams) {
return txParams
}
- /**
+/**
@returns an {array} of states that can be considered final
*/
function getFinalStates () {
diff --git a/app/scripts/controllers/transactions/pending-tx-tracker.js b/app/scripts/controllers/transactions/pending-tx-tracker.js
index bc11f6633..1ef3be36e 100644
--- a/app/scripts/controllers/transactions/pending-tx-tracker.js
+++ b/app/scripts/controllers/transactions/pending-tx-tracker.js
@@ -186,7 +186,7 @@ class PendingTransactionTracker extends EventEmitter {
this.emit('tx:warning', txMeta, err)
}
}
- /**
+ /**
checks to see if if the tx's nonce has been used by another transaction
@param txMeta {Object} - txMeta object
@emits tx:dropped
@@ -198,7 +198,7 @@ class PendingTransactionTracker extends EventEmitter {
const nextNonce = await this.query.getTransactionCount(from)
const { blockNumber } = await this.query.getTransactionByHash(hash) || {}
if (!blockNumber && parseInt(nextNonce) > parseInt(nonce)) {
- return true
+ return true
}
return false
}
diff --git a/app/scripts/controllers/transactions/tx-state-manager.js b/app/scripts/controllers/transactions/tx-state-manager.js
index 2aa28c270..a91b59918 100644
--- a/app/scripts/controllers/transactions/tx-state-manager.js
+++ b/app/scripts/controllers/transactions/tx-state-manager.js
@@ -34,7 +34,7 @@ class TransactionStateManager extends EventEmitter {
this.store = new ObservableStore(
extend({
transactions: [],
- }, initState))
+ }, initState))
this.txHistoryLimit = txHistoryLimit
this.getNetwork = getNetwork
}
@@ -245,7 +245,7 @@ class TransactionStateManager extends EventEmitter {
})
}
-/**
+ /**
@param opts {object} - an object of fields to search for eg:<br>
let <code>thingsToLookFor = {<br>
to: '0x0..',<br>
@@ -403,9 +403,9 @@ class TransactionStateManager extends EventEmitter {
// Update state
this._saveTxList(otherAccountTxs)
}
-//
-// PRIVATE METHODS
-//
+ //
+ // PRIVATE METHODS
+ //
// STATUS METHODS
// statuses: