diff --git a/packages/bridge-status-controller/CHANGELOG.md b/packages/bridge-status-controller/CHANGELOG.md index 8dfea60eca..ad9289aa02 100644 --- a/packages/bridge-status-controller/CHANGELOG.md +++ b/packages/bridge-status-controller/CHANGELOG.md @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/transaction-controller` from `^68.2.2` to `^68.3.0` ([#9421](https://github.com/MetaMask/core/pull/9421)) +### Fixed + +- Remove `gasFeeToken`, `skipInitialGasEstimate`, and `excludeNativeTokenForFee` from batch-strategy `addTransactionBatch` params ([#9431](https://github.com/MetaMask/core/pull/9431)) + ## [74.1.0] ### Added diff --git a/packages/bridge-status-controller/src/__snapshots__/bridge-status-controller.test.ts.snap b/packages/bridge-status-controller/src/__snapshots__/bridge-status-controller.test.ts.snap index 243853ff9e..a36828f538 100644 --- a/packages/bridge-status-controller/src/__snapshots__/bridge-status-controller.test.ts.snap +++ b/packages/bridge-status-controller/src/__snapshots__/bridge-status-controller.test.ts.snap @@ -1240,16 +1240,13 @@ exports[`BridgeStatusController submitTx: EVM bridge should handle smart transac { "atomic": true, "disable7702": true, - "excludeNativeTokenForFee": true, "from": "0xaccount1", - "gasFeeToken": undefined, "isGasFeeIncluded": false, "isGasFeeSponsored": false, "isInternal": true, "networkClientId": "arbitrum", "origin": "metamask", "requireApproval": false, - "skipInitialGasEstimate": false, "transactions": [ { "assetsFiatValues": { @@ -3953,16 +3950,13 @@ exports[`BridgeStatusController submitTx: EVM swap should handle smart transacti { "atomic": true, "disable7702": true, - "excludeNativeTokenForFee": true, "from": "0xaccount1", - "gasFeeToken": undefined, "isGasFeeIncluded": false, "isGasFeeSponsored": false, "isInternal": true, "networkClientId": "arbitrum", "origin": "metamask", "requireApproval": false, - "skipInitialGasEstimate": false, "transactions": [ { "assetsFiatValues": undefined, diff --git a/packages/bridge-status-controller/src/bridge-status-controller.test.ts b/packages/bridge-status-controller/src/bridge-status-controller.test.ts index 2bb5e59242..790a2a0aae 100644 --- a/packages/bridge-status-controller/src/bridge-status-controller.test.ts +++ b/packages/bridge-status-controller/src/bridge-status-controller.test.ts @@ -4168,13 +4168,10 @@ describe('BridgeStatusController', () => { { "atomic": true, "disable7702": true, - "excludeNativeTokenForFee": true, - "gasFeeToken": undefined, "isDelegatedAccount": false, "isGasFeeIncluded": false, "isGasFeeSponsored": false, "requireApproval": false, - "skipInitialGasEstimate": false, } `); }); @@ -4251,13 +4248,10 @@ describe('BridgeStatusController', () => { { "atomic": true, "disable7702": true, - "excludeNativeTokenForFee": false, - "gasFeeToken": "0x0000000000000000000000000000000000000032", "isDelegatedAccount": false, "isGasFeeIncluded": false, "isGasFeeSponsored": false, "requireApproval": false, - "skipInitialGasEstimate": true, } `); }); @@ -4584,13 +4578,10 @@ describe('BridgeStatusController', () => { { "atomic": true, "disable7702": false, - "excludeNativeTokenForFee": true, - "gasFeeToken": undefined, "isDelegatedAccount": true, "isGasFeeIncluded": false, "isGasFeeSponsored": false, "requireApproval": false, - "skipInitialGasEstimate": false, } `); }); @@ -4710,13 +4701,10 @@ describe('BridgeStatusController', () => { { "atomic": true, "disable7702": false, - "excludeNativeTokenForFee": true, - "gasFeeToken": undefined, "isDelegatedAccount": false, "isGasFeeIncluded": true, "isGasFeeSponsored": false, "requireApproval": false, - "skipInitialGasEstimate": false, } `); }); @@ -4768,13 +4756,10 @@ describe('BridgeStatusController', () => { { "atomic": true, "disable7702": true, - "excludeNativeTokenForFee": true, - "gasFeeToken": undefined, "isDelegatedAccount": false, "isGasFeeIncluded": false, "isGasFeeSponsored": false, "requireApproval": false, - "skipInitialGasEstimate": false, } `); }); diff --git a/packages/bridge-status-controller/src/strategy/batch-strategy.ts b/packages/bridge-status-controller/src/strategy/batch-strategy.ts index 219fa41b43..88f7357e69 100644 --- a/packages/bridge-status-controller/src/strategy/batch-strategy.ts +++ b/packages/bridge-status-controller/src/strategy/batch-strategy.ts @@ -1,6 +1,4 @@ -import { FeeType, isNativeAddress } from '@metamask/bridge-controller'; import type { TxData } from '@metamask/bridge-controller'; -import type { Hex } from '@metamask/utils'; import { findAllTransactionsInBatch, @@ -36,12 +34,6 @@ export async function* submitBatchHandler( isBridgeTx, }); - const gasFeeToken = - quoteResponse.quote.feeData[FeeType.TX_FEE]?.asset?.address && - isNativeAddress(quoteResponse.quote.feeData[FeeType.TX_FEE].asset.address) - ? undefined - : (quoteResponse.quote.feeData[FeeType.TX_FEE]?.asset?.address as Hex); - const transactionParams = await getAddTransactionBatchParams({ tradeData, requireApproval, @@ -55,11 +47,6 @@ export async function* submitBatchHandler( ), isGasFeeSponsored: Boolean(quoteResponse.quote.gasSponsored), isGasFeeIncluded: Boolean(quoteResponse.quote.gasIncluded7702), - gasFeeToken, - skipInitialGasEstimate: quoteResponse.quote.gasIncluded7702 - ? isDelegatedAccount - : Boolean(gasFeeToken), - excludeNativeTokenForFee: !gasFeeToken, }); const { batchId } = await addTransactionBatchFn(transactionParams);