feat(wallet): add AccountsController and ConnectivityController by grypez · Pull Request #8924 · MetaMask/core

grypez · 2026-05-28T17:06:56Z

Explanation

Adds AccountsController and ConnectivityController as default initialized controllers in the wallet package, following the InitializationConfiguration pattern established by KeyringController. The required messenger delegation for AccountsController is wired up (keyring actions, SnapKeyring events, and MultichainNetworkController:networkDidChange). A temporary AlwaysOnlineAdapter is introduced for ConnectivityController pending a real platform adapter, and a createSecretRecoveryPhrase utility is added alongside the existing importSecretRecoveryPhrase.

AccountsController is deprecated in favour of AccountTreeController and MultichainAccountService, but both of those still consume AccountsController actions/events at the messenger level, so it must remain present as infrastructure. Migration is tracked via a TODO on the initialization file.

References

N/A

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
I've introduced breaking changes in this PR and have prepared draft pull requests for clients and consumer packages to resolve them

Note

Medium Risk
Breaking wallet API (required connectivity adapter) plus account/keyring messenger wiring; scope is bounded to wallet initialization and a small accounts-controller constructor tweak.

Overview
Breaking change for @metamask/wallet consumers: default initialization now includes AccountsController and ConnectivityController, and instanceOptions.connectivityController.connectivityAdapter is required (tests use the new AlwaysOnlineAdapter stub until a real platform adapter is injected).

AccountsController is registered via the existing InitializationConfiguration pattern, with messenger delegation for keyring actions/events (including KeyringController:stateChange, Snap keyring account updates, and MultichainNetworkController:networkDidChange). Wallet tests assert keyring-created addresses appear in AccountsController state.

ConnectivityController is wired the same way, taking the injected adapter at init. @metamask/accounts-controller makes constructor state optional (defaults when omitted). Package deps, TS project references, README dependency graph, and CODEOWNERS paths are updated accordingly.

^{Reviewed by Cursor Bugbot for commit 02b1f32. Bugbot is set up for automated code reviews on this repo. Configure here.}

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…ctivityController Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…ller initialization Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

FrederikBolding · 2026-06-01T07:46:00Z

Let's add a CODEOWNER rule for this that matches the controller (same applies to ConnectivityController).

Additionally, let's have the accounts team review the addition.

Use explicit type annotation instead of verbose generic type parameters, leveraging the exported AccountsControllerMessenger type. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

… init Add connectivityAdapter to instanceOptions so mobile and extension can supply a platform-specific adapter. Fall back to AlwaysOnlineAdapter when none is provided. Call controller.init() from the factory so the initial connectivity status is always fetched on construction. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…ired init Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…explicit dependencies Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…OWNERS Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…vityController factory Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…ller options are provided Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…tions field Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…angelog Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

grypez · 2026-06-02T01:13:32Z

Given mandatory connectivity adaptor is a breaking change, will need to prepare integration PRs in mobile and extension

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 488b4c6. Configure here.}

FrederikBolding · 2026-06-02T08:09:54Z

+  }
+}
+
+export const connectivityController: InitializationConfiguration<


Do we not need a way to call init?

Perhaps we can just have an async function on the Wallet class that iterates each instance and calls init if it exists

Pass the connectivity adapter through `instanceOptions.connectivityController` instead of a top-level `WalletOptions.connectivityAdapter` field, and make the `connectivityController` instance options required. This drops the constructor glue that re-wrapped the top-level option and keeps the wallet defaults compatible across mobile and extension, since each consumer supplies its own adapter. Supersedes the top-level field introduced in 878145e, per PR review feedback. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Drop @MetaMask/core-platform as co-owner of the wallet accounts-controller initialization file so it matches the ownership of the accounts-controller package itself (@MetaMask/accounts-engineers), per PR review feedback. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

…-controllers

…tor state Document that the `AccountsController` constructor's `state` option is now optional, introduced in this PR alongside the wallet default-controller work. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

…-controllers # Conflicts: # .github/CODEOWNERS # README.md # packages/wallet/CHANGELOG.md # packages/wallet/package.json # packages/wallet/src/initialization/instances/index.ts # packages/wallet/src/types.ts # packages/wallet/tsconfig.build.json # yarn.lock

…directory convention Move the AccountsController and ConnectivityController initialization configs into their own directories to match the per-controller layout established by the ApprovalController instance, so the package isn't left in two styles. - accounts-controller/accounts-controller.ts - connectivity-controller/{connectivity-controller,types,always-online-adapter}.ts with colocated tests, pulling AlwaysOnlineAdapter into its own sibling file (mirroring the keyring encryptor split) and extracting the connectivity instance options into a ConnectivityControllerInstanceOptions type. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

grypez force-pushed the grypez/wallet-account-controllers branch 4 times, most recently from d35a344 to 83241f6 Compare May 29, 2026 00:49

grypez and others added 3 commits May 29, 2026 15:45

feat(wallet): add AccountsController and ConnectivityController

6ee1499

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

chore(wallet): add changelog entries for AccountsController and Conne…

e744c91

…ctivityController Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

test(wallet): add tests for AccountsController and ConnectivityContro…

e85be4e

…ller initialization Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

grypez force-pushed the grypez/wallet-account-controllers branch from ce86ff2 to e85be4e Compare May 30, 2026 12:26

grypez marked this pull request as ready for review May 30, 2026 12:47

grypez requested a review from a team as a code owner May 30, 2026 12:47

grypez temporarily deployed to default-branch May 30, 2026 12:47 — with GitHub Actions Inactive

cursor Bot reviewed May 30, 2026

View reviewed changes

Comment thread packages/wallet/src/initialization/instances/connectivity-controller.ts Outdated

FrederikBolding reviewed Jun 1, 2026

View reviewed changes

Comment thread packages/wallet/src/initialization/instances/accounts-controller.ts Outdated

FrederikBolding reviewed Jun 1, 2026

View reviewed changes

Comment thread packages/wallet/src/utilities.test.ts Outdated

FrederikBolding reviewed Jun 1, 2026

View reviewed changes

Comment thread packages/wallet/src/initialization/instances/connectivity-controller.ts Outdated

FrederikBolding reviewed Jun 1, 2026

View reviewed changes

Comment thread packages/wallet/src/Wallet.test.ts Outdated

grypez and others added 4 commits June 1, 2026 08:59

refactor(wallet): simplify AccountsController messenger instantiation

a9e2a08

Use explicit type annotation instead of verbose generic type parameters, leveraging the exported AccountsControllerMessenger type. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

test(wallet): update ConnectivityController test to reflect factory-f…

135e595

…ired init Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

test(wallet): use setupWallet in AccountsController test

2286e06

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

cursor Bot reviewed Jun 1, 2026

View reviewed changes

Comment thread packages/wallet/src/initialization/instances/connectivity-controller.ts Outdated

test(wallet): consolidate utilities tests into Wallet.test.ts

7bdf8fd

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

sirtimid mentioned this pull request Jun 1, 2026

feat(wallet): wire ApprovalController into default initialization #8953

Merged

4 tasks

cursor Bot reviewed Jun 1, 2026

View reviewed changes

Comment thread packages/wallet/src/initialization/instances/accounts-controller/accounts-controller.ts

grypez and others added 5 commits June 1, 2026 12:43

feat(wallet): don't call ConnectivityController.init() from factory

5f7cd5f

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

deps(wallet): add accounts-controller and connectivity-controller as …

3efac13

…explicit dependencies Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

docs: Update README.md with package dep links

b1364f7

chore: add CODEOWNERS rule for accounts-controller wallet initialization

784be65

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

chore: explicitly own wallet initialization instances subpath in CODE…

af010be

…OWNERS Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

FrederikBolding reviewed Jun 1, 2026

View reviewed changes

Comment thread packages/wallet/src/types.ts Outdated

FrederikBolding reviewed Jun 1, 2026

View reviewed changes

Comment thread packages/wallet/src/initialization/instances/accounts-controller.ts Outdated

FrederikBolding reviewed Jun 1, 2026

View reviewed changes

Comment thread packages/wallet/src/initialization/instances/connectivity-controller.ts Outdated

FrederikBolding reviewed Jun 1, 2026

View reviewed changes

Comment thread packages/wallet/src/initialization/instances/accounts-controller.ts Outdated

grypez and others added 4 commits June 1, 2026 13:39

refactor(wallet): remove explicit Messenger type params from Connecti…

b701b1e

…vityController factory Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

fix(accounts-controller): make state optional in constructor

eb4d185

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

refactor(wallet): drop AccountsController state cast and TODO comment

29825d5

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

refactor(wallet): require connectivityAdapter when connectivityContro…

7cb173f

…ller options are provided Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

grypez requested a review from a team as a code owner June 1, 2026 19:37

grypez and others added 3 commits June 1, 2026 16:55

refactor(wallet): require connectivityAdapter as a top-level WalletOp…

878145e

…tions field Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

test(wallet): pass AlwaysOnlineAdapter explicitly in wallet tests

087aa71

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Merge origin/main into grypez/wallet-account-controllers

af8e906

cursor Bot reviewed Jun 1, 2026

View reviewed changes

Comment thread packages/wallet/src/utilities.ts Outdated

fix: lint

9879a05

cursor Bot reviewed Jun 1, 2026

View reviewed changes

Comment thread packages/wallet/src/initialization/instances/connectivity-controller/always-online-adapter.ts

grypez and others added 2 commits June 1, 2026 19:44

refactor(wallet): remove createSecretRecoveryPhrase utility

0bc503f

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

chore(wallet): mark connectivityAdapter requirement as breaking in ch…

488b4c6

…angelog Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

cursor Bot reviewed Jun 2, 2026

View reviewed changes

Comment thread packages/wallet/CHANGELOG.md Outdated

FrederikBolding reviewed Jun 2, 2026

View reviewed changes

Comment thread .github/CODEOWNERS Outdated

FrederikBolding reviewed Jun 2, 2026

View reviewed changes

Comment thread packages/wallet/src/Wallet.ts Outdated

FrederikBolding reviewed Jun 2, 2026

View reviewed changes

Comment thread packages/wallet/src/types.ts Outdated

grypez and others added 6 commits June 2, 2026 05:16

Merge remote-tracking branch 'origin/main' into grypez/wallet-account…

57c3bab

…-controllers

Uh oh!

Conversation

grypez commented May 28, 2026 • edited by cursor Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation

References

Checklist

Uh oh!

Uh oh!

Uh oh!

FrederikBolding Jun 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

grypez commented Jun 2, 2026

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

FrederikBolding Jun 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

grypez commented May 28, 2026 •

edited by cursor Bot

Loading

FrederikBolding Jun 1, 2026 •

edited

Loading

FrederikBolding Jun 2, 2026 •

edited

Loading