@metamask-previews/profile-sync-controller 15.0.0-preview-0c874fe4 → 15.0.0-preview-4ec8b2d

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":";;;AAAA,qEAA4D;AAG5D,iDAIsB;AAEtB,uCAGiB;AACjB,uEAA4E;AAE5E;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CACpD,eAAgC,EAChC,OAA8B;IAE9B,MAAM,EAAE,gCAAgC,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAEnE,IACE,CAAC,IAAA,qCAAwB,EAAC,OAAO,CAAC;QAClC,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,iCAAY,CAAC,EAAE,CAAC,CAAC,8DAA8D;MAChI;QACA,OAAO;KACR;IAED,8GAA8G;IAC9G,MAAM,YAAY,EAAE,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;IAC/D,iDAAiD;IACjD,MAAM,oBAAoB,GAAG,YAAY,EAAE,CAAC,IAAI,CAC9C,iCAAiC,CAClC,CAAC;IAEF,MAAM,uBAAuB,GAAG,oBAAoB,CAAC,IAAI,CACvD,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,eAAe,CAAC,OAAO,CACzD,CAAC;IAEF,sFAAsF;IACtF,oCAAoC;IACpC,uBAAuB;IACvB,IAAI,CAAC,uBAAuB,EAAE;QAC5B,MAAM,IAAI,KAAK,CACb,yEAAyE,eAAe,CAAC,OAAO,EAAE,CACnG,CAAC;KACH;IAED,MAAM,eAAe,GACnB,MAAM,CACJ,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,OAAO,CACnE,KAAK,EACL,EAAE,CACH,CACF,IAAI,SAAS,CAAC;IAEjB,IAAI;QACF,8DAA8D;QAC9D,MAAM,aAAa,GAAG,IAAA,8CAAsC,EAC1D,uBAAuB,CACxB,CAAC;QAEF,MAAM,gCAAgC,EAAE,CAAC,iBAAiB,CACxD,GAAG,2CAA0B,CAAC,QAAQ,IAAI,uBAAuB,CAAC,OAAO,EAAE,EAC3E,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAC7B,eAAe,CAChB,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,uBAAuB;QACvB,MAAM,YAAY,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACxE,MAAM,IAAI,KAAK,CACb,oEAAoE,YAAY,EAAE,CACnF,CAAC;KACH;AACH,CAAC;AA3DD,4EA2DC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,qCAAqC,CACzD,OAA8B,EAC9B,eAAuB;IAEvB,MAAM,EAAE,gCAAgC,EAAE,GAAG,OAAO,CAAC;IAErD,MAAM,oBAAoB,GAAG,MAAM,IAAA,oCAAuB,EACxD,OAAO,EACP,eAAe,CAChB,CAAC;IAEF,IAAI,CAAC,oBAAoB,EAAE,MAAM,EAAE;QACjC,OAAO;KACR;IAED,MAAM,2CAA2C,GAAG,oBAAoB,CAAC,GAAG,CAC1E,8CAAsC,CACvC,CAAC;IAEF,MAAM,gCAAgC,EAAE,CAAC,sBAAsB,CAC7D,2CAA0B,CAAC,QAAQ,EACnC,2CAA2C,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;QAC3D,OAAO,CAAC,CAAC;QACT,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;KACxB,CAAC,EACF,eAAe,CAChB,CAAC;AACJ,CAAC;AA3BD,sFA2BC;AAYD;;;;;;;;GAQG;AACI,KAAK,UAAU,mCAAmC,CACvD,MAAiD,EACjD,OAA8B,EAC9B,eAAuB;IAEvB,IAAI,CAAC,IAAA,qCAAwB,EAAC,OAAO,CAAC,EAAE;QACtC,OAAO;KACR;IAED,MAAM,EACJ,wBAAwB,GAAG,QAAQ,EACnC,cAAc,EACd,oBAAoB,EACpB,+BAA+B,GAChC,GAAG,MAAM,CAAC;IACX,MAAM,EAAE,YAAY,EAAE,gCAAgC,EAAE,GAAG,OAAO,CAAC;IAEnE,IAAI;QACF,MAAM,gCAAgC,EAAE,CAAC,6BAA6B,CACpE,IAAI,CACL,CAAC;QAEF,MAAM,uBAAuB,GAAG,MAAM,IAAA,uCAA0B,EAC9D,OAAO,EACP,eAAe,CAChB,CAAC;QAEF,IAAI,CAAC,uBAAuB,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE;YAC/D,MAAM,qCAAqC,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;YACtE,OAAO;SACR;QACD,kEAAkE;QAClE,sFAAsF;QACtF,IAAI,wBAAwB,GAAG,KAAK,CAAC;QAErC,wEAAwE;QACxE,MAAM,sCAAsC,GAAsB,EAAE,CAAC;QAErE,iEAAiE;QACjE,8BAA8B;QAC9B,MAAM,oBAAoB,GAAG,MAAM,IAAA,oCAAuB,EACxD,OAAO,EACP,eAAe,CAChB,CAAC;QAEF,IAAI,CAAC,oBAAoB,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE;YACzD,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;SACzD;QAED,MAAM,8CAA8C,GAClD,uBAAuB,CAAC,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC;QAE/D,uDAAuD;QACvD,mGAAmG;QACnG,IAAI,8CAA8C,EAAE;YAClD,MAAM,qBAAqB,GACzB,IAAI,CAAC,GAAG,CAAC,uBAAuB,CAAC,MAAM,EAAE,wBAAwB,CAAC;gBAClE,oBAAoB,CAAC,MAAM,CAAC;YAE9B,8DAA8D;YAC9D,MAAM,YAAY,EAAE,CAAC,IAAI,CACvB,+BAA+B,EAC/B;gBACE,EAAE,EAAE,eAAe;aACpB,EACD,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;gBACpB,MAAM,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;YACnD,CAAC,CACF,CAAC;YAEF,2EAA2E;YAC3E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,qBAAqB,EAAE,CAAC,EAAE,EAAE;gBAC9C,cAAc,EAAE,EAAE,CAAC;aACpB;SACF;QAED,qCAAqC;QACrC,qGAAqG;QACrG,MAAM,6BAA6B,GAAG,MAAM,IAAA,oCAAuB,EACjE,OAAO,EACP,eAAe,CAChB,CAAC;QAEF,MAAM,kBAAkB,GAAG,6BAA6B,CAAC,MAAM,CAC7D,CAAC,OAAO,EAAE,EAAE,CACV,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CACnE,CAAC;QAEF,KAAK,MAAM,eAAe,IAAI,6BAA6B,EAAE;YAC3D,MAAM,kBAAkB,GAAG,uBAAuB,CAAC,IAAI,CACrD,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,eAAe,CAAC,OAAO,CACnD,CAAC;YAEF,gDAAgD;YAChD,uBAAuB;YACvB,IAAI,CAAC,kBAAkB,EAAE;gBACvB,wGAAwG;gBACxG,IAAI,kBAAkB,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;oBAChD,wBAAwB,GAAG,IAAI,CAAC;oBAChC,+BAA+B,EAAE,CAC/B,0GAA0G,EAC1G;wBACE,eAAe;wBACf,kBAAkB;wBAClB,kBAAkB;wBAClB,uBAAuB;wBACvB,oBAAoB;wBACpB,6BAA6B;wBAC7B,sCAAsC;qBACvC,CACF,CAAC;oBACF,SAAS;iBACV;gBACD,wHAAwH;gBACxH,sCAAsC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBAC7D,SAAS;aACV;YAED,6DAA6D;YAC7D,qEAAqE;YAErE,0CAA0C;YAC1C,MAAM,4BAA4B,GAAG,IAAA,gCAAwB,EAC3D,eAAe,CAAC,QAAQ,CAAC,IAAI,CAC9B,CAAC;YACF,MAAM,+BAA+B,GAAG,IAAA,gCAAwB,EAC9D,kBAAkB,CAAC,CAAC,CACrB,CAAC;YAEF,oCAAoC;YACpC,IAAI,4BAA4B,EAAE;gBAChC,IAAI,CAAC,+BAA+B,EAAE;oBACpC,YAAY,EAAE,CAAC,IAAI,CACjB,0CAA0C,EAC1C,eAAe,CAAC,EAAE,EAClB;wBACE,IAAI,EAAE,kBAAkB,CAAC,CAAC;qBAC3B,CACF,CAAC;oBAEF,oBAAoB,EAAE,EAAE,CAAC;iBAC1B;gBACD,SAAS;aACV;YAED,6EAA6E;YAC7E,IAAI,+BAA+B,EAAE;gBACnC,sCAAsC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBAC7D,SAAS;aACV;YAED,kCAAkC;YAElC,yDAAyD;YACzD,6EAA6E;YAC7E,IAAI,kBAAkB,CAAC,GAAG,KAAK,SAAS,EAAE;gBACxC,IAAI,eAAe,CAAC,QAAQ,CAAC,iBAAiB,KAAK,SAAS,EAAE;oBAC5D,MAAM,0BAA0B,GAC9B,eAAe,CAAC,QAAQ,CAAC,iBAAiB,GAAG,kBAAkB,CAAC,GAAG,CAAC;oBAEtE,IAAI,0BAA0B,EAAE;wBAC9B,sCAAsC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;wBAC7D,SAAS;qBACV;iBACF;gBAED,YAAY,EAAE,CAAC,IAAI,CACjB,0CAA0C,EAC1C,eAAe,CAAC,EAAE,EAClB;oBACE,IAAI,EAAE,kBAAkB,CAAC,CAAC;oBAC1B,iBAAiB,EAAE,kBAAkB,CAAC,GAAG;iBAC1C,CACF,CAAC;gBAEF,MAAM,0CAA0C,GAC9C,eAAe,CAAC,QAAQ,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAC,CAAC;gBAEzD,IAAI,CAAC,0CAA0C,EAAE;oBAC/C,oBAAoB,EAAE,EAAE,CAAC;iBAC1B;gBAED,SAAS;aACV;iBAAM,IAAI,eAAe,CAAC,QAAQ,CAAC,iBAAiB,KAAK,SAAS,EAAE;gBACnE,sCAAsC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBAC7D,SAAS;aACV;SACF;QAED,sDAAsD;QACtD,IAAI,sCAAsC,CAAC,MAAM,EAAE;YACjD,MAAM,gCAAgC,EAAE,CAAC,sBAAsB,CAC7D,2CAA0B,CAAC,QAAQ,EACnC,sCAAsC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;gBACtD,OAAO,CAAC,OAAO;gBACf,IAAI,CAAC,SAAS,CAAC,IAAA,8CAAsC,EAAC,OAAO,CAAC,CAAC;aAChE,CAAC,EACF,eAAe,CAChB,CAAC;SACH;QAED,sGAAsG;QACtG,8CAA8C;QAC9C,MAAM,8BAA8B,GAAG,uBAAuB,CAAC,MAAM,CACnE,CAAC,OAAO,EAAE,EAAE,CACV,CAAC,6BAA6B,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,CACtE,CAAC;QAEF,IAAI,8BAA8B,CAAC,MAAM,EAAE;YACzC,MAAM,gCAAgC,EAAE,CAAC,yBAAyB,CAChE,2CAA0B,CAAC,QAAQ,EACnC,8BAA8B,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAC1D,eAAe,CAChB,CAAC;YACF,wBAAwB,GAAG,IAAI,CAAC;YAChC,+BAA+B,EAAE,CAC/B,yHAAyH,EACzH;gBACE,8BAA8B;gBAC9B,oBAAoB;gBACpB,6BAA6B;gBAC7B,sCAAsC;gBACtC,uBAAuB;aACxB,CACF,CAAC;SACH;QAED,IAAI,wBAAwB,EAAE;YAC5B,MAAM,CAAC,4BAA4B,EAAE,yBAAyB,CAAC,GAC7D,MAAM,OAAO,CAAC,GAAG,CAAC;gBAChB,IAAA,uCAA0B,EAAC,OAAO,EAAE,eAAe,CAAC;gBACpD,IAAA,oCAAuB,EAAC,OAAO,EAAE,eAAe,CAAC;aAClD,CAAC,CAAC;YAEL,MAAM,oEAAoE,GACxE,yBAAyB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAC1C,4BAA4B,EAAE,IAAI,CAChC,CAAC,kBAAkB,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,KAAK,OAAO,CAAC,OAAO,CACjE,CACF,CAAC;YAEJ,uBAAuB;YACvB,MAAM,oEAAoE,GACxE,CAAC,4BAA4B,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,wBAAwB;gBACpE,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAC9C,yBAAyB,CAAC,IAAI,CAC5B,CAAC,eAAe,EAAE,EAAE,CAAC,eAAe,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAC3D,CACF,CAAC;YAER,MAAM,iBAAiB,GACrB,oEAAoE;gBACpE,oEAAoE,CAAC;YAEvE,MAAM,OAAO,GAAG;gBACd,4BAA4B;gBAC5B,yBAAyB;aAC1B,CAAC;YACF,IAAI,iBAAiB,EAAE;gBACrB,+BAA+B,EAAE,CAC/B,6FAA6F,EAC7F,OAAO,CACR,CAAC;aACH;iBAAM;gBACL,+BAA+B,EAAE,CAC/B,oGAAoG,EACpG,OAAO,CACR,CAAC;aACH;SACF;KACF;IAAC,OAAO,CAAC,EAAE;QACV,uBAAuB;QACvB,MAAM,YAAY,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACxE,MAAM,IAAI,KAAK,CACb,uEAAuE,YAAY,EAAE,CACtF,CAAC;KACH;YAAS;QACR,MAAM,gCAAgC,EAAE,CAAC,6BAA6B,CACpE,KAAK,CACN,CAAC;KACH;AACH,CAAC;AA1RD,kFA0RC","sourcesContent":["import { 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 { AccountSyncingOptions } from './types';\nimport {\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 options - parameters used for saving the internal account\n */\nexport async function saveInternalAccountToUserStorage(\n  internalAccount: InternalAccount,\n  options: AccountSyncingOptions,\n): Promise<void> {\n  const { getUserStorageControllerInstance, getMessenger } = options;\n\n  if (\n    !canPerformAccountSyncing(options) ||\n    internalAccount.metadata.keyring.type !== String(KeyringTypes.hd) // sync only EVM accounts until we support multichain accounts\n  ) {\n    return;\n  }\n\n  // Refresh the internal accounts list so that it populates entropySourceId and derivationPath for all accounts\n  await getMessenger().call('AccountsController:updateAccounts');\n  // Find back our account from this refreshed list\n  const internalAccountsList = getMessenger().call(\n    'AccountsController:listAccounts',\n  );\n\n  const internalAccountFromList = internalAccountsList.find(\n    (account) => account.address === internalAccount.address,\n  );\n\n  // This should never happen because users don't have the ability to remove an accounts\n  // but if it does, we throw an error\n  // istanbul ignore next\n  if (!internalAccountFromList) {\n    throw new Error(\n      `UserStorageController - failed to find internal account in the list - ${internalAccount.address}`,\n    );\n  }\n\n  const entropySourceId =\n    String(\n      JSON.stringify(internalAccountFromList.options.entropySource).replace(\n        /\"/gu,\n        '',\n      ),\n    ) || undefined;\n\n  try {\n    // Map the internal account to the user storage account schema\n    const mappedAccount = mapInternalAccountToUserStorageAccount(\n      internalAccountFromList,\n    );\n\n    await getUserStorageControllerInstance().performSetStorage(\n      `${USER_STORAGE_FEATURE_NAMES.accounts}.${internalAccountFromList.address}`,\n      JSON.stringify(mappedAccount),\n      entropySourceId,\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 options - parameters used for saving the list of internal accounts\n * @param entropySourceId - The entropy source ID used to derive the key,\n * when multiple sources are available (Multi-SRP).\n */\nexport async function saveInternalAccountsListToUserStorage(\n  options: AccountSyncingOptions,\n  entropySourceId: string,\n): Promise<void> {\n  const { getUserStorageControllerInstance } = options;\n\n  const internalAccountsList = await getInternalAccountsList(\n    options,\n    entropySourceId,\n  );\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    entropySourceId,\n  );\n}\n\ntype SyncInternalAccountsWithUserStorageConfig = {\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 * @param entropySourceId - The entropy source ID used to derive the key,\n */\nexport async function syncInternalAccountsWithUserStorage(\n  config: SyncInternalAccountsWithUserStorageConfig,\n  options: AccountSyncingOptions,\n  entropySourceId: string,\n): Promise<void> {\n  if (!canPerformAccountSyncing(options)) {\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(\n      options,\n      entropySourceId,\n    );\n\n    if (!userStorageAccountsList || !userStorageAccountsList.length) {\n      await saveInternalAccountsListToUserStorage(options, entropySourceId);\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(\n      options,\n      entropySourceId,\n    );\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          id: entropySourceId,\n        },\n        async ({ keyring }) => {\n          await keyring.addAccounts(numberOfAccountsToAdd);\n        },\n      );\n\n      // TODO: below code is kept for analytics 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 = await getInternalAccountsList(\n      options,\n      entropySourceId,\n    );\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        entropySourceId,\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        entropySourceId,\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, entropySourceId),\n          getInternalAccountsList(options, entropySourceId),\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  } 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 { AccountSyncingOptions } from './types';\nimport {\n  isInternalAccountFromPrimarySRPHdKeyring,\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 options - parameters used for saving the internal account\n */\nexport async function saveInternalAccountToUserStorage(\n  internalAccount: InternalAccount,\n  options: AccountSyncingOptions,\n): Promise<void> {\n  const { getUserStorageControllerInstance } = options;\n\n  if (\n    !canPerformAccountSyncing(options) ||\n    !isEvmAccountType(internalAccount.type) ||\n    !(await isInternalAccountFromPrimarySRPHdKeyring(internalAccount, options))\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 options - parameters used for saving the list of internal accounts\n */\nexport async function saveInternalAccountsListToUserStorage(\n  options: AccountSyncingOptions,\n): Promise<void> {\n  const { getUserStorageControllerInstance } = options;\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 = {\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  if (!canPerformAccountSyncing(options)) {\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(options);\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      // NOTE: we only support the primary SRP HD keyring for now\n      // This is why we are hardcoding the index to 0\n      await getMessenger().call(\n        'KeyringController:withKeyring',\n        {\n          type: KeyringTypes.hd,\n          index: 0,\n        },\n        async ({ keyring }) => {\n          await keyring.addAccounts(numberOfAccountsToAdd);\n        },\n      );\n\n      // TODO: below code is kept for analytics 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

@@ -11,10 +11,8 @@ export declare function saveInternalAccountToUserStorage(internalAccount: Intern
  * Saves the list of internal accounts to the user storage.
  *
  * @param options - parameters used for saving the list of internal accounts
- * @param entropySourceId - The entropy source ID used to derive the key,
- * when multiple sources are available (Multi-SRP).
  */
-export declare function saveInternalAccountsListToUserStorage(options: AccountSyncingOptions, entropySourceId: string): Promise<void>;
+export declare function saveInternalAccountsListToUserStorage(options: AccountSyncingOptions): Promise<void>;
 type SyncInternalAccountsWithUserStorageConfig = {
     maxNumberOfAccountsToAdd?: number;
     onAccountAdded?: () => void;
@@ -28,8 +26,7 @@ type SyncInternalAccountsWithUserStorageConfig = {
  *
  * @param config - parameters used for syncing the internal accounts list with the user storage accounts list
  * @param options - parameters used for syncing the internal accounts list with the user storage accounts list
- * @param entropySourceId - The entropy source ID used to derive the key,
  */
-export declare function syncInternalAccountsWithUserStorage(config: SyncInternalAccountsWithUserStorageConfig, options: AccountSyncingOptions, entropySourceId: string): Promise<void>;
+export declare function syncInternalAccountsWithUserStorage(config: SyncInternalAccountsWithUserStorageConfig, options: AccountSyncingOptions): Promise<void>;
 export {};
 //# sourceMappingURL=controller-integration.d.cts.map

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,qBAAqB,EAAE,oBAAgB;AAOrD;;;;;GAKG;AACH,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAwDf;AAED;;;;;;GAMG;AACH,wBAAsB,qCAAqC,CACzD,OAAO,EAAE,qBAAqB,EAC9B,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CAwBf;AAED,KAAK,yCAAyC,GAAG;IAC/C,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;;;;;;;;GAQG;AACH,wBAAsB,mCAAmC,CACvD,MAAM,EAAE,yCAAyC,EACjD,OAAO,EAAE,qBAAqB,EAC9B,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CAsRf"}
+{"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,qBAAqB,EAAE,oBAAgB;AAQrD;;;;;GAKG;AACH,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CA6Bf;AAED;;;;GAIG;AACH,wBAAsB,qCAAqC,CACzD,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED,KAAK,yCAAyC,GAAG;IAC/C,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,CAwRf"}

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

@@ -11,10 +11,8 @@ export declare function saveInternalAccountToUserStorage(internalAccount: Intern
  * Saves the list of internal accounts to the user storage.
  *
  * @param options - parameters used for saving the list of internal accounts
- * @param entropySourceId - The entropy source ID used to derive the key,
- * when multiple sources are available (Multi-SRP).
  */
-export declare function saveInternalAccountsListToUserStorage(options: AccountSyncingOptions, entropySourceId: string): Promise<void>;
+export declare function saveInternalAccountsListToUserStorage(options: AccountSyncingOptions): Promise<void>;
 type SyncInternalAccountsWithUserStorageConfig = {
     maxNumberOfAccountsToAdd?: number;
     onAccountAdded?: () => void;
@@ -28,8 +26,7 @@ type SyncInternalAccountsWithUserStorageConfig = {
  *
  * @param config - parameters used for syncing the internal accounts list with the user storage accounts list
  * @param options - parameters used for syncing the internal accounts list with the user storage accounts list
- * @param entropySourceId - The entropy source ID used to derive the key,
  */
-export declare function syncInternalAccountsWithUserStorage(config: SyncInternalAccountsWithUserStorageConfig, options: AccountSyncingOptions, entropySourceId: string): Promise<void>;
+export declare function syncInternalAccountsWithUserStorage(config: SyncInternalAccountsWithUserStorageConfig, options: AccountSyncingOptions): Promise<void>;
 export {};
 //# sourceMappingURL=controller-integration.d.mts.map

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,qBAAqB,EAAE,oBAAgB;AAOrD;;;;;GAKG;AACH,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAwDf;AAED;;;;;;GAMG;AACH,wBAAsB,qCAAqC,CACzD,OAAO,EAAE,qBAAqB,EAC9B,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CAwBf;AAED,KAAK,yCAAyC,GAAG;IAC/C,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;;;;;;;;GAQG;AACH,wBAAsB,mCAAmC,CACvD,MAAM,EAAE,yCAAyC,EACjD,OAAO,EAAE,qBAAqB,EAC9B,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CAsRf"}
+{"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,qBAAqB,EAAE,oBAAgB;AAQrD;;;;;GAKG;AACH,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CA6Bf;AAED;;;;GAIG;AACH,wBAAsB,qCAAqC,CACzD,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED,KAAK,yCAAyC,GAAG;IAC/C,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,CAwRf"}

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

@@ -1,6 +1,7 @@
+import { isEvmAccountType } from "@metamask/keyring-api";
 import { KeyringTypes } from "@metamask/keyring-controller";
 import { canPerformAccountSyncing, getInternalAccountsList, getUserStorageAccountsList } from "./sync-utils.mjs";
-import { isNameDefaultAccountName, mapInternalAccountToUserStorageAccount } from "./utils.mjs";
+import { isInternalAccountFromPrimarySRPHdKeyring, isNameDefaultAccountName, mapInternalAccountToUserStorageAccount } from "./utils.mjs";
 import { USER_STORAGE_FEATURE_NAMES } from "../../../shared/storage-schema.mjs";
 /**
  * Saves an individual internal account to the user storage.
@@ -9,28 +10,18 @@ import { USER_STORAGE_FEATURE_NAMES } from "../../../shared/storage-schema.mjs";
  * @param options - parameters used for saving the internal account
  */
 export async function saveInternalAccountToUserStorage(internalAccount, options) {
-    const { getUserStorageControllerInstance, getMessenger } = options;
+    const { getUserStorageControllerInstance } = options;
     if (!canPerformAccountSyncing(options) ||
-        internalAccount.metadata.keyring.type !== String(KeyringTypes.hd) // sync only EVM accounts until we support multichain accounts
-    ) {
+        !isEvmAccountType(internalAccount.type) ||
+        !(await isInternalAccountFromPrimarySRPHdKeyring(internalAccount, options))) {
         return;
     }
-    // Refresh the internal accounts list so that it populates entropySourceId and derivationPath for all accounts
-    await getMessenger().call('AccountsController:updateAccounts');
-    // Find back our account from this refreshed list
-    const internalAccountsList = getMessenger().call('AccountsController:listAccounts');
-    const internalAccountFromList = internalAccountsList.find((account) => account.address === internalAccount.address);
-    // This should never happen because users don't have the ability to remove an accounts
-    // but if it does, we throw an error
-    // istanbul ignore next
-    if (!internalAccountFromList) {
-        throw new Error(`UserStorageController - failed to find internal account in the list - ${internalAccount.address}`);
-    }
-    const entropySourceId = String(JSON.stringify(internalAccountFromList.options.entropySource).replace(/"/gu, '')) || undefined;
     try {
         // Map the internal account to the user storage account schema
-        const mappedAccount = mapInternalAccountToUserStorageAccount(internalAccountFromList);
-        await getUserStorageControllerInstance().performSetStorage(`${USER_STORAGE_FEATURE_NAMES.accounts}.${internalAccountFromList.address}`, JSON.stringify(mappedAccount), entropySourceId);
+        const mappedAccount = mapInternalAccountToUserStorageAccount(internalAccount);
+        await getUserStorageControllerInstance().performSetStorage(
+        // ESLint is confused here.
+        `${USER_STORAGE_FEATURE_NAMES.accounts}.${internalAccount.address}`, JSON.stringify(mappedAccount));
     }
     catch (e) {
         // istanbul ignore next
@@ -42,12 +33,10 @@ export async function saveInternalAccountToUserStorage(internalAccount, options)
  * Saves the list of internal accounts to the user storage.
  *
  * @param options - parameters used for saving the list of internal accounts
- * @param entropySourceId - The entropy source ID used to derive the key,
- * when multiple sources are available (Multi-SRP).
  */
-export async function saveInternalAccountsListToUserStorage(options, entropySourceId) {
+export async function saveInternalAccountsListToUserStorage(options) {
     const { getUserStorageControllerInstance } = options;
-    const internalAccountsList = await getInternalAccountsList(options, entropySourceId);
+    const internalAccountsList = await getInternalAccountsList(options);
     if (!internalAccountsList?.length) {
         return;
     }
@@ -55,7 +44,7 @@ export async function saveInternalAccountsListToUserStorage(options, entropySour
     await getUserStorageControllerInstance().performBatchSetStorage(USER_STORAGE_FEATURE_NAMES.accounts, internalAccountsListFormattedForUserStorage.map((account) => [
         account.a,
         JSON.stringify(account),
-    ]), entropySourceId);
+    ]));
 }
 /**
  * Syncs the internal accounts list with the user storage accounts list.
@@ -64,9 +53,8 @@ export async function saveInternalAccountsListToUserStorage(options, entropySour
  *
  * @param config - parameters used for syncing the internal accounts list with the user storage accounts list
  * @param options - parameters used for syncing the internal accounts list with the user storage accounts list
- * @param entropySourceId - The entropy source ID used to derive the key,
  */
-export async function syncInternalAccountsWithUserStorage(config, options, entropySourceId) {
+export async function syncInternalAccountsWithUserStorage(config, options) {
     if (!canPerformAccountSyncing(options)) {
         return;
     }
@@ -74,9 +62,10 @@ export async function syncInternalAccountsWithUserStorage(config, options, entro
     const { getMessenger, getUserStorageControllerInstance } = options;
     try {
         await getUserStorageControllerInstance().setIsAccountSyncingInProgress(true);
-        const userStorageAccountsList = await getUserStorageAccountsList(options, entropySourceId);
+        const userStorageAccountsList = await getUserStorageAccountsList(options);
         if (!userStorageAccountsList || !userStorageAccountsList.length) {
-            await saveInternalAccountsListToUserStorage(options, entropySourceId);
+            await saveInternalAccountsListToUserStorage(options);
+            await getUserStorageControllerInstance().setHasAccountSyncingSyncedAtLeastOnce(true);
             return;
         }
         // Keep a record if erroneous situations are found during the sync
@@ -86,7 +75,7 @@ export async function syncInternalAccountsWithUserStorage(config, options, entro
         const internalAccountsToBeSavedToUserStorage = [];
         // Compare internal accounts list with user storage accounts list
         // First step: compare lengths
-        const internalAccountsList = await getInternalAccountsList(options, entropySourceId);
+        const internalAccountsList = await getInternalAccountsList(options);
         if (!internalAccountsList || !internalAccountsList.length) {
             throw new Error(`Failed to get internal accounts list`);
         }
@@ -97,8 +86,11 @@ export async function syncInternalAccountsWithUserStorage(config, options, entro
             const numberOfAccountsToAdd = Math.min(userStorageAccountsList.length, maxNumberOfAccountsToAdd) -
                 internalAccountsList.length;
             // Create new accounts to match the user storage accounts list
+            // NOTE: we only support the primary SRP HD keyring for now
+            // This is why we are hardcoding the index to 0
             await getMessenger().call('KeyringController:withKeyring', {
-                id: entropySourceId,
+                type: KeyringTypes.hd,
+                index: 0,
             }, async ({ keyring }) => {
                 await keyring.addAccounts(numberOfAccountsToAdd);
             });
@@ -109,7 +101,7 @@ export async function syncInternalAccountsWithUserStorage(config, options, entro
         }
         // Second step: compare account names
         // Get the internal accounts list again since new accounts might have been added in the previous step
-        const refreshedInternalAccountsList = await getInternalAccountsList(options, entropySourceId);
+        const refreshedInternalAccountsList = await getInternalAccountsList(options);
         const newlyAddedAccounts = refreshedInternalAccountsList.filter((account) => !internalAccountsList.find((a) => a.address === account.address));
         for (const internalAccount of refreshedInternalAccountsList) {
             const userStorageAccount = userStorageAccountsList.find((account) => account.a === internalAccount.address);
@@ -185,13 +177,13 @@ export async function syncInternalAccountsWithUserStorage(config, options, entro
             await getUserStorageControllerInstance().performBatchSetStorage(USER_STORAGE_FEATURE_NAMES.accounts, internalAccountsToBeSavedToUserStorage.map((account) => [
                 account.address,
                 JSON.stringify(mapInternalAccountToUserStorageAccount(account)),
-            ]), entropySourceId);
+            ]));
         }
         // In case we have corrupted user storage with accounts that don't exist in the internal accounts list
         // Delete those accounts from the user storage
         const userStorageAccountsToBeDeleted = userStorageAccountsList.filter((account) => !refreshedInternalAccountsList.find((a) => a.address === account.a));
         if (userStorageAccountsToBeDeleted.length) {
-            await getUserStorageControllerInstance().performBatchDeleteStorage(USER_STORAGE_FEATURE_NAMES.accounts, userStorageAccountsToBeDeleted.map((account) => account.a), entropySourceId);
+            await getUserStorageControllerInstance().performBatchDeleteStorage(USER_STORAGE_FEATURE_NAMES.accounts, userStorageAccountsToBeDeleted.map((account) => account.a));
             erroneousSituationsFound = true;
             onAccountSyncErroneousSituation?.('An account was present in the user storage accounts list but was not found in the internal accounts list after the sync', {
                 userStorageAccountsToBeDeleted,
@@ -203,8 +195,8 @@ export async function syncInternalAccountsWithUserStorage(config, options, entro
         }
         if (erroneousSituationsFound) {
             const [finalUserStorageAccountsList, finalInternalAccountsList] = await Promise.all([
-                getUserStorageAccountsList(options, entropySourceId),
-                getInternalAccountsList(options, entropySourceId),
+                getUserStorageAccountsList(options),
+                getInternalAccountsList(options),
             ]);
             const doesEveryAccountInInternalAccountsListExistInUserStorageAccountsList = finalInternalAccountsList.every((account) => finalUserStorageAccountsList?.some((userStorageAccount) => userStorageAccount.a === account.address));
             // istanbul ignore next
@@ -224,6 +216,9 @@ export async function syncInternalAccountsWithUserStorage(config, options, entro
                 onAccountSyncErroneousSituation?.('Erroneous situations were found during the sync, and final state does not match the expected state', context);
             }
         }
+        // We do this here and not in the finally statement because we want to make sure that
+        // the accounts are saved / updated / deleted at least once before we set this flag
+        await getUserStorageControllerInstance().setHasAccountSyncingSyncedAtLeastOnce(true);
     }
     catch (e) {
         // istanbul ignore next

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

@@ -1 +1 @@
-{"version":3,"file":"controller-integration.mjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/account-syncing/controller-integration.ts"],"names":[],"mappings":"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","sourcesContent":["import { 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 { AccountSyncingOptions } from './types';\nimport {\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 options - parameters used for saving the internal account\n */\nexport async function saveInternalAccountToUserStorage(\n  internalAccount: InternalAccount,\n  options: AccountSyncingOptions,\n): Promise<void> {\n  const { getUserStorageControllerInstance, getMessenger } = options;\n\n  if (\n    !canPerformAccountSyncing(options) ||\n    internalAccount.metadata.keyring.type !== String(KeyringTypes.hd) // sync only EVM accounts until we support multichain accounts\n  ) {\n    return;\n  }\n\n  // Refresh the internal accounts list so that it populates entropySourceId and derivationPath for all accounts\n  await getMessenger().call('AccountsController:updateAccounts');\n  // Find back our account from this refreshed list\n  const internalAccountsList = getMessenger().call(\n    'AccountsController:listAccounts',\n  );\n\n  const internalAccountFromList = internalAccountsList.find(\n    (account) => account.address === internalAccount.address,\n  );\n\n  // This should never happen because users don't have the ability to remove an accounts\n  // but if it does, we throw an error\n  // istanbul ignore next\n  if (!internalAccountFromList) {\n    throw new Error(\n      `UserStorageController - failed to find internal account in the list - ${internalAccount.address}`,\n    );\n  }\n\n  const entropySourceId =\n    String(\n      JSON.stringify(internalAccountFromList.options.entropySource).replace(\n        /\"/gu,\n        '',\n      ),\n    ) || undefined;\n\n  try {\n    // Map the internal account to the user storage account schema\n    const mappedAccount = mapInternalAccountToUserStorageAccount(\n      internalAccountFromList,\n    );\n\n    await getUserStorageControllerInstance().performSetStorage(\n      `${USER_STORAGE_FEATURE_NAMES.accounts}.${internalAccountFromList.address}`,\n      JSON.stringify(mappedAccount),\n      entropySourceId,\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 options - parameters used for saving the list of internal accounts\n * @param entropySourceId - The entropy source ID used to derive the key,\n * when multiple sources are available (Multi-SRP).\n */\nexport async function saveInternalAccountsListToUserStorage(\n  options: AccountSyncingOptions,\n  entropySourceId: string,\n): Promise<void> {\n  const { getUserStorageControllerInstance } = options;\n\n  const internalAccountsList = await getInternalAccountsList(\n    options,\n    entropySourceId,\n  );\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    entropySourceId,\n  );\n}\n\ntype SyncInternalAccountsWithUserStorageConfig = {\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 * @param entropySourceId - The entropy source ID used to derive the key,\n */\nexport async function syncInternalAccountsWithUserStorage(\n  config: SyncInternalAccountsWithUserStorageConfig,\n  options: AccountSyncingOptions,\n  entropySourceId: string,\n): Promise<void> {\n  if (!canPerformAccountSyncing(options)) {\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(\n      options,\n      entropySourceId,\n    );\n\n    if (!userStorageAccountsList || !userStorageAccountsList.length) {\n      await saveInternalAccountsListToUserStorage(options, entropySourceId);\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(\n      options,\n      entropySourceId,\n    );\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          id: entropySourceId,\n        },\n        async ({ keyring }) => {\n          await keyring.addAccounts(numberOfAccountsToAdd);\n        },\n      );\n\n      // TODO: below code is kept for analytics 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 = await getInternalAccountsList(\n      options,\n      entropySourceId,\n    );\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        entropySourceId,\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        entropySourceId,\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, entropySourceId),\n          getInternalAccountsList(options, entropySourceId),\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  } 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.mjs","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 { AccountSyncingOptions } from './types';\nimport {\n  isInternalAccountFromPrimarySRPHdKeyring,\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 options - parameters used for saving the internal account\n */\nexport async function saveInternalAccountToUserStorage(\n  internalAccount: InternalAccount,\n  options: AccountSyncingOptions,\n): Promise<void> {\n  const { getUserStorageControllerInstance } = options;\n\n  if (\n    !canPerformAccountSyncing(options) ||\n    !isEvmAccountType(internalAccount.type) ||\n    !(await isInternalAccountFromPrimarySRPHdKeyring(internalAccount, options))\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 options - parameters used for saving the list of internal accounts\n */\nexport async function saveInternalAccountsListToUserStorage(\n  options: AccountSyncingOptions,\n): Promise<void> {\n  const { getUserStorageControllerInstance } = options;\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 = {\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  if (!canPerformAccountSyncing(options)) {\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(options);\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      // NOTE: we only support the primary SRP HD keyring for now\n      // This is why we are hardcoding the index to 0\n      await getMessenger().call(\n        'KeyringController:withKeyring',\n        {\n          type: KeyringTypes.hd,\n          index: 0,\n        },\n        async ({ keyring }) => {\n          await keyring.addAccounts(numberOfAccountsToAdd);\n        },\n      );\n\n      // TODO: below code is kept for analytics 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/sync-utils.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUserStorageAccountsList = exports.getInternalAccountsList = exports.canPerformAccountSyncing = void 0;
-const keyring_controller_1 = require("@metamask/keyring-controller");
+const utils_1 = require("./utils.cjs");
 const storage_schema_1 = require("../../../shared/storage-schema.cjs");
 /**
  * Checks if account syncing can be performed based on a set of conditions
@@ -28,29 +28,24 @@ exports.canPerformAccountSyncing = canPerformAccountSyncing;
  * and are from the HD keyring
  *
  * @param options - parameters used for getting the list of internal accounts
- * @param entropySourceId - The entropy source ID used to derive the key,
- * when multiple sources are available (Multi-SRP).
  * @returns the list of internal accounts
  */
-async function getInternalAccountsList(options, entropySourceId) {
+async function getInternalAccountsList(options) {
     const { getMessenger } = options;
-    await getMessenger().call('AccountsController:updateAccounts');
-    const internalAccountsList = getMessenger().call('AccountsController:listAccounts');
-    return internalAccountsList.filter((account) => entropySourceId === account.options.entropySource &&
-        account.metadata.keyring.type === String(keyring_controller_1.KeyringTypes.hd));
+    // eslint-disable-next-line @typescript-eslint/await-thenable
+    const internalAccountsList = await getMessenger().call('AccountsController:listAccounts');
+    return await (0, utils_1.mapInternalAccountsListToPrimarySRPHdKeyringInternalAccountsList)(internalAccountsList, options);
 }
 exports.getInternalAccountsList = getInternalAccountsList;
 /**
  * Get the list of user storage accounts
  *
  * @param options - parameters used for getting the list of user storage accounts
- * @param entropySourceId - The entropy source ID used to derive the storage key,
- * when multiple sources are available (Multi-SRP).
  * @returns the list of user storage accounts
  */
-async function getUserStorageAccountsList(options, entropySourceId) {
+async function getUserStorageAccountsList(options) {
     const { getUserStorageControllerInstance } = options;
-    const rawAccountsListResponse = await getUserStorageControllerInstance().performGetStorageAllFeatureEntries(storage_schema_1.USER_STORAGE_FEATURE_NAMES.accounts, entropySourceId);
+    const rawAccountsListResponse = await getUserStorageControllerInstance().performGetStorageAllFeatureEntries(storage_schema_1.USER_STORAGE_FEATURE_NAMES.accounts);
     return (rawAccountsListResponse?.map((rawAccount) => JSON.parse(rawAccount)) ?? null);
 }
 exports.getUserStorageAccountsList = getUserStorageAccountsList;

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

@@ -1 +1 @@
-{"version":3,"file":"sync-utils.cjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/account-syncing/sync-utils.ts"],"names":[],"mappings":";;;AAAA,qEAA4D;AAI5D,uEAA4E;AAE5E;;;;;GAKG;AACH,SAAgB,wBAAwB,CACtC,OAA8B;IAE9B,MAAM,EAAE,YAAY,EAAE,gCAAgC,EAAE,GAAG,OAAO,CAAC;IAEnE,MAAM,EACJ,sBAAsB,EACtB,uBAAuB,EACvB,0BAA0B,GAC3B,GAAG,gCAAgC,EAAE,CAAC,KAAK,CAAC;IAC7C,MAAM,aAAa,GAAG,YAAY,EAAE,CAAC,IAAI,CACvC,qCAAqC,CACtC,CAAC;IAEF,IACE,CAAC,sBAAsB;QACvB,CAAC,uBAAuB;QACxB,CAAC,aAAa;QACd,0BAA0B,EAC1B;QACA,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAxBD,4DAwBC;AAED;;;;;;;;;GASG;AACI,KAAK,UAAU,uBAAuB,CAC3C,OAA8B,EAC9B,eAAuB;IAEvB,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAEjC,MAAM,YAAY,EAAE,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;IAE/D,MAAM,oBAAoB,GAAG,YAAY,EAAE,CAAC,IAAI,CAC9C,iCAAiC,CAClC,CAAC;IAEF,OAAO,oBAAoB,CAAC,MAAM,CAChC,CAAC,OAAO,EAAE,EAAE,CACV,eAAe,KAAK,OAAO,CAAC,OAAO,CAAC,aAAa;QACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,iCAAY,CAAC,EAAE,CAAC,CAC5D,CAAC;AACJ,CAAC;AAjBD,0DAiBC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,0BAA0B,CAC9C,OAA8B,EAC9B,eAAwB;IAExB,MAAM,EAAE,gCAAgC,EAAE,GAAG,OAAO,CAAC;IAErD,MAAM,uBAAuB,GAC3B,MAAM,gCAAgC,EAAE,CAAC,kCAAkC,CACzE,2CAA0B,CAAC,QAAQ,EACnC,eAAe,CAChB,CAAC;IAEJ,OAAO,CACL,uBAAuB,EAAE,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,IAAI,CAC7E,CAAC;AACJ,CAAC;AAfD,gEAeC","sourcesContent":["import { KeyringTypes } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport type { AccountSyncingOptions, UserStorageAccount } from './types';\nimport { USER_STORAGE_FEATURE_NAMES } from '../../../shared/storage-schema';\n\n/**\n * Checks if account syncing can be performed based on a set of conditions\n *\n * @param options - parameters used for checking if account syncing can be performed\n * @returns Returns true if account syncing can be performed, false otherwise.\n */\nexport function canPerformAccountSyncing(\n  options: AccountSyncingOptions,\n): boolean {\n  const { getMessenger, getUserStorageControllerInstance } = options;\n\n  const {\n    isBackupAndSyncEnabled,\n    isAccountSyncingEnabled,\n    isAccountSyncingInProgress,\n  } = getUserStorageControllerInstance().state;\n  const isAuthEnabled = getMessenger().call(\n    'AuthenticationController:isSignedIn',\n  );\n\n  if (\n    !isBackupAndSyncEnabled ||\n    !isAccountSyncingEnabled ||\n    !isAuthEnabled ||\n    isAccountSyncingInProgress\n  ) {\n    return false;\n  }\n\n  return true;\n}\n\n/**\n * Get the list of internal accounts\n * This function returns only the internal accounts that are from the primary SRP\n * and are from the HD keyring\n *\n * @param options - parameters used for getting the list of internal accounts\n * @param entropySourceId - The entropy source ID used to derive the key,\n * when multiple sources are available (Multi-SRP).\n * @returns the list of internal accounts\n */\nexport async function getInternalAccountsList(\n  options: AccountSyncingOptions,\n  entropySourceId: string,\n): Promise<InternalAccount[]> {\n  const { getMessenger } = options;\n\n  await getMessenger().call('AccountsController:updateAccounts');\n\n  const internalAccountsList = getMessenger().call(\n    'AccountsController:listAccounts',\n  );\n\n  return internalAccountsList.filter(\n    (account) =>\n      entropySourceId === account.options.entropySource &&\n      account.metadata.keyring.type === String(KeyringTypes.hd), // sync only EVM accounts until we support multichain accounts\n  );\n}\n\n/**\n * Get the list of user storage accounts\n *\n * @param options - parameters used for getting the list of user storage accounts\n * @param entropySourceId - The entropy source ID used to derive the storage key,\n * when multiple sources are available (Multi-SRP).\n * @returns the list of user storage accounts\n */\nexport async function getUserStorageAccountsList(\n  options: AccountSyncingOptions,\n  entropySourceId?: string,\n): Promise<UserStorageAccount[] | null> {\n  const { getUserStorageControllerInstance } = options;\n\n  const rawAccountsListResponse =\n    await getUserStorageControllerInstance().performGetStorageAllFeatureEntries(\n      USER_STORAGE_FEATURE_NAMES.accounts,\n      entropySourceId,\n    );\n\n  return (\n    rawAccountsListResponse?.map((rawAccount) => JSON.parse(rawAccount)) ?? null\n  );\n}\n"]}
+{"version":3,"file":"sync-utils.cjs","sourceRoot":"","sources":["../../../../src/controllers/user-storage/account-syncing/sync-utils.ts"],"names":[],"mappings":";;;AAGA,uCAA2F;AAC3F,uEAA4E;AAE5E;;;;;GAKG;AACH,SAAgB,wBAAwB,CACtC,OAA8B;IAE9B,MAAM,EAAE,YAAY,EAAE,gCAAgC,EAAE,GAAG,OAAO,CAAC;IAEnE,MAAM,EACJ,sBAAsB,EACtB,uBAAuB,EACvB,0BAA0B,GAC3B,GAAG,gCAAgC,EAAE,CAAC,KAAK,CAAC;IAC7C,MAAM,aAAa,GAAG,YAAY,EAAE,CAAC,IAAI,CACvC,qCAAqC,CACtC,CAAC;IAEF,IACE,CAAC,sBAAsB;QACvB,CAAC,uBAAuB;QACxB,CAAC,aAAa;QACd,0BAA0B,EAC1B;QACA,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAxBD,4DAwBC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,uBAAuB,CAC3C,OAA8B;IAE9B,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IAEjC,6DAA6D;IAC7D,MAAM,oBAAoB,GAAG,MAAM,YAAY,EAAE,CAAC,IAAI,CACpD,iCAAiC,CAClC,CAAC;IAEF,OAAO,MAAM,IAAA,wEAAgE,EAC3E,oBAAoB,EACpB,OAAO,CACR,CAAC;AACJ,CAAC;AAdD,0DAcC;AAED;;;;;GAKG;AACI,KAAK,UAAU,0BAA0B,CAC9C,OAA8B;IAE9B,MAAM,EAAE,gCAAgC,EAAE,GAAG,OAAO,CAAC;IAErD,MAAM,uBAAuB,GAC3B,MAAM,gCAAgC,EAAE,CAAC,kCAAkC,CACzE,2CAA0B,CAAC,QAAQ,CACpC,CAAC;IAEJ,OAAO,CACL,uBAAuB,EAAE,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,IAAI,CAC7E,CAAC;AACJ,CAAC;AAbD,gEAaC","sourcesContent":["import type { InternalAccount } from '@metamask/keyring-internal-api';\n\nimport type { AccountSyncingOptions, UserStorageAccount } from './types';\nimport { mapInternalAccountsListToPrimarySRPHdKeyringInternalAccountsList } from './utils';\nimport { USER_STORAGE_FEATURE_NAMES } from '../../../shared/storage-schema';\n\n/**\n * Checks if account syncing can be performed based on a set of conditions\n *\n * @param options - parameters used for checking if account syncing can be performed\n * @returns Returns true if account syncing can be performed, false otherwise.\n */\nexport function canPerformAccountSyncing(\n  options: AccountSyncingOptions,\n): boolean {\n  const { getMessenger, getUserStorageControllerInstance } = options;\n\n  const {\n    isBackupAndSyncEnabled,\n    isAccountSyncingEnabled,\n    isAccountSyncingInProgress,\n  } = getUserStorageControllerInstance().state;\n  const isAuthEnabled = getMessenger().call(\n    'AuthenticationController:isSignedIn',\n  );\n\n  if (\n    !isBackupAndSyncEnabled ||\n    !isAccountSyncingEnabled ||\n    !isAuthEnabled ||\n    isAccountSyncingInProgress\n  ) {\n    return false;\n  }\n\n  return true;\n}\n\n/**\n * Get the list of internal accounts\n * This function returns only the internal accounts that are from the primary SRP\n * and are from the HD keyring\n *\n * @param options - parameters used for getting the list of internal accounts\n * @returns the list of internal accounts\n */\nexport async function getInternalAccountsList(\n  options: AccountSyncingOptions,\n): Promise<InternalAccount[]> {\n  const { getMessenger } = options;\n\n  // eslint-disable-next-line @typescript-eslint/await-thenable\n  const internalAccountsList = await getMessenger().call(\n    'AccountsController:listAccounts',\n  );\n\n  return await mapInternalAccountsListToPrimarySRPHdKeyringInternalAccountsList(\n    internalAccountsList,\n    options,\n  );\n}\n\n/**\n * Get the list of user storage accounts\n *\n * @param options - parameters used for getting the list of user storage accounts\n * @returns the list of user storage accounts\n */\nexport async function getUserStorageAccountsList(\n  options: AccountSyncingOptions,\n): Promise<UserStorageAccount[] | null> {\n  const { getUserStorageControllerInstance } = options;\n\n  const rawAccountsListResponse =\n    await getUserStorageControllerInstance().performGetStorageAllFeatureEntries(\n      USER_STORAGE_FEATURE_NAMES.accounts,\n    );\n\n  return (\n    rawAccountsListResponse?.map((rawAccount) => JSON.parse(rawAccount)) ?? null\n  );\n}\n"]}

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

@@ -13,18 +13,14 @@ export declare function canPerformAccountSyncing(options: AccountSyncingOptions)
  * and are from the HD keyring
  *
  * @param options - parameters used for getting the list of internal accounts
- * @param entropySourceId - The entropy source ID used to derive the key,
- * when multiple sources are available (Multi-SRP).
  * @returns the list of internal accounts
  */
-export declare function getInternalAccountsList(options: AccountSyncingOptions, entropySourceId: string): Promise<InternalAccount[]>;
+export declare function getInternalAccountsList(options: AccountSyncingOptions): Promise<InternalAccount[]>;
 /**
  * Get the list of user storage accounts
  *
  * @param options - parameters used for getting the list of user storage accounts
- * @param entropySourceId - The entropy source ID used to derive the storage key,
- * when multiple sources are available (Multi-SRP).
  * @returns the list of user storage accounts
  */
-export declare function getUserStorageAccountsList(options: AccountSyncingOptions, entropySourceId?: string): Promise<UserStorageAccount[] | null>;
+export declare function getUserStorageAccountsList(options: AccountSyncingOptions): Promise<UserStorageAccount[] | null>;
 //# sourceMappingURL=sync-utils.d.cts.map

package/dist/controllers/user-storage/account-syncing/sync-utils.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"sync-utils.d.cts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/account-syncing/sync-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,oBAAgB;AAGzE;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAsBT;AAED;;;;;;;;;GASG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,qBAAqB,EAC9B,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,eAAe,EAAE,CAAC,CAc5B;AAED;;;;;;;GAOG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,qBAAqB,EAC9B,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,kBAAkB,EAAE,GAAG,IAAI,CAAC,CAYtC"}
+{"version":3,"file":"sync-utils.d.cts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/account-syncing/sync-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,oBAAgB;AAIzE;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAsBT;AAED;;;;;;;GAOG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,eAAe,EAAE,CAAC,CAY5B;AAED;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,kBAAkB,EAAE,GAAG,IAAI,CAAC,CAWtC"}

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

@@ -13,18 +13,14 @@ export declare function canPerformAccountSyncing(options: AccountSyncingOptions)
  * and are from the HD keyring
  *
  * @param options - parameters used for getting the list of internal accounts
- * @param entropySourceId - The entropy source ID used to derive the key,
- * when multiple sources are available (Multi-SRP).
  * @returns the list of internal accounts
  */
-export declare function getInternalAccountsList(options: AccountSyncingOptions, entropySourceId: string): Promise<InternalAccount[]>;
+export declare function getInternalAccountsList(options: AccountSyncingOptions): Promise<InternalAccount[]>;
 /**
  * Get the list of user storage accounts
  *
  * @param options - parameters used for getting the list of user storage accounts
- * @param entropySourceId - The entropy source ID used to derive the storage key,
- * when multiple sources are available (Multi-SRP).
  * @returns the list of user storage accounts
  */
-export declare function getUserStorageAccountsList(options: AccountSyncingOptions, entropySourceId?: string): Promise<UserStorageAccount[] | null>;
+export declare function getUserStorageAccountsList(options: AccountSyncingOptions): Promise<UserStorageAccount[] | null>;
 //# sourceMappingURL=sync-utils.d.mts.map

package/dist/controllers/user-storage/account-syncing/sync-utils.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"sync-utils.d.mts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/account-syncing/sync-utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,oBAAgB;AAGzE;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAsBT;AAED;;;;;;;;;GASG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,qBAAqB,EAC9B,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,eAAe,EAAE,CAAC,CAc5B;AAED;;;;;;;GAOG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,qBAAqB,EAC9B,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,kBAAkB,EAAE,GAAG,IAAI,CAAC,CAYtC"}
+{"version":3,"file":"sync-utils.d.mts","sourceRoot":"","sources":["../../../../src/controllers/user-storage/account-syncing/sync-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,uCAAuC;AAEtE,OAAO,KAAK,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,oBAAgB;AAIzE;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAsBT;AAED;;;;;;;GAOG;AACH,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,eAAe,EAAE,CAAC,CAY5B;AAED;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,kBAAkB,EAAE,GAAG,IAAI,CAAC,CAWtC"}

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

@@ -1,4 +1,4 @@
-import { KeyringTypes } from "@metamask/keyring-controller";
+import { mapInternalAccountsListToPrimarySRPHdKeyringInternalAccountsList } from "./utils.mjs";
 import { USER_STORAGE_FEATURE_NAMES } from "../../../shared/storage-schema.mjs";
 /**
  * Checks if account syncing can be performed based on a set of conditions
@@ -24,28 +24,23 @@ export function canPerformAccountSyncing(options) {
  * and are from the HD keyring
  *
  * @param options - parameters used for getting the list of internal accounts
- * @param entropySourceId - The entropy source ID used to derive the key,
- * when multiple sources are available (Multi-SRP).
  * @returns the list of internal accounts
  */
-export async function getInternalAccountsList(options, entropySourceId) {
+export async function getInternalAccountsList(options) {
     const { getMessenger } = options;
-    await getMessenger().call('AccountsController:updateAccounts');
-    const internalAccountsList = getMessenger().call('AccountsController:listAccounts');
-    return internalAccountsList.filter((account) => entropySourceId === account.options.entropySource &&
-        account.metadata.keyring.type === String(KeyringTypes.hd));
+    // eslint-disable-next-line @typescript-eslint/await-thenable
+    const internalAccountsList = await getMessenger().call('AccountsController:listAccounts');
+    return await mapInternalAccountsListToPrimarySRPHdKeyringInternalAccountsList(internalAccountsList, options);
 }
 /**
  * Get the list of user storage accounts
  *
  * @param options - parameters used for getting the list of user storage accounts
- * @param entropySourceId - The entropy source ID used to derive the storage key,
- * when multiple sources are available (Multi-SRP).
  * @returns the list of user storage accounts
  */
-export async function getUserStorageAccountsList(options, entropySourceId) {
+export async function getUserStorageAccountsList(options) {
     const { getUserStorageControllerInstance } = options;
-    const rawAccountsListResponse = await getUserStorageControllerInstance().performGetStorageAllFeatureEntries(USER_STORAGE_FEATURE_NAMES.accounts, entropySourceId);
+    const rawAccountsListResponse = await getUserStorageControllerInstance().performGetStorageAllFeatureEntries(USER_STORAGE_FEATURE_NAMES.accounts);
     return (rawAccountsListResponse?.map((rawAccount) => JSON.parse(rawAccount)) ?? null);
 }
 //# sourceMappingURL=sync-utils.mjs.map