Skip to content
Merged
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
5 changes: 1 addition & 4 deletions eslint-suppressions.json
Original file line number Diff line number Diff line change
Expand Up @@ -344,13 +344,10 @@
"count": 2
}
},
"packages/solana-wallet-snap/src/core/services/assets/AssetsService.ts": {
"packages/solana-wallet-snap/src/core/services/assets/adapters/SnapAssetsAdapter.ts": {
"@typescript-eslint/await-thenable": {
"count": 1
},
"@typescript-eslint/explicit-function-return-type": {
"count": 10
},
"no-unused-private-class-members": {
"count": 2
}
Expand Down
1 change: 1 addition & 0 deletions packages/solana-wallet-snap/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

### Changed

- Extract Snap-owned assets domain logic into `SnapAssetsAdapter`; `AssetsService` is a thin facade that delegates metadata, market data, fetch, persist, and account asset reads through the adapter (no Core routing yet). ([#121](https://github.com/MetaMask/internal-snaps/pull/121))
- Align `AssetsService` read API with `snap-networks-utils` / AssetsController shapes by adding `getAccountAssetByID`, `getAccountAssetsByIDs`, `getAccountAssetsByScope`, and `getAccountAssets`, and routing Keyring and Send through them (still Snap-owned storage). ([#120](https://github.com/MetaMask/internal-snaps/pull/120))

## [6.0.0]
Expand Down
2 changes: 1 addition & 1 deletion packages/solana-wallet-snap/snap.manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://github.com/MetaMask/internal-snaps.git"
},
"source": {
"shasum": "dlsGUfU2sircQb9+jdv2u74wqp3t/Zn82O0JrY2lHAw=",
"shasum": "2c2WNzBfLdP/UYJdepbBVpyYrpjzuSob/iobC9JJRLo=",
"location": {
"npm": {
"filePath": "dist/bundle.js",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import type { AccountsService } from '../accounts/AccountsService';
import type { ConfigProvider } from '../config';
import type { SolanaConnection } from '../connection';
import type { TokenPricesService } from '../token-prices/TokenPrices';
import { SnapAssetsAdapter } from './adapters/SnapAssetsAdapter';
import type { AssetsRepository } from './AssetsRepository';
import { AssetsService } from './AssetsService';

Expand All @@ -34,6 +35,7 @@ jest.mock('@metamask/keyring-snap-sdk', () => ({

describe('AssetsService', () => {
let assetsService: AssetsService;
let snapAssetsAdapter: SnapAssetsAdapter;
let mockConnection: SolanaConnection;
let mockConfigProvider: ConfigProvider;
let mockAssetsRepository: AssetsRepository;
Expand Down Expand Up @@ -88,7 +90,7 @@ describe('AssetsService', () => {
findById: jest.fn().mockResolvedValue(MOCK_SOLANA_KEYRING_ACCOUNT_0),
} as unknown as AccountsService;

assetsService = new AssetsService({
snapAssetsAdapter = new SnapAssetsAdapter({
connection: mockConnection,
logger: mockLogger,
configProvider: mockConfigProvider,
Expand All @@ -99,6 +101,10 @@ describe('AssetsService', () => {
cache: mockCache,
nftApiClient: mockNftApiClient,
});

assetsService = new AssetsService({
snapAdapter: snapAssetsAdapter,
});
});

describe('fetch', () => {
Expand Down Expand Up @@ -174,6 +180,45 @@ describe('AssetsService', () => {
});
});

describe('getAssetsMetadata', () => {
it('fetches token metadata from the token API client', async () => {
const tokenAssetTypes = [
MOCK_ASSET_ENTITY_1.assetType,
MOCK_ASSET_ENTITY_2.assetType,
];

const metadata = await assetsService.getAssetsMetadata(tokenAssetTypes);

expect(mockTokenApiClient.getTokensMetadata).toHaveBeenCalledWith(
tokenAssetTypes,
);
expect(metadata).toStrictEqual(SOLANA_MOCK_TOKEN_METADATA);
});
});

describe('fetchAssetsMarketData', () => {
it('delegates to the token prices service', async () => {
const assets = [
{
asset: MOCK_ASSET_ENTITY_0.assetType,
unit: MOCK_ASSET_ENTITY_0.assetType,
},
];
const expected = { [MOCK_ASSET_ENTITY_0.assetType]: {} };

jest
.spyOn(mockTokenPricesService, 'getMultipleTokensMarketData')
.mockResolvedValueOnce(expected as never);

const result = await assetsService.fetchAssetsMarketData(assets);

expect(
mockTokenPricesService.getMultipleTokensMarketData,
).toHaveBeenCalledWith(assets);
expect(result).toStrictEqual(expected);
});
});

describe('save', () => {
it('saves an asset', async () => {
const spy = jest
Expand Down
Loading