Skip to content

fix(multichain-account-service)!: wait for Snap platform to be ready #7266

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

Open
ccharly wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix(multichain-account-service)!: wait for Snap platform to be ready #7266

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
05e7530
feat(multichain-account-service): wait for Snap platform to be ready …
ccharly Nov 28, 2025
6e4c4a6
refactor: enforce Snap platform check before any provider calls
ccharly Nov 28, 2025
5ac68b5
chore: cosmetic
ccharly Nov 28, 2025
d01b4a1
refactor: remove extra ensureSnapPlatformIsReady call
ccharly Nov 28, 2025
1b69b3a
refactor: move reset state to setup function
ccharly Nov 28, 2025
0ccef45
chore: update changelog
ccharly Dec 1, 2025
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
Next Next commit
feat(multichain-account-service): wait for Snap platform to be ready … 
…before processing requests
  • Loading branch information
@ccharly
ccharly committed Nov 28, 2025
commit 05e75300c9cfe14f437ef5248e8e9553d2084ed8
17 changes: 17 additions & 0 deletions packages/multichain-account-service/src/providers/BaseBip44AccountProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,23 @@ export abstract class BaseBip44AccountProvider implements Bip44AccountProvider {

abstract getName(): string;

protected getAnyAccount(): Bip44Account<KeyringAccount> | undefined {
const anyAccount = this.messenger
.call(
// NOTE: Even though the name is misleading, this only fetches all internal
// accounts, including EVM and non-EVM. We might wanna change this action
// name once we fully support multichain accounts.
'AccountsController:listMultichainAccounts',
)
.find((account) => {
return isBip44Account(account) && this.isAccountCompatible(account);
});

// We cast here since `.find` will return a `InternalAccount | undefined`
// despite having the `isBip44Account` check.
return anyAccount as Bip44Account<KeyringAccount> | undefined;
}

#getAccounts(
filter: (account: KeyringAccount) => boolean = () => true,
): Bip44Account<KeyringAccount>[] {
Expand Down
13 changes: 9 additions & 4 deletions packages/multichain-account-service/src/providers/BtcAccountProvider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ class MockBtcKeyring {
return account;
});
}
class MockBtcAccountProvider extends BtcAccountProvider {
override async ensureSnapPlatformIsReady(): Promise<void> {
// Override to avoid waiting during tests.
}
}

/**
* Sets up a BtcAccountProvider for testing.
Expand Down Expand Up @@ -153,7 +158,7 @@ function setup({
const multichainMessenger = getMultichainAccountServiceMessenger(messenger);
const provider = new AccountProviderWrapper(
multichainMessenger,
new BtcAccountProvider(multichainMessenger),
new MockBtcAccountProvider(multichainMessenger),
);

return {
Expand Down Expand Up @@ -348,7 +353,7 @@ describe('BtcAccountProvider', () => {

const multichainMessenger =
getMultichainAccountServiceMessenger(messenger);
const btcProvider = new BtcAccountProvider(
const btcProvider = new MockBtcAccountProvider(
multichainMessenger,
undefined,
mockTrace,
Expand Down Expand Up @@ -400,7 +405,7 @@ describe('BtcAccountProvider', () => {

const multichainMessenger =
getMultichainAccountServiceMessenger(messenger);
const btcProvider = new BtcAccountProvider(
const btcProvider = new MockBtcAccountProvider(
multichainMessenger,
undefined,
mockTrace,
Expand Down Expand Up @@ -433,7 +438,7 @@ describe('BtcAccountProvider', () => {

const multichainMessenger =
getMultichainAccountServiceMessenger(messenger);
const btcProvider = new BtcAccountProvider(
const btcProvider = new MockBtcAccountProvider(
multichainMessenger,
undefined,
mockTrace,
Expand Down
Loading