aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/transaction-manager.js
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-01-05 07:03:45 +0800
committerFrankie <frankie.diamond@gmail.com>2017-01-05 07:03:45 +0800
commitcf6817092b92930ab96e1c9e610669b485b384ff (patch)
treecfa92fa6bbdcd0be1dfbab5d805cf146ac81e416 /app/scripts/transaction-manager.js
parent4b17222a5994166e01486698803896fd2d60043c (diff)
downloadtangerine-wallet-browser-cf6817092b92930ab96e1c9e610669b485b384ff.tar.gz
tangerine-wallet-browser-cf6817092b92930ab96e1c9e610669b485b384ff.tar.zst
tangerine-wallet-browser-cf6817092b92930ab96e1c9e610669b485b384ff.zip
remove unnecessary try statments
Diffstat (limited to 'app/scripts/transaction-manager.js')
-rw-r--r--app/scripts/transaction-manager.js40
1 files changed, 17 insertions, 23 deletions
diff --git a/app/scripts/transaction-manager.js b/app/scripts/transaction-manager.js
index a2dba69b5..6becfa6d1 100644
--- a/app/scripts/transaction-manager.js
+++ b/app/scripts/transaction-manager.js
@@ -138,29 +138,23 @@ module.exports = class TransactionManager extends EventEmitter {
// formats txParams so the keyringController can sign it
formatTxForSigining (txParams) {
- return new Promise((resolve, reject) => {
- try {
- var address = txParams.from
- var metaTx = this.getTx(txParams.metamaskId)
- var gasMultiplier = metaTx.gasMultiplier
- var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice), 16)
- gasPrice = gasPrice.mul(new BN(gasMultiplier * 100, 10)).div(new BN(100, 10))
- txParams.gasPrice = ethUtil.intToHex(gasPrice.toNumber())
-
- // normalize values
- txParams.to = normalize(txParams.to)
- txParams.from = normalize(txParams.from)
- txParams.value = normalize(txParams.value)
- txParams.data = normalize(txParams.data)
- txParams.gasLimit = normalize(txParams.gasLimit || txParams.gas)
- txParams.nonce = normalize(txParams.nonce)
- const ethTx = new Transaction(txParams)
- var txId = txParams.metamaskId
- resolve({ethTx, address, txId})
- } catch (err) {
- reject(err)
- }
- })
+ var address = txParams.from
+ var metaTx = this.getTx(txParams.metamaskId)
+ var gasMultiplier = metaTx.gasMultiplier
+ var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice), 16)
+ gasPrice = gasPrice.mul(new BN(gasMultiplier * 100, 10)).div(new BN(100, 10))
+ txParams.gasPrice = ethUtil.intToHex(gasPrice.toNumber())
+
+ // normalize values
+ txParams.to = normalize(txParams.to)
+ txParams.from = normalize(txParams.from)
+ txParams.value = normalize(txParams.value)
+ txParams.data = normalize(txParams.data)
+ txParams.gasLimit = normalize(txParams.gasLimit || txParams.gas)
+ txParams.nonce = normalize(txParams.nonce)
+ const ethTx = new Transaction(txParams)
+ var txId = txParams.metamaskId
+ return Promise.resolve({ethTx, address, txId})
}
// receives a signed tx object and updates the tx hash