Skip to content

chore(keyring-controller): remove QRKeyring-related code #6031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

mikesposito
Copy link
Member

@mikesposito mikesposito commented Jun 25, 2025

Explanation

Dependent on:

This PR removes all code related to the QRKeyring from KeystoneHQ, which we intend to deprecate in favor of the new QRKeyring implementation in the MetaMask accounts monorepo, that fully supports our Keyring type.

References

Changelog

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, highlighting breaking changes as necessary
  • I've prepared draft pull requests for clients and consumer packages to resolve any breaking changes

@mikesposito mikesposito requested review from a team as code owners June 25, 2025 11:26
@mikesposito mikesposito marked this pull request as draft June 25, 2025 11:31
@mikesposito
Copy link
Member Author

@metamaskbot publish-preview

Copy link
Contributor

Preview builds have been published. See these instructions for more information about preview builds.

Expand for full list of packages and versions.
{
  "@metamask-previews/account-tree-controller": "0.4.0-preview-d7c00b1",
  "@metamask-previews/accounts-controller": "31.0.0-preview-d7c00b1",
  "@metamask-previews/address-book-controller": "6.1.0-preview-d7c00b1",
  "@metamask-previews/announcement-controller": "7.0.3-preview-d7c00b1",
  "@metamask-previews/app-metadata-controller": "1.0.0-preview-d7c00b1",
  "@metamask-previews/approval-controller": "7.1.3-preview-d7c00b1",
  "@metamask-previews/assets-controllers": "69.0.0-preview-d7c00b1",
  "@metamask-previews/base-controller": "8.0.1-preview-d7c00b1",
  "@metamask-previews/bridge-controller": "33.0.1-preview-d7c00b1",
  "@metamask-previews/bridge-status-controller": "32.0.0-preview-d7c00b1",
  "@metamask-previews/build-utils": "3.0.3-preview-d7c00b1",
  "@metamask-previews/chain-agnostic-permission": "1.0.0-preview-d7c00b1",
  "@metamask-previews/composable-controller": "11.0.0-preview-d7c00b1",
  "@metamask-previews/controller-utils": "11.10.0-preview-d7c00b1",
  "@metamask-previews/delegation-controller": "0.5.0-preview-d7c00b1",
  "@metamask-previews/earn-controller": "2.0.0-preview-d7c00b1",
  "@metamask-previews/eip1193-permission-middleware": "1.0.0-preview-d7c00b1",
  "@metamask-previews/ens-controller": "17.0.0-preview-d7c00b1",
  "@metamask-previews/error-reporting-service": "2.0.0-preview-d7c00b1",
  "@metamask-previews/eth-json-rpc-provider": "4.1.8-preview-d7c00b1",
  "@metamask-previews/foundryup": "1.0.0-preview-d7c00b1",
  "@metamask-previews/gas-fee-controller": "24.0.0-preview-d7c00b1",
  "@metamask-previews/json-rpc-engine": "10.0.3-preview-d7c00b1",
  "@metamask-previews/json-rpc-middleware-stream": "8.0.7-preview-d7c00b1",
  "@metamask-previews/keyring-controller": "22.0.2-preview-d7c00b1",
  "@metamask-previews/logging-controller": "6.0.4-preview-d7c00b1",
  "@metamask-previews/message-manager": "12.0.1-preview-d7c00b1",
  "@metamask-previews/multichain-api-middleware": "1.0.0-preview-d7c00b1",
  "@metamask-previews/multichain-network-controller": "0.9.0-preview-d7c00b1",
  "@metamask-previews/multichain-transactions-controller": "3.0.0-preview-d7c00b1",
  "@metamask-previews/name-controller": "8.0.3-preview-d7c00b1",
  "@metamask-previews/network-controller": "24.0.0-preview-d7c00b1",
  "@metamask-previews/notification-services-controller": "12.0.0-preview-d7c00b1",
  "@metamask-previews/permission-controller": "11.0.6-preview-d7c00b1",
  "@metamask-previews/permission-log-controller": "3.0.3-preview-d7c00b1",
  "@metamask-previews/phishing-controller": "12.6.0-preview-d7c00b1",
  "@metamask-previews/polling-controller": "14.0.0-preview-d7c00b1",
  "@metamask-previews/preferences-controller": "18.2.0-preview-d7c00b1",
  "@metamask-previews/profile-sync-controller": "19.0.0-preview-d7c00b1",
  "@metamask-previews/rate-limit-controller": "6.0.3-preview-d7c00b1",
  "@metamask-previews/remote-feature-flag-controller": "1.6.0-preview-d7c00b1",
  "@metamask-previews/sample-controllers": "1.0.0-preview-d7c00b1",
  "@metamask-previews/seedless-onboarding-controller": "1.0.0-preview-d7c00b1",
  "@metamask-previews/selected-network-controller": "23.0.0-preview-d7c00b1",
  "@metamask-previews/signature-controller": "31.0.0-preview-d7c00b1",
  "@metamask-previews/token-search-discovery-controller": "3.3.0-preview-d7c00b1",
  "@metamask-previews/transaction-controller": "58.1.0-preview-d7c00b1",
  "@metamask-previews/user-operation-controller": "37.0.0-preview-d7c00b1"
}

Comment on lines -1884 to -1886
await withController(
// @ts-expect-error QRKeyring is not yet compatible with Keyring type.
{ keyringBuilders: [keyringBuilderFactory(QRKeyring)] },
Copy link
Member Author

Choose a reason for hiding this comment

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

Some of these test scenarios were adding QRKeyring to builders, but without doing anything with it. These changes here may be a little confusing because of indentation change, but the only lines removed should be the ones related to keyringBuilders.

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.

Refactor keyring-controller to remove QR keyring methods
1 participant