perf: Add accountIdByAddress to AccountsController state#7893
Open
perf: Add accountIdByAddress to AccountsController state#7893
accountIdByAddress to AccountsController state#7893Conversation
hmalik88
changed the title
accountIdByAddress to AccountsController stateaccountIdByAddress to AccountsController state
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
ccharly
reviewed
Feb 10, 2026
Comment on lines
442
to
444
| const accountId = | ||
| this.state.internalAccounts.accountIdByAddress[address.toLowerCase()]; | ||
| return accountId ? this.getAccount(accountId) : undefined; |
Contributor
There was a problem hiding this comment.
We have this problem since quite some time now, but we should not lower-case addresses 😬 While EVM addresses are case-insensitive, non-EVM (at least Solana) are case-sensitives.
"Sometimes" (yes, we have this problem elsewhere 🥹) we're using the account.type to check if it's an EVM account type, and we either use checksummed addresses or lower-cased addresses.
Since we only have the address here, I wonder if we should check for the 0x prefix and lower-case only in this case?
Ideally we should just decide what is the format we want to use everywhere and we just stick to this, but we probably have some legacy code depending on non-sanitized addresses sometimes so...
Any opinion?
Contributor
Author
There was a problem hiding this comment.
Just decided to continue to lowercase and left a comment around it as we discussed!
ccharly
reviewed
Feb 10, 2026
|
|
||
| ### Added | ||
|
|
||
| - **BREAKING:** Add `accountIdByAddress` mapping to state and update `getAccountByAddress` function ([#7893](https://github.com/MetaMask/core/pull/7893)) |
Contributor
Author
There was a problem hiding this comment.
It classifies as breaking since we have to write a migration in the clients no? getAccountByAddress calls would break.
Member
There was a problem hiding this comment.
I don't think so since this should be constructed inside the constructor therefore we shouldn't need a migration nor breaking change
ccharly
reviewed
Feb 10, 2026
Contributor
Author
|
@metamaskbot publish-preview |
Contributor
|
Preview builds have been published. See these instructions for more information about preview builds. Expand for full list of packages and versions. |
mathieuartu
reviewed
Feb 16, 2026
Contributor
mathieuartu
left a comment
mathieuartu
left a comment
There was a problem hiding this comment.
Looks good, added one possible readability improvement suggestion and a perf question
gantunesr
reviewed
Feb 16, 2026
gantunesr
reviewed
Feb 16, 2026
hmalik88
changed the title
accountIdByAddress to AccountsController stateaccountIdByAddress to AccountsController state
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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
Currently when doing an account lookup by address we're doing an O(n) operation in the clients, this has been improved to O(1) by adding an address -> account id mapping in state. The
getAccountByAddressfunction now also takes advantage of this new piece of state to improve its lookup time.Note: This will require a migration in the clients.
References
N/A
Checklist
Note
Medium Risk
State shape changes are breaking for consumers and require client migrations; correctness depends on address normalization (currently forced to lowercase), which could be problematic for case-sensitive non-EVM addresses.
Overview
Improves
AccountsControlleraddress lookups by adding a newaccountIdByAddress(lowercased address → account id) map to controller state and switchinggetAccountByAddressfrom linear scan to direct map access.Keeps this map in sync by (re)building it in the constructor,
updateAccounts,loadBackup, and account add/remove flows; it’s marked non-persisted and excluded from state logs. Updates controller typings and adjusts tests/fixtures across dependent packages to include the new state field.Written by Cursor Bugbot for commit b51eceb. This will update automatically on new commits. Configure here.