Skip to content

fix: remove metadata for unsupported keyrings#5725

Merged
mikesposito merged 21 commits into
mainfrom
mikesposito/fix/unsupported-keyrings
May 13, 2025
Merged

fix: remove metadata for unsupported keyrings#5725
mikesposito merged 21 commits into
mainfrom
mikesposito/fix/unsupported-keyrings

Conversation

@mikesposito

@mikesposito mikesposito commented Apr 29, 2025

Copy link
Copy Markdown
Member

Explanation

When the user vault is decrypted and there is an attempt to restore an unsupported/deprecated/faulty keyring there's no mechanism to remove related metadata, which leads to a situation where no further action can be made on the controller, because checks for keyrings and metadata length will fail.

We could remove the related metadata object when the keyring restore fails, but then we would lose the original ID generated for the keyring. We can, instead, change the place where the metadata is stored from a state property to the encrypted vault: by placing the metadata along with its serialised keyring in the vault we can guarantee a 1:1 link between them while being able to keep metadata for unsupported keyrings.

Given that we don't need to use the KeyringController state to persist metadata anymore (as it is persisted along with the vault), we can also remove keyringsMetadata completely, and add a metadata attribute to each keyring in state.keyrings instead - which won't be persisted, as it will be recreated at runtime every time the vault is decrypted and the keyrings are deserialised.

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

Comment thread packages/keyring-controller/src/KeyringController.ts Outdated
@v-goyal

v-goyal commented May 6, 2025

Copy link
Copy Markdown

If we remove the metadata, there's no way to get it back yeah? What's the purpose of adding the keyring to unsupportedKeyrings? Should we consider adding unsupportedKeyringsMetadata?

@mikesposito

Copy link
Copy Markdown
Member Author

If we remove the metadata, there's no way to get it back yeah? What's the purpose of adding the keyring to unsupportedKeyrings? Should we consider adding unsupportedKeyringsMetadata?

@v-goyal Correct, if we remove metadata we won't get it back (that's the downside I was describing here). Unfortunately, we can't apply the same strategy we use for the unsupported keyrings because metadata is stored in the state directly instead of the vault, so removing them from the state would mean immediately persisting the new array of metadata. With keyrings, we don't need to worry about that because even if we skip one of them in the state (because unsupported), it'll still be kept in the vault unchanged and retried at the next unlock.

A solution to do that with metadata would probably be to save them in the vault along with the keyring itself - that would save us a lot of headaches, but it's a more complex solution that would also require a strategy to migrate the existing metadata for users that already have it in the state

@mikesposito mikesposito marked this pull request as ready for review May 7, 2025 11:37
@mikesposito mikesposito requested review from a team as code owners May 7, 2025 11:37
@mikesposito

Copy link
Copy Markdown
Member Author

@metamaskbot publish-preview

@github-actions

github-actions Bot commented May 7, 2025

Copy link
Copy Markdown
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/accounts-controller": "28.0.0-preview-dedc8739",
  "@metamask-previews/address-book-controller": "6.0.3-preview-dedc8739",
  "@metamask-previews/announcement-controller": "7.0.3-preview-dedc8739",
  "@metamask-previews/app-metadata-controller": "1.0.0-preview-dedc8739",
  "@metamask-previews/approval-controller": "7.1.3-preview-dedc8739",
  "@metamask-previews/assets-controllers": "61.0.0-preview-dedc8739",
  "@metamask-previews/base-controller": "8.0.1-preview-dedc8739",
  "@metamask-previews/bridge-controller": "21.0.0-preview-dedc8739",
  "@metamask-previews/bridge-status-controller": "18.0.0-preview-dedc8739",
  "@metamask-previews/build-utils": "3.0.3-preview-dedc8739",
  "@metamask-previews/chain-agnostic-permission": "0.6.0-preview-dedc8739",
  "@metamask-previews/composable-controller": "11.0.0-preview-dedc8739",
  "@metamask-previews/controller-utils": "11.8.0-preview-dedc8739",
  "@metamask-previews/delegation-controller": "0.2.0-preview-dedc8739",
  "@metamask-previews/earn-controller": "0.13.0-preview-dedc8739",
  "@metamask-previews/eip1193-permission-middleware": "0.1.0-preview-dedc8739",
  "@metamask-previews/ens-controller": "16.0.0-preview-dedc8739",
  "@metamask-previews/eth-json-rpc-provider": "4.1.8-preview-dedc8739",
  "@metamask-previews/gas-fee-controller": "23.0.0-preview-dedc8739",
  "@metamask-previews/json-rpc-engine": "10.0.3-preview-dedc8739",
  "@metamask-previews/json-rpc-middleware-stream": "8.0.7-preview-dedc8739",
  "@metamask-previews/keyring-controller": "21.0.6-preview-dedc8739",
  "@metamask-previews/logging-controller": "6.0.4-preview-dedc8739",
  "@metamask-previews/message-manager": "12.0.1-preview-dedc8739",
  "@metamask-previews/multichain": "4.0.0-preview-dedc8739",
  "@metamask-previews/multichain-api-middleware": "0.2.0-preview-dedc8739",
  "@metamask-previews/multichain-network-controller": "0.6.0-preview-dedc8739",
  "@metamask-previews/multichain-transactions-controller": "0.10.0-preview-dedc8739",
  "@metamask-previews/name-controller": "8.0.3-preview-dedc8739",
  "@metamask-previews/network-controller": "23.4.0-preview-dedc8739",
  "@metamask-previews/notification-services-controller": "7.0.0-preview-dedc8739",
  "@metamask-previews/permission-controller": "11.0.6-preview-dedc8739",
  "@metamask-previews/permission-log-controller": "3.0.3-preview-dedc8739",
  "@metamask-previews/phishing-controller": "12.5.0-preview-dedc8739",
  "@metamask-previews/polling-controller": "13.0.0-preview-dedc8739",
  "@metamask-previews/preferences-controller": "17.0.0-preview-dedc8739",
  "@metamask-previews/profile-sync-controller": "13.0.0-preview-dedc8739",
  "@metamask-previews/queued-request-controller": "10.0.0-preview-dedc8739",
  "@metamask-previews/rate-limit-controller": "6.0.3-preview-dedc8739",
  "@metamask-previews/remote-feature-flag-controller": "1.6.0-preview-dedc8739",
  "@metamask-previews/sample-controllers": "0.1.0-preview-dedc8739",
  "@metamask-previews/selected-network-controller": "22.0.0-preview-dedc8739",
  "@metamask-previews/signature-controller": "28.0.0-preview-dedc8739",
  "@metamask-previews/token-search-discovery-controller": "3.1.0-preview-dedc8739",
  "@metamask-previews/transaction-controller": "55.0.0-preview-dedc8739",
  "@metamask-previews/user-operation-controller": "34.0.0-preview-dedc8739"
}

@mikesposito

Copy link
Copy Markdown
Member Author

A solution to do that with metadata would probably be to save them in the vault along with the keyring itself

I'm going to refactor this PR to implement this solution

@mikesposito mikesposito requested review from a team as code owners May 8, 2025 16:15
@mikesposito mikesposito marked this pull request as draft May 8, 2025 16:16
Comment thread packages/keyring-controller/src/KeyringController.ts Outdated
@mikesposito mikesposito force-pushed the mikesposito/fix/unsupported-keyrings branch from af27c1e to 765a3ae Compare May 8, 2025 16:46
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.

Keyring metadata mismatch for unsupported keyrings

6 participants