Address PR feedback

Author: pedronfigueiredo

packages/transaction-controller/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Add `perpsAcrossDeposit` and `predictAcrossDeposit` transaction types ([#7806](https://github.com/MetaMask/core/pull/7806))
+
 ### Added
 
 - Add optional `requiredAssets` to `TransactionMeta` ([#7820](https://github.com/MetaMask/core/pull/7820))

packages/transaction-controller/src/types.ts

@@ -836,9 +836,14 @@ export enum TransactionType {
   relayDeposit = 'relayDeposit',
 
   /**
-   * Deposit funds for Across quote.
+   * Deposit funds for Across quote via Perps.
    */
-  acrossDeposit = 'acrossDeposit',
+  perpsAcrossDeposit = 'perpsAcrossDeposit',
+
+  /**
+   * Deposit funds for Across quote via Predict.
+   */
+  predictAcrossDeposit = 'predictAcrossDeposit',
 
   /**
    * When a transaction is failed it can be retried by
@@ -2101,6 +2106,9 @@ export type MetamaskPayMetadata = {
   /** Chain ID of the payment token. */
   chainId?: Hex;
 
+  /** Total time spent submitting the MetaMask Pay flow, in milliseconds. */
+  executionLatencyMs?: number;
+
   /** Total network fee in fiat currency, including the original and bridge transactions. */
   networkFeeFiat?: string;
 
@@ -2112,9 +2120,6 @@ export type MetamaskPayMetadata = {
 
   /** Total cost of the transaction in fiat currency, including gas, fees, and the funds themselves. */
   totalFiat?: string;
-
-  /** Total time spent executing the MetaMask Pay flow, in milliseconds. */
-  executionLatencyMs?: number;
 };
 
 /**

packages/transaction-pay-controller/ARCHITECTURE.md

@@ -44,22 +44,20 @@ Quotes are retrieved from the [Relay API](https://docs.relay.link/what-is-relay)
 
 The resulting transaction deposits the necessary funds (on the source network), then a Relayer on the target chain immediately transfers the necessary funds and optionally executes any requested call data.
 
-### TokenPay (provider routing)
+### Across
 
-The `TokenPayStrategy` routes quote and execution requests through provider adapters (currently Relay and Across).
+The `AcrossStrategy` retrieves quotes from the Across API and submits approvals and deposit transactions via the `TransactionController`.
 
-Provider selection is determined by feature flags:
+### Strategy Selection and Fallback
 
-- `tokenPay.providerOrder` controls priority (default: `[primaryProvider, 'relay', 'across']`).
-- Each provider can be enabled/disabled via `tokenPay.providers.<id>.enabled`.
-- Providers may also implement capability gating in `supports(...)` (e.g., Across rejects same-chain swaps).
+Strategy order and configuration are determined by feature flags:
 
-Routing behavior:
+- `payStrategies.strategyOrder` controls the ordered strategy list (default: `[Relay, Across]`).
+- Each strategy can be enabled/disabled via `payStrategies.<strategy>.enabled`.
+- Strategies may implement capability gating in `supports(...)` (e.g., Across rejects same-chain swaps).
 
-- The strategy selects the **first** provider in order that is enabled and returns `supports(...) === true`.
-- If no provider supports the request, the strategy throws, and the controller returns no quotes.
-- There is **no automatic fallback** if the selected provider throws during quote retrieval or execution; errors surface and quotes are left empty. (Future work could introduce fallback on specific error types.)
-- Current limitation: provider-specific capability checks that happen during quote building (e.g., Across rejecting type-4/EIP-7702 transactions) do not fall back to lower-priority providers. If we add a third provider after Across that supports type-4, we should consider adding fallback logic or moving that check into `supports(...)` to avoid returning no quotes.
+- The controller selects the **first** strategy in order that returns `supports(...) === true`.
+- If the selected strategy fails during quote retrieval or execution, the next compatible strategy is attempted.
 
 ## Lifecycle
 
@@ -71,11 +69,11 @@ The high level interaction with the `TransactionPayController` is as follows:
 4. Controller identifies any required tokens and adds them to its state.
 5. If a client confirmation is using `MetaMask Pay`, the user selects a payment token (or it is done automatically) which invokes the `updatePaymentToken` action.
    - The below steps are also triggered if the transaction `data` is updated.
-6. Controller selects an appropriate `PayStrategy` using the `getStrategy` action.
-7. Controller requests quotes from the `PayStrategy` and persists them in state, including associated totals.
+6. Controller requests an ordered list of strategies via the `getStrategies` action.
+7. Controller selects the first compatible strategy and requests quotes, falling back to the next strategy if quote retrieval fails.
 8. Resulting fees and totals are presented in the client transaction confirmation.
 9. If approved by the user, the target transaction is signed and published.
-10. The `TransactionPayPublishHook` is invoked and submits the relevant quotes via the same `PayStrategy`.
+10. The `TransactionPayPublishHook` is invoked and submits the relevant quotes via the strategy indicated by the quotes, with fallback on execution errors.
 11. The hook waits for any transactions and quotes to complete.
 12. Depending on the pay strategy and required tokens, the original target transaction is also published as the required funds are now in place on the user's account on the target chain.
 13. Target transaction is finalized and any related controller state is removed.

packages/transaction-pay-controller/CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Generate required tokens using `requiredAssets` from transaction metadata ([#7820](https://github.com/MetaMask/core/pull/7820))
+- Add standalone Across pay strategy with core-level selection and fallback ([#7806](https://github.com/MetaMask/core/pull/7806))
 
 ### Changed
 
@@ -24,6 +25,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Bump `@metamask/bridge-controller` from `^65.1.0` to `^65.2.0` ([#7802](https://github.com/MetaMask/core/pull/7802))
 - Poll Relay status for same-chain quotes with a single deposit step ([#7761](https://github.com/MetaMask/core/pull/7761))
 
+### Removed
+
+- Remove TokenPay strategy and provider adapters ([#0000](https://github.com/MetaMask/core/pull/0000))
+
 ## [12.0.2]
 
 ### Changed

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

@@ -112,6 +112,54 @@ describe('TransactionPayController', () => {
         ),
       ).toBe(TransactionPayStrategy.Test);
     });
+
+    it('returns relay if getStrategies callback returns empty', async () => {
+      new TransactionPayController({
+        getDelegationTransaction: jest.fn(),
+        getStrategies: (): TransactionPayStrategy[] => [],
+        messenger,
+      });
+
+      expect(
+        messenger.call(
+          'TransactionPayController:getStrategy',
+          TRANSACTION_META_MOCK,
+        ),
+      ).toBe(TransactionPayStrategy.Relay);
+    });
+  });
+
+  describe('getStrategies Action', () => {
+    it('returns relay by default', async () => {
+      createController();
+
+      expect(
+        messenger.call(
+          'TransactionPayController:getStrategies',
+          TRANSACTION_META_MOCK,
+        ),
+      ).toStrictEqual([
+        TransactionPayStrategy.Relay,
+        TransactionPayStrategy.Across,
+      ]);
+    });
+
+    it('returns callback list if provided', async () => {
+      new TransactionPayController({
+        getDelegationTransaction: jest.fn(),
+        getStrategies: (): TransactionPayStrategy[] => [
+          TransactionPayStrategy.Test,
+        ],
+        messenger,
+      });
+
+      expect(
+        messenger.call(
+          'TransactionPayController:getStrategies',
+          TRANSACTION_META_MOCK,
+        ),
+      ).toStrictEqual([TransactionPayStrategy.Test]);
+    });
   });
 
   describe('transaction data update', () => {

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

@@ -16,6 +16,7 @@ import type {
   UpdatePaymentTokenRequest,
 } from './types';
 import { updateQuotes } from './utils/quotes';
+import { getStrategyOrder } from './utils/feature-flags';
 import { updateSourceAmounts } from './utils/source-amounts';
 import { pollTransactionChanges } from './utils/transaction';
 
@@ -43,9 +44,14 @@ export class TransactionPayController extends BaseController<
     transaction: TransactionMeta,
   ) => TransactionPayStrategy;
 
+  readonly #getStrategies?: (
+    transaction: TransactionMeta,
+  ) => TransactionPayStrategy[];
+
   constructor({
     getDelegationTransaction,
     getStrategy,
+    getStrategies,
     messenger,
     state,
   }: TransactionPayControllerOptions) {
@@ -58,6 +64,7 @@ export class TransactionPayController extends BaseController<
 
     this.#getDelegationTransaction = getDelegationTransaction;
     this.#getStrategy = getStrategy;
+    this.#getStrategies = getStrategies;
 
     this.#registerActionHandlers();
 
@@ -141,15 +148,31 @@ export class TransactionPayController extends BaseController<
   }
 
   #registerActionHandlers(): void {
+    const getStrategies =
+      this.#getStrategies ??
+      ((transaction: TransactionMeta): TransactionPayStrategy[] => {
+        if (this.#getStrategy) {
+          return [this.#getStrategy(transaction)];
+        }
+
+        return getStrategyOrder(this.messenger);
+      });
+
     this.messenger.registerActionHandler(
       'TransactionPayController:getDelegationTransaction',
       this.#getDelegationTransaction.bind(this),
     );
 
     this.messenger.registerActionHandler(
       'TransactionPayController:getStrategy',
-      this.#getStrategy ??
-        ((): TransactionPayStrategy => TransactionPayStrategy.Relay),
+      (transaction: TransactionMeta): TransactionPayStrategy =>
+        getStrategies(transaction)[0] ?? TransactionPayStrategy.Relay,
+    );
+
+    this.messenger.registerActionHandler(
+      'TransactionPayController:getStrategies',
+      (transaction: TransactionMeta): TransactionPayStrategy[] =>
+        getStrategies(transaction),
     );
 
     this.messenger.registerActionHandler(

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

@@ -14,8 +14,8 @@ export const POLYGON_USDCE_ADDRESS =
   '0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174' as Hex;
 
 export enum TransactionPayStrategy {
+  Across = 'across',
   Bridge = 'bridge',
   Relay = 'relay',
-  TokenPay = 'tokenPay',
   Test = 'test',
 }