Skip to content

fix: make account providers wait for Snap platform to be ready #39051

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.

Sign up for GitHub

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

Merged
ccharly merged 9 commits into from
Jan 13, 2026
+41 −31
Merged

fix: make account providers wait for Snap platform to be ready #39051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
634222c
feat: wait for Snap platform to be ready
ccharly Jan 6, 2026
1885808
test: test preview build
ccharly Jan 6, 2026
1bf3ea7
chore: dedupe + lavamoat:auto
ccharly Jan 6, 2026
f38c047
Merge branch 'main' into cc/fix/account-providers-wait-for-snap-platform
ccharly Jan 7, 2026
530897e
chore: remove preview builds
ccharly Jan 9, 2026
812f723
chore: fix lavamoat mv2
ccharly Jan 9, 2026
e337073
Update LavaMoat policies
metamaskbot Jan 9, 2026
27dafe8
Merge branch 'main' into cc/fix/account-providers-wait-for-snap-platform
ccharly Jan 12, 2026
db2397a
Merge branch 'main' into cc/fix/account-providers-wait-for-snap-platform
ccharly Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions app/scripts/controller-init/messengers/accounts/multichain-account-service-messenger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ import {
AccountsControllerGetAccountByAddressAction,
AccountsControllerListMultichainAccountsAction,
} from '@metamask/accounts-controller';
import { HandleSnapRequest as SnapControllerHandleRequest } from '@metamask/snaps-controllers';
import {
SnapControllerStateChangeEvent,
SnapControllerGetStateAction,
HandleSnapRequest as SnapControllerHandleRequestAction,
} from '@metamask/snaps-controllers';
import {
KeyringControllerWithKeyringAction,
KeyringControllerGetStateAction,
Expand All @@ -22,7 +26,6 @@ import {
RemoteFeatureFlagControllerStateChangeEvent,
RemoteFeatureFlagControllerGetStateAction,
} from '@metamask/remote-feature-flag-controller';
import { ErrorReportingServiceCaptureExceptionAction } from '@metamask/error-reporting-service';
import {
PreferencesControllerGetStateAction,
PreferencesControllerStateChangeEvent,
Expand All @@ -33,20 +36,21 @@ type Actions =
| AccountsControllerListMultichainAccountsAction
| AccountsControllerGetAccountAction
| AccountsControllerGetAccountByAddressAction
| SnapControllerHandleRequest
| SnapControllerGetStateAction
| SnapControllerHandleRequestAction
| KeyringControllerGetStateAction
| KeyringControllerWithKeyringAction
| KeyringControllerAddNewKeyringAction
| KeyringControllerGetKeyringsByTypeAction
| NetworkControllerGetNetworkClientByIdAction
| NetworkControllerFindNetworkClientIdByChainIdAction
| ErrorReportingServiceCaptureExceptionAction;
| NetworkControllerFindNetworkClientIdByChainIdAction;

type Events =
| KeyringControllerStateChangeEvent
| AccountsControllerAccountAddedEvent
| AccountsControllerAccountRemovedEvent
| RemoteFeatureFlagControllerStateChangeEvent;
| RemoteFeatureFlagControllerStateChangeEvent
| SnapControllerStateChangeEvent;

export type MultichainAccountServiceMessenger = ReturnType<
typeof getMultichainAccountServiceMessenger
Expand Down Expand Up @@ -75,6 +79,7 @@ export function getMultichainAccountServiceMessenger(
messenger: serviceMessenger,
events: [
'KeyringController:stateChange',
'SnapController:stateChange',
'AccountsController:accountAdded',
'AccountsController:accountRemoved',
'RemoteFeatureFlagController:stateChange',
Expand All @@ -83,14 +88,14 @@ export function getMultichainAccountServiceMessenger(
'AccountsController:listMultichainAccounts',
'AccountsController:getAccountByAddress',
'AccountsController:getAccount',
'SnapController:getState',
'SnapController:handleRequest',
'KeyringController:getState',
'KeyringController:withKeyring',
'KeyringController:addNewKeyring',
'KeyringController:getKeyringsByType',
'NetworkController:getNetworkClientById',
'NetworkController:findNetworkClientIdByChainId',
'ErrorReportingService:captureException',
],
});
return serviceMessenger;
Expand Down
3 changes: 2 additions & 1 deletion lavamoat/browserify/beta/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,7 +1575,8 @@
"@metamask/keyring-snap-client": true,
"@metamask/snaps-utils": true,
"@metamask/utils": true,
"@metamask/eth-qr-keyring>async-mutex": true
"@metamask/eth-qr-keyring>async-mutex": true,
"lodash": true
}
},
"@metamask/multichain-api-middleware": {
Expand Down
3 changes: 2 additions & 1 deletion lavamoat/browserify/experimental/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,7 +1575,8 @@
"@metamask/keyring-snap-client": true,
"@metamask/snaps-utils": true,
"@metamask/utils": true,
"@metamask/eth-qr-keyring>async-mutex": true
"@metamask/eth-qr-keyring>async-mutex": true,
"lodash": true
}
},
"@metamask/multichain-api-middleware": {
Expand Down
3 changes: 2 additions & 1 deletion lavamoat/browserify/flask/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,7 +1575,8 @@
"@metamask/keyring-snap-client": true,
"@metamask/snaps-utils": true,
"@metamask/utils": true,
"@metamask/eth-qr-keyring>async-mutex": true
"@metamask/eth-qr-keyring>async-mutex": true,
"lodash": true
}
},
"@metamask/multichain-api-middleware": {
Expand Down
3 changes: 2 additions & 1 deletion lavamoat/browserify/main/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,7 +1575,8 @@
"@metamask/keyring-snap-client": true,
"@metamask/snaps-utils": true,
"@metamask/utils": true,
"@metamask/eth-qr-keyring>async-mutex": true
"@metamask/eth-qr-keyring>async-mutex": true,
"lodash": true
}
},
"@metamask/multichain-api-middleware": {
Expand Down
3 changes: 2 additions & 1 deletion lavamoat/webpack/mv2/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1619,7 +1619,8 @@
"@metamask/keyring-snap-client": true,
"@metamask/snaps-utils": true,
"@metamask/utils": true,
"@metamask/eth-qr-keyring>async-mutex": true
"@metamask/eth-qr-keyring>async-mutex": true,
"lodash": true
}
},
"@metamask/multichain-api-middleware": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@
"@metamask/message-signing-snap": "1.1.4",
"@metamask/messenger": "^0.3.0",
"@metamask/metamask-eth-abis": "^3.1.1",
"@metamask/multichain-account-service": "^3.0.0",
"@metamask/multichain-account-service": "^5.0.0",
"@metamask/multichain-api-client": "^0.10.1",
"@metamask/multichain-api-middleware": "^1.2.5",
"@metamask/multichain-network-controller": "^2.0.0",
Expand Down
36 changes: 18 additions & 18 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7335,44 +7335,43 @@ __metadata:
languageName: node
linkType: hard

"@metamask/multichain-account-service@npm:^3.0.0":
version: 3.0.0
resolution: "@metamask/multichain-account-service@npm:3.0.0"
"@metamask/multichain-account-service@npm:^4.0.0, @metamask/multichain-account-service@npm:^4.0.1":
version: 4.0.1
resolution: "@metamask/multichain-account-service@npm:4.0.1"
dependencies:
"@ethereumjs/util": "npm:^9.1.0"
"@metamask/accounts-controller": "npm:^35.0.0"
"@metamask/base-controller": "npm:^9.0.0"
"@metamask/error-reporting-service": "npm:^3.0.0"
"@metamask/eth-snap-keyring": "npm:^18.0.0"
"@metamask/key-tree": "npm:^10.1.1"
"@metamask/keyring-api": "npm:^21.0.0"
"@metamask/keyring-controller": "npm:^25.0.0"
"@metamask/keyring-internal-api": "npm:^9.0.0"
"@metamask/keyring-snap-client": "npm:^8.0.0"
"@metamask/keyring-utils": "npm:^3.1.0"
"@metamask/messenger": "npm:^0.3.0"
"@metamask/snaps-controllers": "npm:^14.0.1"
"@metamask/snaps-sdk": "npm:^9.0.0"
"@metamask/snaps-utils": "npm:^11.0.0"
"@metamask/superstruct": "npm:^3.1.0"
"@metamask/utils": "npm:^11.8.1"
async-mutex: "npm:^0.5.0"
peerDependencies:
"@metamask/account-api": ^0.12.0
"@metamask/accounts-controller": ^34.0.0
"@metamask/error-reporting-service": ^3.0.0
"@metamask/keyring-controller": ^24.0.0
"@metamask/providers": ^22.0.0
"@metamask/snaps-controllers": ^14.0.0
webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
checksum: 10/d2190875f1deceddbbb5c259f504530d04e9bf93d0c54c7d671135a647ceb524127dbeaafa56900ed229bd6d1505a891ee422ce09647e0a17773af1865b0913d
checksum: 10/a664bed3b1f54c27c26f0eec2e07b666dbc09d80fb6cad6f081fecc40b6029971988cad0a9cc010ce97fea83b962d31809aae21e37792c19e94dce509eeb98e2
languageName: node
linkType: hard

"@metamask/multichain-account-service@npm:^4.0.0, @metamask/multichain-account-service@npm:^4.0.1":
version: 4.0.1
resolution: "@metamask/multichain-account-service@npm:4.0.1"
"@metamask/multichain-account-service@npm:^5.0.0":
version: 5.0.0
resolution: "@metamask/multichain-account-service@npm:5.0.0"
dependencies:
"@ethereumjs/util": "npm:^9.1.0"
"@metamask/accounts-controller": "npm:^35.0.0"
"@metamask/base-controller": "npm:^9.0.0"
"@metamask/error-reporting-service": "npm:^3.0.0"
"@metamask/eth-snap-keyring": "npm:^18.0.0"
"@metamask/key-tree": "npm:^10.1.1"
"@metamask/keyring-api": "npm:^21.0.0"
Expand All @@ -7381,17 +7380,18 @@ __metadata:
"@metamask/keyring-snap-client": "npm:^8.0.0"
"@metamask/keyring-utils": "npm:^3.1.0"
"@metamask/messenger": "npm:^0.3.0"
"@metamask/snaps-controllers": "npm:^14.0.1"
"@metamask/snaps-sdk": "npm:^9.0.0"
"@metamask/snaps-utils": "npm:^11.0.0"
"@metamask/snaps-controllers": "npm:^17.2.0"
"@metamask/snaps-sdk": "npm:^10.3.0"
"@metamask/snaps-utils": "npm:^11.7.0"
"@metamask/superstruct": "npm:^3.1.0"
"@metamask/utils": "npm:^11.8.1"
"@metamask/utils": "npm:^11.9.0"
async-mutex: "npm:^0.5.0"
lodash: "npm:^4.17.21"
peerDependencies:
"@metamask/account-api": ^0.12.0
"@metamask/providers": ^22.0.0
webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
checksum: 10/a664bed3b1f54c27c26f0eec2e07b666dbc09d80fb6cad6f081fecc40b6029971988cad0a9cc010ce97fea83b962d31809aae21e37792c19e94dce509eeb98e2
checksum: 10/2a65158752f5b92cfbaa00a7488382e489af8178a585a4a327fa025f885e2c08fbdbf48f141d8efbea3405e4104d5d976081c9fe7bfec2a7ae9b6a7a67d074ec
languageName: node
linkType: hard

Expand Down Expand Up @@ -33489,7 +33489,7 @@ __metadata:
"@metamask/message-signing-snap": "npm:1.1.4"
"@metamask/messenger": "npm:^0.3.0"
"@metamask/metamask-eth-abis": "npm:^3.1.1"
"@metamask/multichain-account-service": "npm:^3.0.0"
"@metamask/multichain-account-service": "npm:^5.0.0"
"@metamask/multichain-api-client": "npm:^0.10.1"
"@metamask/multichain-api-middleware": "npm:^1.2.5"
"@metamask/multichain-network-controller": "npm:^2.0.0"
Expand Down
Loading