@metamask-previews/account-tree-controller 7.5.3-preview-d52465c2b → 7.5.3-preview-34f2bcbf7

package/CHANGELOG.md

@@ -7,10 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- **BREAKING:** Expose `status` on `AccountGroupMultichainAccountObject` ([#9104](https://github.com/MetaMask/core/pull/9104))
+  - The controller now requires the new event `MultichainAccountService:groupStatusChange`.
+  - The field reflects `MultichainAccountGroupStatus` and is kept in sync via the new `MultichainAccountService:groupStatusChange` event subscription.
+
 ### Changed
 
 - The `Multichain Account Syncing - Full` trace is now only emitted when a backup-and-sync run actually mutates local or remote state (rolled-back local changes do not count) ([#9343](https://github.com/MetaMask/core/pull/9343))
-- Bump `@metamask/keyring-api` from `^23.1.0` to `^23.3.0` ([#9249](https://github.com/MetaMask/core/pull/9249))
+- Bump `@metamask/keyring-api` from `^23.1.0` to `^23.5.0` ([#9249](https://github.com/MetaMask/core/pull/9249), [#9390](https://github.com/MetaMask/core/pull/9390))
 - Bump `@metamask/multichain-account-service` from `^11.0.0` to `^11.1.0` ([#9264](https://github.com/MetaMask/core/pull/9264))
 - Bump `@metamask/accounts-controller` from `^39.0.3` to `^39.0.4` ([#9349](https://github.com/MetaMask/core/pull/9349))
 - Bump `@metamask/messenger` from `^1.2.0` to `^2.0.0` ([#9392](https://github.com/MetaMask/core/pull/9392))

package/dist/AccountTreeController.cjs

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AccountTreeController_instances, _AccountTreeController_accountIdToContext, _AccountTreeController_groupIdToWalletId, _AccountTreeController_backupAndSyncService, _AccountTreeController_rules, _AccountTreeController_trace, _AccountTreeController_backupAndSyncConfig, _AccountTreeController_accountOrderCallbacks, _AccountTreeController_initialized, _AccountTreeController_initTreeContext, _AccountTreeController_getEntropyRule, _AccountTreeController_getSnapRule, _AccountTreeController_getKeyringRule, _AccountTreeController_applyAccountWalletMetadata, _AccountTreeController_getRuleForWallet, _AccountTreeController_getComputedAccountGroupName, _AccountTreeController_getDefaultAccountGroupName, _AccountTreeController_applyAccountGroupMetadata, _AccountTreeController_handleAccountsAdded, _AccountTreeController_handleAccountsRemoved, _AccountTreeController_pruneEmptyGroupAndWallet, _AccountTreeController_publishAccountGroupCreated, _AccountTreeController_publishAccountGroupUpdated, _AccountTreeController_publishAccountGroupRemoved, _AccountTreeController_insert, _AccountTreeController_listAccounts, _AccountTreeController_assertAccountGroupExists, _AccountTreeController_assertAccountWalletExists, _AccountTreeController_assertAccountGroupNameIsUnique, _AccountTreeController_setSelectedAccountGroup, _AccountTreeController_getDefaultSelectedAccountGroup, _AccountTreeController_handleSelectedAccountChange, _AccountTreeController_handleMultichainAccountWalletStatusChange, _AccountTreeController_getAccountGroup, _AccountTreeController_getDefaultAccountFromAccountGroupId, _AccountTreeController_getDefaultAccountGroupId, _AccountTreeController_hasEvmAccount, _AccountTreeController_resolveNameConflict, _AccountTreeController_createBackupAndSyncContext;
+var _AccountTreeController_instances, _AccountTreeController_accountIdToContext, _AccountTreeController_groupIdToWalletId, _AccountTreeController_backupAndSyncService, _AccountTreeController_rules, _AccountTreeController_trace, _AccountTreeController_backupAndSyncConfig, _AccountTreeController_accountOrderCallbacks, _AccountTreeController_initialized, _AccountTreeController_initTreeContext, _AccountTreeController_getEntropyRule, _AccountTreeController_getSnapRule, _AccountTreeController_getKeyringRule, _AccountTreeController_applyAccountWalletMetadata, _AccountTreeController_getRuleForWallet, _AccountTreeController_getComputedAccountGroupName, _AccountTreeController_getDefaultAccountGroupName, _AccountTreeController_applyAccountGroupMetadata, _AccountTreeController_handleAccountsAdded, _AccountTreeController_handleAccountsRemoved, _AccountTreeController_pruneEmptyGroupAndWallet, _AccountTreeController_publishAccountGroupCreated, _AccountTreeController_publishAccountGroupUpdated, _AccountTreeController_publishAccountGroupRemoved, _AccountTreeController_insert, _AccountTreeController_listAccounts, _AccountTreeController_assertAccountGroupExists, _AccountTreeController_assertAccountWalletExists, _AccountTreeController_assertAccountGroupNameIsUnique, _AccountTreeController_setSelectedAccountGroup, _AccountTreeController_getDefaultSelectedAccountGroup, _AccountTreeController_handleSelectedAccountChange, _AccountTreeController_handleMultichainAccountWalletStatusChange, _AccountTreeController_handleMultichainAccountGroupStatusChange, _AccountTreeController_getMultichainAccountWalletStatus, _AccountTreeController_getMultichainAccountGroupStatus, _AccountTreeController_getAccountGroup, _AccountTreeController_getDefaultAccountFromAccountGroupId, _AccountTreeController_getDefaultAccountGroupId, _AccountTreeController_hasEvmAccount, _AccountTreeController_resolveNameConflict, _AccountTreeController_createBackupAndSyncContext;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccountTreeController = exports.getDefaultAccountTreeControllerState = exports.controllerName = void 0;
 const account_api_1 = require("@metamask/account-api");
@@ -25,6 +25,7 @@ const logger_1 = require("./logger.cjs");
 const entropy_1 = require("./rules/entropy.cjs");
 const keyring_1 = require("./rules/keyring.cjs");
 const snap_1 = require("./rules/snap.cjs");
+const wallet_1 = require("./wallet.cjs");
 exports.controllerName = 'AccountTreeController';
 const MESSENGER_EXPOSED_METHODS = [
     'getSelectedAccountGroup',
@@ -181,6 +182,9 @@ class AccountTreeController extends base_controller_1.BaseController {
         this.messenger.subscribe('MultichainAccountService:walletStatusChange', (walletId, status) => {
             __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_handleMultichainAccountWalletStatusChange).call(this, walletId, status);
         });
+        this.messenger.subscribe('MultichainAccountService:groupStatusChange', (groupId, status) => {
+            __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_handleMultichainAccountGroupStatusChange).call(this, groupId, status);
+        });
         this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
     }
     /**
@@ -920,7 +924,9 @@ _AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeControlle
         (0, logger_1.projectLogger)(`[${walletId}] Added as new wallet`);
         wallets[walletId] = {
             ...result.wallet,
-            status: 'ready',
+            status: (0, wallet_1.isMultichainAccountWallet)(result.wallet)
+                ? __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getMultichainAccountWalletStatus).call(this, result.wallet.metadata.entropy.id)
+                : 'ready',
             groups: {},
             metadata: {
                 name: '', // Will get updated later.
@@ -931,7 +937,7 @@ _AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeControlle
         };
         wallet = wallets[walletId];
         // Trigger atomic sync for new wallet (only for entropy wallets)
-        if (wallet.type === account_api_1.AccountWalletType.Entropy) {
+        if ((0, wallet_1.isMultichainAccountWallet)(wallet)) {
             __classPrivateFieldGet(this, _AccountTreeController_backupAndSyncService, "f").enqueueSingleWalletSync(walletId);
         }
     }
@@ -946,6 +952,10 @@ _AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeControlle
             ...result.group,
             // Type-wise, we are guaranteed to always have at least 1 account.
             accounts: [id],
+            ...((0, group_1.isMultichainAccountGroup)(result.group) &&
+                (0, wallet_1.isMultichainAccountWallet)(result.wallet) && {
+                status: __classPrivateFieldGet(this, _AccountTreeController_instances, "m", _AccountTreeController_getMultichainAccountGroupStatus).call(this, result.wallet.metadata.entropy.id, result.group.metadata.entropy.groupIndex),
+            }),
             metadata: {
                 name: '',
                 ...{ pinned: false, hidden: false, lastSelected: 0 }, // Default UI states
@@ -958,7 +968,7 @@ _AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeControlle
         // Map group ID to its containing wallet ID for efficient direct access
         __classPrivateFieldGet(this, _AccountTreeController_groupIdToWalletId, "f").set(groupId, walletId);
         // Trigger atomic sync for new group (only for entropy wallets)
-        if (wallet.type === account_api_1.AccountWalletType.Entropy) {
+        if ((0, wallet_1.isMultichainAccountWallet)(wallet)) {
             __classPrivateFieldGet(this, _AccountTreeController_backupAndSyncService, "f").enqueueSingleGroupSync(groupId);
         }
     }
@@ -1015,9 +1025,6 @@ _AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeControlle
     if (!accountToSelect) {
         throw new Error('No accounts found in group');
     }
-    const gutoSetGroupStart = Date.now();
-    console.log('[GUTO PERFORMANCE LOG] AccountTreeController.#setSelectedAccountGroup START');
-    const gutoUpdateStart = Date.now();
     this.update((state) => {
         // Update our selected account group first.
         state.selectedAccountGroup = groupId;
@@ -1034,20 +1041,14 @@ _AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeControlle
             state.accountTree.wallets[walletId].groups[groupId].metadata.lastSelected = now;
         }
     });
-    console.log(`[GUTO PERFORMANCE LOG] AccountTreeController state.update (sync) took ${Date.now() - gutoUpdateStart}ms`);
     (0, logger_1.projectLogger)(`Selected group is now: [${this.state.selectedAccountGroup}]`);
-    const gutoPublishStart = Date.now();
     this.messenger.publish(`${exports.controllerName}:selectedAccountGroupChange`, groupId, previousSelectedAccountGroup);
-    console.log(`[GUTO PERFORMANCE LOG] AccountTreeController publish selectedAccountGroupChange (sync subscriber fan-out) took ${Date.now() - gutoPublishStart}ms`);
     if (forwardSelectedAccount) {
         // Update AccountsController - this will trigger selectedAccountChange event,
         // but our handler is idempotent so it won't cause infinite loop
-        const gutoSetAccountStart = Date.now();
         this.messenger.call('AccountsController:setSelectedAccount', accountToSelect);
-        console.log(`[GUTO PERFORMANCE LOG] AccountTreeController AccountsController:setSelectedAccount (sync selectedAccountChange fan-out) took ${Date.now() - gutoSetAccountStart}ms`);
         (0, logger_1.projectLogger)(`Selected account is now: ${accountToSelect}`);
     }
-    console.log(`[GUTO PERFORMANCE LOG] AccountTreeController.#setSelectedAccountGroup END (total, sync) took ${Date.now() - gutoSetGroupStart}ms`);
 }, _AccountTreeController_getDefaultSelectedAccountGroup = function _AccountTreeController_getDefaultSelectedAccountGroup(wallets) {
     const selectedAccount = this.messenger.call('AccountsController:getSelectedMultichainAccount');
     if (selectedAccount?.id) {
@@ -1076,6 +1077,30 @@ _AccountTreeController_accountIdToContext = new WeakMap(), _AccountTreeControlle
             wallet.status = walletStatus;
         }
     });
+}, _AccountTreeController_handleMultichainAccountGroupStatusChange = function _AccountTreeController_handleMultichainAccountGroupStatusChange(groupId, groupStatus) {
+    this.update((state) => {
+        const walletId = __classPrivateFieldGet(this, _AccountTreeController_groupIdToWalletId, "f").get(groupId);
+        if (walletId) {
+            const group = state.accountTree.wallets[walletId]?.groups[groupId];
+            if (group && (0, group_1.isMultichainAccountGroup)(group)) {
+                group.status = groupStatus;
+            }
+        }
+    });
+}, _AccountTreeController_getMultichainAccountWalletStatus = function _AccountTreeController_getMultichainAccountWalletStatus(entropySource) {
+    try {
+        return this.messenger.call('MultichainAccountService:getMultichainAccountWallet', { entropySource }).status;
+    }
+    catch {
+        return 'uninitialized';
+    }
+}, _AccountTreeController_getMultichainAccountGroupStatus = function _AccountTreeController_getMultichainAccountGroupStatus(entropySource, groupIndex) {
+    try {
+        return this.messenger.call('MultichainAccountService:getMultichainAccountGroup', { entropySource, groupIndex }).status;
+    }
+    catch {
+        return 'uninitialized';
+    }
 }, _AccountTreeController_getAccountGroup = function _AccountTreeController_getAccountGroup(groupId) {
     const found = Object.values(this.state.accountTree.wallets).find((wallet) => wallet.groups[groupId] !== undefined);
     return found?.groups[groupId];