feat: call getPaymentOverrideData method to get payment override steps for transactions when paymentOverride is defined by jpuri · Pull Request #8870 · MetaMask/core

jpuri · 2026-05-21T05:36:40Z

Explanation

If paymentOverride is defined call getPaymentOverrideData method to get payment override steps for transactions.

References

Related to https://consensyssoftware.atlassian.net/browse/CONF-1404

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
Changes how Relay batches are built, gas is estimated, and source balances are validated when paymentOverride is active; incorrect client callback data could mis-submit or underfund txs, though the feature is opt-in and covered by tests.

Overview
Adds an optional getPaymentOverrideData hook on TransactionPayController (constructor option + TransactionPayController:getPaymentOverrideData messenger action). When paymentOverride is set on transaction config/data, quote requests carry that flag through, and the Relay path prepends client-supplied BatchTransactionParams ahead of relay steps instead of using the post-quote “original tx” prepend.

Relay gas now reserves a fixed 75,000 for those prepended override txs (including on combined EIP-7702 limits). Submit skips source balance validation for override flows, maps batch transaction types via a generic prependCount (not only isPostQuote), and falls back to a single-tx path if the callback returns no calls.

Public exports add GetPaymentOverrideDataRequest / GetPaymentOverrideDataResponse; tests cover controller delegation, quote gas, and submit batch behavior.

^{Reviewed by Cursor Bugbot for commit e4c41e3. Bugbot is set up for automated code reviews on this repo. Configure here.}

…ditional_trxn_steps

…Mask/core into build_additional_trxn_steps

matthewwalsh0 · 2026-05-27T15:45:34Z

+export type GetPaymentOverrideDataCallback = (
+  transactionId: string,
+  amount: string,
+) => Promise<TransactionParams | undefined>;


Also here, should we return an object for future-proofing so:

Promise<{ calls: BatchTransactionParams[]}>?

PR is updated to address this

Can't see this one?

Ah I missed that part to convert it to object, done now.

…Mask/core into build_additional_trxn_steps

matthewwalsh0 · 2026-05-28T08:29:08Z

 }

+// Hardcoded gas allowance for the prepended payment override transaction(s).
+const PAYMENT_OVERRIDE_GAS = 75_000;


Minor, constants at top.

PR is updated to address this.

matthewwalsh0 · 2026-05-28T08:32:12Z

    const transactions = allParams.map((singleParams, index) => {
-      const gasLimit = gasLimits[index];
+      const relayIndex = overrideCount > 0 ? index - overrideCount : index;
+      const gasLimit = relayIndex >= 0 ? gasLimits[relayIndex] : undefined;


We don't need this logic anymore do we? Since we're providing an extra gas limit in the list?

Good catch, PR is updated

matthewwalsh0 · 2026-05-28T08:33:53Z

      ? toHex(metamask.gasLimits[0])
      : undefined;

+    const overrideCount = quote.request.paymentOverride


Could we make this generic for the post quote scenario also? What if we have a payment override and post quote?

Yep, I updated the PR

matthewwalsh0 · 2026-05-28T08:34:39Z

 ): TransactionMeta['type'] {
-  // Post-quote index 0 is the original transaction
-  if (isPostQuote && index === 0) {
+  const prependCount = isPostQuote ? 1 : overrideCount;


We don't need to check post quote do we as we may have post quote plus payment override? So just the overrideCount is sufficient?

Good point, PR is updated to address this

matthewwalsh0 · 2026-05-28T08:35:23Z

+ */
+export type GetPaymentOverrideDataCallback = (
+  request: GetPaymentOverrideDataRequest,
+) => Promise<BatchTransactionParams[]>;


Do we want that response object for future-proofing? So the {calls}?

PR is updated to address this

…Mask/core into build_additional_trxn_steps

cursor

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

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit e4c41e3. Configure here.}

jpuri added 3 commits May 20, 2026 17:22

feat: add transaction data property useMoneyAccount

4fddaec

update changelog

a1258e6

feat: support for money account source for MM pay deposit transactions

3ecc086

jpuri mentioned this pull request May 21, 2026

feat: add transaction data property useMoneyAccount #8858

Merged

4 tasks

Base automatically changed from money_account_support to main May 21, 2026 12:04

jpuri added 13 commits May 22, 2026 18:37

merge

1fc9d29

update

886efa9

update

c6f336a

update

3c024f3

update

b270c54

update

0abfc00

update

4a19e41

update

a0501e5

update

edec73a

update

0b42cf3

update

d32a3f4

update

7801d59

update

fb4ff92

jpuri added the team-confirmations label May 25, 2026

jpuri changed the title ~~feat: support for money account source for MM pay deposit transactions~~ feat: if paymentOverride is defined call getPaymentOverrideData method to get payment override steps for transactions May 25, 2026

jpuri added 10 commits May 26, 2026 07:51

update

8d683c8

Merge branch 'main' of https://github.com/MetaMask/core into build_ad…

9c6080f

…ditional_trxn_steps

update

e3897dd

update

f4a6fea

Merge branch 'main' into build_additional_trxn_steps

df9209e

update

c392af5

Merge branch 'build_additional_trxn_steps' of https://github.com/Meta…

889084c

…Mask/core into build_additional_trxn_steps

update

26439e5

update

287808b

update

02c0695

update

be8c99a

jpuri changed the title ~~feat: if paymentOverride is defined call getPaymentOverrideData method to get payment override steps for transactions~~ feat: call getPaymentOverrideData method to get payment override steps for transactions when paymentOverride is defined May 27, 2026

Merge branch 'build_additional_trxn_steps' of https://github.com/Meta…

ce8333c

…Mask/core into build_additional_trxn_steps

jpuri enabled auto-merge May 27, 2026 14:47

update

8332556

cursor Bot reviewed May 27, 2026

View reviewed changes

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

matthewwalsh0 requested changes May 27, 2026

View reviewed changes

update

2fb76df

cursor Bot reviewed May 27, 2026

View reviewed changes

Comment thread packages/transaction-pay-controller/src/strategy/relay/relay-submit.test.ts Outdated

Comment thread packages/transaction-pay-controller/src/strategy/relay/relay-submit.test.ts Outdated

Comment thread packages/transaction-pay-controller/src/TransactionPayController.test.ts Outdated

jpuri added 7 commits May 27, 2026 22:08

update

c2afcb4

Merge branch 'main' into build_additional_trxn_steps

cf9615b

update

9f70f71

Merge branch 'main' into build_additional_trxn_steps

1bf0deb

Merge branch 'build_additional_trxn_steps' of https://github.com/Meta…

aa25cca

…Mask/core into build_additional_trxn_steps

update

d54d178

update

6444b39

jpuri requested a review from matthewwalsh0 May 27, 2026 16:55

Merge branch 'main' into build_additional_trxn_steps

44e34c2

cursor Bot reviewed May 28, 2026

View reviewed changes

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

matthewwalsh0 requested changes May 28, 2026

View reviewed changes

jpuri added 3 commits May 28, 2026 14:56

update

12757b5

Merge branch 'build_additional_trxn_steps' of https://github.com/Meta…

0ee79e9

…Mask/core into build_additional_trxn_steps

update

7c064a9

cursor Bot reviewed May 28, 2026

View reviewed changes

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

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

jpuri added 2 commits May 28, 2026 15:09

update

31a8152

Merge branch 'main' into build_additional_trxn_steps

33accc9

jpuri requested a review from matthewwalsh0 May 28, 2026 09:43

cursor Bot reviewed May 28, 2026

View reviewed changes

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

Merge branch 'main' into build_additional_trxn_steps

e4c41e3

cursor Bot reviewed May 28, 2026

View reviewed changes

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

Uh oh!

Conversation

jpuri commented May 21, 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!

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!

Uh oh!

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!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jpuri commented May 21, 2026 •

edited by cursor Bot

Loading