fix(transaction-controller): allow nested batch transactions with duplicate batchId when requireApproval is false#8884
Draft
matthewwalsh0 wants to merge 1 commit into
Draft
Conversation
…sPublishHook batch call
f15c67e to
4678f2f
Compare
Member
Author
|
@metamaskbot publish-preview |
Contributor
|
Preview builds have been published. Learn how to use preview builds in other projects. Expand for full list of packages and versions. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Explanation
ExtraTransactionsPublishHookcallsaddTransactionBatchinternally to submit the ERC-20 gas-fee-token payment alongside a Smart Transaction. It was not passingisInternal: true, so the duplicate-batch-ID guard (introduced in #8633) treated it as an untrusted external call and threwDuplicateBundleId(error 5720).Before #8633 this worked because the old guard checked
origin && origin !== ORIGIN_METAMASK— no origin meant no block. The new!isInternalguard has no equivalent null-check, so the missing flag caused the regression.Fix: pass
isInternal: trueat theExtraTransactionsPublishHookcall site.References
isInternalflag #8633Checklist