feat(transaction-pay): add TokenPay strategy with Across provider + metrics by pedronfigueiredo · Pull Request #7806 · MetaMask/core

pedronfigueiredo · 2026-02-02T12:46:52Z

Explanation

This PR introduces a TokenPay strategy that routes to provider adapters (Relay + Across), adds an Across provider end‑to‑end, and tracks quote/execution latency and costs. It also enforces current Across limitations (same‑chain swaps, perps deposits, and type‑4 authorization lists) with explicit gating and TODOs.

Key changes

New TokenPay strategy + provider adapter interface/registry.
Across provider:
- Quote requests to /swap/approval (GET or POST with actions).
- Quote normalization for provider fees, source/target network fees, dust, amounts, and duration.
- Actions API support for delegated calls (token transfer + delegation).
- Submit flow for approval + swap txs, requiredTransactionIds tracking, intent completion.
Relay adapter:
- Wraps existing Relay quote + submit logic for TokenPay.
Feature flags:
- TokenPay provider config (Across API base/key/app fees/slippage; Relay quote URL).
Gating and TODOs:
- Reject same‑chain quotes (mUSD conversions) when Across can’t do same‑chain swaps.
- Disable perps deposits (Hypercore) until Across supports USDC‑PERPs.
- Block type‑4/EIP‑7702 authorizationList actions until supported (first‑time Polymarket deposits).
Metrics:
- Across quote latency stored on quote original.metrics.latency.
- Execution latency stored on transactionMeta.metamaskPay.executionLatencyMs.

References

Checklist

I've updated the test suite for new or updated code as appropriate
I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate
I've communicated my changes to consumers by updating changelogs for packages I've changed
I've introduced breaking changes in this PR and have prepared draft pull requests for clients and consumer packages to resolve them

Note

Medium Risk
Adds a new pay provider (Across) and changes strategy selection/execution to support ordered fallback, which can alter transaction submission behavior and quote routing; also touches tx metadata recording but with guarded, non-fatal updates.

Overview
Adds a new Across pay strategy end-to-end, including quote fetching/normalization from the Across API and submission logic that can send approval + deposit transactions (batched when needed) using new TransactionType values (perpsAcrossDeposit, predictAcrossDeposit).

Updates TransactionPayController to support an ordered getStrategies action (defaulting to [Relay, Across]) and changes quote retrieval and publish-hook execution to select the first compatible strategy and fallback to the next on quote/execution failures.

Introduces MetaMask Pay metrics: records quote latency on Across quotes and stores execution submit latency in tx.metamaskPay.executionLatencyMs (preserving existing metadata), plus adds impact/impactRatio fee fields and refactors Relay/Bridge submission flows via a shared submitSourceTransactions helper and more robust feature-flag parsing.

^{Written by Cursor Bugbot for commit 4185673. This will update automatically on new commits. Configure here.}

packages/transaction-pay-controller/src/strategy/token-pay/TokenPayStrategy.ts

packages/transaction-pay-controller/src/strategy/across/across-submit.ts

packages/transaction-pay-controller/src/utils/feature-flags.ts

packages/transaction-pay-controller/src/strategy/across/across-submit.ts

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

packages/transaction-pay-controller/src/strategy/relay/RelayProvider.ts

packages/transaction-controller/src/types.ts

packages/transaction-pay-controller/ARCHITECTURE.md

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

packages/transaction-pay-controller/src/strategy/token-pay/TokenPayStrategy.ts

packages/transaction-pay-controller/src/strategy/across/across-submit.ts

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

packages/transaction-controller/CHANGELOG.md

packages/transaction-pay-controller/CHANGELOG.md

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

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

cursor · 2026-02-06T10:08:39Z

packages/transaction-pay-controller/src/strategy/across/across-submit.ts

+    default:
+      return TransactionType.perpsAcrossDeposit;
+  }
+}


Default deposit type mislabels non-perps Across transactions

Medium Severity

getAcrossDepositType defaults to TransactionType.perpsAcrossDeposit for any transaction type other than perpsDeposit or predictDeposit. Since AcrossStrategy.supports() already blocks perpsDeposit, the only transactions reaching Across are predictDeposit and all other types (e.g., regular token transfers via fallback). Non-perps, non-predict transactions get incorrectly labeled as perpsAcrossDeposit, which misrepresents the transaction in analytics, tracking, and any downstream type-checking logic. The transaction-controller CHANGELOG even references a generic acrossDeposit type that was never defined, suggesting a missing general-purpose deposit type.

matthewwalsh0

This is looking awesome Pedro!

To summarise a few comments, I think my core suggestion now is trying to break up this 5000 line PR into multiple PRs for each discrete change, such as:

Fallback mechanism
Across strategy
Execution latency property
Minimise duplication between strategy submit logic
Gas station support in Across

matthewwalsh0 · 2026-02-08T15:08:01Z

packages/transaction-controller/CHANGELOG.md

 - Add support for `transactionHistoryLimit` feature flag to configure the maximum number of transactions stored in state ([#7648](https://github.com/MetaMask/core/pull/7648))
  - Defaults to 40 if not provided.
 - Add optional `callTraceErrors` to `simulationData` ([#7641](https://github.com/MetaMask/core/pull/7641))
+- Add `acrossDeposit` transaction type and `MetamaskPayMetadata.executionLatencyMs` for MetaMask Pay tracking ([#7806](https://github.com/MetaMask/core/pull/7806))


matthewwalsh0 · 2026-02-08T15:08:12Z

packages/transaction-controller/src/types.ts

+  /**
+   * Deposit funds for Across quote via Perps.
+   */
+  perpsAcrossDeposit = 'perpsAcrossDeposit',


Minor, alphabetical?

matthewwalsh0 · 2026-02-08T15:14:57Z

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

+          return [this.#getStrategy(transaction)];
+        }
+
+        return getStrategyOrder(this.messenger);


To clarify, we proritise the client decision, but fallback to a generic flow defined by feature flags?

Should we define this in a dedicated local function like #getStrategiesWithFallback?

matthewwalsh0 · 2026-02-08T15:15:59Z

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

+      ]);
+    });
+
+    it('returns callback list if provided', async () => {


Do we need tests for fallback to getStrategy and then fallback to the feature flags?

matthewwalsh0 · 2026-02-08T15:22:40Z

packages/transaction-pay-controller/src/helpers/TransactionPayPublishHook.ts

+      }
+
+      try {
+        const quotes = await strategy.getQuotes(request);


I don't believe execution fallback is possible as we can't present the new quote with new fees to the user since the confirmation is gone.

I believe the fallback mechanism is only for quote retrieval time?

matthewwalsh0 · 2026-02-08T16:08:49Z

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

+    messenger,
+  });
+
+  return {


Does this mean we don't support gas station yet?

That's fine as a future PR to reduce complexity, we can re-use Relay logic which includes balance checks etc.

matthewwalsh0 · 2026-02-08T16:11:23Z

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

+  const { swapTx } = quote;
+  const chainId = toHex(swapTx.chainId);
+
+  const gasResult = await estimateGasWithBufferOrFallback({


As this isn't conditional, does that mean we always have to work out the gas?

If so we have extensive logic in Relay for 7702, batch, and simulation that we could make generic in a future PR.

Though maybe not needed here if we can guarantee only one transaction, since no swap support?

matthewwalsh0 · 2026-02-08T16:13:34Z

packages/transaction-pay-controller/src/strategy/across/across-submit.ts

+    requiredTransactionNote:
+      'Add required transaction ID from Across submission',
+    intentCompleteNote: 'Intent complete after Across submission',
+    buildTransactions: async (quote) => {


Better readability if we define this outside of the function call?

matthewwalsh0 · 2026-02-08T16:16:17Z

packages/transaction-pay-controller/src/strategy/across/across-submit.ts

+        chainId,
+        from,
+        transactions,
+        submit: async (preparedTransactions): Promise<void> => {


Isn't the calls to the transaction controller exactly what we want to avoid duplicating?

Could we have each strategy just build a list of standard params, then pass them to a standard util that adds them, waits for completion, and returns hashes?

But given the size and complexity of this PR, simpler is better, so happy for you to duplicate all the submit for now if that's easier and we have a dedicated PR to address duplication later?

matthewwalsh0 · 2026-02-08T16:17:45Z

packages/transaction-pay-controller/src/utils/strategy-helpers.ts

+  let hasReportedLatency = false;
+
+  for (const quote of quotes) {
+    const prepared = await buildTransactions(quote);


Could the strategies do this themselves then just pass a list of params to this function?

So this function would add (via batch if needed), collect transaction IDs, then wait for confirmed?

As mentioned in a different comment, happy to duplicate for now given complexity and size of this PR.

…execution metrics - Add an Across pay strategy (quotes + submit) and Across-specific transaction types for MetaMask Pay flows. - Extend strategy selection to support ordered strategies and compatibility checks via supports, then fallback to the next strategy on quote/execution failures. - Refactor Relay and Across execution paths to use a shared source-transaction submission helper with confirmation waits and required transaction tracking. - Add pay-strategy feature flag config for Across/Relay enablement and Across API settings, plus safer feature-flag reads. - Record quote/submit latency in MetaMask Pay metadata (executionLatencyMs) and preserve execution metrics when quotes are refreshed. - Expand tests for Across quote/submit/support behavior, publish-hook fallback logic, feature-flag defaults, and shared strategy helpers.

…7868) ## Explanation As per preemptive validation on #7806  - Adds ordered strategy retrieval via `TransactionPayController:getStrategies` while preserving existing `getStrategy` behavior. - Adds compatibility filtering (`supports(...)`) during strategy selection. - Implements quote fallback orchestration: - try next strategy when quote retrieval fails - try next strategy when quote list is empty - skip unsupported strategies - Implements publish-hook fallback orchestration: - execute primary strategy from existing quote strategy - on execution failure, rebuild quote requests and try next compatible strategy - throw original primary error if all fallback attempts fail ## References  Addresses MetaMask/MetaMask-planning#6992 ## Checklist - [ ] I've updated the test suite for new or updated code as appropriate - [ ] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [ ] I've communicated my changes to consumers by [updating changelogs for packages I've changed](https://github.com/MetaMask/core/tree/main/docs/processes/updating-changelogs.md) - [ ] I've introduced [breaking changes](https://github.com/MetaMask/core/tree/main/docs/processes/breaking-changes.md) in this PR and have prepared draft pull requests for clients and consumer packages to resolve them  --- > [!NOTE] > **Medium Risk** > Changes core quote-selection and submission routing for pay transactions; incorrect strategy ordering, supports checks, or fallback behavior could alter fees/quotes returned or cause pay flows to fail in edge cases. > > **Overview** > **MetaMask Pay now supports ordered strategy orchestration with fallback.** `TransactionPayController` accepts an optional `getStrategies` callback (while preserving `getStrategy`) and falls back to a remotely-configured `strategyOrder` feature flag (defaulting to Relay), filtering invalid values. > > Quote updates/refresh now try strategies in priority order via `getStrategiesByName`, optionally skip incompatible strategies via a new `PayStrategy.supports(...)` hook, and fall through when a strategy errors, returns no quotes, or fails batch-transaction generation. Publish-time submission now selects the strategy from `quotes[0].strategy` (instead of re-resolving from controller) to ensure the submit path matches the quote origin. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 7908026. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup>

pedronfigueiredo self-assigned this Feb 2, 2026

pedronfigueiredo requested review from a team as code owners February 2, 2026 12:46

pedronfigueiredo added the team-confirmations label Feb 2, 2026

cursor bot reviewed Feb 2, 2026

View reviewed changes

pedronfigueiredo force-pushed the pnf/cor-across-strategy branch 2 times, most recently from 6e9ba0c to 047509a Compare February 2, 2026 15:16

cursor bot reviewed Feb 2, 2026

View reviewed changes

packages/transaction-pay-controller/src/strategy/across/across-submit.ts Show resolved Hide resolved

packages/transaction-pay-controller/src/strategy/across/across-quotes.ts Outdated Show resolved Hide resolved

matthewwalsh0 requested changes Feb 2, 2026

View reviewed changes

pedronfigueiredo force-pushed the pnf/cor-across-strategy branch from 1a4c355 to f5f13b3 Compare February 5, 2026 12:27

cursor bot reviewed Feb 5, 2026

View reviewed changes

packages/transaction-controller/CHANGELOG.md Outdated Show resolved Hide resolved

packages/transaction-pay-controller/CHANGELOG.md Outdated Show resolved Hide resolved

pedronfigueiredo force-pushed the pnf/cor-across-strategy branch 3 times, most recently from 4ee01fe to 204fc2e Compare February 5, 2026 13:26

cursor bot reviewed Feb 5, 2026

View reviewed changes

packages/transaction-pay-controller/src/strategy/relay/relay-quotes.ts Outdated Show resolved Hide resolved

pedronfigueiredo force-pushed the pnf/cor-across-strategy branch 3 times, most recently from cb2195a to d0e45a5 Compare February 6, 2026 10:00

cursor bot reviewed Feb 6, 2026

View reviewed changes

pedronfigueiredo force-pushed the pnf/cor-across-strategy branch from d0e45a5 to b6c9ca4 Compare February 6, 2026 10:10

pedronfigueiredo requested a review from matthewwalsh0 February 6, 2026 10:16

matthewwalsh0 requested changes Feb 8, 2026

View reviewed changes

pedronfigueiredo force-pushed the pnf/cor-across-strategy branch from b6c9ca4 to 4185673 Compare February 9, 2026 10:35

pedronfigueiredo mentioned this pull request Feb 9, 2026

feat(transaction-pay): add ordered strategy fallback orchestration #7868

Merged

4 tasks

Uh oh!

Comments

Conversation

pedronfigueiredo commented Feb 2, 2026 • edited by cursor bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation

References

Checklist

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cursor bot left a comment

Choose a reason for hiding this comment

Uh oh!

cursor bot Feb 6, 2026

Choose a reason for hiding this comment

Default deposit type mislabels non-perps Across transactions

Uh oh!

matthewwalsh0 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

pedronfigueiredo commented Feb 2, 2026 •

edited by cursor bot

Loading

matthewwalsh0 left a comment •

edited

Loading