Skip to content

fix: skip already-aligned accounts during wallet alignment#9269

Merged
mathieuartu merged 5 commits into
mainfrom
fix/alignment-traces-scoped
Jun 30, 2026
Merged

fix: skip already-aligned accounts during wallet alignment#9269
mathieuartu merged 5 commits into
mainfrom
fix/alignment-traces-scoped

Conversation

@mathieuartu

@mathieuartu mathieuartu commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

Explanation

This PR adds exact-range account group alignment. This is mainly done to fix Sentry unnecessary spam, but can also improve performance slightly.

References

Fixes: https://consensyssoftware.atlassian.net/browse/MUL-1939

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 core wallet alignment and account-creation scheduling; behavior is more selective but miscomputed sub-ranges could leave groups misaligned until a later align run.

Overview
Wallet alignment no longer calls createAccounts for every provider across the full group index range. It now derives contiguous sub-ranges where each provider is missing an account and only invokes creation for those gaps.

MultichainAccountGroup gains isProviderAligned(provider), and group isAligned() is implemented via that helper. MultichainAccountWallet refactors the shared build path from #buildGroupStateForRange to #buildGroupState with a getSubRanges callback: alignment supplies #getUnalignedSubRangesForProvider, while group creation still passes the full [from, to] range. Providers that are already aligned for all indices in the range are skipped entirely (fewer traces / Sentry noise).

Tests cover single missing indices, fully aligned providers, and non-contiguous missing indices (separate createAccounts calls per gap).

Reviewed by Cursor Bugbot for commit 851ec05. Bugbot is set up for automated code reviews on this repo. Configure here.

@mathieuartu mathieuartu self-assigned this Jun 25, 2026
@mathieuartu mathieuartu requested review from a team as code owners June 25, 2026 15:10
montelaidev
montelaidev previously approved these changes Jun 29, 2026

@montelaidev montelaidev left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Code looks good.

@mathieuartu

Copy link
Copy Markdown
Contributor Author

@metamaskbot publish-preview

@mathieuartu

Copy link
Copy Markdown
Contributor Author

@metamaskbot publish-preview

@github-actions

Copy link
Copy Markdown
Contributor

Preview builds have been published. Learn how to use preview builds in other projects.

Expand for full list of packages and versions.
@metamask-previews/account-tree-controller@7.5.3-preview-d7951629b
@metamask-previews/accounts-controller@39.0.3-preview-d7951629b
@metamask-previews/address-book-controller@7.1.2-preview-d7951629b
@metamask-previews/ai-controllers@0.7.0-preview-d7951629b
@metamask-previews/analytics-controller@1.2.1-preview-d7951629b
@metamask-previews/analytics-data-regulation-controller@0.0.0-preview-d7951629b
@metamask-previews/announcement-controller@8.1.0-preview-d7951629b
@metamask-previews/app-metadata-controller@2.0.1-preview-d7951629b
@metamask-previews/approval-controller@9.0.2-preview-d7951629b
@metamask-previews/assets-controller@9.1.0-preview-d7951629b
@metamask-previews/assets-controllers@109.2.2-preview-d7951629b
@metamask-previews/authenticated-user-storage@2.1.0-preview-d7951629b
@metamask-previews/base-controller@9.1.0-preview-d7951629b
@metamask-previews/base-data-service@0.1.3-preview-d7951629b
@metamask-previews/bitcoin-regtest-up@0.0.0-preview-d7951629b
@metamask-previews/bridge-controller@77.1.0-preview-d7951629b
@metamask-previews/bridge-status-controller@74.0.0-preview-d7951629b
@metamask-previews/build-utils@3.0.4-preview-d7951629b
@metamask-previews/chain-agnostic-permission@1.6.2-preview-d7951629b
@metamask-previews/chomp-api-service@3.1.0-preview-d7951629b
@metamask-previews/claims-controller@0.5.3-preview-d7951629b
@metamask-previews/client-controller@1.0.1-preview-d7951629b
@metamask-previews/compliance-controller@2.1.0-preview-d7951629b
@metamask-previews/composable-controller@12.0.1-preview-d7951629b
@metamask-previews/config-registry-controller@0.4.1-preview-d7951629b
@metamask-previews/connectivity-controller@0.2.0-preview-d7951629b
@metamask-previews/controller-utils@12.3.0-preview-d7951629b
@metamask-previews/core-backend@6.3.3-preview-d7951629b
@metamask-previews/delegation-controller@3.0.2-preview-d7951629b
@metamask-previews/earn-controller@12.2.1-preview-d7951629b
@metamask-previews/eip-5792-middleware@3.0.4-preview-d7951629b
@metamask-previews/eip-7702-internal-rpc-middleware@0.1.1-preview-d7951629b
@metamask-previews/eip1193-permission-middleware@2.0.1-preview-d7951629b
@metamask-previews/ens-controller@19.1.4-preview-d7951629b
@metamask-previews/eth-block-tracker@15.0.1-preview-d7951629b
@metamask-previews/eth-json-rpc-middleware@23.1.3-preview-d7951629b
@metamask-previews/eth-json-rpc-provider@6.0.1-preview-d7951629b
@metamask-previews/foundryup@1.0.1-preview-d7951629b
@metamask-previews/gas-fee-controller@26.2.3-preview-d7951629b
@metamask-previews/gator-permissions-controller@4.2.1-preview-d7951629b
@metamask-previews/geolocation-controller@0.1.3-preview-d7951629b
@metamask-previews/java-tron-up@0.0.0-preview-d7951629b
@metamask-previews/json-rpc-engine@10.5.0-preview-d7951629b
@metamask-previews/json-rpc-middleware-stream@8.0.8-preview-d7951629b
@metamask-previews/keyring-controller@27.1.0-preview-d7951629b
@metamask-previews/local-node-utils@0.0.0-preview-d7951629b
@metamask-previews/logging-controller@8.0.2-preview-d7951629b
@metamask-previews/message-manager@14.1.2-preview-d7951629b
@metamask-previews/messenger@1.2.0-preview-d7951629b
@metamask-previews/messenger-cli@0.2.0-preview-d7951629b
@metamask-previews/money-account-balance-service@2.1.1-preview-d7951629b
@metamask-previews/money-account-controller@0.3.3-preview-d7951629b
@metamask-previews/money-account-upgrade-controller@2.1.0-preview-d7951629b
@metamask-previews/multichain-account-service@11.1.0-preview-d7951629b
@metamask-previews/multichain-api-middleware@3.1.5-preview-d7951629b
@metamask-previews/multichain-network-controller@3.2.0-preview-d7951629b
@metamask-previews/multichain-transactions-controller@7.1.1-preview-d7951629b
@metamask-previews/name-controller@9.1.2-preview-d7951629b
@metamask-previews/network-controller@33.0.0-preview-d7951629b
@metamask-previews/network-enablement-controller@5.4.0-preview-d7951629b
@metamask-previews/notification-services-controller@24.2.0-preview-d7951629b
@metamask-previews/passkey-controller@2.0.1-preview-d7951629b
@metamask-previews/permission-controller@13.1.1-preview-d7951629b
@metamask-previews/permission-log-controller@5.1.0-preview-d7951629b
@metamask-previews/perps-controller@9.0.0-preview-d7951629b
@metamask-previews/phishing-controller@17.2.0-preview-d7951629b
@metamask-previews/polling-controller@16.0.7-preview-d7951629b
@metamask-previews/preferences-controller@23.1.0-preview-d7951629b
@metamask-previews/profile-metrics-controller@4.0.1-preview-d7951629b
@metamask-previews/profile-sync-controller@28.2.0-preview-d7951629b
@metamask-previews/ramps-controller@15.0.0-preview-d7951629b
@metamask-previews/rate-limit-controller@7.0.1-preview-d7951629b
@metamask-previews/react-data-query@0.2.1-preview-d7951629b
@metamask-previews/remote-feature-flag-controller@4.2.2-preview-d7951629b
@metamask-previews/sample-controllers@5.0.2-preview-d7951629b
@metamask-previews/seedless-onboarding-controller@10.0.3-preview-d7951629b
@metamask-previews/selected-network-controller@26.1.4-preview-d7951629b
@metamask-previews/shield-controller@5.1.2-preview-d7951629b
@metamask-previews/signature-controller@39.2.6-preview-d7951629b
@metamask-previews/smart-transactions-controller@24.2.3-preview-d7951629b
@metamask-previews/snap-account-service@1.0.0-preview-d7951629b
@metamask-previews/social-controllers@2.3.1-preview-d7951629b
@metamask-previews/solana-test-validator-up@0.0.0-preview-d7951629b
@metamask-previews/stellar-quickstart-up@0.0.0-preview-d7951629b
@metamask-previews/storage-service@1.0.2-preview-d7951629b
@metamask-previews/subscription-controller@6.2.0-preview-d7951629b
@metamask-previews/transaction-controller@68.2.0-preview-d7951629b
@metamask-previews/transaction-pay-controller@23.17.2-preview-d7951629b
@metamask-previews/user-operation-controller@41.2.5-preview-d7951629b
@metamask-previews/wallet@5.0.0-preview-d7951629b
@metamask-previews/wallet-cli@0.0.0-preview-d7951629b

@ccharly ccharly left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM + live tested!

@mathieuartu mathieuartu enabled auto-merge June 30, 2026 10:35
@mathieuartu mathieuartu added this pull request to the merge queue Jun 30, 2026
Merged via the queue into main with commit dbb2ac2 Jun 30, 2026
400 checks passed
@mathieuartu mathieuartu deleted the fix/alignment-traces-scoped branch June 30, 2026 10:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants