feat(account-tree-controller): use multichain-account-service to build multichain account wallet/group nodes
#6646
Conversation
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
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. |
…for bip-44 accounts
ccharly
force-pushed
the
feat/account-tree-controller-use-service
branch
from
4390b9d to
c5de1f5
Compare
Contributor
Author
|
@metamaskbot publish-preview |
Contributor
Author
|
@metamaskbot publish-preview |
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. |
4 tasks
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. |
fabiobozzo
reviewed
Oct 28, 2025
fabiobozzo
reviewed
Oct 28, 2025
| }, | ||
| ); | ||
|
|
||
| this.messenger.subscribe( |
Contributor
There was a problem hiding this comment.
What if these 2 new handlers fire before the initialization completes?
Should we add a guard before each like if (!this.#initialized) return; ?
Contributor
Author
There was a problem hiding this comment.
That's a very good point, and IMO that make sense to add this !this.initialized check! I'll do this, thanks
fabiobozzo
reviewed
Oct 28, 2025
fabiobozzo
reviewed
Oct 28, 2025
fabiobozzo
reviewed
Oct 28, 2025
fabiobozzo
reviewed
Oct 28, 2025
fabiobozzo
reviewed
Oct 28, 2025
fabiobozzo
reviewed
Oct 28, 2025
fabiobozzo
reviewed
Oct 28, 2025
| 'UserStorageController:performBatchSetStorage', | ||
| 'AuthenticationController:getSessionProfile', | ||
| 'MultichainAccountService:createMultichainAccountGroup', | ||
| 'MultichainAccountService:getMultichainAccountWallets', |
Contributor
There was a problem hiding this comment.
Don't we need to mock that action handler too in the test setup?
messenger.registerActionHandler(
'MultichainAccountService:getMultichainAccountWallets',
jest.fn().mockReturnValue([]),
);
fabiobozzo
reviewed
Oct 28, 2025
fabiobozzo
reviewed
Oct 28, 2025
Contributor
fabiobozzo
left a comment
fabiobozzo
left a comment
There was a problem hiding this comment.
LGTM ✨
Finally, great separation of concerns, as you anticipated me long ago! Much cleaner than it was
fabiobozzo
previously approved these changes
Oct 29, 2025
Contributor
Author
|
@metamaskbot publish-previews |
fabiobozzo
previously approved these changes
Oct 29, 2025
Contributor
|
Preview builds have been published. See these instructions for more information about preview builds. Expand for full list of packages and versions. |
fabiobozzo
approved these changes
Oct 29, 2025
4 tasks
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
multichain-account-serviceis responsible of holding/grouping all BIP-44 accounts together (in wallets and groups).The
account-tree-controllerwas re-using a similar matching logic to build it's tree and match those wallets and groups. But... In reality, this is the responsibility of the service and thus, the controller should "consume" the wallets/groups from the service directly.Architecture wise, this is more correct, and other kind of wallets could follow the same pattern (having 1 wallet for each keyring types and 1 wallet for each other kind of account management Snaps).
References
N/A
Checklist
Note
Switches multichain (BIP-44) wallet/group construction to MultichainAccountService, listening to its events and skipping BIP-44 in AccountsController event handling.
MultichainAccountService:getMultichainAccountWalletsto buildAccountWalletType.Entropywallets andMultichainAccountgroups; remove entropy matching from controller.MultichainAccountService:{multichainAccountGroupCreated,multichainAccountGroupUpdated,walletStatusChange}to insert/update groups and wallet status post-init.AccountsController:account{Added,Removed}; only process non-BIP-44 (Snap/Keyring) accounts.getEntropyDefaultAccountWalletNameandgetEntropyDefaultAccountGroupPrefix; keep computed group names with EVM priority and conflict resolution.EntropyRuleclass with pure helpers:getEntropyDefaultAccountWalletName,getEntropyComputedAccountGroupName,getEntropyDefaultAccountGroupPrefix.MultichainAccountService.Written by Cursor Bugbot for commit 88cb1ba. This will update automatically on new commits. Configure here.