Skip to content

fix: batch NFT ownership checks via Multicall3#8281

Merged
juanmigdr merged 12 commits intomainfrom
fix/do-not-make-On-calls-fo-refresh
Apr 10, 2026
Merged

fix: batch NFT ownership checks via Multicall3#8281
juanmigdr merged 12 commits intomainfrom
fix/do-not-make-On-calls-fo-refresh

Conversation

@juanmigdr
Copy link
Copy Markdown
Member

@juanmigdr juanmigdr commented Mar 24, 2026

Explanation

  • Replace individual AssetsContractController messenger calls (getERC721OwnerOf, getERC1155BalanceOf) with a new getNftOwnershipForMultipleNfts utility that batches ERC-721 ownerOf and ERC-1155 balanceOf calls through Multicall3's aggregate3, falling back to individual RPC calls on unsupported chains or when multicall fails.
  • Remove checkAndUpdateSingleNftOwnershipStatus in favor of checkAndUpdateAllNftsOwnershipStatus, which now batches all NFTs in a single pass.
  • Add an optional standard parameter to isNftOwner so callers that already know the token standard skip redundant subcalls.
  • checkAndUpdateAllNftsOwnershipStatus now removes NFTs confirmed as unowned from state rather than retaining them with isCurrentlyOwned: false. The "Previously Owned" NFT feature this flag powered is no longer supported.

Breaking Changes

  • checkAndUpdateSingleNftOwnershipStatus removed — use checkAndUpdateAllNftsOwnershipStatus instead.
  • AllowedActions narrowedAssetsContractController:getERC721OwnerOf and AssetsContractController:getERC1155BalanceOf are no longer required by NftController'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

  • 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 due to breaking API surface (AllowedActions narrowed, checkAndUpdateSingleNftOwnershipStatus removed) 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.isNftOwner and checkAndUpdateAllNftsOwnershipStatus now use the new getNftOwnershipForMultipleNfts helper to aggregate ERC-721 ownerOf / ERC-1155 balanceOf calls (with fallback to individual calls when multicall/chain support is unavailable), and callers can pass an optional standard to skip unnecessary subcalls.

Breaking behavior changes: AssetsContractController:getERC721OwnerOf and AssetsContractController:getERC1155BalanceOf are removed from NftController AllowedActions, checkAndUpdateSingleNftOwnershipStatus is removed, and ownership refresh now removes NFTs confirmed as unowned from state instead of setting isCurrentlyOwned: false. Tests and changelog are updated accordingly, and multicall gains 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.

@juanmigdr juanmigdr requested a review from a team as a code owner March 24, 2026 12:36
Comment thread packages/assets-controllers/src/multicall.ts
Comment thread packages/assets-controllers/src/multicall.ts
Copy link
Copy Markdown

@cursor cursor bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Fix All in Cursor

❌ 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.

Comment thread packages/assets-controllers/src/multicall.ts
Comment thread packages/assets-controllers/src/NftController.ts
@juanmigdr juanmigdr enabled auto-merge April 10, 2026 11:25
@juanmigdr juanmigdr added this pull request to the merge queue Apr 10, 2026
Merged via the queue into main with commit d148dd7 Apr 10, 2026
341 checks passed
@juanmigdr juanmigdr deleted the fix/do-not-make-On-calls-fo-refresh branch April 10, 2026 12:58
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 -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants