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

Fix calculation and display of eth received amounts in swaps (#9546)

Browse Source 
* Update txMeta after postTxBalance has been retrieved

* Use gas used from txReceipt to calculate eth received

* Return null from getSwapsTokensReceivedFromTxMeta in tokenSymbol is ETH and txReceipt is missing

* Get latest txMeta before updating it with postTxBalance in case of a swaps tx in confirmTransaction

* Lint fix
This commit is contained in:
Dan J Miller 2020-10-12 07:52:51 -02:30 committed by GitHub
parent 6409caa081
commit dc5edb5431
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,6 @@ import { ethers } from 'ethers'
import NonceTracker from 'nonce-tracker' import NonceTracker from 'nonce-tracker'
import log from 'loglevel' import log from 'loglevel'
import BigNumber from 'bignumber.js' import BigNumber from 'bignumber.js'
import { cloneDeep } from 'lodash'
import { import {
TOKEN_METHOD_APPROVE, TOKEN_METHOD_APPROVE,
TOKEN_METHOD_TRANSFER, TOKEN_METHOD_TRANSFER,
@ -558,9 +557,9 @@ export default class TransactionController extends EventEmitter {
async confirmTransaction (txId, txReceipt) { async confirmTransaction (txId, txReceipt) {
// get the txReceipt before marking the transaction confirmed // get the txReceipt before marking the transaction confirmed
// to ensure the receipt is gotten before the ui revives the tx // to ensure the receipt is gotten before the ui revives the tx
const initialTxMeta = this.txStateManager.getTx(txId) const txMeta = this.txStateManager.getTx(txId)
if (!initialTxMeta) { if (!txMeta) {
return return
} }
@ -571,20 +570,24 @@ export default class TransactionController extends EventEmitter {
? txReceipt.gasUsed ? txReceipt.gasUsed
: txReceipt.gasUsed.toString(16) : txReceipt.gasUsed.toString(16)
initialTxMeta.txReceipt = { txMeta.txReceipt = {
...txReceipt, ...txReceipt,
gasUsed, gasUsed,
} }
this.txStateManager.setTxStatusConfirmed(txId) this.txStateManager.setTxStatusConfirmed(txId)
this._markNonceDuplicatesDropped(txId) this._markNonceDuplicatesDropped(txId)
this.txStateManager.updateTx(initialTxMeta, 'transactions#confirmTransaction - add txReceipt') this.txStateManager.updateTx(txMeta, 'transactions#confirmTransaction - add txReceipt')
if (initialTxMeta.transactionCategory === SWAP) { if (txMeta.transactionCategory === SWAP) {
const txMeta = cloneDeep(initialTxMeta)
const postTxBalance = await this.query.getBalance(txMeta.txParams.from) const postTxBalance = await this.query.getBalance(txMeta.txParams.from)
txMeta.postTxBalance = postTxBalance.toString(16) const latestTxMeta = this.txStateManager.getTx(txId)
this._trackSwapsMetrics(txMeta)
latestTxMeta.postTxBalance = postTxBalance.toString(16)
this.txStateManager.updateTx(latestTxMeta, 'transactions#confirmTransaction - add postTxBalance')
this._trackSwapsMetrics(latestTxMeta)
} }
} catch (err) { } catch (err) {

6
ui/app/pages/swaps/swaps.util.js
View File

@ -365,11 +365,12 @@ export function quotesToRenderableData (quotes, gasPrice, conversionRate, curren
} }
export function getSwapsTokensReceivedFromTxMeta (tokenSymbol, txMeta, tokenAddress, accountAddress, tokenDecimals) { export function getSwapsTokensReceivedFromTxMeta (tokenSymbol, txMeta, tokenAddress, accountAddress, tokenDecimals) {
const txReceipt = txMeta?.txReceipt
if (tokenSymbol === 'ETH') { if (tokenSymbol === 'ETH') {
if (!txMeta || !txMeta.postTxBalance || !txMeta.preTxBalance) { if (!txReceipt || !txMeta || !txMeta.postTxBalance || !txMeta.preTxBalance) {
return null return null
} }
const gasCost = calcGasTotal(txMeta.txParams.gas, txMeta.txParams.gasPrice) const gasCost = calcGasTotal(txReceipt.gasUsed, txMeta.txParams.gasPrice)
const preTxBalanceLessGasCost = subtractCurrencies(txMeta.preTxBalance, gasCost, { const preTxBalanceLessGasCost = subtractCurrencies(txMeta.preTxBalance, gasCost, {
aBase: 16, aBase: 16,
bBase: 16, bBase: 16,
@ -385,7 +386,6 @@ export function getSwapsTokensReceivedFromTxMeta (tokenSymbol, txMeta, tokenAddr
}) })
return ethReceived return ethReceived
} }
const txReceipt = txMeta?.txReceipt
const txReceiptLogs = txReceipt?.logs const txReceiptLogs = txReceipt?.logs
if (txReceiptLogs && txReceipt?.status !== '0x0') { if (txReceiptLogs && txReceipt?.status !== '0x0') {
const tokenTransferLog = txReceiptLogs.find((txReceiptLog) => { const tokenTransferLog = txReceiptLogs.find((txReceiptLog) => {