aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-01-19 03:33:37 +0800
committerkumavis <aaron@kumavis.me>2017-01-19 03:33:37 +0800
commit3b7301488f0711ea76e60b6d1bfff36f33314fb1 (patch)
tree9bf9bd4f2cf6b6591082608a9cf279c34c83346e /app
parent1f2840a7beff0cde617f1caf7cb7070507c81f7d (diff)
downloadtangerine-wallet-browser-3b7301488f0711ea76e60b6d1bfff36f33314fb1.tar
tangerine-wallet-browser-3b7301488f0711ea76e60b6d1bfff36f33314fb1.tar.gz
tangerine-wallet-browser-3b7301488f0711ea76e60b6d1bfff36f33314fb1.tar.bz2
tangerine-wallet-browser-3b7301488f0711ea76e60b6d1bfff36f33314fb1.tar.lz
tangerine-wallet-browser-3b7301488f0711ea76e60b6d1bfff36f33314fb1.tar.xz
tangerine-wallet-browser-3b7301488f0711ea76e60b6d1bfff36f33314fb1.tar.zst
tangerine-wallet-browser-3b7301488f0711ea76e60b6d1bfff36f33314fb1.zip
tx-manager - use rpc-specified txHash
Diffstat (limited to 'app')
-rw-r--r--app/scripts/transaction-manager.js11
1 files changed, 5 insertions, 6 deletions
diff --git a/app/scripts/transaction-manager.js b/app/scripts/transaction-manager.js
index 87f99ce62..9261bb54a 100644
--- a/app/scripts/transaction-manager.js
+++ b/app/scripts/transaction-manager.js
@@ -190,7 +190,7 @@ module.exports = class TransactionManager extends EventEmitter {
let fromAddress = txParams.from
let ethTx = this.txProviderUtils.buildEthTxFromParams(txParams, txMeta.gasMultiplier)
this.signEthTx(ethTx, fromAddress).then(() => {
- this.updateTxAsSigned(txMeta.id, ethTx)
+ this.setTxStatusSigned(txMeta.id)
cb(null, ethUtil.bufferToHex(ethTx.serialize()))
}).catch((err) => {
cb(err)
@@ -198,21 +198,20 @@ module.exports = class TransactionManager extends EventEmitter {
}
publishTransaction (txId, rawTx, cb) {
- this.txProviderUtils.publishTransaction(rawTx, (err) => {
+ this.txProviderUtils.publishTransaction(rawTx, (err, txHash) => {
if (err) return cb(err)
+ this.setTxHash(txId, txHash)
this.setTxStatusSubmitted(txId)
cb()
})
}
- // receives a signed tx object and updates the tx hash
- updateTxAsSigned (txId, ethTx) {
+ // receives a txHash records the tx as signed
+ setTxHash (txId, txHash) {
// Add the tx hash to the persisted meta-tx object
- let txHash = ethUtil.bufferToHex(ethTx.hash())
let txMeta = this.getTx(txId)
txMeta.hash = txHash
this.updateTx(txMeta)
- this.setTxStatusSigned(txMeta.id)
}
/*