@metamask-previews/profile-sync-controller 7.0.1-preview-cd1fb95d → 7.0.1-preview-74b4a89

package/dist/controllers/user-storage/__fixtures__/mockMessenger.d.cts

@@ -32,7 +32,7 @@ export declare function createCustomUserStorageMessenger(props?: {
             identifierId: string;
             profileId: string;
         }>;
-    } | import("@metamask/keyring-controller").KeyringControllerGetStateAction | import("@metamask/accounts-controller").AccountsControllerListAccountsAction | import("@metamask/accounts-controller").AccountsControllerUpdateAccountMetadataAction | import("@metamask/keyring-controller").KeyringControllerAddNewAccountAction | import("@metamask/network-controller").NetworkControllerGetStateAction | import("@metamask/network-controller").NetworkControllerAddNetworkAction | import("@metamask/network-controller").NetworkControllerRemoveNetworkAction | import("@metamask/network-controller").NetworkControllerUpdateNetworkAction, import("@metamask/keyring-controller").KeyringControllerLockEvent | import("@metamask/keyring-controller").KeyringControllerUnlockEvent | import("../index.cjs").UserStorageControllerStateChangeEvent | import("@metamask/accounts-controller").AccountsControllerAccountAddedEvent | import("@metamask/accounts-controller").AccountsControllerAccountRenamedEvent | import("@metamask/network-controller").NetworkControllerNetworkRemovedEvent, "SnapController:handleRequest" | "KeyringController:getState" | "AuthenticationController:isSignedIn" | "AuthenticationController:performSignIn" | "AuthenticationController:performSignOut" | "AuthenticationController:getBearerToken" | "AuthenticationController:getSessionProfile" | "AccountsController:listAccounts" | "AccountsController:updateAccountMetadata" | "KeyringController:addNewAccount" | "NetworkController:getState" | "NetworkController:addNetwork" | "NetworkController:removeNetwork" | "NetworkController:updateNetwork", "KeyringController:lock" | "KeyringController:unlock" | "AccountsController:accountAdded" | "AccountsController:accountRenamed" | "NetworkController:networkRemoved">;
+    } | import("@metamask/keyring-controller").KeyringControllerGetStateAction | import("@metamask/accounts-controller").AccountsControllerListAccountsAction | import("@metamask/accounts-controller").AccountsControllerUpdateAccountMetadataAction | import("@metamask/network-controller").NetworkControllerGetStateAction | import("@metamask/network-controller").NetworkControllerAddNetworkAction | import("@metamask/network-controller").NetworkControllerRemoveNetworkAction | import("@metamask/network-controller").NetworkControllerUpdateNetworkAction, import("@metamask/keyring-controller").KeyringControllerLockEvent | import("@metamask/keyring-controller").KeyringControllerUnlockEvent | import("../index.cjs").UserStorageControllerStateChangeEvent | import("@metamask/accounts-controller").AccountsControllerAccountAddedEvent | import("@metamask/accounts-controller").AccountsControllerAccountRenamedEvent | import("@metamask/network-controller").NetworkControllerNetworkRemovedEvent, "SnapController:handleRequest" | "KeyringController:getState" | "AuthenticationController:isSignedIn" | "AuthenticationController:performSignIn" | "AuthenticationController:performSignOut" | "AuthenticationController:getBearerToken" | "AuthenticationController:getSessionProfile" | "AccountsController:listAccounts" | "AccountsController:updateAccountMetadata" | "NetworkController:getState" | "NetworkController:addNetwork" | "NetworkController:removeNetwork" | "NetworkController:updateNetwork", "KeyringController:lock" | "KeyringController:unlock" | "AccountsController:accountAdded" | "AccountsController:accountRenamed" | "NetworkController:networkRemoved">;
 };
 type OverrideMessengers = {
     baseMessenger: Messenger<AllowedActions, AllowedEvents>;
@@ -64,7 +64,7 @@ export declare function mockUserStorageMessenger(overrideMessengers?: OverrideMe
             identifierId: string;
             profileId: string;
         }>;
-    } | import("@metamask/keyring-controller").KeyringControllerGetStateAction | import("@metamask/accounts-controller").AccountsControllerListAccountsAction | import("@metamask/accounts-controller").AccountsControllerUpdateAccountMetadataAction | import("@metamask/keyring-controller").KeyringControllerAddNewAccountAction | import("@metamask/network-controller").NetworkControllerGetStateAction | import("@metamask/network-controller").NetworkControllerAddNetworkAction | import("@metamask/network-controller").NetworkControllerRemoveNetworkAction | import("@metamask/network-controller").NetworkControllerUpdateNetworkAction, import("@metamask/keyring-controller").KeyringControllerLockEvent | import("@metamask/keyring-controller").KeyringControllerUnlockEvent | import("../index.cjs").UserStorageControllerStateChangeEvent | import("@metamask/accounts-controller").AccountsControllerAccountAddedEvent | import("@metamask/accounts-controller").AccountsControllerAccountRenamedEvent | import("@metamask/network-controller").NetworkControllerNetworkRemovedEvent, "SnapController:handleRequest" | "KeyringController:getState" | "AuthenticationController:isSignedIn" | "AuthenticationController:performSignIn" | "AuthenticationController:performSignOut" | "AuthenticationController:getBearerToken" | "AuthenticationController:getSessionProfile" | "AccountsController:listAccounts" | "AccountsController:updateAccountMetadata" | "KeyringController:addNewAccount" | "NetworkController:getState" | "NetworkController:addNetwork" | "NetworkController:removeNetwork" | "NetworkController:updateNetwork", "KeyringController:lock" | "KeyringController:unlock" | "AccountsController:accountAdded" | "AccountsController:accountRenamed" | "NetworkController:networkRemoved">;
+    } | import("@metamask/keyring-controller").KeyringControllerGetStateAction | import("@metamask/accounts-controller").AccountsControllerListAccountsAction | import("@metamask/accounts-controller").AccountsControllerUpdateAccountMetadataAction | import("@metamask/network-controller").NetworkControllerGetStateAction | import("@metamask/network-controller").NetworkControllerAddNetworkAction | import("@metamask/network-controller").NetworkControllerRemoveNetworkAction | import("@metamask/network-controller").NetworkControllerUpdateNetworkAction, import("@metamask/keyring-controller").KeyringControllerLockEvent | import("@metamask/keyring-controller").KeyringControllerUnlockEvent | import("../index.cjs").UserStorageControllerStateChangeEvent | import("@metamask/accounts-controller").AccountsControllerAccountAddedEvent | import("@metamask/accounts-controller").AccountsControllerAccountRenamedEvent | import("@metamask/network-controller").NetworkControllerNetworkRemovedEvent, "SnapController:handleRequest" | "KeyringController:getState" | "AuthenticationController:isSignedIn" | "AuthenticationController:performSignIn" | "AuthenticationController:performSignOut" | "AuthenticationController:getBearerToken" | "AuthenticationController:getSessionProfile" | "AccountsController:listAccounts" | "AccountsController:updateAccountMetadata" | "NetworkController:getState" | "NetworkController:addNetwork" | "NetworkController:removeNetwork" | "NetworkController:updateNetwork", "KeyringController:lock" | "KeyringController:unlock" | "AccountsController:accountAdded" | "AccountsController:accountRenamed" | "NetworkController:networkRemoved">;
     mockSnapGetPublicKey: jest.Mock<any, any>;
     mockSnapSignMessage: jest.Mock<any, any>;
     mockAuthGetBearerToken: jest.Mock<Promise<string>, []>;
@@ -75,7 +75,7 @@ export declare function mockUserStorageMessenger(overrideMessengers?: OverrideMe
     mockAuthPerformSignIn: jest.Mock<Promise<string>, []>;
     mockAuthIsSignedIn: jest.Mock<boolean, []>;
     mockAuthPerformSignOut: jest.Mock<void, []>;
-    mockKeyringAddNewAccount: jest.Mock<Promise<string>, [accountCount?: number | undefined]>;
+    mockKeyringWithKeyring: jest.Mock<Promise<unknown>, [selector: import("@metamask/keyring-controller").KeyringSelector, operation: (keyring: import("@metamask/keyring-internal-api").EthKeyring<import("@metamask/utils").Json>) => Promise<unknown>]>;
     mockAccountsUpdateAccountMetadata: jest.Mock<void, [accountId: string, metadata: Partial<{
         name: string;
         importTime: number;

package/dist/controllers/user-storage/__fixtures__/mockMessenger.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"mockMessenger.d.cts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/__fixtures__/mockMessenger.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,kCAAkC;AACjE,OAAO,EAAE,SAAS,EAAE,kCAAkC;AAGtD,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,8BAA8B,EAC/B,qBAAW;AAyBZ,KAAK,cAAc,GAAG,eAAe,CACnC,uBAAuB,EACvB,aAAa,CAAC,MAAM,CAAC,CACtB,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAAC,KAAK,CAAC,EAAE;IACvD,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC;CACnC;;;;;;;;;;;;;;;;;;;;;EAiCA;AAED,KAAK,kBAAkB,GAAG;IACxB,aAAa,EAAE,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IACxD,SAAS,EAAE,8BAA8B,CAAC;CAC3C,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,kBAAkB,CAAC,EAAE,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqKxC"}
+{"version":3,"file":"mockMessenger.d.cts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/__fixtures__/mockMessenger.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,kCAAkC;AACjE,OAAO,EAAE,SAAS,EAAE,kCAAkC;AAGtD,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,8BAA8B,EAC/B,qBAAW;AAyBZ,KAAK,cAAc,GAAG,eAAe,CACnC,uBAAuB,EACvB,aAAa,CAAC,MAAM,CAAC,CACtB,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAAC,KAAK,CAAC,EAAE;IACvD,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC;CACnC;;;;;;;;;;;;;;;;;;;;;EAgCA;AAED,KAAK,kBAAkB,GAAG;IACxB,aAAa,EAAE,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IACxD,SAAS,EAAE,8BAA8B,CAAC;CAC3C,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,kBAAkB,CAAC,EAAE,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoKxC"}

package/dist/controllers/user-storage/__fixtures__/mockMessenger.d.mts

@@ -32,7 +32,7 @@ export declare function createCustomUserStorageMessenger(props?: {
             identifierId: string;
             profileId: string;
         }>;
-    } | import("@metamask/keyring-controller").KeyringControllerGetStateAction | import("@metamask/accounts-controller").AccountsControllerListAccountsAction | import("@metamask/accounts-controller").AccountsControllerUpdateAccountMetadataAction | import("@metamask/keyring-controller").KeyringControllerAddNewAccountAction | import("@metamask/network-controller").NetworkControllerGetStateAction | import("@metamask/network-controller").NetworkControllerAddNetworkAction | import("@metamask/network-controller").NetworkControllerRemoveNetworkAction | import("@metamask/network-controller").NetworkControllerUpdateNetworkAction, import("@metamask/keyring-controller").KeyringControllerLockEvent | import("@metamask/keyring-controller").KeyringControllerUnlockEvent | import("../index.mjs").UserStorageControllerStateChangeEvent | import("@metamask/accounts-controller").AccountsControllerAccountAddedEvent | import("@metamask/accounts-controller").AccountsControllerAccountRenamedEvent | import("@metamask/network-controller").NetworkControllerNetworkRemovedEvent, "SnapController:handleRequest" | "KeyringController:getState" | "AuthenticationController:isSignedIn" | "AuthenticationController:performSignIn" | "AuthenticationController:performSignOut" | "AuthenticationController:getBearerToken" | "AuthenticationController:getSessionProfile" | "AccountsController:listAccounts" | "AccountsController:updateAccountMetadata" | "KeyringController:addNewAccount" | "NetworkController:getState" | "NetworkController:addNetwork" | "NetworkController:removeNetwork" | "NetworkController:updateNetwork", "KeyringController:lock" | "KeyringController:unlock" | "AccountsController:accountAdded" | "AccountsController:accountRenamed" | "NetworkController:networkRemoved">;
+    } | import("@metamask/keyring-controller").KeyringControllerGetStateAction | import("@metamask/accounts-controller").AccountsControllerListAccountsAction | import("@metamask/accounts-controller").AccountsControllerUpdateAccountMetadataAction | import("@metamask/network-controller").NetworkControllerGetStateAction | import("@metamask/network-controller").NetworkControllerAddNetworkAction | import("@metamask/network-controller").NetworkControllerRemoveNetworkAction | import("@metamask/network-controller").NetworkControllerUpdateNetworkAction, import("@metamask/keyring-controller").KeyringControllerLockEvent | import("@metamask/keyring-controller").KeyringControllerUnlockEvent | import("../index.mjs").UserStorageControllerStateChangeEvent | import("@metamask/accounts-controller").AccountsControllerAccountAddedEvent | import("@metamask/accounts-controller").AccountsControllerAccountRenamedEvent | import("@metamask/network-controller").NetworkControllerNetworkRemovedEvent, "SnapController:handleRequest" | "KeyringController:getState" | "AuthenticationController:isSignedIn" | "AuthenticationController:performSignIn" | "AuthenticationController:performSignOut" | "AuthenticationController:getBearerToken" | "AuthenticationController:getSessionProfile" | "AccountsController:listAccounts" | "AccountsController:updateAccountMetadata" | "NetworkController:getState" | "NetworkController:addNetwork" | "NetworkController:removeNetwork" | "NetworkController:updateNetwork", "KeyringController:lock" | "KeyringController:unlock" | "AccountsController:accountAdded" | "AccountsController:accountRenamed" | "NetworkController:networkRemoved">;
 };
 type OverrideMessengers = {
     baseMessenger: Messenger<AllowedActions, AllowedEvents>;
@@ -64,7 +64,7 @@ export declare function mockUserStorageMessenger(overrideMessengers?: OverrideMe
             identifierId: string;
             profileId: string;
         }>;
-    } | import("@metamask/keyring-controller").KeyringControllerGetStateAction | import("@metamask/accounts-controller").AccountsControllerListAccountsAction | import("@metamask/accounts-controller").AccountsControllerUpdateAccountMetadataAction | import("@metamask/keyring-controller").KeyringControllerAddNewAccountAction | import("@metamask/network-controller").NetworkControllerGetStateAction | import("@metamask/network-controller").NetworkControllerAddNetworkAction | import("@metamask/network-controller").NetworkControllerRemoveNetworkAction | import("@metamask/network-controller").NetworkControllerUpdateNetworkAction, import("@metamask/keyring-controller").KeyringControllerLockEvent | import("@metamask/keyring-controller").KeyringControllerUnlockEvent | import("../index.mjs").UserStorageControllerStateChangeEvent | import("@metamask/accounts-controller").AccountsControllerAccountAddedEvent | import("@metamask/accounts-controller").AccountsControllerAccountRenamedEvent | import("@metamask/network-controller").NetworkControllerNetworkRemovedEvent, "SnapController:handleRequest" | "KeyringController:getState" | "AuthenticationController:isSignedIn" | "AuthenticationController:performSignIn" | "AuthenticationController:performSignOut" | "AuthenticationController:getBearerToken" | "AuthenticationController:getSessionProfile" | "AccountsController:listAccounts" | "AccountsController:updateAccountMetadata" | "KeyringController:addNewAccount" | "NetworkController:getState" | "NetworkController:addNetwork" | "NetworkController:removeNetwork" | "NetworkController:updateNetwork", "KeyringController:lock" | "KeyringController:unlock" | "AccountsController:accountAdded" | "AccountsController:accountRenamed" | "NetworkController:networkRemoved">;
+    } | import("@metamask/keyring-controller").KeyringControllerGetStateAction | import("@metamask/accounts-controller").AccountsControllerListAccountsAction | import("@metamask/accounts-controller").AccountsControllerUpdateAccountMetadataAction | import("@metamask/network-controller").NetworkControllerGetStateAction | import("@metamask/network-controller").NetworkControllerAddNetworkAction | import("@metamask/network-controller").NetworkControllerRemoveNetworkAction | import("@metamask/network-controller").NetworkControllerUpdateNetworkAction, import("@metamask/keyring-controller").KeyringControllerLockEvent | import("@metamask/keyring-controller").KeyringControllerUnlockEvent | import("../index.mjs").UserStorageControllerStateChangeEvent | import("@metamask/accounts-controller").AccountsControllerAccountAddedEvent | import("@metamask/accounts-controller").AccountsControllerAccountRenamedEvent | import("@metamask/network-controller").NetworkControllerNetworkRemovedEvent, "SnapController:handleRequest" | "KeyringController:getState" | "AuthenticationController:isSignedIn" | "AuthenticationController:performSignIn" | "AuthenticationController:performSignOut" | "AuthenticationController:getBearerToken" | "AuthenticationController:getSessionProfile" | "AccountsController:listAccounts" | "AccountsController:updateAccountMetadata" | "NetworkController:getState" | "NetworkController:addNetwork" | "NetworkController:removeNetwork" | "NetworkController:updateNetwork", "KeyringController:lock" | "KeyringController:unlock" | "AccountsController:accountAdded" | "AccountsController:accountRenamed" | "NetworkController:networkRemoved">;
     mockSnapGetPublicKey: jest.Mock<any, any>;
     mockSnapSignMessage: jest.Mock<any, any>;
     mockAuthGetBearerToken: jest.Mock<Promise<string>, []>;
@@ -75,7 +75,7 @@ export declare function mockUserStorageMessenger(overrideMessengers?: OverrideMe
     mockAuthPerformSignIn: jest.Mock<Promise<string>, []>;
     mockAuthIsSignedIn: jest.Mock<boolean, []>;
     mockAuthPerformSignOut: jest.Mock<void, []>;
-    mockKeyringAddNewAccount: jest.Mock<Promise<string>, [accountCount?: number | undefined]>;
+    mockKeyringWithKeyring: jest.Mock<Promise<unknown>, [selector: import("@metamask/keyring-controller").KeyringSelector, operation: (keyring: import("@metamask/keyring-internal-api").EthKeyring<import("@metamask/utils").Json>) => Promise<unknown>]>;
     mockAccountsUpdateAccountMetadata: jest.Mock<void, [accountId: string, metadata: Partial<{
         name: string;
         importTime: number;

package/dist/controllers/user-storage/__fixtures__/mockMessenger.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"mockMessenger.d.mts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/__fixtures__/mockMessenger.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,kCAAkC;AACjE,OAAO,EAAE,SAAS,EAAE,kCAAkC;AAGtD,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,8BAA8B,EAC/B,qBAAW;AAyBZ,KAAK,cAAc,GAAG,eAAe,CACnC,uBAAuB,EACvB,aAAa,CAAC,MAAM,CAAC,CACtB,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAAC,KAAK,CAAC,EAAE;IACvD,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC;CACnC;;;;;;;;;;;;;;;;;;;;;EAiCA;AAED,KAAK,kBAAkB,GAAG;IACxB,aAAa,EAAE,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IACxD,SAAS,EAAE,8BAA8B,CAAC;CAC3C,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,kBAAkB,CAAC,EAAE,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqKxC"}
+{"version":3,"file":"mockMessenger.d.mts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/__fixtures__/mockMessenger.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,kCAAkC;AACjE,OAAO,EAAE,SAAS,EAAE,kCAAkC;AAGtD,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,8BAA8B,EAC/B,qBAAW;AAyBZ,KAAK,cAAc,GAAG,eAAe,CACnC,uBAAuB,EACvB,aAAa,CAAC,MAAM,CAAC,CACtB,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAAC,KAAK,CAAC,EAAE;IACvD,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC;CACnC;;;;;;;;;;;;;;;;;;;;;EAgCA;AAED,KAAK,kBAAkB,GAAG;IACxB,aAAa,EAAE,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IACxD,SAAS,EAAE,8BAA8B,CAAC;CAC3C,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,kBAAkB,CAAC,EAAE,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAoKxC"}

package/dist/controllers/user-storage/__fixtures__/mockMessenger.mjs

@@ -14,7 +14,6 @@ export function createCustomUserStorageMessenger(props) {
         name: 'UserStorageController',
         allowedActions: [
             'KeyringController:getState',
-            'KeyringController:addNewAccount',
             'SnapController:handleRequest',
             'AuthenticationController:getBearerToken',
             'AuthenticationController:getSessionProfile',
@@ -61,7 +60,7 @@ export function mockUserStorageMessenger(overrideMessengers) {
     const mockAuthPerformSignIn = typedMockFn('AuthenticationController:performSignIn').mockResolvedValue('New Access Token');
     const mockAuthIsSignedIn = typedMockFn('AuthenticationController:isSignedIn').mockReturnValue(true);
     const mockAuthPerformSignOut = typedMockFn('AuthenticationController:performSignOut');
-    const mockKeyringAddNewAccount = typedMockFn('KeyringController:addNewAccount');
+    const mockKeyringWithKeyring = typedMockFn('KeyringController:withKeyring');
     // Untyped mock as there is a TS(2742) issue.
     // This will return `InternalAccount[]`
     const mockAccountsListAccounts = jest.fn();
@@ -105,8 +104,9 @@ export function mockUserStorageMessenger(overrideMessengers) {
         if (actionType === 'KeyringController:getState') {
             return { isUnlocked: true };
         }
-        if (actionType === 'KeyringController:addNewAccount') {
-            return mockKeyringAddNewAccount();
+        if (actionType === 'KeyringController:withKeyring') {
+            const [, ...params] = typedArgs;
+            return mockKeyringWithKeyring(...params);
         }
         if (actionType === 'AccountsController:listAccounts') {
             return mockAccountsListAccounts();
@@ -142,7 +142,7 @@ export function mockUserStorageMessenger(overrideMessengers) {
         mockAuthPerformSignIn,
         mockAuthIsSignedIn,
         mockAuthPerformSignOut,
-        mockKeyringAddNewAccount,
+        mockKeyringWithKeyring,
         mockAccountsUpdateAccountMetadata,
         mockAccountsListAccounts,
         mockNetworkControllerGetState,

package/dist/controllers/user-storage/__fixtures__/mockMessenger.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"mockMessenger.mjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/__fixtures__/mockMessenger.ts"],"names":[],"mappings":"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","sourcesContent":["import type { NotNamespacedBy } from '@metamask/base-controller';\nimport { Messenger } from '@metamask/base-controller';\n\nimport { MOCK_STORAGE_KEY_SIGNATURE } from '.';\nimport type {\n  AllowedActions,\n  AllowedEvents,\n  UserStorageControllerMessenger,\n} from '..';\n\ntype GetHandler<ActionType extends AllowedActions['type']> = Extract<\n  AllowedActions,\n  { type: ActionType }\n>['handler'];\n\ntype CallParams = {\n  [K in AllowedActions['type']]: [\n    K,\n    ...Parameters<Extract<AllowedActions, { type: K }>['handler']>,\n  ];\n}[AllowedActions['type']];\n\nconst typedMockFn = <\n  ActionType extends AllowedActions['type'],\n  Handler = GetHandler<ActionType>,\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  Func extends (...args: any) => any = Handler extends (...args: any[]) => any\n    ? Handler\n    : never,\n>(\n  _type: ActionType,\n) => jest.fn<ReturnType<Func>, Parameters<Func>>();\n\ntype ExternalEvents = NotNamespacedBy<\n  'UserStorageController',\n  AllowedEvents['type']\n>;\n\n/**\n * creates a custom user storage messenger, in case tests need different permissions\n *\n * @param props - overrides\n * @param props.overrideEvents - override events\n * @returns base messenger, and messenger. You can pass this into the mocks below to mock messenger calls\n */\nexport function createCustomUserStorageMessenger(props?: {\n  overrideEvents?: ExternalEvents[];\n}) {\n  const baseMessenger = new Messenger<AllowedActions, AllowedEvents>();\n  const messenger = baseMessenger.getRestricted({\n    name: 'UserStorageController',\n    allowedActions: [\n      'KeyringController:getState',\n      'KeyringController:addNewAccount',\n      'SnapController:handleRequest',\n      'AuthenticationController:getBearerToken',\n      'AuthenticationController:getSessionProfile',\n      'AuthenticationController:isSignedIn',\n      'AuthenticationController:performSignOut',\n      'AuthenticationController:performSignIn',\n      'AccountsController:listAccounts',\n      'AccountsController:updateAccountMetadata',\n      'NetworkController:getState',\n      'NetworkController:addNetwork',\n      'NetworkController:updateNetwork',\n      'NetworkController:removeNetwork',\n    ],\n    allowedEvents: props?.overrideEvents ?? [\n      'KeyringController:lock',\n      'KeyringController:unlock',\n      'AccountsController:accountAdded',\n      'AccountsController:accountRenamed',\n      'NetworkController:networkRemoved',\n    ],\n  });\n\n  return {\n    baseMessenger,\n    messenger,\n  };\n}\n\ntype OverrideMessengers = {\n  baseMessenger: Messenger<AllowedActions, AllowedEvents>;\n  messenger: UserStorageControllerMessenger;\n};\n\n/**\n * Jest Mock Utility to generate a mock User Storage Messenger\n *\n * @param overrideMessengers - override messengers if need to modify the underlying permissions\n * @returns series of mocks to actions that can be called\n */\nexport function mockUserStorageMessenger(\n  overrideMessengers?: OverrideMessengers,\n) {\n  const { baseMessenger, messenger } =\n    overrideMessengers ?? createCustomUserStorageMessenger();\n\n  const mockSnapGetPublicKey = jest.fn().mockResolvedValue('MOCK_PUBLIC_KEY');\n  const mockSnapSignMessage = jest\n    .fn()\n    .mockResolvedValue(MOCK_STORAGE_KEY_SIGNATURE);\n\n  const mockAuthGetBearerToken = typedMockFn(\n    'AuthenticationController:getBearerToken',\n  ).mockResolvedValue('MOCK_BEARER_TOKEN');\n\n  const mockAuthGetSessionProfile = typedMockFn(\n    'AuthenticationController:getSessionProfile',\n  ).mockResolvedValue({\n    identifierId: '',\n    profileId: 'MOCK_PROFILE_ID',\n  });\n\n  const mockAuthPerformSignIn = typedMockFn(\n    'AuthenticationController:performSignIn',\n  ).mockResolvedValue('New Access Token');\n\n  const mockAuthIsSignedIn = typedMockFn(\n    'AuthenticationController:isSignedIn',\n  ).mockReturnValue(true);\n\n  const mockAuthPerformSignOut = typedMockFn(\n    'AuthenticationController:performSignOut',\n  );\n\n  const mockKeyringAddNewAccount = typedMockFn(\n    'KeyringController:addNewAccount',\n  );\n\n  // Untyped mock as there is a TS(2742) issue.\n  // This will return `InternalAccount[]`\n  const mockAccountsListAccounts = jest.fn();\n\n  const mockAccountsUpdateAccountMetadata = typedMockFn(\n    'AccountsController:updateAccountMetadata',\n  ).mockResolvedValue(true as never);\n\n  const mockNetworkControllerGetState = typedMockFn(\n    'NetworkController:getState',\n  ).mockReturnValue({\n    selectedNetworkClientId: '',\n    networksMetadata: {},\n    networkConfigurationsByChainId: {},\n  });\n\n  const mockNetworkControllerAddNetwork = typedMockFn(\n    'NetworkController:addNetwork',\n  );\n\n  const mockNetworkControllerRemoveNetwork = typedMockFn(\n    'NetworkController:removeNetwork',\n  );\n\n  const mockNetworkControllerUpdateNetwork = typedMockFn(\n    'NetworkController:updateNetwork',\n  );\n\n  jest.spyOn(messenger, 'call').mockImplementation((...args) => {\n    const typedArgs = args as unknown as CallParams;\n    const [actionType] = typedArgs;\n\n    if (actionType === 'SnapController:handleRequest') {\n      const [, params] = typedArgs;\n      if (params.request.method === 'getPublicKey') {\n        return mockSnapGetPublicKey();\n      }\n\n      if (params.request.method === 'signMessage') {\n        return mockSnapSignMessage();\n      }\n\n      throw new Error(\n        `MOCK_FAIL - unsupported SnapController:handleRequest call: ${\n          params.request.method as string\n        }`,\n      );\n    }\n\n    if (actionType === 'AuthenticationController:getBearerToken') {\n      return mockAuthGetBearerToken();\n    }\n\n    if (actionType === 'AuthenticationController:getSessionProfile') {\n      return mockAuthGetSessionProfile();\n    }\n\n    if (actionType === 'AuthenticationController:performSignIn') {\n      return mockAuthPerformSignIn();\n    }\n\n    if (actionType === 'AuthenticationController:isSignedIn') {\n      return mockAuthIsSignedIn();\n    }\n\n    if (actionType === 'AuthenticationController:performSignOut') {\n      return mockAuthPerformSignOut();\n    }\n\n    if (actionType === 'KeyringController:getState') {\n      return { isUnlocked: true };\n    }\n\n    if (actionType === 'KeyringController:addNewAccount') {\n      return mockKeyringAddNewAccount();\n    }\n\n    if (actionType === 'AccountsController:listAccounts') {\n      return mockAccountsListAccounts();\n    }\n\n    if (typedArgs[0] === 'AccountsController:updateAccountMetadata') {\n      const [, ...params] = typedArgs;\n      return mockAccountsUpdateAccountMetadata(...params);\n    }\n\n    if (actionType === 'NetworkController:getState') {\n      return mockNetworkControllerGetState();\n    }\n\n    if (actionType === 'NetworkController:addNetwork') {\n      const [, ...params] = typedArgs;\n      return mockNetworkControllerAddNetwork(...params);\n    }\n\n    if (actionType === 'NetworkController:removeNetwork') {\n      const [, ...params] = typedArgs;\n      return mockNetworkControllerRemoveNetwork(...params);\n    }\n\n    if (actionType === 'NetworkController:updateNetwork') {\n      const [, ...params] = typedArgs;\n      return mockNetworkControllerUpdateNetwork(...params);\n    }\n\n    throw new Error(\n      `MOCK_FAIL - unsupported messenger call: ${actionType as string}`,\n    );\n  });\n\n  return {\n    baseMessenger,\n    messenger,\n    mockSnapGetPublicKey,\n    mockSnapSignMessage,\n    mockAuthGetBearerToken,\n    mockAuthGetSessionProfile,\n    mockAuthPerformSignIn,\n    mockAuthIsSignedIn,\n    mockAuthPerformSignOut,\n    mockKeyringAddNewAccount,\n    mockAccountsUpdateAccountMetadata,\n    mockAccountsListAccounts,\n    mockNetworkControllerGetState,\n    mockNetworkControllerAddNetwork,\n    mockNetworkControllerRemoveNetwork,\n    mockNetworkControllerUpdateNetwork,\n  };\n}\n"]}
+{"version":3,"file":"mockMessenger.mjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/__fixtures__/mockMessenger.ts"],"names":[],"mappings":"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","sourcesContent":["import type { NotNamespacedBy } from '@metamask/base-controller';\nimport { Messenger } from '@metamask/base-controller';\n\nimport { MOCK_STORAGE_KEY_SIGNATURE } from '.';\nimport type {\n  AllowedActions,\n  AllowedEvents,\n  UserStorageControllerMessenger,\n} from '..';\n\ntype GetHandler<ActionType extends AllowedActions['type']> = Extract<\n  AllowedActions,\n  { type: ActionType }\n>['handler'];\n\ntype CallParams = {\n  [K in AllowedActions['type']]: [\n    K,\n    ...Parameters<Extract<AllowedActions, { type: K }>['handler']>,\n  ];\n}[AllowedActions['type']];\n\nconst typedMockFn = <\n  ActionType extends AllowedActions['type'],\n  Handler = GetHandler<ActionType>,\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  Func extends (...args: any) => any = Handler extends (...args: any[]) => any\n    ? Handler\n    : never,\n>(\n  _type: ActionType,\n) => jest.fn<ReturnType<Func>, Parameters<Func>>();\n\ntype ExternalEvents = NotNamespacedBy<\n  'UserStorageController',\n  AllowedEvents['type']\n>;\n\n/**\n * creates a custom user storage messenger, in case tests need different permissions\n *\n * @param props - overrides\n * @param props.overrideEvents - override events\n * @returns base messenger, and messenger. You can pass this into the mocks below to mock messenger calls\n */\nexport function createCustomUserStorageMessenger(props?: {\n  overrideEvents?: ExternalEvents[];\n}) {\n  const baseMessenger = new Messenger<AllowedActions, AllowedEvents>();\n  const messenger = baseMessenger.getRestricted({\n    name: 'UserStorageController',\n    allowedActions: [\n      'KeyringController:getState',\n      'SnapController:handleRequest',\n      'AuthenticationController:getBearerToken',\n      'AuthenticationController:getSessionProfile',\n      'AuthenticationController:isSignedIn',\n      'AuthenticationController:performSignOut',\n      'AuthenticationController:performSignIn',\n      'AccountsController:listAccounts',\n      'AccountsController:updateAccountMetadata',\n      'NetworkController:getState',\n      'NetworkController:addNetwork',\n      'NetworkController:updateNetwork',\n      'NetworkController:removeNetwork',\n    ],\n    allowedEvents: props?.overrideEvents ?? [\n      'KeyringController:lock',\n      'KeyringController:unlock',\n      'AccountsController:accountAdded',\n      'AccountsController:accountRenamed',\n      'NetworkController:networkRemoved',\n    ],\n  });\n\n  return {\n    baseMessenger,\n    messenger,\n  };\n}\n\ntype OverrideMessengers = {\n  baseMessenger: Messenger<AllowedActions, AllowedEvents>;\n  messenger: UserStorageControllerMessenger;\n};\n\n/**\n * Jest Mock Utility to generate a mock User Storage Messenger\n *\n * @param overrideMessengers - override messengers if need to modify the underlying permissions\n * @returns series of mocks to actions that can be called\n */\nexport function mockUserStorageMessenger(\n  overrideMessengers?: OverrideMessengers,\n) {\n  const { baseMessenger, messenger } =\n    overrideMessengers ?? createCustomUserStorageMessenger();\n\n  const mockSnapGetPublicKey = jest.fn().mockResolvedValue('MOCK_PUBLIC_KEY');\n  const mockSnapSignMessage = jest\n    .fn()\n    .mockResolvedValue(MOCK_STORAGE_KEY_SIGNATURE);\n\n  const mockAuthGetBearerToken = typedMockFn(\n    'AuthenticationController:getBearerToken',\n  ).mockResolvedValue('MOCK_BEARER_TOKEN');\n\n  const mockAuthGetSessionProfile = typedMockFn(\n    'AuthenticationController:getSessionProfile',\n  ).mockResolvedValue({\n    identifierId: '',\n    profileId: 'MOCK_PROFILE_ID',\n  });\n\n  const mockAuthPerformSignIn = typedMockFn(\n    'AuthenticationController:performSignIn',\n  ).mockResolvedValue('New Access Token');\n\n  const mockAuthIsSignedIn = typedMockFn(\n    'AuthenticationController:isSignedIn',\n  ).mockReturnValue(true);\n\n  const mockAuthPerformSignOut = typedMockFn(\n    'AuthenticationController:performSignOut',\n  );\n\n  const mockKeyringWithKeyring = typedMockFn('KeyringController:withKeyring');\n\n  // Untyped mock as there is a TS(2742) issue.\n  // This will return `InternalAccount[]`\n  const mockAccountsListAccounts = jest.fn();\n\n  const mockAccountsUpdateAccountMetadata = typedMockFn(\n    'AccountsController:updateAccountMetadata',\n  ).mockResolvedValue(true as never);\n\n  const mockNetworkControllerGetState = typedMockFn(\n    'NetworkController:getState',\n  ).mockReturnValue({\n    selectedNetworkClientId: '',\n    networksMetadata: {},\n    networkConfigurationsByChainId: {},\n  });\n\n  const mockNetworkControllerAddNetwork = typedMockFn(\n    'NetworkController:addNetwork',\n  );\n\n  const mockNetworkControllerRemoveNetwork = typedMockFn(\n    'NetworkController:removeNetwork',\n  );\n\n  const mockNetworkControllerUpdateNetwork = typedMockFn(\n    'NetworkController:updateNetwork',\n  );\n\n  jest.spyOn(messenger, 'call').mockImplementation((...args) => {\n    const typedArgs = args as unknown as CallParams;\n    const [actionType] = typedArgs;\n\n    if (actionType === 'SnapController:handleRequest') {\n      const [, params] = typedArgs;\n      if (params.request.method === 'getPublicKey') {\n        return mockSnapGetPublicKey();\n      }\n\n      if (params.request.method === 'signMessage') {\n        return mockSnapSignMessage();\n      }\n\n      throw new Error(\n        `MOCK_FAIL - unsupported SnapController:handleRequest call: ${\n          params.request.method as string\n        }`,\n      );\n    }\n\n    if (actionType === 'AuthenticationController:getBearerToken') {\n      return mockAuthGetBearerToken();\n    }\n\n    if (actionType === 'AuthenticationController:getSessionProfile') {\n      return mockAuthGetSessionProfile();\n    }\n\n    if (actionType === 'AuthenticationController:performSignIn') {\n      return mockAuthPerformSignIn();\n    }\n\n    if (actionType === 'AuthenticationController:isSignedIn') {\n      return mockAuthIsSignedIn();\n    }\n\n    if (actionType === 'AuthenticationController:performSignOut') {\n      return mockAuthPerformSignOut();\n    }\n\n    if (actionType === 'KeyringController:getState') {\n      return { isUnlocked: true };\n    }\n\n    if (actionType === 'KeyringController:withKeyring') {\n      const [, ...params] = typedArgs;\n      return mockKeyringWithKeyring(...params);\n    }\n\n    if (actionType === 'AccountsController:listAccounts') {\n      return mockAccountsListAccounts();\n    }\n\n    if (typedArgs[0] === 'AccountsController:updateAccountMetadata') {\n      const [, ...params] = typedArgs;\n      return mockAccountsUpdateAccountMetadata(...params);\n    }\n\n    if (actionType === 'NetworkController:getState') {\n      return mockNetworkControllerGetState();\n    }\n\n    if (actionType === 'NetworkController:addNetwork') {\n      const [, ...params] = typedArgs;\n      return mockNetworkControllerAddNetwork(...params);\n    }\n\n    if (actionType === 'NetworkController:removeNetwork') {\n      const [, ...params] = typedArgs;\n      return mockNetworkControllerRemoveNetwork(...params);\n    }\n\n    if (actionType === 'NetworkController:updateNetwork') {\n      const [, ...params] = typedArgs;\n      return mockNetworkControllerUpdateNetwork(...params);\n    }\n\n    throw new Error(\n      `MOCK_FAIL - unsupported messenger call: ${actionType as string}`,\n    );\n  });\n\n  return {\n    baseMessenger,\n    messenger,\n    mockSnapGetPublicKey,\n    mockSnapSignMessage,\n    mockAuthGetBearerToken,\n    mockAuthGetSessionProfile,\n    mockAuthPerformSignIn,\n    mockAuthIsSignedIn,\n    mockAuthPerformSignOut,\n    mockKeyringWithKeyring,\n    mockAccountsUpdateAccountMetadata,\n    mockAccountsListAccounts,\n    mockNetworkControllerGetState,\n    mockNetworkControllerAddNetwork,\n    mockNetworkControllerRemoveNetwork,\n    mockNetworkControllerUpdateNetwork,\n  };\n}\n"]}

package/dist/controllers/user-storage/account-syncing/__fixtures__/test-utils.cjs

@@ -15,7 +15,7 @@ const utils_1 = require("../utils.cjs");
  */
 function mockUserStorageMessengerForAccountSyncing(options) {
     const messengerMocks = (0, mockMessenger_1.mockUserStorageMessenger)();
-    messengerMocks.mockKeyringAddNewAccount.mockImplementation(async () => {
+    messengerMocks.mockKeyringWithKeyring.mockImplementation(async () => {
         messengerMocks.baseMessenger.publish('AccountsController:accountAdded', mockAccounts_1.MOCK_INTERNAL_ACCOUNTS.ONE[0]);
         return mockAccounts_1.MOCK_INTERNAL_ACCOUNTS.ONE[0].address;
     });

package/dist/controllers/user-storage/account-syncing/__fixtures__/test-utils.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"test-utils.cjs","sourceRoot":"","sources":["../../../../../src/controllers/user-storage/account-syncing/__fixtures__/test-utils.ts"],"names":[],"mappings":";;;AAEA,qDAAwD;AACxD,wEAAiE;AACjE,wEAA4E;AAC5E,wCAAkE;AAElE;;;;;;;GAOG;AACH,SAAgB,yCAAyC,CAAC,OAIzD;IACC,MAAM,cAAc,GAAG,IAAA,wCAAwB,GAAE,CAAC;IAElD,cAAc,CAAC,wBAAwB,CAAC,kBAAkB,CAAC,KAAK,IAAI,EAAE;QACpE,cAAc,CAAC,aAAa,CAAC,OAAO,CAClC,iCAAiC,EACjC,qCAAsB,CAAC,GAAG,CAAC,CAAC,CAAoB,CACjD,CAAC;QACF,OAAO,qCAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,cAAc,CAAC,wBAAwB,CAAC,eAAe,CACrD,CAAC,OAAO,EAAE,QAAQ,EAAE,YAAY;QAC9B,qCAAsB,CAAC,GAAG,CAAsB,CACnD,CAAC;IAEF,OAAO,cAAc,CAAC;AACxB,CAAC;AArBD,8FAqBC;AAED;;;;;;GAMG;AACH,SAAgB,wCAAwC,CACtD,IAAiC,EACjC,UAAkB;IAElB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC;QAC1C,IAAA,6BAAgB,EAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC;QAC/C,IAAI,CAAC,SAAS,CAAC,IAAA,8CAAsC,EAAC,UAAU,CAAC,CAAC;KACnE,CAAC,CAAC;AACL,CAAC;AARD,4FAQC;AAED;;;;;;GAMG;AACH,SAAgB,wCAAwC,CACtD,IAAc,EACd,UAAkB;IAElB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC3B,IAAA,6BAAgB,EAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,CAChD,CAAC;AACJ,CAAC;AAPD,4FAOC","sourcesContent":["import type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport { MOCK_INTERNAL_ACCOUNTS } from './mockAccounts';\nimport { createSHA256Hash } from '../../../../shared/encryption';\nimport { mockUserStorageMessenger } from '../../__fixtures__/mockMessenger';\nimport { mapInternalAccountToUserStorageAccount } from '../utils';\n\n/**\n * Test Utility - create a mock user storage messenger for account syncing tests\n *\n * @param options - options for the mock messenger\n * @param options.accounts - options for the accounts part of the controller\n * @param options.accounts.accountsList - list of accounts to return for the 'AccountsController:listAccounts' action\n * @returns Mock User Storage Messenger\n */\nexport function mockUserStorageMessengerForAccountSyncing(options?: {\n  accounts?: {\n    accountsList?: InternalAccount[];\n  };\n}) {\n  const messengerMocks = mockUserStorageMessenger();\n\n  messengerMocks.mockKeyringAddNewAccount.mockImplementation(async () => {\n    messengerMocks.baseMessenger.publish(\n      'AccountsController:accountAdded',\n      MOCK_INTERNAL_ACCOUNTS.ONE[0] as InternalAccount,\n    );\n    return MOCK_INTERNAL_ACCOUNTS.ONE[0].address;\n  });\n\n  messengerMocks.mockAccountsListAccounts.mockReturnValue(\n    (options?.accounts?.accountsList ??\n      MOCK_INTERNAL_ACCOUNTS.ALL) as InternalAccount[],\n  );\n\n  return messengerMocks;\n}\n\n/**\n * Test Utility - creates a realistic expected batch upsert payload\n *\n * @param data - data supposed to be upserted\n * @param storageKey - storage key\n * @returns expected body\n */\nexport function createExpectedAccountSyncBatchUpsertBody(\n  data: [string, InternalAccount][],\n  storageKey: string,\n) {\n  return data.map(([entryKey, entryValue]) => [\n    createSHA256Hash(String(entryKey) + storageKey),\n    JSON.stringify(mapInternalAccountToUserStorageAccount(entryValue)),\n  ]);\n}\n\n/**\n * Test Utility - creates a realistic expected batch delete payload\n *\n * @param data - data supposed to be deleted\n * @param storageKey - storage key\n * @returns expected body\n */\nexport function createExpectedAccountSyncBatchDeleteBody(\n  data: string[],\n  storageKey: string,\n) {\n  return data.map((entryKey) =>\n    createSHA256Hash(String(entryKey) + storageKey),\n  );\n}\n"]}
+{"version":3,"file":"test-utils.cjs","sourceRoot":"","sources":["../../../../../src/controllers/user-storage/account-syncing/__fixtures__/test-utils.ts"],"names":[],"mappings":";;;AAEA,qDAAwD;AACxD,wEAAiE;AACjE,wEAA4E;AAC5E,wCAAkE;AAElE;;;;;;;GAOG;AACH,SAAgB,yCAAyC,CAAC,OAIzD;IACC,MAAM,cAAc,GAAG,IAAA,wCAAwB,GAAE,CAAC;IAElD,cAAc,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,KAAK,IAAI,EAAE;QAClE,cAAc,CAAC,aAAa,CAAC,OAAO,CAClC,iCAAiC,EACjC,qCAAsB,CAAC,GAAG,CAAC,CAAC,CAAoB,CACjD,CAAC;QACF,OAAO,qCAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,cAAc,CAAC,wBAAwB,CAAC,eAAe,CACrD,CAAC,OAAO,EAAE,QAAQ,EAAE,YAAY;QAC9B,qCAAsB,CAAC,GAAG,CAAsB,CACnD,CAAC;IAEF,OAAO,cAAc,CAAC;AACxB,CAAC;AArBD,8FAqBC;AAED;;;;;;GAMG;AACH,SAAgB,wCAAwC,CACtD,IAAiC,EACjC,UAAkB;IAElB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC;QAC1C,IAAA,6BAAgB,EAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC;QAC/C,IAAI,CAAC,SAAS,CAAC,IAAA,8CAAsC,EAAC,UAAU,CAAC,CAAC;KACnE,CAAC,CAAC;AACL,CAAC;AARD,4FAQC;AAED;;;;;;GAMG;AACH,SAAgB,wCAAwC,CACtD,IAAc,EACd,UAAkB;IAElB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC3B,IAAA,6BAAgB,EAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,CAChD,CAAC;AACJ,CAAC;AAPD,4FAOC","sourcesContent":["import type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport { MOCK_INTERNAL_ACCOUNTS } from './mockAccounts';\nimport { createSHA256Hash } from '../../../../shared/encryption';\nimport { mockUserStorageMessenger } from '../../__fixtures__/mockMessenger';\nimport { mapInternalAccountToUserStorageAccount } from '../utils';\n\n/**\n * Test Utility - create a mock user storage messenger for account syncing tests\n *\n * @param options - options for the mock messenger\n * @param options.accounts - options for the accounts part of the controller\n * @param options.accounts.accountsList - list of accounts to return for the 'AccountsController:listAccounts' action\n * @returns Mock User Storage Messenger\n */\nexport function mockUserStorageMessengerForAccountSyncing(options?: {\n  accounts?: {\n    accountsList?: InternalAccount[];\n  };\n}) {\n  const messengerMocks = mockUserStorageMessenger();\n\n  messengerMocks.mockKeyringWithKeyring.mockImplementation(async () => {\n    messengerMocks.baseMessenger.publish(\n      'AccountsController:accountAdded',\n      MOCK_INTERNAL_ACCOUNTS.ONE[0] as InternalAccount,\n    );\n    return MOCK_INTERNAL_ACCOUNTS.ONE[0].address;\n  });\n\n  messengerMocks.mockAccountsListAccounts.mockReturnValue(\n    (options?.accounts?.accountsList ??\n      MOCK_INTERNAL_ACCOUNTS.ALL) as InternalAccount[],\n  );\n\n  return messengerMocks;\n}\n\n/**\n * Test Utility - creates a realistic expected batch upsert payload\n *\n * @param data - data supposed to be upserted\n * @param storageKey - storage key\n * @returns expected body\n */\nexport function createExpectedAccountSyncBatchUpsertBody(\n  data: [string, InternalAccount][],\n  storageKey: string,\n) {\n  return data.map(([entryKey, entryValue]) => [\n    createSHA256Hash(String(entryKey) + storageKey),\n    JSON.stringify(mapInternalAccountToUserStorageAccount(entryValue)),\n  ]);\n}\n\n/**\n * Test Utility - creates a realistic expected batch delete payload\n *\n * @param data - data supposed to be deleted\n * @param storageKey - storage key\n * @returns expected body\n */\nexport function createExpectedAccountSyncBatchDeleteBody(\n  data: string[],\n  storageKey: string,\n) {\n  return data.map((entryKey) =>\n    createSHA256Hash(String(entryKey) + storageKey),\n  );\n}\n"]}

package/dist/controllers/user-storage/account-syncing/__fixtures__/test-utils.d.cts

@@ -32,7 +32,7 @@ export declare function mockUserStorageMessengerForAccountSyncing(options?: {
             identifierId: string;
             profileId: string;
         }>;
-    } | import("@metamask/keyring-controller").KeyringControllerGetStateAction | import("@metamask/accounts-controller").AccountsControllerListAccountsAction | import("@metamask/accounts-controller").AccountsControllerUpdateAccountMetadataAction | import("@metamask/keyring-controller").KeyringControllerAddNewAccountAction | import("@metamask/network-controller").NetworkControllerGetStateAction | import("@metamask/network-controller").NetworkControllerAddNetworkAction | import("@metamask/network-controller").NetworkControllerRemoveNetworkAction | import("@metamask/network-controller").NetworkControllerUpdateNetworkAction, import("@metamask/keyring-controller").KeyringControllerLockEvent | import("@metamask/keyring-controller").KeyringControllerUnlockEvent | import("../../index.cjs").UserStorageControllerStateChangeEvent | import("@metamask/accounts-controller").AccountsControllerAccountAddedEvent | import("@metamask/accounts-controller").AccountsControllerAccountRenamedEvent | import("@metamask/network-controller").NetworkControllerNetworkRemovedEvent, "SnapController:handleRequest" | "KeyringController:getState" | "AuthenticationController:isSignedIn" | "AuthenticationController:performSignIn" | "AuthenticationController:performSignOut" | "AuthenticationController:getBearerToken" | "AuthenticationController:getSessionProfile" | "AccountsController:listAccounts" | "AccountsController:updateAccountMetadata" | "KeyringController:addNewAccount" | "NetworkController:getState" | "NetworkController:addNetwork" | "NetworkController:removeNetwork" | "NetworkController:updateNetwork", "KeyringController:lock" | "KeyringController:unlock" | "AccountsController:accountAdded" | "AccountsController:accountRenamed" | "NetworkController:networkRemoved">;
+    } | import("@metamask/keyring-controller").KeyringControllerGetStateAction | import("@metamask/accounts-controller").AccountsControllerListAccountsAction | import("@metamask/accounts-controller").AccountsControllerUpdateAccountMetadataAction | import("@metamask/network-controller").NetworkControllerGetStateAction | import("@metamask/network-controller").NetworkControllerAddNetworkAction | import("@metamask/network-controller").NetworkControllerRemoveNetworkAction | import("@metamask/network-controller").NetworkControllerUpdateNetworkAction, import("@metamask/keyring-controller").KeyringControllerLockEvent | import("@metamask/keyring-controller").KeyringControllerUnlockEvent | import("../../index.cjs").UserStorageControllerStateChangeEvent | import("@metamask/accounts-controller").AccountsControllerAccountAddedEvent | import("@metamask/accounts-controller").AccountsControllerAccountRenamedEvent | import("@metamask/network-controller").NetworkControllerNetworkRemovedEvent, "SnapController:handleRequest" | "KeyringController:getState" | "AuthenticationController:isSignedIn" | "AuthenticationController:performSignIn" | "AuthenticationController:performSignOut" | "AuthenticationController:getBearerToken" | "AuthenticationController:getSessionProfile" | "AccountsController:listAccounts" | "AccountsController:updateAccountMetadata" | "NetworkController:getState" | "NetworkController:addNetwork" | "NetworkController:removeNetwork" | "NetworkController:updateNetwork", "KeyringController:lock" | "KeyringController:unlock" | "AccountsController:accountAdded" | "AccountsController:accountRenamed" | "NetworkController:networkRemoved">;
     mockSnapGetPublicKey: jest.Mock<any, any>;
     mockSnapSignMessage: jest.Mock<any, any>;
     mockAuthGetBearerToken: jest.Mock<Promise<string>, []>;
@@ -43,7 +43,7 @@ export declare function mockUserStorageMessengerForAccountSyncing(options?: {
     mockAuthPerformSignIn: jest.Mock<Promise<string>, []>;
     mockAuthIsSignedIn: jest.Mock<boolean, []>;
     mockAuthPerformSignOut: jest.Mock<void, []>;
-    mockKeyringAddNewAccount: jest.Mock<Promise<string>, [accountCount?: number | undefined]>;
+    mockKeyringWithKeyring: jest.Mock<Promise<unknown>, [selector: import("@metamask/keyring-controller").KeyringSelector, operation: (keyring: import("@metamask/keyring-internal-api").EthKeyring<import("@metamask/utils").Json>) => Promise<unknown>]>;
     mockAccountsUpdateAccountMetadata: jest.Mock<void, [accountId: string, metadata: Partial<{
         name: string;
         importTime: number;

package/dist/controllers/user-storage/account-syncing/__fixtures__/test-utils.d.mts

@@ -32,7 +32,7 @@ export declare function mockUserStorageMessengerForAccountSyncing(options?: {
             identifierId: string;
             profileId: string;
         }>;
-    } | import("@metamask/keyring-controller").KeyringControllerGetStateAction | import("@metamask/accounts-controller").AccountsControllerListAccountsAction | import("@metamask/accounts-controller").AccountsControllerUpdateAccountMetadataAction | import("@metamask/keyring-controller").KeyringControllerAddNewAccountAction | import("@metamask/network-controller").NetworkControllerGetStateAction | import("@metamask/network-controller").NetworkControllerAddNetworkAction | import("@metamask/network-controller").NetworkControllerRemoveNetworkAction | import("@metamask/network-controller").NetworkControllerUpdateNetworkAction, import("@metamask/keyring-controller").KeyringControllerLockEvent | import("@metamask/keyring-controller").KeyringControllerUnlockEvent | import("../../index.mjs").UserStorageControllerStateChangeEvent | import("@metamask/accounts-controller").AccountsControllerAccountAddedEvent | import("@metamask/accounts-controller").AccountsControllerAccountRenamedEvent | import("@metamask/network-controller").NetworkControllerNetworkRemovedEvent, "SnapController:handleRequest" | "KeyringController:getState" | "AuthenticationController:isSignedIn" | "AuthenticationController:performSignIn" | "AuthenticationController:performSignOut" | "AuthenticationController:getBearerToken" | "AuthenticationController:getSessionProfile" | "AccountsController:listAccounts" | "AccountsController:updateAccountMetadata" | "KeyringController:addNewAccount" | "NetworkController:getState" | "NetworkController:addNetwork" | "NetworkController:removeNetwork" | "NetworkController:updateNetwork", "KeyringController:lock" | "KeyringController:unlock" | "AccountsController:accountAdded" | "AccountsController:accountRenamed" | "NetworkController:networkRemoved">;
+    } | import("@metamask/keyring-controller").KeyringControllerGetStateAction | import("@metamask/accounts-controller").AccountsControllerListAccountsAction | import("@metamask/accounts-controller").AccountsControllerUpdateAccountMetadataAction | import("@metamask/network-controller").NetworkControllerGetStateAction | import("@metamask/network-controller").NetworkControllerAddNetworkAction | import("@metamask/network-controller").NetworkControllerRemoveNetworkAction | import("@metamask/network-controller").NetworkControllerUpdateNetworkAction, import("@metamask/keyring-controller").KeyringControllerLockEvent | import("@metamask/keyring-controller").KeyringControllerUnlockEvent | import("../../index.mjs").UserStorageControllerStateChangeEvent | import("@metamask/accounts-controller").AccountsControllerAccountAddedEvent | import("@metamask/accounts-controller").AccountsControllerAccountRenamedEvent | import("@metamask/network-controller").NetworkControllerNetworkRemovedEvent, "SnapController:handleRequest" | "KeyringController:getState" | "AuthenticationController:isSignedIn" | "AuthenticationController:performSignIn" | "AuthenticationController:performSignOut" | "AuthenticationController:getBearerToken" | "AuthenticationController:getSessionProfile" | "AccountsController:listAccounts" | "AccountsController:updateAccountMetadata" | "NetworkController:getState" | "NetworkController:addNetwork" | "NetworkController:removeNetwork" | "NetworkController:updateNetwork", "KeyringController:lock" | "KeyringController:unlock" | "AccountsController:accountAdded" | "AccountsController:accountRenamed" | "NetworkController:networkRemoved">;
     mockSnapGetPublicKey: jest.Mock<any, any>;
     mockSnapSignMessage: jest.Mock<any, any>;
     mockAuthGetBearerToken: jest.Mock<Promise<string>, []>;
@@ -43,7 +43,7 @@ export declare function mockUserStorageMessengerForAccountSyncing(options?: {
     mockAuthPerformSignIn: jest.Mock<Promise<string>, []>;
     mockAuthIsSignedIn: jest.Mock<boolean, []>;
     mockAuthPerformSignOut: jest.Mock<void, []>;
-    mockKeyringAddNewAccount: jest.Mock<Promise<string>, [accountCount?: number | undefined]>;
+    mockKeyringWithKeyring: jest.Mock<Promise<unknown>, [selector: import("@metamask/keyring-controller").KeyringSelector, operation: (keyring: import("@metamask/keyring-internal-api").EthKeyring<import("@metamask/utils").Json>) => Promise<unknown>]>;
     mockAccountsUpdateAccountMetadata: jest.Mock<void, [accountId: string, metadata: Partial<{
         name: string;
         importTime: number;

package/dist/controllers/user-storage/account-syncing/__fixtures__/test-utils.mjs

@@ -12,7 +12,7 @@ import { mapInternalAccountToUserStorageAccount } from "../utils.mjs";
  */
 export function mockUserStorageMessengerForAccountSyncing(options) {
     const messengerMocks = mockUserStorageMessenger();
-    messengerMocks.mockKeyringAddNewAccount.mockImplementation(async () => {
+    messengerMocks.mockKeyringWithKeyring.mockImplementation(async () => {
         messengerMocks.baseMessenger.publish('AccountsController:accountAdded', MOCK_INTERNAL_ACCOUNTS.ONE[0]);
         return MOCK_INTERNAL_ACCOUNTS.ONE[0].address;
     });

package/dist/controllers/user-storage/account-syncing/__fixtures__/test-utils.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"test-utils.mjs","sourceRoot":"","sources":["../../../../../src/controllers/user-storage/account-syncing/__fixtures__/test-utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,2BAAuB;AACxD,OAAO,EAAE,gBAAgB,EAAE,gDAAsC;AACjE,OAAO,EAAE,wBAAwB,EAAE,6CAAyC;AAC5E,OAAO,EAAE,sCAAsC,EAAE,qBAAiB;AAElE;;;;;;;GAOG;AACH,MAAM,UAAU,yCAAyC,CAAC,OAIzD;IACC,MAAM,cAAc,GAAG,wBAAwB,EAAE,CAAC;IAElD,cAAc,CAAC,wBAAwB,CAAC,kBAAkB,CAAC,KAAK,IAAI,EAAE;QACpE,cAAc,CAAC,aAAa,CAAC,OAAO,CAClC,iCAAiC,EACjC,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAoB,CACjD,CAAC;QACF,OAAO,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,cAAc,CAAC,wBAAwB,CAAC,eAAe,CACrD,CAAC,OAAO,EAAE,QAAQ,EAAE,YAAY;QAC9B,sBAAsB,CAAC,GAAG,CAAsB,CACnD,CAAC;IAEF,OAAO,cAAc,CAAC;AACxB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,wCAAwC,CACtD,IAAiC,EACjC,UAAkB;IAElB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC;QAC1C,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC;QAC/C,IAAI,CAAC,SAAS,CAAC,sCAAsC,CAAC,UAAU,CAAC,CAAC;KACnE,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,wCAAwC,CACtD,IAAc,EACd,UAAkB;IAElB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC3B,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,CAChD,CAAC;AACJ,CAAC","sourcesContent":["import type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport { MOCK_INTERNAL_ACCOUNTS } from './mockAccounts';\nimport { createSHA256Hash } from '../../../../shared/encryption';\nimport { mockUserStorageMessenger } from '../../__fixtures__/mockMessenger';\nimport { mapInternalAccountToUserStorageAccount } from '../utils';\n\n/**\n * Test Utility - create a mock user storage messenger for account syncing tests\n *\n * @param options - options for the mock messenger\n * @param options.accounts - options for the accounts part of the controller\n * @param options.accounts.accountsList - list of accounts to return for the 'AccountsController:listAccounts' action\n * @returns Mock User Storage Messenger\n */\nexport function mockUserStorageMessengerForAccountSyncing(options?: {\n  accounts?: {\n    accountsList?: InternalAccount[];\n  };\n}) {\n  const messengerMocks = mockUserStorageMessenger();\n\n  messengerMocks.mockKeyringAddNewAccount.mockImplementation(async () => {\n    messengerMocks.baseMessenger.publish(\n      'AccountsController:accountAdded',\n      MOCK_INTERNAL_ACCOUNTS.ONE[0] as InternalAccount,\n    );\n    return MOCK_INTERNAL_ACCOUNTS.ONE[0].address;\n  });\n\n  messengerMocks.mockAccountsListAccounts.mockReturnValue(\n    (options?.accounts?.accountsList ??\n      MOCK_INTERNAL_ACCOUNTS.ALL) as InternalAccount[],\n  );\n\n  return messengerMocks;\n}\n\n/**\n * Test Utility - creates a realistic expected batch upsert payload\n *\n * @param data - data supposed to be upserted\n * @param storageKey - storage key\n * @returns expected body\n */\nexport function createExpectedAccountSyncBatchUpsertBody(\n  data: [string, InternalAccount][],\n  storageKey: string,\n) {\n  return data.map(([entryKey, entryValue]) => [\n    createSHA256Hash(String(entryKey) + storageKey),\n    JSON.stringify(mapInternalAccountToUserStorageAccount(entryValue)),\n  ]);\n}\n\n/**\n * Test Utility - creates a realistic expected batch delete payload\n *\n * @param data - data supposed to be deleted\n * @param storageKey - storage key\n * @returns expected body\n */\nexport function createExpectedAccountSyncBatchDeleteBody(\n  data: string[],\n  storageKey: string,\n) {\n  return data.map((entryKey) =>\n    createSHA256Hash(String(entryKey) + storageKey),\n  );\n}\n"]}
+{"version":3,"file":"test-utils.mjs","sourceRoot":"","sources":["../../../../../src/controllers/user-storage/account-syncing/__fixtures__/test-utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,2BAAuB;AACxD,OAAO,EAAE,gBAAgB,EAAE,gDAAsC;AACjE,OAAO,EAAE,wBAAwB,EAAE,6CAAyC;AAC5E,OAAO,EAAE,sCAAsC,EAAE,qBAAiB;AAElE;;;;;;;GAOG;AACH,MAAM,UAAU,yCAAyC,CAAC,OAIzD;IACC,MAAM,cAAc,GAAG,wBAAwB,EAAE,CAAC;IAElD,cAAc,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,KAAK,IAAI,EAAE;QAClE,cAAc,CAAC,aAAa,CAAC,OAAO,CAClC,iCAAiC,EACjC,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAoB,CACjD,CAAC;QACF,OAAO,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,cAAc,CAAC,wBAAwB,CAAC,eAAe,CACrD,CAAC,OAAO,EAAE,QAAQ,EAAE,YAAY;QAC9B,sBAAsB,CAAC,GAAG,CAAsB,CACnD,CAAC;IAEF,OAAO,cAAc,CAAC;AACxB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,wCAAwC,CACtD,IAAiC,EACjC,UAAkB;IAElB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC;QAC1C,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC;QAC/C,IAAI,CAAC,SAAS,CAAC,sCAAsC,CAAC,UAAU,CAAC,CAAC;KACnE,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,wCAAwC,CACtD,IAAc,EACd,UAAkB;IAElB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC3B,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,UAAU,CAAC,CAChD,CAAC;AACJ,CAAC","sourcesContent":["import type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport { MOCK_INTERNAL_ACCOUNTS } from './mockAccounts';\nimport { createSHA256Hash } from '../../../../shared/encryption';\nimport { mockUserStorageMessenger } from '../../__fixtures__/mockMessenger';\nimport { mapInternalAccountToUserStorageAccount } from '../utils';\n\n/**\n * Test Utility - create a mock user storage messenger for account syncing tests\n *\n * @param options - options for the mock messenger\n * @param options.accounts - options for the accounts part of the controller\n * @param options.accounts.accountsList - list of accounts to return for the 'AccountsController:listAccounts' action\n * @returns Mock User Storage Messenger\n */\nexport function mockUserStorageMessengerForAccountSyncing(options?: {\n  accounts?: {\n    accountsList?: InternalAccount[];\n  };\n}) {\n  const messengerMocks = mockUserStorageMessenger();\n\n  messengerMocks.mockKeyringWithKeyring.mockImplementation(async () => {\n    messengerMocks.baseMessenger.publish(\n      'AccountsController:accountAdded',\n      MOCK_INTERNAL_ACCOUNTS.ONE[0] as InternalAccount,\n    );\n    return MOCK_INTERNAL_ACCOUNTS.ONE[0].address;\n  });\n\n  messengerMocks.mockAccountsListAccounts.mockReturnValue(\n    (options?.accounts?.accountsList ??\n      MOCK_INTERNAL_ACCOUNTS.ALL) as InternalAccount[],\n  );\n\n  return messengerMocks;\n}\n\n/**\n * Test Utility - creates a realistic expected batch upsert payload\n *\n * @param data - data supposed to be upserted\n * @param storageKey - storage key\n * @returns expected body\n */\nexport function createExpectedAccountSyncBatchUpsertBody(\n  data: [string, InternalAccount][],\n  storageKey: string,\n) {\n  return data.map(([entryKey, entryValue]) => [\n    createSHA256Hash(String(entryKey) + storageKey),\n    JSON.stringify(mapInternalAccountToUserStorageAccount(entryValue)),\n  ]);\n}\n\n/**\n * Test Utility - creates a realistic expected batch delete payload\n *\n * @param data - data supposed to be deleted\n * @param storageKey - storage key\n * @returns expected body\n */\nexport function createExpectedAccountSyncBatchDeleteBody(\n  data: string[],\n  storageKey: string,\n) {\n  return data.map((entryKey) =>\n    createSHA256Hash(String(entryKey) + storageKey),\n  );\n}\n"]}

package/dist/controllers/user-storage/account-syncing/controller-integration.cjs

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.syncInternalAccountsWithUserStorage = exports.saveInternalAccountsListToUserStorage = exports.saveInternalAccountToUserStorage = void 0;
 const keyring_api_1 = require("@metamask/keyring-api");
+const keyring_controller_1 = require("@metamask/keyring-controller");
 const sync_utils_1 = require("./sync-utils.cjs");
 const utils_1 = require("./utils.cjs");
 const storage_schema_1 = require("../../../shared/storage-schema.cjs");
@@ -99,8 +100,13 @@ async function syncInternalAccountsWithUserStorage(config, options) {
             const numberOfAccountsToAdd = Math.min(userStorageAccountsList.length, maxNumberOfAccountsToAdd) -
                 internalAccountsList.length;
             // Create new accounts to match the user storage accounts list
+            await getMessenger().call('KeyringController:withKeyring', {
+                type: keyring_controller_1.KeyringTypes.hd,
+            }, async (keyring) => {
+                keyring.addAccounts(numberOfAccountsToAdd);
+            });
+            // Keeping this for analytics purposes, but should probably be re-thought
             for (let i = 0; i < numberOfAccountsToAdd; i++) {
-                await getMessenger().call('KeyringController:addNewAccount');
                 onAccountAdded?.();
             }
         }

package/dist/controllers/user-storage/account-syncing/controller-integration.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"controller-integration.cjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/account-syncing/controller-integration.ts"],"names":[],"mappings":"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","sourcesContent":["import { isEvmAccountType } from '@metamask/keyring-api';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport {\n  canPerformAccountSyncing,\n  getInternalAccountsList,\n  getUserStorageAccountsList,\n} from './sync-utils';\nimport type { AccountSyncingConfig, AccountSyncingOptions } from './types';\nimport {\n  doesInternalAccountHaveCorrectKeyringType,\n  isNameDefaultAccountName,\n  mapInternalAccountToUserStorageAccount,\n} from './utils';\nimport { USER_STORAGE_FEATURE_NAMES } from '../../../shared/storage-schema';\n\n/**\n * Saves an individual internal account to the user storage.\n *\n * @param internalAccount - The internal account to save\n * @param config - parameters used for saving the internal account\n * @param options - parameters used for saving the internal account\n */\nexport async function saveInternalAccountToUserStorage(\n  internalAccount: InternalAccount,\n  config: AccountSyncingConfig,\n  options: AccountSyncingOptions,\n): Promise<void> {\n  const { isAccountSyncingEnabled } = config;\n  const { getUserStorageControllerInstance } = options;\n\n  if (\n    !isAccountSyncingEnabled ||\n    !canPerformAccountSyncing(config, options) ||\n    !isEvmAccountType(internalAccount.type) ||\n    !doesInternalAccountHaveCorrectKeyringType(internalAccount)\n  ) {\n    return;\n  }\n\n  try {\n    // Map the internal account to the user storage account schema\n    const mappedAccount =\n      mapInternalAccountToUserStorageAccount(internalAccount);\n\n    await getUserStorageControllerInstance().performSetStorage(\n      // ESLint is confused here.\n\n      `${USER_STORAGE_FEATURE_NAMES.accounts}.${internalAccount.address}`,\n      JSON.stringify(mappedAccount),\n    );\n  } catch (e) {\n    // istanbul ignore next\n    const errorMessage = e instanceof Error ? e.message : JSON.stringify(e);\n    throw new Error(\n      `UserStorageController - failed to save account to user storage - ${errorMessage}`,\n    );\n  }\n}\n\n/**\n * Saves the list of internal accounts to the user storage.\n *\n * @param config - parameters used for saving the list of internal accounts\n * @param options - parameters used for saving the list of internal accounts\n */\nexport async function saveInternalAccountsListToUserStorage(\n  config: AccountSyncingConfig,\n  options: AccountSyncingOptions,\n): Promise<void> {\n  const { isAccountSyncingEnabled } = config;\n  const { getUserStorageControllerInstance } = options;\n\n  if (!isAccountSyncingEnabled) {\n    return;\n  }\n\n  const internalAccountsList = await getInternalAccountsList(options);\n\n  if (!internalAccountsList?.length) {\n    return;\n  }\n\n  const internalAccountsListFormattedForUserStorage = internalAccountsList.map(\n    mapInternalAccountToUserStorageAccount,\n  );\n\n  await getUserStorageControllerInstance().performBatchSetStorage(\n    USER_STORAGE_FEATURE_NAMES.accounts,\n    internalAccountsListFormattedForUserStorage.map((account) => [\n      account.a,\n      JSON.stringify(account),\n    ]),\n  );\n}\n\ntype SyncInternalAccountsWithUserStorageConfig = AccountSyncingConfig & {\n  maxNumberOfAccountsToAdd?: number;\n  onAccountAdded?: () => void;\n  onAccountNameUpdated?: () => void;\n  onAccountSyncErroneousSituation?: (\n    errorMessage: string,\n    sentryContext?: Record<string, unknown>,\n  ) => void;\n};\n\n/**\n * Syncs the internal accounts list with the user storage accounts list.\n * This method is used to make sure that the internal accounts list is up-to-date with the user storage accounts list and vice-versa.\n * It will add new accounts to the internal accounts list, update/merge conflicting names and re-upload the results in some cases to the user storage.\n *\n * @param config - parameters used for syncing the internal accounts list with the user storage accounts list\n * @param options - parameters used for syncing the internal accounts list with the user storage accounts list\n */\nexport async function syncInternalAccountsWithUserStorage(\n  config: SyncInternalAccountsWithUserStorageConfig,\n  options: AccountSyncingOptions,\n): Promise<void> {\n  const { isAccountSyncingEnabled } = config;\n\n  if (!canPerformAccountSyncing(config, options) || !isAccountSyncingEnabled) {\n    return;\n  }\n\n  const {\n    maxNumberOfAccountsToAdd = Infinity,\n    onAccountAdded,\n    onAccountNameUpdated,\n    onAccountSyncErroneousSituation,\n  } = config;\n  const { getMessenger, getUserStorageControllerInstance } = options;\n\n  try {\n    await getUserStorageControllerInstance().setIsAccountSyncingInProgress(\n      true,\n    );\n\n    const userStorageAccountsList = await getUserStorageAccountsList(options);\n\n    if (!userStorageAccountsList || !userStorageAccountsList.length) {\n      await saveInternalAccountsListToUserStorage(\n        { isAccountSyncingEnabled },\n        options,\n      );\n      await getUserStorageControllerInstance().setHasAccountSyncingSyncedAtLeastOnce(\n        true,\n      );\n      return;\n    }\n    // Keep a record if erroneous situations are found during the sync\n    // This is done so we can send the context to Sentry in case of an erroneous situation\n    let erroneousSituationsFound = false;\n\n    // Prepare an array of internal accounts to be saved to the user storage\n    const internalAccountsToBeSavedToUserStorage: InternalAccount[] = [];\n\n    // Compare internal accounts list with user storage accounts list\n    // First step: compare lengths\n    const internalAccountsList = await getInternalAccountsList(options);\n\n    if (!internalAccountsList || !internalAccountsList.length) {\n      throw new Error(`Failed to get internal accounts list`);\n    }\n\n    const hasMoreUserStorageAccountsThanInternalAccounts =\n      userStorageAccountsList.length > internalAccountsList.length;\n\n    // We don't want to remove existing accounts for a user\n    // so we only add new accounts if the user has more accounts in user storage than internal accounts\n    if (hasMoreUserStorageAccountsThanInternalAccounts) {\n      const numberOfAccountsToAdd =\n        Math.min(userStorageAccountsList.length, maxNumberOfAccountsToAdd) -\n        internalAccountsList.length;\n\n      // Create new accounts to match the user storage accounts list\n      for (let i = 0; i < numberOfAccountsToAdd; i++) {\n        await getMessenger().call('KeyringController:addNewAccount');\n        onAccountAdded?.();\n      }\n    }\n\n    // Second step: compare account names\n    // Get the internal accounts list again since new accounts might have been added in the previous step\n    const refreshedInternalAccountsList =\n      await getInternalAccountsList(options);\n\n    const newlyAddedAccounts = refreshedInternalAccountsList.filter(\n      (account) =>\n        !internalAccountsList.find((a) => a.address === account.address),\n    );\n\n    for (const internalAccount of refreshedInternalAccountsList) {\n      const userStorageAccount = userStorageAccountsList.find(\n        (account) => account.a === internalAccount.address,\n      );\n\n      // If the account is not present in user storage\n      // istanbul ignore next\n      if (!userStorageAccount) {\n        // If the account was just added in the previous step, skip saving it, it's likely to be a bogus account\n        if (newlyAddedAccounts.includes(internalAccount)) {\n          erroneousSituationsFound = true;\n          onAccountSyncErroneousSituation?.(\n            'An account was added to the internal accounts list but was not present in the user storage accounts list',\n            {\n              internalAccount,\n              userStorageAccount,\n              newlyAddedAccounts,\n              userStorageAccountsList,\n              internalAccountsList,\n              refreshedInternalAccountsList,\n              internalAccountsToBeSavedToUserStorage,\n            },\n          );\n          continue;\n        }\n        // Otherwise, it means that this internal account was present before the sync, and needs to be saved to the user storage\n        internalAccountsToBeSavedToUserStorage.push(internalAccount);\n        continue;\n      }\n\n      // From this point on, we know that the account is present in\n      // both the internal accounts list and the user storage accounts list\n\n      // One or both accounts have default names\n      const isInternalAccountNameDefault = isNameDefaultAccountName(\n        internalAccount.metadata.name,\n      );\n      const isUserStorageAccountNameDefault = isNameDefaultAccountName(\n        userStorageAccount.n,\n      );\n\n      // Internal account has default name\n      if (isInternalAccountNameDefault) {\n        if (!isUserStorageAccountNameDefault) {\n          getMessenger().call(\n            'AccountsController:updateAccountMetadata',\n            internalAccount.id,\n            {\n              name: userStorageAccount.n,\n            },\n          );\n\n          onAccountNameUpdated?.();\n        }\n        continue;\n      }\n\n      // Internal account has custom name but user storage account has default name\n      if (isUserStorageAccountNameDefault) {\n        internalAccountsToBeSavedToUserStorage.push(internalAccount);\n        continue;\n      }\n\n      // Both accounts have custom names\n\n      // User storage account has a nameLastUpdatedAt timestamp\n      // Note: not storing the undefined checks in constants to act as a type guard\n      if (userStorageAccount.nlu !== undefined) {\n        if (internalAccount.metadata.nameLastUpdatedAt !== undefined) {\n          const isInternalAccountNameNewer =\n            internalAccount.metadata.nameLastUpdatedAt > userStorageAccount.nlu;\n\n          if (isInternalAccountNameNewer) {\n            internalAccountsToBeSavedToUserStorage.push(internalAccount);\n            continue;\n          }\n        }\n\n        getMessenger().call(\n          'AccountsController:updateAccountMetadata',\n          internalAccount.id,\n          {\n            name: userStorageAccount.n,\n            nameLastUpdatedAt: userStorageAccount.nlu,\n          },\n        );\n\n        const areInternalAndUserStorageAccountNamesEqual =\n          internalAccount.metadata.name === userStorageAccount.n;\n\n        if (!areInternalAndUserStorageAccountNamesEqual) {\n          onAccountNameUpdated?.();\n        }\n\n        continue;\n      } else if (internalAccount.metadata.nameLastUpdatedAt !== undefined) {\n        internalAccountsToBeSavedToUserStorage.push(internalAccount);\n        continue;\n      }\n    }\n\n    // Save the internal accounts list to the user storage\n    if (internalAccountsToBeSavedToUserStorage.length) {\n      await getUserStorageControllerInstance().performBatchSetStorage(\n        USER_STORAGE_FEATURE_NAMES.accounts,\n        internalAccountsToBeSavedToUserStorage.map((account) => [\n          account.address,\n          JSON.stringify(mapInternalAccountToUserStorageAccount(account)),\n        ]),\n      );\n    }\n\n    // In case we have corrupted user storage with accounts that don't exist in the internal accounts list\n    // Delete those accounts from the user storage\n    const userStorageAccountsToBeDeleted = userStorageAccountsList.filter(\n      (account) =>\n        !refreshedInternalAccountsList.find((a) => a.address === account.a),\n    );\n\n    if (userStorageAccountsToBeDeleted.length) {\n      await getUserStorageControllerInstance().performBatchDeleteStorage(\n        USER_STORAGE_FEATURE_NAMES.accounts,\n        userStorageAccountsToBeDeleted.map((account) => account.a),\n      );\n      erroneousSituationsFound = true;\n      onAccountSyncErroneousSituation?.(\n        'An account was present in the user storage accounts list but was not found in the internal accounts list after the sync',\n        {\n          userStorageAccountsToBeDeleted,\n          internalAccountsList,\n          refreshedInternalAccountsList,\n          internalAccountsToBeSavedToUserStorage,\n          userStorageAccountsList,\n        },\n      );\n    }\n\n    if (erroneousSituationsFound) {\n      const [finalUserStorageAccountsList, finalInternalAccountsList] =\n        await Promise.all([\n          getUserStorageAccountsList(options),\n          getInternalAccountsList(options),\n        ]);\n\n      const doesEveryAccountInInternalAccountsListExistInUserStorageAccountsList =\n        finalInternalAccountsList.every((account) =>\n          finalUserStorageAccountsList?.some(\n            (userStorageAccount) => userStorageAccount.a === account.address,\n          ),\n        );\n\n      // istanbul ignore next\n      const doesEveryAccountInUserStorageAccountsListExistInInternalAccountsList =\n        (finalUserStorageAccountsList?.length || 0) > maxNumberOfAccountsToAdd\n          ? true\n          : finalUserStorageAccountsList?.every((account) =>\n              finalInternalAccountsList.some(\n                (internalAccount) => internalAccount.address === account.a,\n              ),\n            );\n\n      const doFinalListsMatch =\n        doesEveryAccountInInternalAccountsListExistInUserStorageAccountsList &&\n        doesEveryAccountInUserStorageAccountsListExistInInternalAccountsList;\n\n      const context = {\n        finalUserStorageAccountsList,\n        finalInternalAccountsList,\n      };\n      if (doFinalListsMatch) {\n        onAccountSyncErroneousSituation?.(\n          'Erroneous situations were found during the sync, but final state matches the expected state',\n          context,\n        );\n      } else {\n        onAccountSyncErroneousSituation?.(\n          'Erroneous situations were found during the sync, and final state does not match the expected state',\n          context,\n        );\n      }\n    }\n\n    // We do this here and not in the finally statement because we want to make sure that\n    // the accounts are saved / updated / deleted at least once before we set this flag\n    await getUserStorageControllerInstance().setHasAccountSyncingSyncedAtLeastOnce(\n      true,\n    );\n  } catch (e) {\n    // istanbul ignore next\n    const errorMessage = e instanceof Error ? e.message : JSON.stringify(e);\n    throw new Error(\n      `UserStorageController - failed to sync user storage accounts list - ${errorMessage}`,\n    );\n  } finally {\n    await getUserStorageControllerInstance().setIsAccountSyncingInProgress(\n      false,\n    );\n  }\n}\n"]}
+{"version":3,"file":"controller-integration.cjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/account-syncing/controller-integration.ts"],"names":[],"mappings":"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","sourcesContent":["import { isEvmAccountType } from '@metamask/keyring-api';\nimport { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport {\n  canPerformAccountSyncing,\n  getInternalAccountsList,\n  getUserStorageAccountsList,\n} from './sync-utils';\nimport type { AccountSyncingConfig, AccountSyncingOptions } from './types';\nimport {\n  doesInternalAccountHaveCorrectKeyringType,\n  isNameDefaultAccountName,\n  mapInternalAccountToUserStorageAccount,\n} from './utils';\nimport { USER_STORAGE_FEATURE_NAMES } from '../../../shared/storage-schema';\n\n/**\n * Saves an individual internal account to the user storage.\n *\n * @param internalAccount - The internal account to save\n * @param config - parameters used for saving the internal account\n * @param options - parameters used for saving the internal account\n */\nexport async function saveInternalAccountToUserStorage(\n  internalAccount: InternalAccount,\n  config: AccountSyncingConfig,\n  options: AccountSyncingOptions,\n): Promise<void> {\n  const { isAccountSyncingEnabled } = config;\n  const { getUserStorageControllerInstance } = options;\n\n  if (\n    !isAccountSyncingEnabled ||\n    !canPerformAccountSyncing(config, options) ||\n    !isEvmAccountType(internalAccount.type) ||\n    !doesInternalAccountHaveCorrectKeyringType(internalAccount)\n  ) {\n    return;\n  }\n\n  try {\n    // Map the internal account to the user storage account schema\n    const mappedAccount =\n      mapInternalAccountToUserStorageAccount(internalAccount);\n\n    await getUserStorageControllerInstance().performSetStorage(\n      // ESLint is confused here.\n\n      `${USER_STORAGE_FEATURE_NAMES.accounts}.${internalAccount.address}`,\n      JSON.stringify(mappedAccount),\n    );\n  } catch (e) {\n    // istanbul ignore next\n    const errorMessage = e instanceof Error ? e.message : JSON.stringify(e);\n    throw new Error(\n      `UserStorageController - failed to save account to user storage - ${errorMessage}`,\n    );\n  }\n}\n\n/**\n * Saves the list of internal accounts to the user storage.\n *\n * @param config - parameters used for saving the list of internal accounts\n * @param options - parameters used for saving the list of internal accounts\n */\nexport async function saveInternalAccountsListToUserStorage(\n  config: AccountSyncingConfig,\n  options: AccountSyncingOptions,\n): Promise<void> {\n  const { isAccountSyncingEnabled } = config;\n  const { getUserStorageControllerInstance } = options;\n\n  if (!isAccountSyncingEnabled) {\n    return;\n  }\n\n  const internalAccountsList = await getInternalAccountsList(options);\n\n  if (!internalAccountsList?.length) {\n    return;\n  }\n\n  const internalAccountsListFormattedForUserStorage = internalAccountsList.map(\n    mapInternalAccountToUserStorageAccount,\n  );\n\n  await getUserStorageControllerInstance().performBatchSetStorage(\n    USER_STORAGE_FEATURE_NAMES.accounts,\n    internalAccountsListFormattedForUserStorage.map((account) => [\n      account.a,\n      JSON.stringify(account),\n    ]),\n  );\n}\n\ntype SyncInternalAccountsWithUserStorageConfig = AccountSyncingConfig & {\n  maxNumberOfAccountsToAdd?: number;\n  onAccountAdded?: () => void;\n  onAccountNameUpdated?: () => void;\n  onAccountSyncErroneousSituation?: (\n    errorMessage: string,\n    sentryContext?: Record<string, unknown>,\n  ) => void;\n};\n\n/**\n * Syncs the internal accounts list with the user storage accounts list.\n * This method is used to make sure that the internal accounts list is up-to-date with the user storage accounts list and vice-versa.\n * It will add new accounts to the internal accounts list, update/merge conflicting names and re-upload the results in some cases to the user storage.\n *\n * @param config - parameters used for syncing the internal accounts list with the user storage accounts list\n * @param options - parameters used for syncing the internal accounts list with the user storage accounts list\n */\nexport async function syncInternalAccountsWithUserStorage(\n  config: SyncInternalAccountsWithUserStorageConfig,\n  options: AccountSyncingOptions,\n): Promise<void> {\n  const { isAccountSyncingEnabled } = config;\n\n  if (!canPerformAccountSyncing(config, options) || !isAccountSyncingEnabled) {\n    return;\n  }\n\n  const {\n    maxNumberOfAccountsToAdd = Infinity,\n    onAccountAdded,\n    onAccountNameUpdated,\n    onAccountSyncErroneousSituation,\n  } = config;\n  const { getMessenger, getUserStorageControllerInstance } = options;\n\n  try {\n    await getUserStorageControllerInstance().setIsAccountSyncingInProgress(\n      true,\n    );\n\n    const userStorageAccountsList = await getUserStorageAccountsList(options);\n\n    if (!userStorageAccountsList || !userStorageAccountsList.length) {\n      await saveInternalAccountsListToUserStorage(\n        { isAccountSyncingEnabled },\n        options,\n      );\n      await getUserStorageControllerInstance().setHasAccountSyncingSyncedAtLeastOnce(\n        true,\n      );\n      return;\n    }\n    // Keep a record if erroneous situations are found during the sync\n    // This is done so we can send the context to Sentry in case of an erroneous situation\n    let erroneousSituationsFound = false;\n\n    // Prepare an array of internal accounts to be saved to the user storage\n    const internalAccountsToBeSavedToUserStorage: InternalAccount[] = [];\n\n    // Compare internal accounts list with user storage accounts list\n    // First step: compare lengths\n    const internalAccountsList = await getInternalAccountsList(options);\n\n    if (!internalAccountsList || !internalAccountsList.length) {\n      throw new Error(`Failed to get internal accounts list`);\n    }\n\n    const hasMoreUserStorageAccountsThanInternalAccounts =\n      userStorageAccountsList.length > internalAccountsList.length;\n\n    // We don't want to remove existing accounts for a user\n    // so we only add new accounts if the user has more accounts in user storage than internal accounts\n    if (hasMoreUserStorageAccountsThanInternalAccounts) {\n      const numberOfAccountsToAdd =\n        Math.min(userStorageAccountsList.length, maxNumberOfAccountsToAdd) -\n        internalAccountsList.length;\n\n      // Create new accounts to match the user storage accounts list\n      await getMessenger().call(\n        'KeyringController:withKeyring',\n        {\n          type: KeyringTypes.hd,\n        },\n        async (keyring) => {\n          keyring.addAccounts(numberOfAccountsToAdd);\n        },\n      );\n\n      // Keeping this for analytics purposes, but should probably be re-thought\n      for (let i = 0; i < numberOfAccountsToAdd; i++) {\n        onAccountAdded?.();\n      }\n    }\n\n    // Second step: compare account names\n    // Get the internal accounts list again since new accounts might have been added in the previous step\n    const refreshedInternalAccountsList =\n      await getInternalAccountsList(options);\n\n    const newlyAddedAccounts = refreshedInternalAccountsList.filter(\n      (account) =>\n        !internalAccountsList.find((a) => a.address === account.address),\n    );\n\n    for (const internalAccount of refreshedInternalAccountsList) {\n      const userStorageAccount = userStorageAccountsList.find(\n        (account) => account.a === internalAccount.address,\n      );\n\n      // If the account is not present in user storage\n      // istanbul ignore next\n      if (!userStorageAccount) {\n        // If the account was just added in the previous step, skip saving it, it's likely to be a bogus account\n        if (newlyAddedAccounts.includes(internalAccount)) {\n          erroneousSituationsFound = true;\n          onAccountSyncErroneousSituation?.(\n            'An account was added to the internal accounts list but was not present in the user storage accounts list',\n            {\n              internalAccount,\n              userStorageAccount,\n              newlyAddedAccounts,\n              userStorageAccountsList,\n              internalAccountsList,\n              refreshedInternalAccountsList,\n              internalAccountsToBeSavedToUserStorage,\n            },\n          );\n          continue;\n        }\n        // Otherwise, it means that this internal account was present before the sync, and needs to be saved to the user storage\n        internalAccountsToBeSavedToUserStorage.push(internalAccount);\n        continue;\n      }\n\n      // From this point on, we know that the account is present in\n      // both the internal accounts list and the user storage accounts list\n\n      // One or both accounts have default names\n      const isInternalAccountNameDefault = isNameDefaultAccountName(\n        internalAccount.metadata.name,\n      );\n      const isUserStorageAccountNameDefault = isNameDefaultAccountName(\n        userStorageAccount.n,\n      );\n\n      // Internal account has default name\n      if (isInternalAccountNameDefault) {\n        if (!isUserStorageAccountNameDefault) {\n          getMessenger().call(\n            'AccountsController:updateAccountMetadata',\n            internalAccount.id,\n            {\n              name: userStorageAccount.n,\n            },\n          );\n\n          onAccountNameUpdated?.();\n        }\n        continue;\n      }\n\n      // Internal account has custom name but user storage account has default name\n      if (isUserStorageAccountNameDefault) {\n        internalAccountsToBeSavedToUserStorage.push(internalAccount);\n        continue;\n      }\n\n      // Both accounts have custom names\n\n      // User storage account has a nameLastUpdatedAt timestamp\n      // Note: not storing the undefined checks in constants to act as a type guard\n      if (userStorageAccount.nlu !== undefined) {\n        if (internalAccount.metadata.nameLastUpdatedAt !== undefined) {\n          const isInternalAccountNameNewer =\n            internalAccount.metadata.nameLastUpdatedAt > userStorageAccount.nlu;\n\n          if (isInternalAccountNameNewer) {\n            internalAccountsToBeSavedToUserStorage.push(internalAccount);\n            continue;\n          }\n        }\n\n        getMessenger().call(\n          'AccountsController:updateAccountMetadata',\n          internalAccount.id,\n          {\n            name: userStorageAccount.n,\n            nameLastUpdatedAt: userStorageAccount.nlu,\n          },\n        );\n\n        const areInternalAndUserStorageAccountNamesEqual =\n          internalAccount.metadata.name === userStorageAccount.n;\n\n        if (!areInternalAndUserStorageAccountNamesEqual) {\n          onAccountNameUpdated?.();\n        }\n\n        continue;\n      } else if (internalAccount.metadata.nameLastUpdatedAt !== undefined) {\n        internalAccountsToBeSavedToUserStorage.push(internalAccount);\n        continue;\n      }\n    }\n\n    // Save the internal accounts list to the user storage\n    if (internalAccountsToBeSavedToUserStorage.length) {\n      await getUserStorageControllerInstance().performBatchSetStorage(\n        USER_STORAGE_FEATURE_NAMES.accounts,\n        internalAccountsToBeSavedToUserStorage.map((account) => [\n          account.address,\n          JSON.stringify(mapInternalAccountToUserStorageAccount(account)),\n        ]),\n      );\n    }\n\n    // In case we have corrupted user storage with accounts that don't exist in the internal accounts list\n    // Delete those accounts from the user storage\n    const userStorageAccountsToBeDeleted = userStorageAccountsList.filter(\n      (account) =>\n        !refreshedInternalAccountsList.find((a) => a.address === account.a),\n    );\n\n    if (userStorageAccountsToBeDeleted.length) {\n      await getUserStorageControllerInstance().performBatchDeleteStorage(\n        USER_STORAGE_FEATURE_NAMES.accounts,\n        userStorageAccountsToBeDeleted.map((account) => account.a),\n      );\n      erroneousSituationsFound = true;\n      onAccountSyncErroneousSituation?.(\n        'An account was present in the user storage accounts list but was not found in the internal accounts list after the sync',\n        {\n          userStorageAccountsToBeDeleted,\n          internalAccountsList,\n          refreshedInternalAccountsList,\n          internalAccountsToBeSavedToUserStorage,\n          userStorageAccountsList,\n        },\n      );\n    }\n\n    if (erroneousSituationsFound) {\n      const [finalUserStorageAccountsList, finalInternalAccountsList] =\n        await Promise.all([\n          getUserStorageAccountsList(options),\n          getInternalAccountsList(options),\n        ]);\n\n      const doesEveryAccountInInternalAccountsListExistInUserStorageAccountsList =\n        finalInternalAccountsList.every((account) =>\n          finalUserStorageAccountsList?.some(\n            (userStorageAccount) => userStorageAccount.a === account.address,\n          ),\n        );\n\n      // istanbul ignore next\n      const doesEveryAccountInUserStorageAccountsListExistInInternalAccountsList =\n        (finalUserStorageAccountsList?.length || 0) > maxNumberOfAccountsToAdd\n          ? true\n          : finalUserStorageAccountsList?.every((account) =>\n              finalInternalAccountsList.some(\n                (internalAccount) => internalAccount.address === account.a,\n              ),\n            );\n\n      const doFinalListsMatch =\n        doesEveryAccountInInternalAccountsListExistInUserStorageAccountsList &&\n        doesEveryAccountInUserStorageAccountsListExistInInternalAccountsList;\n\n      const context = {\n        finalUserStorageAccountsList,\n        finalInternalAccountsList,\n      };\n      if (doFinalListsMatch) {\n        onAccountSyncErroneousSituation?.(\n          'Erroneous situations were found during the sync, but final state matches the expected state',\n          context,\n        );\n      } else {\n        onAccountSyncErroneousSituation?.(\n          'Erroneous situations were found during the sync, and final state does not match the expected state',\n          context,\n        );\n      }\n    }\n\n    // We do this here and not in the finally statement because we want to make sure that\n    // the accounts are saved / updated / deleted at least once before we set this flag\n    await getUserStorageControllerInstance().setHasAccountSyncingSyncedAtLeastOnce(\n      true,\n    );\n  } catch (e) {\n    // istanbul ignore next\n    const errorMessage = e instanceof Error ? e.message : JSON.stringify(e);\n    throw new Error(\n      `UserStorageController - failed to sync user storage accounts list - ${errorMessage}`,\n    );\n  } finally {\n    await getUserStorageControllerInstance().setIsAccountSyncingInProgress(\n      false,\n    );\n  }\n}\n"]}

package/dist/controllers/user-storage/account-syncing/controller-integration.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"controller-integration.d.cts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/account-syncing/controller-integration.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAOtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,oBAAgB;AAQ3E;;;;;;GAMG;AACH,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CA+Bf;AAED;;;;;GAKG;AACH,wBAAsB,qCAAqC,CACzD,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED,KAAK,yCAAyC,GAAG,oBAAoB,GAAG;IACtE,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,IAAI,CAAC;IAClC,+BAA+B,CAAC,EAAE,CAChC,YAAY,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KACpC,IAAI,CAAC;CACX,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,mCAAmC,CACvD,MAAM,EAAE,yCAAyC,EACjD,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAgRf"}
+{"version":3,"file":"controller-integration.d.cts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/account-syncing/controller-integration.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAOtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,oBAAgB;AAQ3E;;;;;;GAMG;AACH,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CA+Bf;AAED;;;;;GAKG;AACH,wBAAsB,qCAAqC,CACzD,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED,KAAK,yCAAyC,GAAG,oBAAoB,GAAG;IACtE,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,IAAI,CAAC;IAClC,+BAA+B,CAAC,EAAE,CAChC,YAAY,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KACpC,IAAI,CAAC;CACX,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,mCAAmC,CACvD,MAAM,EAAE,yCAAyC,EACjD,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CA0Rf"}

package/dist/controllers/user-storage/account-syncing/controller-integration.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"controller-integration.d.mts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/account-syncing/controller-integration.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAOtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,oBAAgB;AAQ3E;;;;;;GAMG;AACH,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CA+Bf;AAED;;;;;GAKG;AACH,wBAAsB,qCAAqC,CACzD,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED,KAAK,yCAAyC,GAAG,oBAAoB,GAAG;IACtE,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,IAAI,CAAC;IAClC,+BAA+B,CAAC,EAAE,CAChC,YAAY,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KACpC,IAAI,CAAC;CACX,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,mCAAmC,CACvD,MAAM,EAAE,yCAAyC,EACjD,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAgRf"}
+{"version":3,"file":"controller-integration.d.mts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/account-syncing/controller-integration.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAOtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,oBAAgB;AAQ3E;;;;;;GAMG;AACH,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CA+Bf;AAED;;;;;GAKG;AACH,wBAAsB,qCAAqC,CACzD,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED,KAAK,yCAAyC,GAAG,oBAAoB,GAAG;IACtE,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,IAAI,CAAC;IAClC,+BAA+B,CAAC,EAAE,CAChC,YAAY,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KACpC,IAAI,CAAC;CACX,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,mCAAmC,CACvD,MAAM,EAAE,yCAAyC,EACjD,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CA0Rf"}

package/dist/controllers/user-storage/account-syncing/controller-integration.mjs

@@ -1,4 +1,5 @@
 import { isEvmAccountType } from "@metamask/keyring-api";
+import { KeyringTypes } from "@metamask/keyring-controller";
 import { canPerformAccountSyncing, getInternalAccountsList, getUserStorageAccountsList } from "./sync-utils.mjs";
 import { doesInternalAccountHaveCorrectKeyringType, isNameDefaultAccountName, mapInternalAccountToUserStorageAccount } from "./utils.mjs";
 import { USER_STORAGE_FEATURE_NAMES } from "../../../shared/storage-schema.mjs";
@@ -94,8 +95,13 @@ export async function syncInternalAccountsWithUserStorage(config, options) {
             const numberOfAccountsToAdd = Math.min(userStorageAccountsList.length, maxNumberOfAccountsToAdd) -
                 internalAccountsList.length;
             // Create new accounts to match the user storage accounts list
+            await getMessenger().call('KeyringController:withKeyring', {
+                type: KeyringTypes.hd,
+            }, async (keyring) => {
+                keyring.addAccounts(numberOfAccountsToAdd);
+            });
+            // Keeping this for analytics purposes, but should probably be re-thought
             for (let i = 0; i < numberOfAccountsToAdd; i++) {
-                await getMessenger().call('KeyringController:addNewAccount');
                 onAccountAdded?.();
             }
         }