@oxy.so/core 7.32.0 → 7.33.0

package/dist/cjs/api/identity.js

@@ -237,7 +237,7 @@ class IdentityApi {
             try {
                 if (!oldPrivateKeyForRing)
                     throw new Error('no readable private key');
-                await retireIdentityKey({ privateKey: oldPrivateKeyForRing, publicKey: oldPublicKey });
+                await retireIdentityKey({ privateKey: oldPrivateKeyForRing, publicKey: oldPublicKey }, { ownerAccountId: userId });
             }
             catch (retainError) {
                 logger_1.logger.warn('Could not keep the current key as a retired key; not rotating.', { component: 'oxy.identity', method: 'rotateKey' }, retainError);
@@ -670,9 +670,12 @@ class IdentityBackupApi {
         if ((0, platform_1.isWeb)())
             return [];
         const { exportRetiredIdentityKeys } = await Promise.resolve().then(() => __importStar(require('../crypto/index')));
+        const userId = this.ctx.oxy.session.userId;
+        if (!userId)
+            throw new Error('No authenticated user — sign in before backing up.');
         let held;
         try {
-            held = await exportRetiredIdentityKeys();
+            held = await exportRetiredIdentityKeys({ ownerAccountId: userId });
         }
         catch {
             return []; // Not Commons: this app holds no ring to carry.
@@ -731,6 +734,11 @@ class IdentityBackupApi {
      */
     async keepCarriedRetiredKeys(payload) {
         const { KeyManager, retireIdentityKey } = await Promise.resolve().then(() => __importStar(require('../crypto/index')));
+        // The backup is the signed-in account's (its phrase opened it): its keys
+        // are kept for that account only (R5-2).
+        const ownerAccountId = this.ctx.oxy.session.userId;
+        if (!ownerAccountId)
+            throw new Error('No authenticated user — sign in before restoring.');
         let kept = 0;
         for (const key of Array.isArray(payload.retiredKeys) ? payload.retiredKeys : []) {
             try {
@@ -741,7 +749,7 @@ class IdentityBackupApi {
                 if (KeyManager.derivePublicKey(key.privateKey).toLowerCase() !== key.publicKey.toLowerCase()) {
                     continue;
                 }
-                await retireIdentityKey({ privateKey: key.privateKey, publicKey: key.publicKey });
+                await retireIdentityKey({ privateKey: key.privateKey, publicKey: key.publicKey }, { ownerAccountId });
                 kept += 1;
             }
             catch (error) {

package/dist/cjs/crypto/index.js

@@ -12,8 +12,8 @@
  * common chunk, which is the cost the lazy loading exists to avoid.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AEAD_NONCE_LENGTH = exports.AEAD_KEY_LENGTH = exports.decryptAead = exports.encryptAead = exports.hkdfSha256 = exports.BACKUP_KDF_ENCRYPTION_INFO = exports.RecoveryPhraseService = exports.SignatureService = exports.exportRetiredIdentityKeys = exports.retiredKeyFromPrivateKey = exports.retiredKeyFromPhrase = exports.syncRetiredKeys = exports.forgetRetiredIdentityKeys = exports.forgetRetiredIdentityKey = exports.listRetiredIdentityKeys = exports.retireIdentityKey = exports.getPreSplitExposure = exports.ensureKeychainGroupsMigrated = exports.groupedKeychainStore = exports.deleteThroughPlan = exports.readThroughPlan = exports.ownKeychainItemPlan = exports.keychainWriteOption = exports.keychainDeletePlan = exports.keychainReadPlan = exports.keychainAccessGroupValue = exports.resolveKeychainAccess = exports.DEV_KEYCHAIN_GROUP_SUFFIX = exports.mayWriteKeychainItem = exports.mayHoldKeychainItem = exports.keychainGroupFor = exports.KeychainAccessUnavailableError = exports.KEYCHAIN_ACCESS_GROUPS = exports.isHealthyOrganizationKeyPair = exports.isOrganizationAccountId = exports.syncOrganizationKeys = exports.deleteOrganizationKey = exports.listOrganizationKeys = exports.getOrganizationRecoveryPhrase = exports.getOrganizationPrivateKey = exports.getOrganizationPublicKey = exports.storeOrganizationKey = exports.organizationKeyFromPhrase = exports.generateOrganizationKey = exports.updateIdentityMarker = exports.readIdentityMarker = exports.IdentityUnavailableError = exports.IdentityPersistError = exports.IdentityAlreadyExistsError = exports.KeyManager = void 0;
-exports.verifySignature = exports.signMessage = exports.loadCommonsIdentityBridge = exports.canonicalize = exports.createContentHasher = exports.solveRegistrationPow = exports.deriveIdentityLinkCode = exports.signIdentityProof = exports.digestIdentityPayload = exports.authChallengeDigest = exports.signSocialReceiveDigest = exports.deriveScopedSeedFromKey = exports.MAX_SOCIAL_RECEIVE_INDEX = exports.SOCIAL_RECEIVE_CHAIN_CODE_KEY = exports.SCOPED_SEED_KDF_SALT = exports.deriveSharedSecret = void 0;
+exports.hkdfSha256 = exports.BACKUP_KDF_ENCRYPTION_INFO = exports.RecoveryPhraseService = exports.SignatureService = exports.RetiredKeyRingUnreadableError = exports.unmirrorPersonalRetiredKeys = exports.countQuarantinedRetiredKeys = exports.claimRetiredIdentityKeys = exports.exportRetiredIdentityKeys = exports.retiredKeyFromPrivateKey = exports.retiredKeyFromPhrase = exports.syncRetiredKeys = exports.forgetRetiredIdentityKeys = exports.forgetRetiredIdentityKey = exports.listRetiredIdentityKeys = exports.retireIdentityKey = exports.getPreSplitExposure = exports.ensureKeychainGroupsMigrated = exports.groupedKeychainStore = exports.deleteThroughPlan = exports.readThroughPlan = exports.ownKeychainItemPlan = exports.keychainWriteOption = exports.keychainDeletePlan = exports.keychainReadPlan = exports.keychainAccessGroupValue = exports.resolveKeychainAccess = exports.DEV_KEYCHAIN_GROUP_SUFFIX = exports.mayWriteKeychainItem = exports.mayHoldKeychainItem = exports.keychainGroupFor = exports.KeychainAccessUnavailableError = exports.KEYCHAIN_ACCESS_GROUPS = exports.isHealthyOrganizationKeyPair = exports.isOrganizationAccountId = exports.syncOrganizationKeys = exports.deleteOrganizationKey = exports.listOrganizationKeys = exports.getOrganizationRecoveryPhrase = exports.getOrganizationPrivateKey = exports.getOrganizationPublicKey = exports.storeOrganizationKey = exports.organizationKeyFromPhrase = exports.generateOrganizationKey = exports.updateIdentityMarker = exports.readIdentityMarker = exports.IdentityUnavailableError = exports.IdentityPersistError = exports.IdentityAlreadyExistsError = exports.KeyManager = void 0;
+exports.verifySignature = exports.signMessage = exports.loadCommonsIdentityBridge = exports.canonicalize = exports.createContentHasher = exports.solveRegistrationPow = exports.deriveIdentityLinkCode = exports.signIdentityProof = exports.digestIdentityPayload = exports.authChallengeDigest = exports.signSocialReceiveDigest = exports.deriveScopedSeedFromKey = exports.MAX_SOCIAL_RECEIVE_INDEX = exports.SOCIAL_RECEIVE_CHAIN_CODE_KEY = exports.SCOPED_SEED_KDF_SALT = exports.deriveSharedSecret = exports.AEAD_NONCE_LENGTH = exports.AEAD_KEY_LENGTH = exports.decryptAead = exports.encryptAead = void 0;
 // MUST stay the first import: the shim has to exist before any module below
 // evaluates or draws randomness (see `./polyfill`).
 require("./polyfill");
@@ -69,6 +69,10 @@ Object.defineProperty(exports, "syncRetiredKeys", { enumerable: true, get: funct
 Object.defineProperty(exports, "retiredKeyFromPhrase", { enumerable: true, get: function () { return retiredKeys_1.retiredKeyFromPhrase; } });
 Object.defineProperty(exports, "retiredKeyFromPrivateKey", { enumerable: true, get: function () { return retiredKeys_1.retiredKeyFromPrivateKey; } });
 Object.defineProperty(exports, "exportRetiredIdentityKeys", { enumerable: true, get: function () { return retiredKeys_1.exportRetiredIdentityKeys; } });
+Object.defineProperty(exports, "claimRetiredIdentityKeys", { enumerable: true, get: function () { return retiredKeys_1.claimRetiredIdentityKeys; } });
+Object.defineProperty(exports, "countQuarantinedRetiredKeys", { enumerable: true, get: function () { return retiredKeys_1.countQuarantinedRetiredKeys; } });
+Object.defineProperty(exports, "unmirrorPersonalRetiredKeys", { enumerable: true, get: function () { return retiredKeys_1.unmirrorPersonalRetiredKeys; } });
+Object.defineProperty(exports, "RetiredKeyRingUnreadableError", { enumerable: true, get: function () { return retiredKeys_1.RetiredKeyRingUnreadableError; } });
 var signatureService_1 = require("./signatureService");
 Object.defineProperty(exports, "SignatureService", { enumerable: true, get: function () { return signatureService_1.SignatureService; } });
 var recoveryPhrase_1 = require("./recoveryPhrase");

package/dist/cjs/crypto/keyManager.js

@@ -788,12 +788,30 @@ class KeyManager {
      * `signSocialReceive`) is fresh, so a cached key here would let a caller
      * compare a new seed against an old key.
      *
+     * iOS, in an app that holds the private key (Commons, the Peable wallet:
+     * keychain roles `holder` and `wallet`): DERIVED from the private key in the
+     * wallet group, never read from the public-key item, which sits in the shared
+     * group every Oxy app can write (R5-1); `null` when that app holds no private
+     * key. Every other iOS app reads the public-key item: it holds nothing it
+     * could derive from, and it never spends. Money code uses
+     * {@link getIdentityPublicKeyForMoney}.
+     *
      * @returns Shared public key or null if no shared identity exists
      */
     static async getSharedPublicKey() {
         if (isWebPlatform()) {
             return null;
         }
+        if ((0, platform_1.isIOS)() && (await KeyManager._holdsSpendingKeys())) {
+            // Not cached: a rotation in Commons changes it under the wallet.
+            try {
+                const privateKey = await KeyManager.getSharedPrivateKey();
+                return privateKey ? KeyManager.derivePublicKey(privateKey) : null;
+            }
+            catch {
+                return null;
+            }
+        }
         // Return cached value if available (iOS only; see above).
         if (!(0, platform_1.isAndroid)() && KeyManager.cachedSharedPublicKey !== null) {
             return KeyManager.cachedSharedPublicKey;
@@ -826,6 +844,68 @@ class KeyManager {
             return null;
         }
     }
+    /**
+     * Whether this iOS app holds spending keys (keychain role `holder` or
+     * `wallet`), so a public key it uses for money must be derived from them.
+     * Throws while the keychain cannot say. @internal
+     */
+    static async _holdsSpendingKeys() {
+        const access = await (0, keychainAccessGroups_1.resolveKeychainAccess)();
+        return access.mode === 'grouped' && access.role !== 'member';
+    }
+    /**
+     * THE public key of the identity a money holder (the Peable wallet, Commons)
+     * receives and spends with: the personal key, or with `opts.accountId` that
+     * organization's (ADR 0061 D6). It is the public half of exactly the private
+     * key {@link deriveScopedSeed} and {@link signSocialReceive} use, so an
+     * address shown from it is one this app can spend (R5-1).
+     *
+     * - iOS (Commons, the Peable wallet): DERIVED from the private key in the
+     *   restricted keychain groups (personal: the wallet group's slot, then
+     *   Commons' primary; organization: its pair). Never the shared group's
+     *   public-key item, which every Oxy app can write. `null` when no private
+     *   key is held, and in every other iOS app.
+     * - Android: inside Commons derived from its own key; elsewhere Commons'
+     *   identity host (`describe`), which answers from Commons' own signer
+     *   store over signature-protected IPC.
+     * - Web: `null`.
+     *
+     * Compare the answer with the account's published `#key-1` before showing a
+     * receive address (Peable ADR 0002). Lowercase uncompressed (`04…`).
+     */
+    static async getIdentityPublicKeyForMoney(opts) {
+        if (isWebPlatform()) {
+            return null;
+        }
+        const accountId = opts?.accountId;
+        if (accountId !== undefined) {
+            if (!(0, organizationKeys_1.isOrganizationAccountId)(accountId))
+                return null;
+            if ((0, platform_1.isAndroid)() && !KeyManager.identitySignerStore) {
+                const bridge = await (0, protocol_1.loadCommonsIdentityBridge)();
+                const description = (await bridge?.describe(accountId)) ?? null;
+                return description?.accountId === accountId && description.publicKey
+                    ? KeyManager.canonicalPublicKey(description.publicKey)
+                    : null;
+            }
+            const organizationKey = await (0, organizationKeys_1.getOrganizationPrivateKey)(accountId);
+            return organizationKey ? KeyManager.derivePublicKey(organizationKey) : null;
+        }
+        if ((0, platform_1.isAndroid)()) {
+            if (KeyManager.identitySignerStore) {
+                const local = await KeyManager.getPrivateKey();
+                return local ? KeyManager.derivePublicKey(local) : null;
+            }
+            const bridge = await (0, protocol_1.loadCommonsIdentityBridge)();
+            const publicKey = (await bridge?.describe())?.publicKey ?? null;
+            return publicKey ? KeyManager.canonicalPublicKey(publicKey) : null;
+        }
+        if (!(0, platform_1.isIOS)()) {
+            return null;
+        }
+        const privateKey = (await KeyManager.getSharedPrivateKey()) ?? (await KeyManager.getPrivateKey());
+        return privateKey ? KeyManager.derivePublicKey(privateKey) : null;
+    }
     /**
      * The shared private key, where this app may hold it: iOS only.
      *
@@ -2089,18 +2169,26 @@ class KeyManager {
             await KeyManager._clearSharedSlot(store);
             // 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).
+            // Every personal entry is bound to its owner's account id (R5-2), so the
+            // same person signing in again finds it, and a different person on this
+            // phone never lists, derives from or signs with it. Only deleting the Oxy
+            // ACCOUNT clears it, explicitly (`forgetRetiredIdentityKeys`).
         }
         // 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
         // launch. Best-effort, like the other recovery sources.
         await KeyManager._clearDeviceBackup();
         // Same for the Android signer store: Commons' identity host must stop
-        // answering for a deleted identity, forced or not.
+        // answering for a deleted identity, forced or not — its personal retired
+        // keys included (R5-2): they stay in Commons' own ring, bound to their
+        // owner, but the host must not hand them to the next person on the phone.
         await KeyManager._clearIdentitySigner();
+        try {
+            await (0, retiredKeys_1.unmirrorPersonalRetiredKeys)();
+        }
+        catch (error) {
+            logger_1.logger.warn('Failed to withdraw the personal retired keys from the identity host', { component: 'KeyManager' }, error);
+        }
         // Clear the marker AFTER key deletion succeeds — a marker must never outlive
         // its identity (a leftover marker would route a truly-absent device to
         // `recovery` instead of `welcome`).
@@ -2629,11 +2717,16 @@ class KeyManager {
      * (personal, or `accountId`'s) whose public key it names: the current key
      * when it matches, else a RETIRED key Commons kept after a rotation or
      * replacement (`./retiredKeys`, ADR 0061 D7 as amended). Spending only: a
-     * retired key never signs in. Never falls back to another key.
+     * retired key never signs in. Never falls back to another key. A PERSONAL
+     * retired key is reached only with `opts.ownerAccountId`, the signed-in
+     * person's account id, and only when the ring keeps it for that account
+     * (R5-2); on Android outside Commons the identity host holds only the
+     * personal keys of the person Commons is signed in as.
      *
      * @param info Context/domain-binding label (distinct labels → independent seeds).
      * @param opts.accountId An organization's account id, for its key.
      * @param opts.publicKey Selects one key of that account by its public key.
+     * @param opts.ownerAccountId The person's account id, for a personal retired key.
      * @returns 32 bytes of derived keying material, or `null` on web / when no
      *          identity key is available to this app.
      */
@@ -2650,7 +2743,7 @@ class KeyManager {
                 const seed = (await bridge?.deriveRetiredScopedSeed?.(info, selected, opts.accountId)) ?? null;
                 return seed ? hexToBytes(seed) : null;
             }
-            const selected = await KeyManager._selectedPrivateKey(opts.publicKey, opts.accountId);
+            const selected = await KeyManager._selectedPrivateKey({ ...opts, publicKey: opts.publicKey });
             return selected ? (0, identityDerivations_1.deriveScopedSeedFromKey)(selected, info) : null;
         }
         if (opts?.accountId !== undefined) {
@@ -2718,7 +2811,7 @@ class KeyManager {
                 return ((await bridge?.signRetiredSocialReceive?.(index, digest, selected, opts.accountId)) ??
                     null);
             }
-            const selected = await KeyManager._selectedPrivateKey(opts.publicKey, opts.accountId);
+            const selected = await KeyManager._selectedPrivateKey({ ...opts, publicKey: opts.publicKey });
             return selected ? (0, identityDerivations_1.signSocialReceiveDigest)(selected, index, digest) : null;
         }
         const accountId = opts?.accountId;
@@ -2757,7 +2850,8 @@ class KeyManager {
     static _selectorKey(publicKey) {
         return KeyManager.isValidPublicKey(publicKey) ? KeyManager.canonicalPublicKey(publicKey) : null;
     }
-    static async _selectedPrivateKey(publicKey, accountId) {
+    static async _selectedPrivateKey(opts) {
+        const { publicKey, accountId, ownerAccountId } = opts;
         if ((0, retiredKeys_1.retiredKeyScope)({ accountId }) === null || !KeyManager.isValidPublicKey(publicKey)) {
             return null;
         }
@@ -2770,7 +2864,11 @@ class KeyManager {
         if (current && KeyManager.canonicalPublicKey(KeyManager.derivePublicKey(current)) === wanted) {
             return current;
         }
-        return (0, retiredKeys_1.getRetiredPrivateKey)(wanted, accountId !== undefined ? { accountId } : undefined);
+        return (0, retiredKeys_1.getRetiredPrivateKey)(wanted, accountId !== undefined
+            ? { accountId }
+            : ownerAccountId !== undefined
+                ? { ownerAccountId }
+                : undefined);
     }
     /**
      * Get a shortened version of the public key for display