Skip to content

fix(account-tree-controller): add support for new (v2) KeyringType#8885

Open
ccharly wants to merge 4 commits into
mainfrom
cc/fix/account-tree-group-names
Open

fix(account-tree-controller): add support for new (v2) KeyringType#8885
ccharly wants to merge 4 commits into
mainfrom
cc/fix/account-tree-group-names

Conversation

@ccharly
Copy link
Copy Markdown
Contributor

@ccharly ccharly commented May 21, 2026

Explanation

We are integrating new keyring v2 slowly. So the group naming will have to support this.

This is required at least for the Snap keyring v2 support that will be seen as "real keyrings" (different from v2 wrappers).

References

N/A

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
Moderate risk because it changes account grouping/naming logic and Snap account detection, which can affect how wallets/groups are organized in clients if keyring types are misidentified.

Overview
Updates account-tree keyring naming helpers to accept both legacy KeyringTypes and new v2 KeyringType, mapping v2 values to the same wallet/group display names.

Extends SnapRule matching to treat KeyringType.Snap accounts as Snap accounts (in addition to KeyringTypes.snap) and adds tests/fixtures covering v2 Snap accounts, blocked snaps, and unknown keyring types; also records the change in the package changelog and removes an obsolete ESLint suppression entry.

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

@ccharly ccharly marked this pull request as ready for review May 21, 2026 15:18
@ccharly ccharly requested review from a team as code owners May 21, 2026 15:18
@ccharly
Copy link
Copy Markdown
Contributor Author

ccharly commented May 21, 2026

@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.4.0-preview-c7c3c44
@metamask-previews/accounts-controller@38.1.1-preview-c7c3c44
@metamask-previews/address-book-controller@7.1.2-preview-c7c3c44
@metamask-previews/ai-controllers@0.6.3-preview-c7c3c44
@metamask-previews/analytics-controller@1.0.1-preview-c7c3c44
@metamask-previews/analytics-data-regulation-controller@0.0.0-preview-c7c3c44
@metamask-previews/announcement-controller@8.1.0-preview-c7c3c44
@metamask-previews/app-metadata-controller@2.0.1-preview-c7c3c44
@metamask-previews/approval-controller@9.0.1-preview-c7c3c44
@metamask-previews/assets-controller@8.0.1-preview-c7c3c44
@metamask-previews/assets-controllers@108.1.0-preview-c7c3c44
@metamask-previews/authenticated-user-storage@2.0.0-preview-c7c3c44
@metamask-previews/base-controller@9.1.0-preview-c7c3c44
@metamask-previews/base-data-service@0.1.3-preview-c7c3c44
@metamask-previews/bridge-controller@73.0.1-preview-c7c3c44
@metamask-previews/bridge-status-controller@71.2.0-preview-c7c3c44
@metamask-previews/build-utils@3.0.4-preview-c7c3c44
@metamask-previews/chain-agnostic-permission@1.6.1-preview-c7c3c44
@metamask-previews/chomp-api-service@3.1.0-preview-c7c3c44
@metamask-previews/claims-controller@0.5.1-preview-c7c3c44
@metamask-previews/client-controller@1.0.1-preview-c7c3c44
@metamask-previews/compliance-controller@2.0.1-preview-c7c3c44
@metamask-previews/composable-controller@12.0.1-preview-c7c3c44
@metamask-previews/config-registry-controller@0.3.1-preview-c7c3c44
@metamask-previews/connectivity-controller@0.2.0-preview-c7c3c44
@metamask-previews/controller-utils@12.1.0-preview-c7c3c44
@metamask-previews/core-backend@6.3.0-preview-c7c3c44
@metamask-previews/delegation-controller@3.0.0-preview-c7c3c44
@metamask-previews/earn-controller@12.2.0-preview-c7c3c44
@metamask-previews/eip-5792-middleware@3.0.4-preview-c7c3c44
@metamask-previews/eip-7702-internal-rpc-middleware@0.1.1-preview-c7c3c44
@metamask-previews/eip1193-permission-middleware@2.0.1-preview-c7c3c44
@metamask-previews/ens-controller@19.1.3-preview-c7c3c44
@metamask-previews/eth-block-tracker@15.0.1-preview-c7c3c44
@metamask-previews/eth-json-rpc-middleware@23.1.3-preview-c7c3c44
@metamask-previews/eth-json-rpc-provider@6.0.1-preview-c7c3c44
@metamask-previews/foundryup@1.0.1-preview-c7c3c44
@metamask-previews/gas-fee-controller@26.2.2-preview-c7c3c44
@metamask-previews/gator-permissions-controller@4.2.0-preview-c7c3c44
@metamask-previews/geolocation-controller@0.1.3-preview-c7c3c44
@metamask-previews/json-rpc-engine@10.5.0-preview-c7c3c44
@metamask-previews/json-rpc-middleware-stream@8.0.8-preview-c7c3c44
@metamask-previews/keyring-controller@25.5.0-preview-c7c3c44
@metamask-previews/logging-controller@8.0.2-preview-c7c3c44
@metamask-previews/message-manager@14.1.2-preview-c7c3c44
@metamask-previews/messenger@1.2.0-preview-c7c3c44
@metamask-previews/messenger-cli@0.2.0-preview-c7c3c44
@metamask-previews/money-account-balance-service@1.0.2-preview-c7c3c44
@metamask-previews/money-account-controller@0.3.0-preview-c7c3c44
@metamask-previews/money-account-upgrade-controller@2.0.2-preview-c7c3c44
@metamask-previews/multichain-account-service@10.0.0-preview-c7c3c44
@metamask-previews/multichain-api-middleware@3.1.2-preview-c7c3c44
@metamask-previews/multichain-network-controller@3.1.2-preview-c7c3c44
@metamask-previews/multichain-transactions-controller@7.1.0-preview-c7c3c44
@metamask-previews/name-controller@9.1.2-preview-c7c3c44
@metamask-previews/network-controller@32.0.0-preview-c7c3c44
@metamask-previews/network-enablement-controller@5.2.0-preview-c7c3c44
@metamask-previews/notification-services-controller@24.1.1-preview-c7c3c44
@metamask-previews/passkey-controller@2.0.1-preview-c7c3c44
@metamask-previews/permission-controller@13.1.1-preview-c7c3c44
@metamask-previews/permission-log-controller@5.1.0-preview-c7c3c44
@metamask-previews/perps-controller@6.2.0-preview-c7c3c44
@metamask-previews/phishing-controller@17.2.0-preview-c7c3c44
@metamask-previews/polling-controller@16.0.6-preview-c7c3c44
@metamask-previews/preferences-controller@23.1.0-preview-c7c3c44
@metamask-previews/profile-metrics-controller@3.1.4-preview-c7c3c44
@metamask-previews/profile-sync-controller@28.1.0-preview-c7c3c44
@metamask-previews/ramps-controller@14.0.0-preview-c7c3c44
@metamask-previews/rate-limit-controller@7.0.1-preview-c7c3c44
@metamask-previews/react-data-query@0.2.1-preview-c7c3c44
@metamask-previews/remote-feature-flag-controller@4.2.1-preview-c7c3c44
@metamask-previews/sample-controllers@5.0.1-preview-c7c3c44
@metamask-previews/seedless-onboarding-controller@9.1.0-preview-c7c3c44
@metamask-previews/selected-network-controller@26.1.3-preview-c7c3c44
@metamask-previews/shield-controller@5.1.2-preview-c7c3c44
@metamask-previews/signature-controller@39.2.2-preview-c7c3c44
@metamask-previews/snap-account-service@0.2.0-preview-c7c3c44
@metamask-previews/social-controllers@2.2.1-preview-c7c3c44
@metamask-previews/storage-service@1.0.1-preview-c7c3c44
@metamask-previews/subscription-controller@6.1.3-preview-c7c3c44
@metamask-previews/transaction-controller@66.0.0-preview-c7c3c44
@metamask-previews/transaction-pay-controller@22.7.0-preview-c7c3c44
@metamask-previews/user-operation-controller@41.2.2-preview-c7c3c44
@metamask-previews/wallet@0.0.0-preview-c7c3c44

@ccharly ccharly temporarily deployed to default-branch May 21, 2026 15:31 — with GitHub Actions Inactive
@ccharly ccharly enabled auto-merge May 21, 2026 15:46
@ccharly ccharly changed the title fix(account-tree-controller): add support for new (v2) KeyringType fix(account-tree-controller): add support for new (v2) KeyringType May 21, 2026
@ccharly
Copy link
Copy Markdown
Contributor Author

ccharly commented May 21, 2026

@metamaskbot publish-preview

@ccharly ccharly disabled auto-merge May 21, 2026 15:59
@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.4.0-preview-855431b
@metamask-previews/accounts-controller@38.1.1-preview-855431b
@metamask-previews/address-book-controller@7.1.2-preview-855431b
@metamask-previews/ai-controllers@0.6.3-preview-855431b
@metamask-previews/analytics-controller@1.0.1-preview-855431b
@metamask-previews/analytics-data-regulation-controller@0.0.0-preview-855431b
@metamask-previews/announcement-controller@8.1.0-preview-855431b
@metamask-previews/app-metadata-controller@2.0.1-preview-855431b
@metamask-previews/approval-controller@9.0.1-preview-855431b
@metamask-previews/assets-controller@8.0.1-preview-855431b
@metamask-previews/assets-controllers@108.1.0-preview-855431b
@metamask-previews/authenticated-user-storage@2.0.0-preview-855431b
@metamask-previews/base-controller@9.1.0-preview-855431b
@metamask-previews/base-data-service@0.1.3-preview-855431b
@metamask-previews/bridge-controller@73.0.1-preview-855431b
@metamask-previews/bridge-status-controller@71.2.0-preview-855431b
@metamask-previews/build-utils@3.0.4-preview-855431b
@metamask-previews/chain-agnostic-permission@1.6.1-preview-855431b
@metamask-previews/chomp-api-service@3.1.0-preview-855431b
@metamask-previews/claims-controller@0.5.1-preview-855431b
@metamask-previews/client-controller@1.0.1-preview-855431b
@metamask-previews/compliance-controller@2.0.1-preview-855431b
@metamask-previews/composable-controller@12.0.1-preview-855431b
@metamask-previews/config-registry-controller@0.3.1-preview-855431b
@metamask-previews/connectivity-controller@0.2.0-preview-855431b
@metamask-previews/controller-utils@12.1.0-preview-855431b
@metamask-previews/core-backend@6.3.0-preview-855431b
@metamask-previews/delegation-controller@3.0.0-preview-855431b
@metamask-previews/earn-controller@12.2.0-preview-855431b
@metamask-previews/eip-5792-middleware@3.0.4-preview-855431b
@metamask-previews/eip-7702-internal-rpc-middleware@0.1.1-preview-855431b
@metamask-previews/eip1193-permission-middleware@2.0.1-preview-855431b
@metamask-previews/ens-controller@19.1.3-preview-855431b
@metamask-previews/eth-block-tracker@15.0.1-preview-855431b
@metamask-previews/eth-json-rpc-middleware@23.1.3-preview-855431b
@metamask-previews/eth-json-rpc-provider@6.0.1-preview-855431b
@metamask-previews/foundryup@1.0.1-preview-855431b
@metamask-previews/gas-fee-controller@26.2.2-preview-855431b
@metamask-previews/gator-permissions-controller@4.2.0-preview-855431b
@metamask-previews/geolocation-controller@0.1.3-preview-855431b
@metamask-previews/json-rpc-engine@10.5.0-preview-855431b
@metamask-previews/json-rpc-middleware-stream@8.0.8-preview-855431b
@metamask-previews/keyring-controller@25.5.0-preview-855431b
@metamask-previews/logging-controller@8.0.2-preview-855431b
@metamask-previews/message-manager@14.1.2-preview-855431b
@metamask-previews/messenger@1.2.0-preview-855431b
@metamask-previews/messenger-cli@0.2.0-preview-855431b
@metamask-previews/money-account-balance-service@1.0.2-preview-855431b
@metamask-previews/money-account-controller@0.3.0-preview-855431b
@metamask-previews/money-account-upgrade-controller@2.0.2-preview-855431b
@metamask-previews/multichain-account-service@10.0.0-preview-855431b
@metamask-previews/multichain-api-middleware@3.1.2-preview-855431b
@metamask-previews/multichain-network-controller@3.1.2-preview-855431b
@metamask-previews/multichain-transactions-controller@7.1.0-preview-855431b
@metamask-previews/name-controller@9.1.2-preview-855431b
@metamask-previews/network-controller@32.0.0-preview-855431b
@metamask-previews/network-enablement-controller@5.2.0-preview-855431b
@metamask-previews/notification-services-controller@24.1.1-preview-855431b
@metamask-previews/passkey-controller@2.0.1-preview-855431b
@metamask-previews/permission-controller@13.1.1-preview-855431b
@metamask-previews/permission-log-controller@5.1.0-preview-855431b
@metamask-previews/perps-controller@6.2.0-preview-855431b
@metamask-previews/phishing-controller@17.2.0-preview-855431b
@metamask-previews/polling-controller@16.0.6-preview-855431b
@metamask-previews/preferences-controller@23.1.0-preview-855431b
@metamask-previews/profile-metrics-controller@3.1.4-preview-855431b
@metamask-previews/profile-sync-controller@28.1.0-preview-855431b
@metamask-previews/ramps-controller@14.0.0-preview-855431b
@metamask-previews/rate-limit-controller@7.0.1-preview-855431b
@metamask-previews/react-data-query@0.2.1-preview-855431b
@metamask-previews/remote-feature-flag-controller@4.2.1-preview-855431b
@metamask-previews/sample-controllers@5.0.1-preview-855431b
@metamask-previews/seedless-onboarding-controller@9.1.0-preview-855431b
@metamask-previews/selected-network-controller@26.1.3-preview-855431b
@metamask-previews/shield-controller@5.1.2-preview-855431b
@metamask-previews/signature-controller@39.2.2-preview-855431b
@metamask-previews/snap-account-service@0.2.0-preview-855431b
@metamask-previews/social-controllers@2.2.1-preview-855431b
@metamask-previews/storage-service@1.0.1-preview-855431b
@metamask-previews/subscription-controller@6.1.3-preview-855431b
@metamask-previews/transaction-controller@66.0.0-preview-855431b
@metamask-previews/transaction-pay-controller@22.7.0-preview-855431b
@metamask-previews/user-operation-controller@41.2.2-preview-855431b
@metamask-previews/wallet@0.0.0-preview-855431b

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