m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #5490 from whymarrh/revert-5375

Browse Source 
Revert txReceipt merge
This commit is contained in:
Whymarrh Whitby 2018-10-10 15:40:43 -02:30 committed by GitHub
commit 3d0ba46f21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/scripts/controllers/transactions/index.js
View File

@ -362,29 +362,7 @@ class TransactionController extends EventEmitter {
this.txStateManager.setTxStatusSubmitted(txId)
}
/**
Sets the status of the transaction to confirmed
and sets the status of nonce duplicates as dropped
if the txParams have data it will fetch the txReceipt
@param txId {number} - the tx's Id
@returns {Promise<void>}
*/
async confirmTransaction (txId) {
// get the txReceipt before marking the transaction confirmed
// to ensure the receipt is gotten before the ui revives the tx
const txMeta = this.txStateManager.getTx(txId)
if (txMeta.txParams.data) {
try {
const txReceipt = await this.query.getTransactionReceipt()
txMeta.txReceipt = txReceipt
this.txStateManager.updateTx(txMeta, 'transactions#confirmTransaction - add txReceipt')
} catch (err) {
log.error(err)
}
}
confirmTransaction (txId) {
this.txStateManager.setTxStatusConfirmed(txId)
this._markNonceDuplicatesDropped(txId)
}