fix: MMPay fiat payment fixes

packages/transaction-pay-controller/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Fix fiat `moneyAccountDeposit` failing after on-ramp settlement by adding `getAmountData` callback for calldata re-encoding, correcting wallet address, quote amount, slippage validation, and switching to a three-phase relay flow with fee-as-buffer strategy; simple deposits (Perps, Predict) skip to a single EXACT_INPUT relay quote for cheaper fees ([#8987](https://github.com/MetaMask/core/pull/8987))
+
 ## [23.2.0]
 
 ### Added

packages/transaction-pay-controller/src/TransactionPayController-method-action-types.ts

@@ -76,6 +76,11 @@ export type TransactionPayControllerGetDelegationTransactionAction = {
  * @param args - The arguments forwarded to the {@link GetPaymentOverrideDataCallback}.
  * @returns A promise resolving to the additional transactions array.
  */
+export type TransactionPayControllerGetAmountDataAction = {
+  type: `TransactionPayController:getAmountData`;
+  handler: TransactionPayController['getAmountData'];
+};
+
 export type TransactionPayControllerGetPaymentOverrideDataAction = {
   type: `TransactionPayController:getPaymentOverrideData`;
   handler: TransactionPayController['getPaymentOverrideData'];
@@ -128,6 +133,7 @@ export type TransactionPayControllerMethodActions =
   | TransactionPayControllerUpdatePaymentTokenAction
   | TransactionPayControllerUpdateFiatPaymentAction
   | TransactionPayControllerGetDelegationTransactionAction
+  | TransactionPayControllerGetAmountDataAction
   | TransactionPayControllerGetPaymentOverrideDataAction
   | TransactionPayControllerGetStrategyAction
   | TransactionPayControllerPolymarketGetDepositWalletAddressAction

packages/transaction-pay-controller/src/TransactionPayController.test.ts

@@ -518,6 +518,51 @@ describe('TransactionPayController', () => {
     });
   });
 
+  describe('getAmountData', () => {
+    it('delegates to the callback', async () => {
+      const resultMock = {
+        updates: [{ nestedTransactionIndex: 0, data: '0xabc' as const }],
+      };
+      const getAmountDataMock = jest.fn().mockResolvedValue(resultMock);
+
+      new TransactionPayController({
+        getAmountData: getAmountDataMock,
+        getDelegationTransaction: jest.fn(),
+        messenger,
+      });
+
+      const requestMock = {
+        amount: '5000000',
+        transaction: TRANSACTION_META_MOCK,
+      };
+
+      const result = await messenger.call(
+        'TransactionPayController:getAmountData',
+        requestMock,
+      );
+
+      expect(getAmountDataMock).toHaveBeenCalledWith(requestMock);
+      expect(result).toStrictEqual(resultMock);
+    });
+
+    it('returns empty updates when no callback is configured', async () => {
+      new TransactionPayController({
+        getDelegationTransaction: jest.fn(),
+        messenger,
+      });
+
+      const result = await messenger.call(
+        'TransactionPayController:getAmountData',
+        {
+          amount: '5000000',
+          transaction: TRANSACTION_META_MOCK,
+        },
+      );
+
+      expect(result).toStrictEqual({ updates: [] });
+    });
+  });
+
   describe('polymarket callbacks', () => {
     const EOA_MOCK = '0x1111111111111111111111111111111111111111' as Hex;
     const DEPOSIT_WALLET_MOCK =

packages/transaction-pay-controller/src/TransactionPayController.ts

@@ -14,6 +14,7 @@ import {
 import { QuoteRefresher } from './helpers/QuoteRefresher';
 import { deriveFiatAssetForFiatPayment } from './strategy/fiat/utils';
 import type {
+  GetAmountDataCallback,
   GetDelegationTransactionCallback,
   GetPaymentOverrideDataCallback,
   PolymarketCallbacks,
@@ -36,6 +37,7 @@ import {
 } from './utils/transaction';
 
 const MESSENGER_EXPOSED_METHODS = [
+  'getAmountData',
   'getDelegationTransaction',
   'getPaymentOverrideData',
   'getStrategy',
@@ -64,6 +66,8 @@ export class TransactionPayController extends BaseController<
   TransactionPayControllerState,
   TransactionPayControllerMessenger
 > {
+  readonly #getAmountData?: GetAmountDataCallback;
+
   readonly #getDelegationTransaction: GetDelegationTransactionCallback;
 
   readonly #getPaymentOverrideData?: GetPaymentOverrideDataCallback;
@@ -79,6 +83,7 @@ export class TransactionPayController extends BaseController<
   readonly #polymarket?: PolymarketCallbacks;
 
   constructor({
+    getAmountData,
     getDelegationTransaction,
     getPaymentOverrideData,
     getStrategy,
@@ -94,6 +99,7 @@ export class TransactionPayController extends BaseController<
       state: { ...getDefaultState(), ...state },
     });
 
+    this.#getAmountData = getAmountData;
     this.#getDelegationTransaction = getDelegationTransaction;
     this.#getPaymentOverrideData = getPaymentOverrideData;
     this.#getStrategy = getStrategy;
@@ -233,6 +239,12 @@ export class TransactionPayController extends BaseController<
    * @param args - The arguments forwarded to the {@link GetPaymentOverrideDataCallback}.
    * @returns A promise resolving to the additional transactions array.
    */
+  getAmountData(
+    ...args: Parameters<GetAmountDataCallback>
+  ): ReturnType<GetAmountDataCallback> {
+    return this.#getAmountData?.(...args) ?? Promise.resolve({ updates: [] });
+  }
+
   getPaymentOverrideData(
     ...args: Parameters<GetPaymentOverrideDataCallback>
   ): ReturnType<GetPaymentOverrideDataCallback> {

packages/transaction-pay-controller/src/index.ts

@@ -1,4 +1,7 @@
 export type {
+  GetAmountDataCallback,
+  GetAmountDataRequest,
+  GetAmountDataResponse,
   GetPaymentOverrideDataRequest,
   GetPaymentOverrideDataResponse,
   TransactionConfig,
@@ -23,6 +26,7 @@ export type {
   UpdatePaymentTokenRequest,
 } from './types';
 export type {
+  TransactionPayControllerGetAmountDataAction,
   TransactionPayControllerGetDelegationTransactionAction,
   TransactionPayControllerGetStrategyAction,
   TransactionPayControllerPolymarketGetDepositWalletAddressAction,

packages/transaction-pay-controller/src/strategy/bridge/bridge-quotes.test.ts

@@ -144,6 +144,7 @@ describe('Bridge Quotes Utils', () => {
 
     request = {
       accountSupports7702: true,
+      from: '0x0000000000000000000000000000000000000000',
       requests: [QUOTE_REQUEST_1_MOCK, QUOTE_REQUEST_2_MOCK],
       messenger,
       transaction: TRANSACTION_META_MOCK,

packages/transaction-pay-controller/src/strategy/fiat/fiat-quotes.test.ts

@@ -181,6 +181,7 @@ function getRequest({
     request: {
       accountSupports7702: false,
       fiatPaymentMethod,
+      from: WALLET_ADDRESS,
       messenger: {
         call: callMock,
       } as unknown as PayStrategyGetQuotesRequest['messenger'],
@@ -336,6 +337,7 @@ describe('getFiatQuotes', () => {
     const result = await getFiatQuotes({
       accountSupports7702: false,
       fiatPaymentMethod: '/payments/debit-credit-card',
+      from: WALLET_ADDRESS,
       messenger: {
         call: callMock,
       } as unknown as PayStrategyGetQuotesRequest['messenger'],
@@ -520,6 +522,7 @@ describe('getFiatQuotes', () => {
     await getFiatQuotes({
       accountSupports7702: false,
       fiatPaymentMethod: '/payments/debit-credit-card',
+      from: WALLET_ADDRESS,
       messenger: {
         call: callMock,
       } as unknown as PayStrategyGetQuotesRequest['messenger'],

packages/transaction-pay-controller/src/strategy/fiat/fiat-quotes.ts

@@ -42,14 +42,18 @@ const log = createModuleLogger(projectLogger, 'fiat-strategy');
 export async function getFiatQuotes(
   request: PayStrategyGetQuotesRequest,
 ): Promise<TransactionPayQuote<FiatQuote>[]> {
-  const { accountSupports7702, fiatPaymentMethod, messenger, transaction } =
-    request;
+  const {
+    accountSupports7702,
+    fiatPaymentMethod,
+    from: walletAddress,
+    messenger,
+    transaction,
+  } = request;
   const transactionId = transaction.id;
 
   const state = messenger.call('TransactionPayController:getState');
   const transactionData = state.transactionData[transactionId];
   const amountFiat = transactionData?.fiatPayment?.amountFiat;
-  const walletAddress = transaction.txParams.from as Hex;
   const requiredTokens = getRequiredTokens(transactionData?.tokens);
   const fiatAsset = deriveFiatAssetForFiatPayment(transaction, messenger);
 
@@ -80,6 +84,7 @@ export async function getFiatQuotes(
 
     const relayQuotes = await getRelayQuotes({
       accountSupports7702,
+      from: walletAddress,
       messenger,
       requests: [relayRequest],
       transaction,