fix: batch NFT ownership checks via Multicall3#8281
Merged
Conversation
7 tasks
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 2 potential issues.
❌ 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 09a4cdc. Configure here.
bergarces
approved these changes
Apr 10, 2026
4 tasks
github-merge-queue bot
pushed a commit
that referenced
this pull request
Apr 13, 2026
## Explanation PR #8281 introduced a breaking change that removed checkAndUpdateSingleNftOwnershipStatus from NftController entirely, replacing it with a batch-only checkAndUpdateAllNftsOwnershipStatus flow. However, the MetaMask extension calls checkAndUpdateSingleNftOwnershipStatus directly after confirmed transactions to check ownership of a single NFT — making the removal a regression for extension consumers. This PR restores checkAndUpdateSingleNftOwnershipStatus with an updated signature that aligns with the new architecture introduced in #8281: the batch boolean second argument is removed, the networkClientId is now the second argument (required), and the method always writes the updated NFT to state and returns it. Additionally, a bug introduced in the restored implementation is fixed: the original draft called this.update() directly followed by this.#updateNestedNftState(), which also calls this.update() internally — causing two stateChanged events to fire for a single logical state change. The redundant this.update() call is removed so the method is consistent with every other NFT-mutating method in the controller. <!-- Thanks for your contribution! Take a moment to answer these questions so that reviewers have the information they need to properly understand your changes: * What is the current state of things and why does it need to change? * What is the solution your changes offer and how does it work? * Are there any changes whose purpose might not obvious to those unfamiliar with the domain? * If your primary goal was to update one package but you found you had to update another one along the way, why did you do so? * If you had to upgrade a dependency, why did you do so? --> ## References Ticket: https://consensyssoftware.atlassian.net/browse/ASSETS-2959 Extension PR: MetaMask/metamask-extension#41689 <!-- Are there any issues that this pull request is tied to? Are there other links that reviewers should consult to understand these changes better? Are there client or consumer pull requests to adopt any breaking changes? For example: * Fixes #12345 * Related to #67890 --> ## 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 <!-- CURSOR_SUMMARY --> --- > [!NOTE] > **Medium Risk** > Reintroduces and changes the signature/behavior of `checkAndUpdateSingleNftOwnershipStatus`, which may break existing call sites and affects how NFT ownership state is mutated. > > **Overview** > Restores `NftController.checkAndUpdateSingleNftOwnershipStatus` (removed in #8281) to fix consumers that perform per-NFT ownership checks, and implements it to call `isNftOwner`, update `isCurrentlyOwned`, persist the updated NFT back into `allNfts`, and return the updated object. > > Updates documentation/tests: adds unit coverage for state updates and `userAddress` overrides, and updates the changelog to document the restored method plus the **breaking** signature change (removing the `batch` boolean argument). > > <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit 5593976. Bugbot is set up for automated code reviews on this repo. Configure [here](https://www.cursor.com/dashboard/bugbot).</sup> <!-- /CURSOR_SUMMARY -->
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
AssetsContractControllermessenger calls (getERC721OwnerOf,getERC1155BalanceOf) with a newgetNftOwnershipForMultipleNftsutility that batches ERC-721ownerOfand ERC-1155balanceOfcalls through Multicall3'saggregate3, falling back to individual RPC calls on unsupported chains or when multicall fails.checkAndUpdateSingleNftOwnershipStatusin favor ofcheckAndUpdateAllNftsOwnershipStatus, which now batches all NFTs in a single pass.standardparameter toisNftOwnerso callers that already know the token standard skip redundant subcalls.checkAndUpdateAllNftsOwnershipStatusnow removes NFTs confirmed as unowned from state rather than retaining them withisCurrentlyOwned: false. The "Previously Owned" NFT feature this flag powered is no longer supported.Breaking Changes
checkAndUpdateSingleNftOwnershipStatusremoved — usecheckAndUpdateAllNftsOwnershipStatusinstead.AllowedActionsnarrowed —AssetsContractController:getERC721OwnerOfandAssetsContractController:getERC1155BalanceOfare no longer required byNftController's messenger. Consumers constructing the messenger must remove these from their allowed actions list.References
Ticket: https://consensyssoftware.atlassian.net/browse/ASSETS-2959
PR on Mobile: MetaMask/metamask-mobile#28655
PR on Extension:
Checklist
Note
Medium Risk
Medium risk due to breaking API surface (
AllowedActionsnarrowed,checkAndUpdateSingleNftOwnershipStatusremoved) and changed state semantics (unowned NFTs are deleted), plus new multicall batching logic that could affect ownership determination across networks.Overview
NFT ownership checks are refactored to batch on-chain calls via Multicall3.
NftController.isNftOwnerandcheckAndUpdateAllNftsOwnershipStatusnow use the newgetNftOwnershipForMultipleNftshelper to aggregate ERC-721ownerOf/ ERC-1155balanceOfcalls (with fallback to individual calls when multicall/chain support is unavailable), and callers can pass an optionalstandardto skip unnecessary subcalls.Breaking behavior changes:
AssetsContractController:getERC721OwnerOfandAssetsContractController:getERC1155BalanceOfare removed fromNftControllerAllowedActions,checkAndUpdateSingleNftOwnershipStatusis removed, and ownership refresh now removes NFTs confirmed as unowned from state instead of settingisCurrentlyOwned: false. Tests and changelog are updated accordingly, andmulticallgains comprehensive coverage for the new NFT ownership batching utility.Reviewed by Cursor Bugbot for commit f782f90. Bugbot is set up for automated code reviews on this repo. Configure here.