@metamask-previews/assets-controller 20.2.0-preview-fbb37663c → 20.2.0-preview-3a0f39d23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +0 -24
- package/dist/AssetsController.d.ts +2 -12
- package/dist/AssetsController.d.ts.map +1 -1
- package/dist/AssetsController.js +7 -150
- package/dist/AssetsController.js.map +1 -1
- package/dist/data-sources/AccountActivityDataSource.d.ts.map +1 -1
- package/dist/data-sources/AccountActivityDataSource.js +3 -19
- package/dist/data-sources/AccountActivityDataSource.js.map +1 -1
- package/dist/data-sources/AccountsApiDataSource.d.ts +0 -8
- package/dist/data-sources/AccountsApiDataSource.d.ts.map +1 -1
- package/dist/data-sources/AccountsApiDataSource.js +1 -17
- package/dist/data-sources/AccountsApiDataSource.js.map +1 -1
- package/dist/data-sources/RpcDataSource.d.ts +2 -5
- package/dist/data-sources/RpcDataSource.d.ts.map +1 -1
- package/dist/data-sources/RpcDataSource.js +3 -5
- package/dist/data-sources/RpcDataSource.js.map +1 -1
- package/dist/data-sources/SnapDataSource.d.ts +0 -9
- package/dist/data-sources/SnapDataSource.d.ts.map +1 -1
- package/dist/data-sources/SnapDataSource.js +1 -10
- package/dist/data-sources/SnapDataSource.js.map +1 -1
- package/dist/data-sources/StakedBalanceDataSource.d.ts +0 -9
- package/dist/data-sources/StakedBalanceDataSource.d.ts.map +1 -1
- package/dist/data-sources/StakedBalanceDataSource.js +0 -10
- package/dist/data-sources/StakedBalanceDataSource.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -7,30 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
7
7
|
|
|
8
8
|
## [Unreleased]
|
|
9
9
|
|
|
10
|
-
### Added
|
|
11
|
-
|
|
12
|
-
- Add `init()`, which reads enabled chains from `NetworkEnablementController:getState` after every controller has been constructed. Later enablement changes still arrive on `NetworkEnablementController:stateChange` ([#10885](https://github.com/MetaMask/core/pull/10885))
|
|
13
|
-
- `init()` refreshes data sources that read other controllers through the messenger: `RpcDataSource.refreshActiveChainsFromNetworkState()` (`NetworkController:getState`), `StakedBalanceDataSource.refreshActiveChainsFromNetworkEnablementState()` (`NetworkEnablementController:getState`), `SnapDataSource.init()` (snap discovery), and `AccountsApiDataSource.init()` (supported networks and `RemoteFeatureFlagController:getState`).
|
|
14
|
-
- Add `SnapDataSource.init()` and `AccountsApiDataSource.init()` ([#10885](https://github.com/MetaMask/core/pull/10885))
|
|
15
|
-
|
|
16
|
-
### Changed
|
|
17
|
-
|
|
18
|
-
- **BREAKING:** Subscribe to `AccountsController:selectedAccountChange` so a selected-account switch refreshes tracked assets when `AccountTreeController` is not registered ([#10885](https://github.com/MetaMask/core/pull/10885))
|
|
19
|
-
- Hosts that restrict which events flow through the `AssetsController` messenger must also delegate `AccountsController:selectedAccountChange`.
|
|
20
|
-
- When `AccountTreeController` is registered, that event is ignored. Group switches still refresh only through `AccountTreeController:selectedAccountGroupChange`, so the two events are not both handled.
|
|
21
|
-
- **BREAKING:** Constructors no longer call messenger actions. Call `AssetsController.init()` after the other controllers exist. `Wallet.init()` does this. Until `init()` runs, enabled chains and data-source active chains stay empty unless a later state change arrives ([#10885](https://github.com/MetaMask/core/pull/10885))
|
|
22
|
-
- `AssetsController` no longer calls `NetworkEnablementController:getState` in its constructor.
|
|
23
|
-
- `RpcDataSource` no longer calls `NetworkController:getState` in its constructor. Call `refreshActiveChainsFromNetworkState()`, or `AssetsController.init()`.
|
|
24
|
-
- `StakedBalanceDataSource` no longer calls `NetworkEnablementController:getState` in its constructor. Call `refreshActiveChainsFromNetworkEnablementState()`, or `AssetsController.init()`.
|
|
25
|
-
- `SnapDataSource` no longer calls `SnapController:getRunnableSnaps` in its constructor. Call `init()`. When `SnapController` is not registered, discovery leaves active chains empty.
|
|
26
|
-
- `AccountsApiDataSource` no longer starts its supported-network fetch, which calls `RemoteFeatureFlagController:getState`, from the constructor. Call `init()`.
|
|
27
|
-
- When `AccountTreeController` actions are not registered, selected-account reads fall back to `AccountsController:getSelectedAccount`, and asset tracking does not wait for account-tree initialization ([#10885](https://github.com/MetaMask/core/pull/10885))
|
|
28
|
-
- `AccountActivityDataSource` uses the same fallback when resolving the account for a balance update.
|
|
29
|
-
|
|
30
|
-
### Fixed
|
|
31
|
-
|
|
32
|
-
- Refresh the newly selected account after startup completes when it changes while the initial asset fetch is in progress ([#10885](https://github.com/MetaMask/core/pull/10885))
|
|
33
|
-
|
|
34
10
|
## [20.2.0]
|
|
35
11
|
|
|
36
12
|
### Changed
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AccountTreeControllerGetAccountsFromSelectedAccountGroupAction, AccountTreeControllerInitializedEvent, AccountTreeControllerIsInitializedAction, AccountTreeControllerSelectedAccountGroupChangeEvent, AccountTreeControllerUninitializedEvent } from '@metamask/account-tree-controller';
|
|
2
|
-
import type { AccountsControllerGetSelectedAccountAction
|
|
2
|
+
import type { AccountsControllerGetSelectedAccountAction } from '@metamask/accounts-controller';
|
|
3
3
|
import { BaseController } from '@metamask/base-controller';
|
|
4
4
|
import type { ControllerGetStateAction, ControllerStateChangeEvent } from '@metamask/base-controller';
|
|
5
5
|
import type { ClientControllerGetStateAction, ClientControllerStateChangeEvent } from '@metamask/client-controller';
|
|
@@ -74,7 +74,7 @@ export type AssetsControllerPriceChangedEvent = {
|
|
|
74
74
|
};
|
|
75
75
|
export type AssetsControllerEvents = AssetsControllerStateChangeEvent | AssetsControllerBalanceChangedEvent | AssetsControllerPriceChangedEvent;
|
|
76
76
|
type AllowedActions = AccountsControllerGetSelectedAccountAction | AccountTreeControllerGetAccountsFromSelectedAccountGroupAction | AccountTreeControllerIsInitializedAction | ClientControllerGetStateAction | KeyringControllerIsUnlockedAction | NetworkControllerGetStateAction | NetworkControllerGetNetworkClientByIdAction | ConfigRegistryControllerGetNetworkConfigByCaip2ChainIdAction | NetworkEnablementControllerGetStateAction | SnapControllerGetRunnableSnapsAction | SnapControllerHandleRequestAction | GetPermissions | PhishingControllerBulkScanTokensAction | RemoteFeatureFlagControllerGetStateAction;
|
|
77
|
-
type AllowedEvents = AccountTreeControllerSelectedAccountGroupChangeEvent | AccountTreeControllerInitializedEvent | AccountTreeControllerUninitializedEvent |
|
|
77
|
+
type AllowedEvents = AccountTreeControllerSelectedAccountGroupChangeEvent | AccountTreeControllerInitializedEvent | AccountTreeControllerUninitializedEvent | ClientControllerStateChangeEvent | KeyringControllerLockEvent | KeyringControllerUnlockEvent | PreferencesControllerStateChangeEvent | TransactionControllerUnapprovedTransactionAddedEvent | TransactionControllerTransactionConfirmedEvent | MultichainTransactionsControllerTransactionConfirmedEvent | NetworkControllerStateChangeEvent | NetworkControllerNetworkAddedEvent | NetworkControllerNetworkDidChangeEvent | NetworkControllerNetworkRemovedEvent | NetworkEnablementControllerEvents | AccountsControllerAccountBalancesUpdatedEvent | PermissionControllerStateChange | SnapControllerSnapInstalledEvent | AccountActivityServiceBalanceUpdatedEvent | AccountActivityServiceStatusChangedEvent | RemoteFeatureFlagControllerStateChangeEvent;
|
|
78
78
|
export type AssetsControllerMessenger = Messenger<typeof CONTROLLER_NAME, AssetsControllerActions | AllowedActions, AssetsControllerEvents | AllowedEvents>;
|
|
79
79
|
export type AssetsControllerOptions = {
|
|
80
80
|
messenger: AssetsControllerMessenger;
|
|
@@ -169,16 +169,6 @@ export type AssetsControllerOptions = {
|
|
|
169
169
|
export declare class AssetsController extends BaseController<typeof CONTROLLER_NAME, AssetsControllerState, AssetsControllerMessenger> {
|
|
170
170
|
#private;
|
|
171
171
|
constructor({ messenger, state, defaultUpdateInterval, isEnabled, isBasicFunctionality, subscribeToBasicFunctionalityChange, queryApiClient, rpcDataSourceConfig, trace, captureException, accountsApiDataSourceConfig, priceDataSourceConfig, stakedBalanceDataSourceConfig, isOnboarded, tempMigrateAssetsInfoMetadataAssets3346, }: AssetsControllerOptions);
|
|
172
|
-
/**
|
|
173
|
-
* Read the current enabled chains from NetworkEnablementController, and
|
|
174
|
-
* refresh data sources that would otherwise read other controllers through
|
|
175
|
-
* the messenger.
|
|
176
|
-
*
|
|
177
|
-
* This controller does not call messenger actions in its constructor.
|
|
178
|
-
* `Wallet` constructs every controller first, then `Wallet.init()` calls
|
|
179
|
-
* `init()`. Later enablement changes arrive on `stateChange` events.
|
|
180
|
-
*/
|
|
181
|
-
init(): Promise<void>;
|
|
182
172
|
/**
|
|
183
173
|
* Returns the callback passed to data sources for reporting active chain updates.
|
|
184
174
|
* Used by tests to simulate a data source reporting chain changes.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AssetsController.d.ts","sourceRoot":"","sources":["../src/AssetsController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,8DAA8D,EAC9D,qCAAqC,EACrC,wCAAwC,EACxC,oDAAoD,EACpD,uCAAuC,EACxC,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"AssetsController.d.ts","sourceRoot":"","sources":["../src/AssetsController.ts"],"names":[],"mappings":"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"}
|
package/dist/AssetsController.js
CHANGED
|
@@ -426,13 +426,6 @@ let AssetsController = (() => {
|
|
|
426
426
|
* its forced `getAssets()` call) runs a second time for the same accounts.
|
|
427
427
|
*/
|
|
428
428
|
#startInFlight = false;
|
|
429
|
-
/**
|
|
430
|
-
* Whether an account switch occurred while startup was force-fetching.
|
|
431
|
-
*
|
|
432
|
-
* The startup subscription skips its initial Accounts API fetch, so a
|
|
433
|
-
* selection made in that window must be refreshed once startup completes.
|
|
434
|
-
*/
|
|
435
|
-
#pendingAccountRefresh = false;
|
|
436
429
|
/** Currently enabled chains from NetworkEnablementController */
|
|
437
430
|
#enabledChains = new Set();
|
|
438
431
|
/**
|
|
@@ -440,22 +433,12 @@ let AssetsController = (() => {
|
|
|
440
433
|
* This includes all accounts in the same group as the selected account
|
|
441
434
|
* (EVM, Bitcoin, Solana, Tron, etc. that belong to the same logical account group).
|
|
442
435
|
*
|
|
443
|
-
* When `AccountTreeController` is not registered, falls back to
|
|
444
|
-
* `AccountsController:getSelectedAccount`.
|
|
445
|
-
*
|
|
446
436
|
* @returns Array of InternalAccount objects from the selected account group.
|
|
447
437
|
*/
|
|
448
438
|
#getSelectedAccounts() {
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
return accounts;
|
|
453
|
-
}
|
|
454
|
-
}
|
|
455
|
-
catch (error) {
|
|
456
|
-
if (!isUnregisteredActionError(error)) {
|
|
457
|
-
throw error;
|
|
458
|
-
}
|
|
439
|
+
const accounts = this.messenger.call('AccountTreeController:getAccountsFromSelectedAccountGroup');
|
|
440
|
+
if (accounts.length > 0) {
|
|
441
|
+
return accounts;
|
|
459
442
|
}
|
|
460
443
|
const selectedAccount = this.messenger.call('AccountsController:getSelectedAccount');
|
|
461
444
|
if (selectedAccount) {
|
|
@@ -466,43 +449,10 @@ let AssetsController = (() => {
|
|
|
466
449
|
/**
|
|
467
450
|
* Whether `AccountTreeController.init()` has completed and the tree is ready.
|
|
468
451
|
*
|
|
469
|
-
*
|
|
470
|
-
* is not blocked on a controller the host has not installed.
|
|
471
|
-
*
|
|
472
|
-
* @returns True when the account tree has been initialized, or when that controller is absent.
|
|
452
|
+
* @returns True when the account tree has been initialized.
|
|
473
453
|
*/
|
|
474
454
|
#isAccountTreeInitialized() {
|
|
475
|
-
|
|
476
|
-
return this.messenger.call('AccountTreeController:isInitialized');
|
|
477
|
-
}
|
|
478
|
-
catch (error) {
|
|
479
|
-
if (!isUnregisteredActionError(error)) {
|
|
480
|
-
throw error;
|
|
481
|
-
}
|
|
482
|
-
return true;
|
|
483
|
-
}
|
|
484
|
-
}
|
|
485
|
-
/**
|
|
486
|
-
* Whether `AccountTreeController` has registered its actions.
|
|
487
|
-
*
|
|
488
|
-
* Selected-account switches are published by `AccountsController` in both
|
|
489
|
-
* setups. When the tree controller is registered it turns those switches
|
|
490
|
-
* into `selectedAccountGroupChange`, so handling both events would refresh
|
|
491
|
-
* tracked assets twice.
|
|
492
|
-
*
|
|
493
|
-
* @returns True when `AccountTreeController:isInitialized` is registered.
|
|
494
|
-
*/
|
|
495
|
-
#isAccountTreeControllerRegistered() {
|
|
496
|
-
try {
|
|
497
|
-
this.messenger.call('AccountTreeController:isInitialized');
|
|
498
|
-
return true;
|
|
499
|
-
}
|
|
500
|
-
catch (error) {
|
|
501
|
-
if (!isUnregisteredActionError(error)) {
|
|
502
|
-
throw error;
|
|
503
|
-
}
|
|
504
|
-
return false;
|
|
505
|
-
}
|
|
455
|
+
return this.messenger.call('AccountTreeController:isInitialized');
|
|
506
456
|
}
|
|
507
457
|
/**
|
|
508
458
|
* Whether the client (UI) is open, read from ClientController state.
|
|
@@ -658,9 +608,7 @@ let AssetsController = (() => {
|
|
|
658
608
|
log('Initializing AssetsController', {
|
|
659
609
|
defaultUpdateInterval: this.#defaultUpdateInterval,
|
|
660
610
|
});
|
|
661
|
-
|
|
662
|
-
// is not missed. Enabled chains are read in init(), after every
|
|
663
|
-
// controller has been constructed.
|
|
611
|
+
this.#initializeState();
|
|
664
612
|
this.#subscribeToEvents();
|
|
665
613
|
this.#registerActionHandlers();
|
|
666
614
|
// Subscriptions start only when both UI is open and keyring unlocked -> #updateActive().
|
|
@@ -696,34 +644,8 @@ let AssetsController = (() => {
|
|
|
696
644
|
const initialNativeAssetMap = buildNativeAssetsFromConstant();
|
|
697
645
|
queryApiClient.setCachedData(NATIVE_ASSETS_QUERY_KEY, initialNativeAssetMap);
|
|
698
646
|
}
|
|
699
|
-
/**
|
|
700
|
-
* Read the current enabled chains from NetworkEnablementController, and
|
|
701
|
-
* refresh data sources that would otherwise read other controllers through
|
|
702
|
-
* the messenger.
|
|
703
|
-
*
|
|
704
|
-
* This controller does not call messenger actions in its constructor.
|
|
705
|
-
* `Wallet` constructs every controller first, then `Wallet.init()` calls
|
|
706
|
-
* `init()`. Later enablement changes arrive on `stateChange` events.
|
|
707
|
-
*/
|
|
708
|
-
async init() {
|
|
709
|
-
this.#initializeState();
|
|
710
|
-
this.#rpcDataSource.refreshActiveChainsFromNetworkState();
|
|
711
|
-
this.#stakedBalanceDataSource.refreshActiveChainsFromNetworkEnablementState();
|
|
712
|
-
this.#snapDataSource.init();
|
|
713
|
-
await this.#accountsApiDataSource.init();
|
|
714
|
-
}
|
|
715
647
|
#initializeState() {
|
|
716
|
-
|
|
717
|
-
try {
|
|
718
|
-
({ enabledNetworkMap } = this.messenger.call('NetworkEnablementController:getState'));
|
|
719
|
-
}
|
|
720
|
-
catch (error) {
|
|
721
|
-
if (!isUnregisteredActionError(error)) {
|
|
722
|
-
throw error;
|
|
723
|
-
}
|
|
724
|
-
log('NetworkEnablementController:getState is not registered yet. Enabled chains are applied from NetworkEnablementController:stateChange.', { error });
|
|
725
|
-
return;
|
|
726
|
-
}
|
|
648
|
+
const { enabledNetworkMap } = this.messenger.call('NetworkEnablementController:getState');
|
|
727
649
|
this.#enabledChains = this.#extractEnabledChains(enabledNetworkMap);
|
|
728
650
|
log('Initialized state', {
|
|
729
651
|
enabledNetworkMap,
|
|
@@ -779,12 +701,6 @@ let AssetsController = (() => {
|
|
|
779
701
|
this.messenger.subscribe('AccountTreeController:selectedAccountGroupChange', (groupId, previousGroupId) => {
|
|
780
702
|
this.#handleAccountGroupChanged(groupId, previousGroupId).catch(console.error);
|
|
781
703
|
});
|
|
782
|
-
// Fallback for hosts that do not register AccountTreeController.
|
|
783
|
-
// Ignored while that controller is registered so a switch is not
|
|
784
|
-
// refreshed here and again on `selectedAccountGroupChange`.
|
|
785
|
-
this.messenger.subscribe('AccountsController:selectedAccountChange', () => {
|
|
786
|
-
this.#handleSelectedAccountChanged().catch(console.error);
|
|
787
|
-
});
|
|
788
704
|
this.messenger.subscribe('AccountTreeController:initialized', () => {
|
|
789
705
|
this.#updateActive();
|
|
790
706
|
});
|
|
@@ -2457,18 +2373,6 @@ let AssetsController = (() => {
|
|
|
2457
2373
|
})
|
|
2458
2374
|
.finally(() => {
|
|
2459
2375
|
this.#startInFlight = false;
|
|
2460
|
-
const shouldRefreshPendingAccount = this.#pendingAccountRefresh &&
|
|
2461
|
-
this.#isUiOpen() &&
|
|
2462
|
-
this.#isKeyringUnlocked() &&
|
|
2463
|
-
this.#isAccountTreeInitialized();
|
|
2464
|
-
this.#pendingAccountRefresh = false;
|
|
2465
|
-
if (shouldRefreshPendingAccount) {
|
|
2466
|
-
this.#refreshTrackedAccounts(this.#getSelectedAccounts()).catch((error) => {
|
|
2467
|
-
log('Failed to refresh assets after startup account switch', {
|
|
2468
|
-
error,
|
|
2469
|
-
});
|
|
2470
|
-
});
|
|
2471
|
-
}
|
|
2472
2376
|
});
|
|
2473
2377
|
}
|
|
2474
2378
|
/**
|
|
@@ -2864,9 +2768,6 @@ let AssetsController = (() => {
|
|
|
2864
2768
|
// (including when the group did not change) so late subscribers can catch
|
|
2865
2769
|
// up — ignore those until we are already tracking.
|
|
2866
2770
|
if (this.#activeSubscriptions.size === 0) {
|
|
2867
|
-
if (this.#startInFlight && groupId !== previousGroupId) {
|
|
2868
|
-
this.#pendingAccountRefresh = true;
|
|
2869
|
-
}
|
|
2870
2771
|
return;
|
|
2871
2772
|
}
|
|
2872
2773
|
if (groupId === previousGroupId) {
|
|
@@ -2879,41 +2780,6 @@ let AssetsController = (() => {
|
|
|
2879
2780
|
groupId,
|
|
2880
2781
|
previousGroupId,
|
|
2881
2782
|
});
|
|
2882
|
-
await this.#refreshTrackedAccounts(accounts);
|
|
2883
|
-
}
|
|
2884
|
-
/**
|
|
2885
|
-
* Refresh tracked assets after `AccountsController:selectedAccountChange`
|
|
2886
|
-
* when `AccountTreeController` is not registered.
|
|
2887
|
-
*
|
|
2888
|
-
* Ignored while the account tree controller is registered, because that
|
|
2889
|
-
* controller republishes the switch as `selectedAccountGroupChange`.
|
|
2890
|
-
* Also ignored until tracking has started, matching group switches, so the
|
|
2891
|
-
* first start stays owned by unlock and account-tree initialization.
|
|
2892
|
-
*/
|
|
2893
|
-
async #handleSelectedAccountChanged() {
|
|
2894
|
-
if (this.#isAccountTreeControllerRegistered()) {
|
|
2895
|
-
return;
|
|
2896
|
-
}
|
|
2897
|
-
if (this.#activeSubscriptions.size === 0) {
|
|
2898
|
-
if (this.#startInFlight) {
|
|
2899
|
-
this.#pendingAccountRefresh = true;
|
|
2900
|
-
}
|
|
2901
|
-
return;
|
|
2902
|
-
}
|
|
2903
|
-
const accounts = this.#getSelectedAccounts();
|
|
2904
|
-
log('Selected account changed', {
|
|
2905
|
-
accountCount: accounts.length,
|
|
2906
|
-
accountIds: accounts.map((account) => account.id),
|
|
2907
|
-
});
|
|
2908
|
-
await this.#refreshTrackedAccounts(accounts);
|
|
2909
|
-
}
|
|
2910
|
-
/**
|
|
2911
|
-
* Force-fetch and resubscribe for the accounts that should be tracked now.
|
|
2912
|
-
*
|
|
2913
|
-
* @param accounts - Accounts to refresh. An empty list skips the fetch and
|
|
2914
|
-
* still resubscribes, matching a switch onto an empty selection.
|
|
2915
|
-
*/
|
|
2916
|
-
async #refreshTrackedAccounts(accounts) {
|
|
2917
2783
|
const releaseLock = await this.#accountRefreshMutex.acquire();
|
|
2918
2784
|
try {
|
|
2919
2785
|
this.#ensureNativeBalancesDefaultZero();
|
|
@@ -3307,13 +3173,4 @@ let AssetsController = (() => {
|
|
|
3307
3173
|
};
|
|
3308
3174
|
})();
|
|
3309
3175
|
export { AssetsController };
|
|
3310
|
-
/**
|
|
3311
|
-
* Whether a messenger call failed because no controller has registered the action yet.
|
|
3312
|
-
*
|
|
3313
|
-
* @param error - The error thrown by `messenger.call`.
|
|
3314
|
-
* @returns True when the action handler is not registered.
|
|
3315
|
-
*/
|
|
3316
|
-
function isUnregisteredActionError(error) {
|
|
3317
|
-
return (error instanceof Error && error.message.includes('has not been registered'));
|
|
3318
|
-
}
|
|
3319
3176
|
//# sourceMappingURL=AssetsController.js.map
|