@oxy.so/core 7.30.0 → 7.32.0

package/dist/esm/crypto/keyManager.js

@@ -11,9 +11,9 @@ import { isDev, logger } from '../logger/index.js';
 import { deriveScopedSeedFromKey, signSocialReceiveDigest } from './identityDerivations.js';
 import { registerIdentitySignerStore } from './identitySigner.js';
 import { getOrganizationPrivateKey, isOrganizationAccountId } from './organizationKeys.js';
-import { forgetRetiredIdentityKeys, getRetiredPrivateKey, retiredKeyScope } from './retiredKeys.js';
+import { getRetiredPrivateKey, retiredKeyScope } from './retiredKeys.js';
 import { groupedKeychainStore, resolveKeychainAccess, } from '../utils/keychainAccessGroups.js';
-import { ensureKeychainGroupsMigrated } from './keychainGroupMigration.js';
+import { prepareKeychainAccess } from './keychainGroupMigration.js';
 import { RECOVERY_MNEMONIC_KEYCHAIN_SERVICE, RECOVERY_MNEMONIC_STORAGE_KEY, STORAGE_KEYS, V2_BACKUP_KEYCHAIN_SERVICE, V2_PRIMARY_KEYCHAIN_SERVICE, V2_STORAGE_KEYS, } from './keychainItems.js';
 import { clearIdentityMarker, readIdentityMarker, updateIdentityMarker, writeIdentityMarker, } from './identityMarker.js';
 import { DEVICE_BACKUP_VERSION, parseDeviceBackup, serializeDeviceBackup, } from './deviceBackup.js';
@@ -172,9 +172,7 @@ async function loadRawSecureStore() {
 async function keychainItemStore(item) {
     const raw = await loadRawSecureStore();
     const access = await resolveKeychainAccess();
-    if (access.mode === 'grouped' && access.role === 'holder') {
-        await ensureKeychainGroupsMigrated();
-    }
+    await prepareKeychainAccess(access);
     return groupedKeychainStore(raw, access, item);
 }
 /** The store for the identity slots (primary, backup, legacy, phrase): Commons only on iOS. */
@@ -2050,13 +2048,12 @@ export class KeyManager {
         if (force) {
             await KeyManager._bestEffortDeleteBackupsAllGenerations(store);
             await KeyManager._clearSharedSlot(store);
-            // The person's retired keys go with the identity they belonged to.
-            try {
-                await forgetRetiredIdentityKeys();
-            }
-            catch (error) {
-                logger.warn('Failed to clear retired keys during delete', { component: 'KeyManager' }, error);
-            }
+            // The retired ring is NOT cleared (R4-4): it is money under the person's
+            // previous keys, and "Start over" or a forced delete must not cost it.
+            // The same person restoring their identity finds it again; a different
+            // identity on this phone cannot use it (each entry is checked against
+            // that account's key history before use). Only deleting the Oxy ACCOUNT
+            // clears it, explicitly (`forgetRetiredIdentityKeys`, Commons' flow).
         }
         // The device backup goes on EVERY delete, forced or not: it is restored
         // silently, so leaving it would bring a deleted identity back on the next