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

Ensure createPendingTxMiddleware returns gasPrice for EIP-1559 transactions (#11685)

Browse Source
This commit is contained in:
Dan J Miller 2021-07-30 18:10:19 -02:30 committed by GitHub
parent fa703173a0
commit b2cb38ab2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/scripts/controllers/network/util.js
View File

@ -36,6 +36,7 @@ export function formatTxMetaForRpcResult(txMeta) {
}; };
if (maxFeePerGas && maxPriorityFeePerGas) { if (maxFeePerGas && maxPriorityFeePerGas) {
formattedTxMeta.gasPrice = maxFeePerGas;
formattedTxMeta.maxFeePerGas = maxFeePerGas; formattedTxMeta.maxFeePerGas = maxFeePerGas;
formattedTxMeta.maxPriorityFeePerGas = maxPriorityFeePerGas; formattedTxMeta.maxPriorityFeePerGas = maxPriorityFeePerGas;
formattedTxMeta.type = TRANSACTION_ENVELOPE_TYPES.FEE_MARKET; formattedTxMeta.type = TRANSACTION_ENVELOPE_TYPES.FEE_MARKET;

1
app/scripts/controllers/network/util.test.js
View File

@ -33,6 +33,7 @@ describe('network utils', function () {
blockNumber: null, blockNumber: null,
from: '0xc684832530fcbddae4b4230a47e991ddcec2831d', from: '0xc684832530fcbddae4b4230a47e991ddcec2831d',
gas: '0x7b0d', gas: '0x7b0d',
gasPrice: '0x77359400',
hash: hash:
'0x4bcb6cd6b182209585f8ad140260ddb35c81a575dd40f508d9767e652a9f60e7', '0x4bcb6cd6b182209585f8ad140260ddb35c81a575dd40f508d9767e652a9f60e7',
input: '0x', input: '0x',