Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions packages/multichain-account-service/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added

- Auto-register `XlmAccountProvider` in `MultichainAccountService`, matching other non-EVM ([#9380](https://github.com/MetaMask/core/pull/9380))
- Adds `MultichainAccountGroup.isProviderAligned(provider)` to check alignment per provider ([#9269](https://github.com/MetaMask/core/pull/9269))

### Changed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
EthAccountType,
SolAccountType,
TrxAccountType,
XlmAccountType,
} from '@metamask/keyring-api';
import type { Keyring } from '@metamask/keyring-api/v2';
import { KeyringType } from '@metamask/keyring-api/v2';
Expand Down Expand Up @@ -41,6 +42,10 @@ import {
TRX_ACCOUNT_PROVIDER_NAME,
TrxAccountProvider,
} from './providers/TrxAccountProvider';
import {
XLM_ACCOUNT_PROVIDER_NAME,
XlmAccountProvider,
} from './providers/XlmAccountProvider';
import type { RootMessenger, MockAccountProvider } from './tests';
import {
MOCK_HARDWARE_ACCOUNT_1,
Expand Down Expand Up @@ -94,6 +99,12 @@ jest.mock('./providers/TrxAccountProvider', () => {
TrxAccountProvider: jest.fn(),
};
});
jest.mock('./providers/XlmAccountProvider', () => {
return {
...jest.requireActual('./providers/XlmAccountProvider'),
XlmAccountProvider: jest.fn(),
};
});

type Mocks = {
// eslint-disable-next-line @typescript-eslint/naming-convention
Expand Down Expand Up @@ -123,6 +134,8 @@ type Mocks = {
BtcAccountProvider: MockAccountProvider;
// eslint-disable-next-line @typescript-eslint/naming-convention
TrxAccountProvider: MockAccountProvider;
// eslint-disable-next-line @typescript-eslint/naming-convention
XlmAccountProvider: MockAccountProvider;
};

function mockAccountProvider<Provider extends Bip44AccountProvider>(
Expand Down Expand Up @@ -164,6 +177,11 @@ function mockAccountProvider<Provider extends Bip44AccountProvider>(
mocks.isAccountCompatible?.mockImplementation(
(account: KeyringAccount) => account.type === TrxAccountType.Eoa,
);
} else if (providerClass === (XlmAccountProvider as unknown)) {
mocks.getName.mockReturnValue(XLM_ACCOUNT_PROVIDER_NAME);
mocks.isAccountCompatible?.mockImplementation(
(account: KeyringAccount) => account.type === XlmAccountType.DataAccount,
);
}

// Mirror production behavior: a provider's tracked account IDs are only
Expand Down Expand Up @@ -221,6 +239,7 @@ async function setup({
SolAccountProvider: makeMockAccountProvider(),
BtcAccountProvider: makeMockAccountProvider(),
TrxAccountProvider: makeMockAccountProvider(),
XlmAccountProvider: makeMockAccountProvider(),
};

// Required for the `assert` on `MultichainAccountWallet.createMultichainAccountGroup`.
Expand Down Expand Up @@ -277,6 +296,7 @@ async function setup({
SolAccountProvider.NAME = SOL_ACCOUNT_PROVIDER_NAME;
BtcAccountProvider.NAME = BTC_ACCOUNT_PROVIDER_NAME;
TrxAccountProvider.NAME = TRX_ACCOUNT_PROVIDER_NAME;
XlmAccountProvider.NAME = XLM_ACCOUNT_PROVIDER_NAME;

mockAccountProvider<EvmAccountProvider>(
EvmAccountProvider,
Expand Down Expand Up @@ -306,6 +326,13 @@ async function setup({
3,
TrxAccountType.Eoa,
);
mockAccountProvider<XlmAccountProvider>(
XlmAccountProvider,
mocks.XlmAccountProvider,
accounts,
4,
XlmAccountType.DataAccount,
);
}

const messenger = getMultichainAccountServiceMessenger(rootMessenger);
Expand Down Expand Up @@ -1031,6 +1058,7 @@ describe('MultichainAccountService', () => {
entropySource: MOCK_HD_KEYRING_1.metadata.id,
}),
).toThrow('Unknown wallet, no wallet matching this entropy source');
expect(mocks.XlmAccountProvider.deleteAccount).not.toHaveBeenCalled();
});

it('continues with remaining accounts and removes the wallet when one provider deleteAccount call throws', async () => {
Expand Down Expand Up @@ -1217,7 +1245,7 @@ describe('MultichainAccountService', () => {
});

// Turning basic functionality off disables the snap-backed provider
// wrappers (Sol/Btc/Trx). EVM is intentionally left enabled.
// wrappers (Sol/Btc/Trx/Xlm). EVM is intentionally left enabled.
await service.setBasicFunctionality(false);

await service.removeMultichainAccountWallet(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,13 @@ import {
EVM_ACCOUNT_PROVIDER_NAME,
BtcAccountProviderConfig,
TrxAccountProviderConfig,
XlmAccountProviderConfig,
XLM_ACCOUNT_PROVIDER_NAME,
BTC_ACCOUNT_PROVIDER_NAME,
TRX_ACCOUNT_PROVIDER_NAME,
BtcAccountProvider,
TrxAccountProvider,
XlmAccountProvider,
} from './providers';
import {
AccountProviderWrapper,
Expand Down Expand Up @@ -83,6 +86,7 @@ export type MultichainAccountServiceOptions = {
[SOL_ACCOUNT_PROVIDER_NAME]?: SolAccountProviderConfig;
[BTC_ACCOUNT_PROVIDER_NAME]?: BtcAccountProviderConfig;
[TRX_ACCOUNT_PROVIDER_NAME]?: TrxAccountProviderConfig;
[XLM_ACCOUNT_PROVIDER_NAME]?: XlmAccountProviderConfig;
};
config?: MultichainAccountServiceConfig;
};
Expand Down Expand Up @@ -221,6 +225,14 @@ export class MultichainAccountService {
trace,
),
),
new AccountProviderWrapper(
this.#messenger,
new XlmAccountProvider(
this.#messenger,
providerConfigs?.[XLM_ACCOUNT_PROVIDER_NAME],
trace,
),
),
// Custom account providers that can be provided by the MetaMask client.
...providers,
];
Expand Down