-
-
Notifications
You must be signed in to change notification settings - Fork 198
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
fix: lock KeyringController
mutex on verifySeedPhrase
#5077
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mikesposito
force-pushed
the
fix/verify-seed-phrase
branch
from
December 17, 2024 14:00
fe26d3c
to
209dbcc
Compare
mikesposito
commented
Dec 17, 2024
* @returns A promise resolving to the seed phrase as Uint8Array. | ||
*/ | ||
async #verifySeedPhrase(): Promise<Uint8Array> { | ||
this.#assertControllerMutexIsLocked(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This forces any caller to fist lock KeyringController mutex (e.g. with #withControllerLock
)
@metamaskbot publish-preview |
danroc
approved these changes
Dec 17, 2024
Preview builds have been published. See these instructions for more information about preview builds. Expand for full list of packages and versions.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Explanation
The
KeyringController.verifySeedPhrase
method was not included in the mutable methods that lock the controller mutex because it doesn't change the state. Though, if another operation gets somehow overlapped (e.g. a consumer callsaddNewAccount
), the call toverifySeedPhrase
can potentially fail.To fix this, this PR is moving verifySeedPhrase behind KeyringController's mutex. Since
addNewAccount
internally callsverifySeedPhrase
, and having a lock on both would create a deadlock, theverifySeedPhrase
implementation has been moved to an internal method.References
Changelog
@metamask/keyring-controller
verifySeedPhrase
is now mutually exclusiveChecklist