@metamask-previews/transaction-pay-controller 30.1.0-preview-0bedd99c0 → 30.1.0-preview-5e24e4d22

package/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Support Predict withdraw in `ServerStrategy` ([#10702](https://github.com/MetaMask/core/pull/10702))
+  - Polymarket deposit wallet withdrawals unwrap directly to a provider deposit address, then sweep any leftover or refunded USDC.e back into the deposit wallet.
+  - Polymarket deposit wallet withdrawals have no source network fee, as the Polymarket relayer pays origin gas.
+  - Non-atomic post-quote payment overrides, such as withdrawing to a Money Account, settle on the override recipient and run the override calls as a second leg.
+  - Post-quote quotes honour `refundTo`, include the original transaction in gas estimation, and reserve the gas fee token cost from the source amount.
+
 ### Changed
 
 - Bump `@metamask/transaction-controller` from `^72.2.0` to `^72.2.1` ([#10817](https://github.com/MetaMask/core/pull/10817))

package/dist/strategy/server/deposit-step.d.ts

@@ -0,0 +1,18 @@
+import type { Hex } from '@metamask/utils';
+import type { ServerQuote } from './types.js';
+/**
+ * Whether a server quote routes through a deposit step, i.e. the user funds the
+ * request by transferring to the provider rather than calling a swap contract.
+ *
+ * @param steps - Server quote steps.
+ * @returns True when the quote has a deposit step.
+ */
+export declare function hasServerDepositStep(steps: ServerQuote['steps']): boolean;
+/**
+ * Get the calldata of the server deposit transaction step.
+ *
+ * @param quote - Server quote.
+ * @returns The deposit calldata, or `undefined` when there is none.
+ */
+export declare function getServerDepositData(quote: ServerQuote): Hex | undefined;
+//# sourceMappingURL=deposit-step.d.ts.map

package/dist/strategy/server/deposit-step.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deposit-step.d.ts","sourceRoot":"","sources":["../../../src/strategy/server/deposit-step.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAG3C,OAAO,KAAK,EAAE,WAAW,EAAyB,MAAM,YAAY,CAAC;AAOrE;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,OAAO,CAEzE;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,WAAW,GAAG,GAAG,GAAG,SAAS,CAExE"}

package/dist/strategy/server/deposit-step.js

@@ -0,0 +1,37 @@
+import { BigNumber } from 'bignumber.js';
+const TOKEN_TRANSFER_FOUR_BYTE = '0xa9059cbb';
+// `0x` + 4-byte selector + two 32-byte arguments (recipient, amount).
+const TOKEN_TRANSFER_DATA_LENGTH = 2 + 8 + 64 * 2;
+/**
+ * Whether a server quote routes through a deposit step, i.e. the user funds the
+ * request by transferring to the provider rather than calling a swap contract.
+ *
+ * @param steps - Server quote steps.
+ * @returns True when the quote has a deposit step.
+ */
+export function hasServerDepositStep(steps) {
+    return steps.some(isDepositStep);
+}
+/**
+ * Get the calldata of the server deposit transaction step.
+ *
+ * @param quote - Server quote.
+ * @returns The deposit calldata, or `undefined` when there is none.
+ */
+export function getServerDepositData(quote) {
+    return quote.steps.find(isDepositStep)?.data;
+}
+/**
+ * Whether a step is a plain ERC-20 `transfer` with no extra calldata and no
+ * native value, which is how a provider deposit address is funded.
+ *
+ * @param step - Server quote step.
+ * @returns True when the step is a plain token transfer.
+ */
+function isDepositStep(step) {
+    return (step.type === 'transaction' &&
+        step.data.length === TOKEN_TRANSFER_DATA_LENGTH &&
+        step.data.toLowerCase().startsWith(TOKEN_TRANSFER_FOUR_BYTE) &&
+        new BigNumber(step.value || '0').isZero());
+}
+//# sourceMappingURL=deposit-step.js.map

package/dist/strategy/server/deposit-step.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deposit-step.js","sourceRoot":"","sources":["../../../src/strategy/server/deposit-step.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC,MAAM,wBAAwB,GAAG,YAAY,CAAC;AAE9C,sEAAsE;AACtE,MAAM,0BAA0B,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAA2B;IAC9D,OAAO,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AACnC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAAkB;IACrD,OAAO,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC;AAC/C,CAAC;AAED;;;;;;GAMG;AACH,SAAS,aAAa,CACpB,IAAkC;IAElC,OAAO,CACL,IAAI,CAAC,IAAI,KAAK,aAAa;QAC3B,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,0BAA0B;QAC/C,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,wBAAwB,CAAC;QAC5D,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,CAC1C,CAAC;AACJ,CAAC","sourcesContent":["import type { Hex } from '@metamask/utils';\nimport { BigNumber } from 'bignumber.js';\n\nimport type { ServerQuote, ServerTransactionStep } from './types.js';\n\nconst TOKEN_TRANSFER_FOUR_BYTE = '0xa9059cbb';\n\n// `0x` + 4-byte selector + two 32-byte arguments (recipient, amount).\nconst TOKEN_TRANSFER_DATA_LENGTH = 2 + 8 + 64 * 2;\n\n/**\n * Whether a server quote routes through a deposit step, i.e. the user funds the\n * request by transferring to the provider rather than calling a swap contract.\n *\n * @param steps - Server quote steps.\n * @returns True when the quote has a deposit step.\n */\nexport function hasServerDepositStep(steps: ServerQuote['steps']): boolean {\n  return steps.some(isDepositStep);\n}\n\n/**\n * Get the calldata of the server deposit transaction step.\n *\n * @param quote - Server quote.\n * @returns The deposit calldata, or `undefined` when there is none.\n */\nexport function getServerDepositData(quote: ServerQuote): Hex | undefined {\n  return quote.steps.find(isDepositStep)?.data;\n}\n\n/**\n * Whether a step is a plain ERC-20 `transfer` with no extra calldata and no\n * native value, which is how a provider deposit address is funded.\n *\n * @param step - Server quote step.\n * @returns True when the step is a plain token transfer.\n */\nfunction isDepositStep(\n  step: ServerQuote['steps'][number],\n): step is ServerTransactionStep {\n  return (\n    step.type === 'transaction' &&\n    step.data.length === TOKEN_TRANSFER_DATA_LENGTH &&\n    step.data.toLowerCase().startsWith(TOKEN_TRANSFER_FOUR_BYTE) &&\n    new BigNumber(step.value || '0').isZero()\n  );\n}\n"]}

package/dist/strategy/server/server-quotes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-quotes.d.ts","sourceRoot":"","sources":["../../../src/strategy/server/server-quotes.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACV,2BAA2B,EAI3B,mBAAmB,EACpB,MAAM,gBAAgB,CAAC;AAmBxB,OAAO,KAAK,EACV,WAAW,EAKZ,MAAM,YAAY,CAAC;AA6CpB;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,2BAA2B,GACnC,OAAO,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE,CAAC,CAY7C"}
+{"version":3,"file":"server-quotes.d.ts","sourceRoot":"","sources":["../../../src/strategy/server/server-quotes.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACV,2BAA2B,EAI3B,mBAAmB,EACpB,MAAM,gBAAgB,CAAC;AAuBxB,OAAO,KAAK,EACV,WAAW,EAKZ,MAAM,YAAY,CAAC;AA6CpB;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,2BAA2B,GACnC,OAAO,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE,CAAC,CAY7C"}

package/dist/strategy/server/server-quotes.js

@@ -5,12 +5,16 @@ import { BigNumber } from 'bignumber.js';
 import { CHAIN_ID_HYPERCORE, PaymentOverride, TransactionPayStrategy, } from '../../constants.js';
 import { projectLogger } from '../../logger.js';
 import { getFiatValueFromUsd } from '../../utils/amounts.js';
-import { getFeatureFlags, getSlippage, isEIP7702Chain, } from '../../utils/feature-flags.js';
+import { getSlippage, isEIP7702Chain } from '../../utils/feature-flags.js';
 import { GasPaymentMode, resolveGasPayment, resolveGasStationCost, } from '../../utils/gas-payment.js';
 import { calculateGasCost, getGasFee } from '../../utils/gas.js';
-import { estimateQuoteGasLimits } from '../../utils/quote-gas.js';
+import { getPolymarketDepositWalletOverrides, getPredictWithdrawFeeTokenAccount, getPredictWithdrawSafeAddress, } from '../../utils/polymarket/withdraw.js';
+import { reservePostQuoteGas } from '../../utils/post-quote.js';
+import { estimateSourceGas } from '../../utils/quote-gas.js';
+import { resolveNonAtomicRecipient } from '../../utils/second-leg.js';
 import { getTokenFiatRate } from '../../utils/token.js';
 import { getQuotePricing, TradeType } from '../../utils/trade-type.js';
+import { hasServerDepositStep } from './deposit-step.js';
 import { normalizeServerPerpsRequest } from './perps.js';
 import { fetchServerQuote } from './server-api.js';
 const log = createModuleLogger(projectLogger, 'server-quotes');
@@ -37,31 +41,68 @@ export async function getServerQuotes(request) {
     return quotes.flat();
 }
 async function getQuotesForRequest(quoteRequest, fullRequest) {
-    const { accountSupports7702, messenger, signal, transaction } = fullRequest;
     try {
-        const body = await buildServerQuoteRequest(quoteRequest, transaction, messenger, accountSupports7702);
-        log('Request body', body);
-        const response = await fetchServerQuote(messenger, body, signal);
-        log('Raw quote response', response);
-        const fulfilledResults = response.results.filter(isFulfilledResult);
-        // The second leg runs from `request.recipient`, so it has to match the
-        // executing account the quote settles on.
-        const settledRequest = {
-            ...quoteRequest,
-            recipient: transaction.txParams.from,
-        };
-        const normalized = await Promise.all(fulfilledResults.map((result) => normalizeQuote(result, settledRequest, messenger, body.tradeType === TradeType.ExactInput, transaction, accountSupports7702, isSecondLegRequired(body, quoteRequest, transaction, result.quote))));
-        log('Normalized quotes', normalized);
-        return normalized;
+        const quotes = await fetchQuotes(quoteRequest, fullRequest);
+        if (!quoteRequest.isPostQuote) {
+            return quotes;
+        }
+        // Post-quote flows commit the whole source balance, so any gas paid in the
+        // source token has to be reserved by re-quoting the same provider for less.
+        return await Promise.all(quotes.map((quote) => reservePostQuoteGas({
+            quote,
+            requote: (adjustedRequest) => requoteProvider(adjustedRequest, fullRequest, quote.original),
+        })));
     }
     catch (error) {
         log('Error fetching quotes', { error });
         return [];
     }
 }
+async function requoteProvider(quoteRequest, fullRequest, { provider }) {
+    const [quote] = await fetchQuotes(quoteRequest, fullRequest, provider);
+    if (!quote) {
+        throw new Error(`No re-quote from provider: ${provider}`);
+    }
+    return quote;
+}
+async function fetchQuotes(quoteRequest, fullRequest, provider) {
+    const { accountSupports7702, messenger, signal, transaction } = fullRequest;
+    const settledRequest = await resolveSettledRequest(quoteRequest, transaction, messenger);
+    const body = await buildServerQuoteRequest(settledRequest, transaction, messenger, accountSupports7702);
+    if (provider) {
+        body.providers = [provider];
+    }
+    log('Request body', body);
+    const response = await fetchServerQuote(messenger, body, signal);
+    log('Raw quote response', response);
+    const fulfilledResults = response.results.filter((result) => isFulfilledResult(result) &&
+        (!provider || result.provider === provider) &&
+        isUsableDepositAddressQuote(body, result));
+    const normalized = await Promise.all(fulfilledResults.map((result) => normalizeQuote(result, settledRequest, messenger, body, transaction, accountSupports7702, isSecondLegRequired(body, settledRequest, transaction, result.quote))));
+    log('Normalized quotes', normalized);
+    return normalized;
+}
+/**
+ * Carry the account the funds settle on as the request recipient.
+ *
+ * The second leg runs from `request.recipient`, which has to match where the
+ * funds actually landed. Non-atomic flows settle on the account submitting the
+ * second leg, such as the Money Account of a Predict withdraw. Otherwise the
+ * quote settles on the executing account rather than the payer.
+ *
+ * @param quoteRequest - Quote request.
+ * @param transaction - Original transaction meta.
+ * @param messenger - Controller messenger.
+ * @returns The request with the settlement recipient applied.
+ */
+async function resolveSettledRequest(quoteRequest, transaction, messenger) {
+    const recipient = (await resolveNonAtomicRecipient(transaction, quoteRequest, messenger)) ??
+        transaction.txParams.from;
+    return { ...quoteRequest, recipient };
+}
 async function buildServerQuoteRequest(quoteRequest, transaction, messenger, accountSupports7702) {
     const normalizedRequest = normalizeServerPerpsRequest(quoteRequest, transaction);
-    const { atomic, from, isMaxAmount, isPostQuote, paymentOverride, sourceChainId, sourceTokenAddress, sourceTokenAmount, targetAmountMinimum, targetChainId, targetTokenAddress, } = normalizedRequest;
+    const { atomic, from, isMaxAmount, isPolymarketDepositWallet, isPostQuote, paymentOverride, refundTo, sourceChainId, sourceTokenAddress, sourceTokenAmount, targetAmountMinimum, targetChainId, targetTokenAddress, } = normalizedRequest;
     const singleData = getSingleTransactionData(transaction);
     const isHypercore = targetChainId === CHAIN_ID_HYPERCORE;
     const isTokenTransfer = !isHypercore && Boolean(singleData?.startsWith(TOKEN_TRANSFER_FOUR_BYTE));
@@ -70,9 +111,12 @@ async function buildServerQuoteRequest(quoteRequest, transaction, messenger, acc
     const executionAccount = transaction.txParams.from;
     const recipient = isTokenTransfer && singleData
         ? decodeTransferRecipient(singleData)
-        : executionAccount;
+        : (normalizedRequest.recipient ?? executionAccount);
     const isHypercoreSource = sourceChainId === CHAIN_ID_HYPERCORE;
+    // Deposit wallet withdraws are broadcast by the Polymarket relayer rather
+    // than as a gasless EIP-7702 batch, so the provider must not quote gasless.
     const supportsGasless = !isHypercoreSource &&
+        !isPolymarketDepositWallet &&
         accountSupports7702 &&
         isEIP7702Chain(messenger, sourceChainId);
     const body = {
@@ -83,6 +127,9 @@ async function buildServerQuoteRequest(quoteRequest, transaction, messenger, acc
         slippage: Math.round(getSlippage(messenger, sourceChainId, sourceTokenAddress) * 10000),
         supportsGasless,
     };
+    if (isPolymarketDepositWallet) {
+        await applyDepositWalletOverrides(body, from, messenger);
+    }
     const hasNoData = singleData === undefined || singleData === '0x';
     const skipDelegation = hasNoData ||
         isTokenTransfer ||
@@ -92,8 +139,13 @@ async function buildServerQuoteRequest(quoteRequest, transaction, messenger, acc
         // they must not be embedded in the quote.
         atomic === false ||
         (isPostQuote ?? false) ||
-        (isMaxAmount ?? false);
-    if (isPostQuote && paymentOverride === PaymentOverride.MoneyAccount) {
+        (isMaxAmount ?? false) ||
+        // The deposit wallet funds the quote with a plain token transfer, so there
+        // are no calls to embed.
+        (isPolymarketDepositWallet ?? false);
+    if (isPostQuote &&
+        atomic !== false &&
+        paymentOverride === PaymentOverride.MoneyAccount) {
         await processMoneyAccountPostQuote(transaction, normalizedRequest, body, messenger);
     }
     else if (!skipDelegation) {
@@ -127,6 +179,12 @@ async function buildServerQuoteRequest(quoteRequest, transaction, messenger, acc
             body.authorizationList = normalizeAuthorizationList(delegation.authorizationList);
         }
     }
+    else if (isPostQuote || atomic === false) {
+        // Honour the caller's refund address so a failed quote refunds the account
+        // the funds came from, such as the Predict Safe, rather than the payer. A
+        // deposit wallet refund address is kept, as the sweep reads refunds there.
+        body.refundTo ??= refundTo;
+    }
     const pricing = getQuotePricing({
         hasCalls: Boolean(body.calls?.length),
         sourceTokenAmount,
@@ -170,6 +228,24 @@ function canDeferCalls({ accountSupports7702, messenger, targetChainId, transact
         transaction.chainId === targetChainId &&
         isEIP7702Chain(messenger, targetChainId));
 }
+/**
+ * Quote a deposit wallet Predict withdraw from the deposit wallet itself.
+ *
+ * The deposit wallet funds the provider's deposit address with the USDC.e
+ * unwrapped from its pUSD, and is also the refund address so the sweep can wrap
+ * any refund back into pUSD.
+ *
+ * @param body - Quote request body to update.
+ * @param from - The user EOA that owns the deposit wallet.
+ * @param messenger - Controller messenger.
+ */
+async function applyDepositWalletOverrides(body, from, messenger) {
+    const { depositWallet, sourceTokenAddress } = await getPolymarketDepositWalletOverrides(from, messenger);
+    body.source = { ...body.source, token: sourceTokenAddress };
+    body.sender = depositWallet;
+    body.refundTo = depositWallet;
+    body.useDepositAddress = true;
+}
 function normalizeAuthorizationList(authorizationList) {
     return authorizationList.map((entry) => ({
         address: entry.address,
@@ -230,6 +306,8 @@ function shouldRequestQuote(quoteRequest) {
  *
  * A second leg is needed either because we declined to embed the calls, or
  * because the provider that won the quote told us it will not execute them.
+ * Non-atomic post-quote flows always need one: their calls come from the
+ * payment override rather than the transaction, and run once funds settle.
  *
  * @param body - The built server quote request.
  * @param quoteRequest - The originating quote request.
@@ -243,6 +321,19 @@ function isSecondLegRequired(body, quoteRequest, transaction, quote) {
     if (body.calls?.length && !quote.callsDeferred) {
         return false;
     }
+    // HyperCore settles off-chain, so there is no target-chain transfer to read
+    // a settled amount from. Checks the built body rather than the original
+    // request, since perps deposits are only rewritten to HyperCore there.
+    if (body.target.chainId === HYPERCORE_CHAIN_ID_NUMBER ||
+        body.source.chainId === HYPERCORE_CHAIN_ID_NUMBER) {
+        return false;
+    }
+    // Post-quote flows submit the original transaction alongside the quote, so
+    // the second leg never re-runs it. Only non-atomic flows have override calls
+    // left to run once the funds settle.
+    if (quoteRequest.isPostQuote) {
+        return quoteRequest.atomic === false;
+    }
     // No calls to run. Plain funding transfers and empty calldata are already
     // satisfied by the quote delivering the target token to the recipient.
     if (!transaction.nestedTransactions?.length) {
@@ -255,23 +346,12 @@ function isSecondLegRequired(body, quoteRequest, transaction, quote) {
     if (singleData.startsWith(TOKEN_TRANSFER_FOUR_BYTE)) {
         return false;
     }
-    // HyperCore settles off-chain, so there is no target-chain transfer to read
-    // a settled amount from. Checks the built body rather than the original
-    // request, since perps deposits are only rewritten to HyperCore there.
-    if (body.target.chainId === HYPERCORE_CHAIN_ID_NUMBER ||
-        body.source.chainId === HYPERCORE_CHAIN_ID_NUMBER) {
-        return false;
-    }
-    // Post-quote flows submit the original transaction separately, so running it
-    // again as a second leg would double-execute it.
-    if (quoteRequest.isPostQuote) {
-        return false;
-    }
     return true;
 }
-async function normalizeQuote(result, quoteRequest, messenger, isInputBased, transaction, accountSupports7702, requiresSecondLeg) {
+async function normalizeQuote(result, quoteRequest, messenger, body, transaction, accountSupports7702, requiresSecondLeg) {
     const { quote } = result;
     const { gasless } = quote;
+    const isInputBased = body.tradeType === TradeType.ExactInput;
     const transactionSteps = quote.steps.filter(isTransactionStep);
     const isSignatureOnly = transactionSteps.length === 0;
     const sourceNetwork = await calculateSourceNetworkCost({
@@ -279,6 +359,7 @@ async function normalizeQuote(result, quoteRequest, messenger, isInputBased, tra
         gasless: gasless || isSignatureOnly,
         messenger,
         quoteRequest,
+        sender: body.sender,
         steps: transactionSteps,
         transaction,
     });
@@ -352,7 +433,7 @@ async function normalizeQuote(result, quoteRequest, messenger, isInputBased, tra
         },
     };
 }
-async function calculateSourceNetworkCost({ accountSupports7702, gasless, messenger, quoteRequest, steps, transaction, }) {
+async function calculateSourceNetworkCost({ accountSupports7702, gasless, messenger, quoteRequest, sender, steps, transaction, }) {
     const noFees = {
         estimate: ZERO_AMOUNT,
         gasLimits: [],
@@ -361,9 +442,11 @@ async function calculateSourceNetworkCost({ accountSupports7702, gasless, messen
         maxFeePerGas: undefined,
         maxPriorityFeePerGas: undefined,
     };
-    const { from, sourceChainId, sourceTokenAddress } = quoteRequest;
+    const { from, isPolymarketDepositWallet, sourceChainId, sourceTokenAddress } = quoteRequest;
+    // A deposit wallet withdraw is broadcast by the Polymarket relayer, which
+    // pays the gas, so the user only signs.
     const gasPayment = resolveGasPayment({
-        isDelegated: gasless,
+        isDelegated: gasless || Boolean(isPolymarketDepositWallet),
         sourceTokenAddress,
         sponsorship: {
             accountSupports7702,
@@ -372,7 +455,10 @@ async function calculateSourceNetworkCost({ accountSupports7702, gasless, messen
         },
     });
     if (gasPayment.mode === GasPaymentMode.Delegation) {
-        log('Zeroing source network fees for gasless quote');
+        log('Zeroing source network fees as the user does not pay origin gas', {
+            gasless,
+            isPolymarketDepositWallet,
+        });
         return noFees;
     }
     if (gasPayment.mode === GasPaymentMode.Sponsored) {
@@ -389,34 +475,38 @@ async function calculateSourceNetworkCost({ accountSupports7702, gasless, messen
         : { maxFeePerGas: undefined, maxPriorityFeePerGas: undefined };
     const maxFeePerGas = firstStep.maxFeePerGas ?? gasFeeEstimate.maxFeePerGas;
     const maxPriorityFeePerGas = firstStep.maxPriorityFeePerGas ?? gasFeeEstimate.maxPriorityFeePerGas;
-    const gasTransactions = steps.map((step) => stepToGasTransaction(step, from));
-    const gasResult = await estimateQuoteGasLimits({
-        fallbackGas: getFeatureFlags(messenger).relayFallbackGas,
-        fallbackOnSimulationFailure: true,
+    // Legacy Safe Predict withdraws hold the source token in the Safe, so deposit
+    // routes are estimated from the Safe. Swap routes keep the sender, as DEX
+    // aggregators reject contract callers.
+    const fromOverride = getPredictWithdrawSafeAddress(quoteRequest, transaction, hasServerDepositStep(steps));
+    const { gasLimits, is7702, totalGasEstimate, totalGasLimit } = await estimateSourceGas({
+        fromOverride,
         messenger,
-        transactions: gasTransactions,
+        request: quoteRequest,
+        transaction,
+        transactions: steps.map((step) => stepToGasTransaction(step, sender)),
     });
-    const { is7702 } = gasResult;
-    const gasLimits = is7702
-        ? [gasResult.gasLimits[0].max]
-        : gasResult.gasLimits.map((gasLimit) => gasLimit.max);
     const estimate = calculateGasCost({
         chainId: chainIdHex,
-        gas: gasResult.totalGasEstimate,
+        gas: totalGasEstimate,
         maxFeePerGas: maxFeePerGas ?? '0',
         maxPriorityFeePerGas: maxPriorityFeePerGas ?? '0',
         messenger,
     });
     const max = calculateGasCost({
         chainId: chainIdHex,
-        gas: gasResult.totalGasLimit,
+        gas: totalGasLimit,
         isMax: true,
         maxFeePerGas: maxFeePerGas ?? '0',
         maxPriorityFeePerGas: maxPriorityFeePerGas ?? '0',
         messenger,
     });
     const fees = { maxFeePerGas, maxPriorityFeePerGas };
+    // Every Predict withdraw holds the source token in the Safe, so the fee token
+    // lookup must use it even on swap routes.
+    const feeTokenAccount = getPredictWithdrawFeeTokenAccount(quoteRequest, transaction);
     const gasStationCost = await resolveGasStationCost({
+        feeTokenAccount,
         firstStepData: {
             data: firstStep.data,
             to: firstStep.to,
@@ -429,13 +519,16 @@ async function calculateSourceNetworkCost({ accountSupports7702, gasless, messen
             sourceChainId,
             sourceTokenAddress,
         },
-        totalGasEstimate: gasResult.totalGasEstimate,
-        totalItemCount: steps.length,
+        totalGasEstimate,
+        totalItemCount: feeTokenAccount
+            ? steps.length + 1
+            : Math.max(steps.length, gasLimits.length),
     });
     if (!gasStationCost.amount) {
         return { estimate, gasLimits, is7702, max, ...fees };
     }
     log('Using gas fee token for source network', {
+        feeTokenAccount,
         gasFeeTokenCost: gasStationCost.amount,
     });
     return {
@@ -469,6 +562,25 @@ function isFulfilledResult(result) {
         result.quote.input !== undefined &&
         result.quote.output !== undefined);
 }
+/**
+ * Whether a quote can be funded as requested. A deposit-address request is only
+ * usable when the quote funds the provider with a plain token transfer, since
+ * that transfer is what gets replaced by an unwrap straight to the deposit
+ * address.
+ *
+ * @param body - The built server quote request.
+ * @param result - Fulfilled provider result.
+ * @returns True when the quote is usable.
+ */
+function isUsableDepositAddressQuote(body, result) {
+    if (!body.useDepositAddress || hasServerDepositStep(result.quote.steps)) {
+        return true;
+    }
+    log('Ignoring deposit address quote without a plain token transfer', {
+        provider: result.provider,
+    });
+    return false;
+}
 function decodeTransferRecipient(data) {
     return TRANSFER_INTERFACE.decodeFunctionData('transfer', data).to.toLowerCase();
 }