Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
71a2ca9
Use transaction meta layer1GasFee
OGPoyraz Mar 15, 2024
57942c9
Remove recently added fetch method
OGPoyraz Mar 18, 2024
0c50ca1
remove old changes
OGPoyraz Mar 19, 2024
f313e00
revert controller
OGPoyraz Mar 19, 2024
2c89128
latest changes
OGPoyraz Mar 19, 2024
942cb5b
update yarn.lock
OGPoyraz Mar 19, 2024
5b7f082
yarn dedupe
OGPoyraz Mar 19, 2024
28a0211
Update MMcontroller
OGPoyraz Mar 19, 2024
b4cadf6
update swaps tests
OGPoyraz Mar 19, 2024
5c10561
update swaps tests
OGPoyraz Mar 19, 2024
4182709
fix lint
OGPoyraz Mar 19, 2024
ea11bc4
fix swaps tests
OGPoyraz Mar 19, 2024
b1ca54f
fix swaps tests
OGPoyraz Mar 19, 2024
6e72997
fix fee detail component
OGPoyraz Mar 19, 2024
38967d6
Update package & policies
OGPoyraz Mar 28, 2024
7eb909c
Merge branch 'develop' into use-layer1gasfeeflow
OGPoyraz Mar 28, 2024
a178eaa
update yarn lock
OGPoyraz Mar 28, 2024
f70e619
Merge branch 'develop' into use-layer1gasfeeflow
OGPoyraz Mar 28, 2024
a9131d0
update fee-details component
OGPoyraz Mar 28, 2024
4980aad
Merge branch 'use-layer1gasfeeflow' of github.com:MetaMask/metamask-e…
OGPoyraz Mar 28, 2024
c243e27
Update LavaMoat policies
metamaskbot Mar 28, 2024
e3ed807
update lock file
OGPoyraz Mar 28, 2024
7ddb765
update privacy snapshot
OGPoyraz Mar 28, 2024
4fb282f
revert privacy snapshot change
OGPoyraz Mar 28, 2024
b8ca7c3
Merge branch 'develop' into use-layer1gasfeeflow
OGPoyraz Mar 28, 2024
810191a
update lock
OGPoyraz Mar 28, 2024
7d14375
Fix lint
OGPoyraz Mar 28, 2024
91b56c8
Remove unused dep
OGPoyraz Mar 28, 2024
f4f6186
Merge branch 'develop' into use-layer1gasfeeflow
OGPoyraz Mar 28, 2024
563c248
Update LavaMoat policies
metamaskbot Mar 28, 2024
3f0a584
Merge branch 'develop' into use-layer1gasfeeflow
matthewwalsh0 Apr 10, 2024
f74d795
Merge branch 'develop' into use-layer1gasfeeflow
matthewwalsh0 Apr 11, 2024
5f70bf7
Add patch to fix layer 1 update from polling
matthewwalsh0 Apr 11, 2024
f216474
Fix linting
matthewwalsh0 Apr 11, 2024
3013c19
Update LavaMoat policies
metamaskbot Apr 11, 2024
bc11cb2
Fix linting
matthewwalsh0 Apr 11, 2024
449f256
Merge branch 'develop' into use-layer1gasfeeflow
matthewwalsh0 Apr 12, 2024
50e0dcc
Use new controller release
matthewwalsh0 Apr 15, 2024
e958bc3
Remove yarn duplication
matthewwalsh0 Apr 15, 2024
27b8937
Update LavaMoat policies
metamaskbot Apr 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions app/scripts/controllers/swaps.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ import {
calcGasTotal,
calcTokenAmount,
} from '../../../shared/lib/transactions-controller-utils';
import fetchEstimatedL1Fee from '../../../ui/helpers/utils/optimism/fetchEstimatedL1Fee';

import { Numeric } from '../../../shared/modules/Numeric';
import { EtherDenomination } from '../../../shared/constants/common';
Expand Down Expand Up @@ -118,6 +117,7 @@ export default class SwapsController {
getTokenRatesState,
fetchTradesInfo = defaultFetchTradesInfo,
getCurrentChainId,
getLayer1GasFee,
getEIP1559GasFeeEstimates,
trackMetaMetricsEvent,
},
Expand All @@ -143,6 +143,8 @@ export default class SwapsController {
this._getCurrentChainId = getCurrentChainId;
this._getEIP1559GasFeeEstimates = getEIP1559GasFeeEstimates;

this._getLayer1GasFee = getLayer1GasFee;

this.getBufferedGasLimit = getBufferedGasLimit;
this.getTokenRatesState = getTokenRatesState;
this.trackMetaMetricsEvent = trackMetaMetricsEvent;
Expand Down Expand Up @@ -321,14 +323,11 @@ export default class SwapsController {
await Promise.all(
Object.values(newQuotes).map(async (quote) => {
if (quote.trade) {
const multiLayerL1TradeFeeTotal = await fetchEstimatedL1Fee(
const multiLayerL1TradeFeeTotal = await this._getLayer1GasFee({
transactionParams: quote.trade,
chainId,
{
txParams: quote.trade,
chainId,
},
this.ethersProvider,
);
});

quote.multiLayerL1TradeFeeTotal = multiLayerL1TradeFeeTotal;
}
return quote;
Expand Down
14 changes: 11 additions & 3 deletions app/scripts/controllers/swaps.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,11 @@ const EMPTY_INIT_STATE = {
const sandbox = sinon.createSandbox();
let fetchTradesInfoStub = sandbox.stub();
const getCurrentChainIdStub = sandbox.stub();
const getLayer1GasFeeStub = sandbox.stub();
const getNetworkClientIdStub = sandbox.stub();
getCurrentChainIdStub.returns(CHAIN_IDS.MAINNET);
getNetworkClientIdStub.returns('1');
getLayer1GasFeeStub.resolves('0x1');
const getEIP1559GasFeeEstimatesStub = sandbox.stub(() => {
return {
gasFeeEstimates: {
Expand All @@ -150,6 +154,8 @@ describe('SwapsController', function () {
fetchTradesInfo: fetchTradesInfoStub,
getCurrentChainId: getCurrentChainIdStub,
getEIP1559GasFeeEstimates: getEIP1559GasFeeEstimatesStub,
getNetworkClientId: getNetworkClientIdStub,
getLayer1GasFee: getLayer1GasFeeStub,
});
};

Expand Down Expand Up @@ -667,9 +673,9 @@ describe('SwapsController', function () {
total: '5.43388249494949494949494949494949495',
medianMetaMaskFee: '0.444444444444444444444444444444444444',
},
ethFee: '0.113822',
multiLayerL1TradeFeeTotal: '0x0103c18816d4e8',
overallValueOfQuote: '49.886178',
ethFee: '0.113536',
multiLayerL1TradeFeeTotal: '0x1',
overallValueOfQuote: '49.886464',
metaMaskFeeInEth: '0.50505050505050505050505050505050505',
ethValueOfTokens: '50',
});
Expand Down Expand Up @@ -851,6 +857,8 @@ describe('SwapsController', function () {
getTokenRatesState: MOCK_TOKEN_RATES_STORE,
fetchTradesInfo: fetchTradesInfoStub,
getCurrentChainId: getCurrentChainIdStub,
getLayer1GasFee: getLayer1GasFeeStub,
getNetworkClientId: getNetworkClientIdStub,
});
const firstEthersInstance = _swapsController.ethersProvider;
const firstEthersProviderChainId =
Expand Down
6 changes: 6 additions & 0 deletions app/scripts/metamask-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -1811,6 +1811,11 @@ export default class MetamaskController extends EventEmitter {
this.gasFeeController.fetchGasFeeEstimates.bind(
this.gasFeeController,
),
getLayer1GasFee: this.txController.getLayer1GasFee.bind(
this.txController,
),
getNetworkClientId: () =>
this.networkController.state.selectedNetworkClientId,
trackMetaMetricsEvent: this.metaMetricsController.trackEvent.bind(
this.metaMetricsController,
),
Expand Down Expand Up @@ -3243,6 +3248,7 @@ export default class MetamaskController extends EventEmitter {
txController.updatePreviousGasParams.bind(txController),
abortTransactionSigning:
txController.abortTransactionSigning.bind(txController),
getLayer1GasFee: txController.getLayer1GasFee.bind(txController),
Comment thread
matthewwalsh0 marked this conversation as resolved.
Resolved
Comment thread
matthewwalsh0 marked this conversation as resolved.
Resolved

// decryptMessageController
decryptMessage: this.decryptMessageController.decryptMessage.bind(
Expand Down
1 change: 0 additions & 1 deletion development/ts-migration-dashboard/files-to-convert.json
Original file line number Diff line number Diff line change
Expand Up @@ -1076,7 +1076,6 @@
"ui/helpers/utils/metrics.js",
"ui/helpers/utils/optimism/buildUnserializedTransaction.js",
"ui/helpers/utils/optimism/buildUnserializedTransaction.test.js",
"ui/helpers/utils/optimism/fetchEstimatedL1Fee.js",
"ui/helpers/utils/permission.js",
"ui/helpers/utils/settings-search.js",
"ui/helpers/utils/settings-search.test.js",
Expand Down
78 changes: 49 additions & 29 deletions lavamoat/browserify/beta/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,30 +108,30 @@
"browserify>util": true
}
},
"@ethereumjs/common": {
"@ethereumjs/tx": {
"packages": {
"@ethereumjs/common>crc-32": true,
"@ethereumjs/tx>@ethereumjs/common": true,
"@ethereumjs/tx>@ethereumjs/rlp": true,
"@ethereumjs/tx>@ethereumjs/util": true,
"@ethereumjs/tx>ethereum-cryptography": true,
"browserify>buffer": true,
"browserify>insert-module-globals>is-buffer": true
}
},
"@ethereumjs/tx>@ethereumjs/common": {
"packages": {
"@ethereumjs/tx>@ethereumjs/common>crc-32": true,
"@ethereumjs/tx>@ethereumjs/util": true,
"browserify>buffer": true,
"webpack>events": true
}
},
"@ethereumjs/common>crc-32": {
"@ethereumjs/tx>@ethereumjs/common>crc-32": {
"globals": {
"DO_NOT_EXPORT_CRC": true,
"define": true
}
},
"@ethereumjs/tx": {
"packages": {
"@ethereumjs/common": true,
"@ethereumjs/tx>@ethereumjs/rlp": true,
"@ethereumjs/tx>@ethereumjs/util": true,
"@ethereumjs/tx>ethereum-cryptography": true,
"browserify>buffer": true,
"browserify>insert-module-globals>is-buffer": true
}
},
"@ethereumjs/tx>@ethereumjs/rlp": {
"globals": {
"TextEncoder": true
Expand Down Expand Up @@ -741,7 +741,7 @@
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ens-controller>@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/utils": true,
"bn.js": true,
Expand Down Expand Up @@ -828,7 +828,7 @@
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ens-controller>@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/utils": true,
"bn.js": true,
Expand Down Expand Up @@ -918,7 +918,8 @@
"console.log": true
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
"@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true,
"@noble/hashes": true
}
},
"@metamask/controller-utils>@spruceid/siwe-parser>apg-js": {
Expand Down Expand Up @@ -964,7 +965,7 @@
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ens-controller>@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/utils": true,
"bn.js": true,
Expand All @@ -973,6 +974,15 @@
"eth-ens-namehash": true
}
},
"@metamask/ens-controller>@metamask/controller-utils>@spruceid/siwe-parser": {
"globals": {
"console.error": true,
"console.log": true
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true
}
},
"@metamask/eth-json-rpc-filters": {
"globals": {
"console.error": true
Expand Down Expand Up @@ -1590,7 +1600,7 @@
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ens-controller>@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/utils": true,
"bn.js": true,
Expand Down Expand Up @@ -1767,7 +1777,7 @@
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ens-controller>@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/utils": true,
"bn.js": true,
Expand Down Expand Up @@ -1908,7 +1918,7 @@
},
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ens-controller>@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/utils": true,
"bn.js": true,
Expand Down Expand Up @@ -1989,7 +1999,7 @@
"setTimeout": true
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ens-controller>@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/smart-transactions-controller>@metamask/controller-utils>@ethereumjs/util": true,
"@metamask/utils": true,
Expand Down Expand Up @@ -2025,7 +2035,7 @@
"setTimeout": true
},
"packages": {
"@ethereumjs/common": true,
"@ethereumjs/tx>@ethereumjs/common": true,
"@ethersproject/abi": true,
"@metamask/eth-query": true,
"@metamask/gas-fee-controller": true,
Expand All @@ -2049,7 +2059,7 @@
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/tx": {
"packages": {
"@ethereumjs/common": true,
"@ethereumjs/tx>@ethereumjs/common": true,
"@ethereumjs/tx>@ethereumjs/rlp": true,
"@ethereumjs/tx>ethereum-cryptography": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
Expand Down Expand Up @@ -2086,16 +2096,26 @@
"setTimeout": true
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@ethereumjs/util": true,
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/utils": true,
"bn.js": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>@metamask/controller-utils>@spruceid/siwe-parser": {
"globals": {
"console.error": true,
"console.log": true
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser>apg-js": true,
"@noble/hashes": true
}
},
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry": {
"packages": {
"@metamask/smart-transactions-controller>@metamask/transaction-controller>eth-method-registry>@metamask/ethjs-contract": true,
Expand Down Expand Up @@ -2325,8 +2345,8 @@
"setTimeout": true
},
"packages": {
"@ethereumjs/common": true,
"@ethereumjs/tx": true,
"@ethereumjs/tx>@ethereumjs/common": true,
"@ethereumjs/tx>@ethereumjs/util": true,
"@ethersproject/abi": true,
"@ethersproject/contracts": true,
Expand Down Expand Up @@ -3289,7 +3309,7 @@
},
"eth-lattice-keyring>@ethereumjs/tx": {
"packages": {
"@ethereumjs/common": true,
"@ethereumjs/tx>@ethereumjs/common": true,
"@ethereumjs/tx>@ethereumjs/rlp": true,
"@ethereumjs/tx>@ethereumjs/util": true,
"@ethersproject/providers": true,
Expand Down Expand Up @@ -3353,7 +3373,7 @@
"setTimeout": true
},
"packages": {
"@ethereumjs/common>crc-32": true,
"@ethereumjs/tx>@ethereumjs/common>crc-32": true,
"@ethersproject/abi": true,
"@metamask/ethjs>js-sha3": true,
"@metamask/ppom-validator>elliptic": true,
Expand All @@ -3377,7 +3397,7 @@
},
"eth-lattice-keyring>gridplus-sdk>@ethereumjs/common": {
"packages": {
"@ethereumjs/common>crc-32": true,
"@ethereumjs/tx>@ethereumjs/common>crc-32": true,
"@ethereumjs/tx>@ethereumjs/util": true,
"browserify>buffer": true,
"webpack>events": true
Expand All @@ -3397,7 +3417,7 @@
},
"eth-lattice-keyring>gridplus-sdk>@ethereumjs/tx>@ethereumjs/common": {
"packages": {
"@ethereumjs/common>crc-32": true,
"@ethereumjs/tx>@ethereumjs/common>crc-32": true,
"@ethereumjs/tx>@ethereumjs/util": true,
"browserify>buffer": true,
"webpack>events": true
Expand Down
Loading