feat: Withdrawal to any token (Predict) #7783

dan437 · 2026-01-30T10:44:28Z

Explanation

Adds support for "post-quote" withdrawal flows, enabling users to withdraw funds to any token/chain (e.g., Predict withdrawals).

Changes:

Add isPostQuote flag to transaction data for withdrawal-first flows
Add setIsPostQuote controller action to enable post-quote mode
Support EXACT_INPUT trade type in Relay strategy for withdrawals (user specifies source amount, receives quote for destination)
Build post-quote requests in buildQuoteRequests when isPostQuote is true
Handle same-token-same-chain withdrawals without requiring a bridge
Add source amount tracking for post-quote flows
Put the deposit into a batch with the original transaction

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
Medium risk because it changes quote construction and Relay submission behavior, including creating EIP-7702 atomic batches that affect transaction execution ordering and required-transaction tracking.

Overview
Adds post-quote (withdrawal-first) flow support by introducing an optional isPostQuote flag on TransactionData and MetamaskPayMetadata, plus a new TransactionPayController:setIsPostQuote action.

Updates quote generation to invert source/target semantics when isPostQuote is true (target minimum forced to 0 / EXACT_INPUT), skip same-token/same-chain withdrawals, and compute source amounts directly from required tokens (excluding skipIfBalance).

Updates the Relay strategy to treat targetAmountMinimum=0 as a valid post-quote request (only filtering out target=0+source=0 gas-fee-token requests) and to submit post-quote withdrawals as an atomic batch that combines the original transaction with Relay deposit transactions; refactors Relay submit logic into reusable helpers and tightens required-token detection for nested transfers.

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

dan437 · 2026-01-30T10:46:54Z

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

-      .filter((singleRequest) => singleRequest.targetAmountMinimum !== '0')
+      // Ignore gas fee token requests (which have both target=0 and source=0)
+      // but keep post-quote requests (which have target=0 but source>0)
+      .filter(


The new logic keeps requests where either target > 0 (normal deposit flows) or source > 0 (withdrawal/post-quote flows). Only requests with both at zero (gas fee token placeholders) get filtered out.

dan437 · 2026-01-30T10:47:49Z

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

+ * @param messenger - Controller messenger.
+ * @returns Submit context with normalized params and metadata.
+ */
+export function getSubmitContext(


I've abstracted shared code between submitPostQuoteTransactions and submitTransactions functions.

cursor

Cursor Bugbot has reviewed your changes and found 2 potential issues.

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

matthewwalsh0 · 2026-01-30T11:33:54Z

packages/transaction-pay-controller/CHANGELOG.md

+### Added
+
+- Add `isPostQuote` field to `TransactionData` type for withdrawal flows ([#7773](https://github.com/MetaMask/core/pull/7773))
+- Add `setIsPostQuote` action type ([#7773](https://github.com/MetaMask/core/pull/7773))


We can nest changes here, so could we have a high level summary like Support quote execution after transaction in Relay strategy with details in nested lines?

matthewwalsh0 · 2026-01-30T11:34:55Z

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

    });
  }

+  setIsPostQuote(transactionId: string, isPostQuote: boolean): void {


Rather than adding more individual setters and actions, could we define a new TransactionConfig type and a single setTransactionConfig that uses a callback to allow custom changes to the config without defining it each time?

matthewwalsh0 · 2026-01-30T11:36:12Z

packages/transaction-pay-controller/src/utils/token.ts

    return { decimals: Number(token.decimals), symbol: token.symbol };
  }

+  if (!token && !isNative) {


Can we remove the changes to this file as they seem identical?

matthewwalsh0 · 2026-01-30T12:47:01Z

packages/transaction-pay-controller/src/utils/source-amounts.ts

+    .map((token) => ({
+      sourceAmountHuman: token.amountHuman,
+      sourceAmountRaw: token.amountRaw,
+      targetTokenAddress: token.address,


This should be the payment token?

matthewwalsh0 · 2026-01-30T12:56:46Z

packages/transaction-pay-controller/src/utils/quotes.ts

+}): QuoteRequest[] {
+  // For withdrawals, the required token (e.g., Polygon USDC.e) becomes the SOURCE
+  // and the destinationToken (paymentToken) becomes the TARGET/destination
+  const sourceToken = tokens.find((token) => !token.skipIfBalance);


Since we've already done this to generate the source amounts, should we instead just look for a source amount with targetTokenAddress matching the payment token / destinationToken?

matthewwalsh0 · 2026-01-30T13:11:58Z

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

 ): Promise<{ transactionHash?: Hex }> {
  log('Executing single quote', quote);

+  const isPostQuote = transaction.metamaskPay?.isPostQuote;


Better to determine this via the strategy request directly, rather than the transaction where the properties are just used for transaction details.

matthewwalsh0 · 2026-01-30T13:15:04Z

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

+  if (isPostQuote) {
+    await submitPostQuoteTransactions(quote, transaction, messenger);
+  } else {
+    await submitTransactions(quote, transaction.id, messenger);


Rather than branching here, would it not be much simpler to keep the original flow and code, but just add a tiny branch in submitTransactions to include the original transaction data as the first entry in normalizedParams if isPostQuote is true?

matthewwalsh0 · 2026-01-30T13:19:37Z

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

+
+  // Add original transaction (e.g., Safe execTransaction call)
+  // Note: We use txParams (the outer call) not nestedTransactions (internal calls)
+  // because nestedTransactions are executed BY the Safe, not by the user's EOA


We only use nestedTransactions for batch transactions to user EOAs, meaning it should be empty anyway?

matthewwalsh0 · 2026-01-30T13:25:14Z

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

    log('Fetched relay quote', quote);

-    return normalizeQuote(quote, request, fullRequest);
+    return await normalizeQuote(quote, request, fullRequest);


Doesn't have to be this PR, but since we're adding a transaction to the Relay deposit transaction, we'll need to update the source gas fees in the normalized quote to include the gas fee of the original transaction.

Technically, we may also need to move the fee to the target property, and set source to zero.

Depends if we consider the fees relative to the transaction or the quote 😅

matthewwalsh0 · 2026-01-30T13:29:26Z

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

+
    const body: RelayQuoteRequest = {
-      amount: isMaxAmount ? sourceTokenAmount : targetAmountMinimum,
+      amount: useExactInput ? sourceTokenAmount : targetAmountMinimum,


I think we also need to update processTransactions to skip changing the quote at all, since we never want to also execute the same transaction data on the target chain of the quote.

I assume it is skipping now since it's just a token transfer for the Predict withdraw.

Signed-off-by: dan437 <80175477+dan437@users.noreply.github.com>

dan437 requested review from a team as code owners January 30, 2026 10:44

This was referenced Jan 30, 2026

feat: Add types for post-quote (withdrawal) flows #7773

Closed

refactor: Extract shared buildTokenData utility (preparation for withdrawals to any token) #7774

Closed

dan437 commented Jan 30, 2026

View reviewed changes

cursor bot reviewed Jan 30, 2026

View reviewed changes

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

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

matthewwalsh0 requested changes Jan 30, 2026

View reviewed changes

dan437 mentioned this pull request Jan 30, 2026

feat: Predict withdrawal to any token (happy path) MetaMask/metamask-mobile#25441

Draft

7 tasks

dan437 added 2 commits February 2, 2026 10:24

feat: Withdrawal to any token (Predict)

3283953

Abstract shared code

8b20558

Signed-off-by: dan437 <80175477+dan437@users.noreply.github.com>

dan437 requested review from a team as code owners February 2, 2026 09:28

dan437 force-pushed the withdrawal-to-any-token branch from 5b8062c to 8b20558 Compare February 2, 2026 09:29

dan437 removed request for a team February 2, 2026 09:30

Uh oh!

feat: Withdrawal to any token (Predict) #7783

Are you sure you want to change the base?

feat: Withdrawal to any token (Predict) #7783

Conversation

dan437 commented Jan 30, 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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cursor bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

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!

matthewwalsh0 Jan 30, 2026 • 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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

dan437 commented Jan 30, 2026 •

edited by cursor bot

Loading

matthewwalsh0 Jan 30, 2026 •

edited

Loading