@interop/was-react 0.3.6 → 0.5.0

package/dist/storage/wasSync.js

@@ -1,6 +1,8 @@
 import { WasRemoteStore } from './wasRemoteStore.js';
+import { SharedCollectionReader } from './sharedCollectionReader.js';
 /**
- * Builds the remote store and starts background replication.
+ * Builds the remote store, opens the shared-collection readers, and starts
+ * background replication.
  *
  * @param options {object}
  * @param options.parsed {ParsedGrants}
@@ -11,11 +13,21 @@ import { WasRemoteStore } from './wasRemoteStore.js';
  * @param options.syncController {SyncController}   a fresh per-session controller
  * @param options.onRemoteChange {(collectionKey, event) => void}   per-doc
  *   reactive patcher for pulled/conflict-resolved remote changes
+ * @param [options.sharedCollections] {SharedCollectionConfig[]}   the shared
+ *   (read-only, wallet-owned) registry; never replicated, never written to
+ * @param [options.identityKeys] {object}   this app's IDENTITY key-agreement key
+ *   and its resolver, the recipient identity a wallet writes into a shared
+ *   collection's epoch roster. Required to open any shared-collection reader
+ * @param [options.identityKeys.keyAgreementKey] {IKeyAgreementKey}
+ * @param [options.identityKeys.keyResolver] {IKeyResolver}
  * @param [options.onAuthError] {() => void}   fired when replication hits a
  *   401/403 (expired/revoked access) -- wired to the reconnect banner
- * @returns {Promise<WasRemoteStore>}
+ * @param [options.onMarkersFetched] {(markers) => void | Promise<void>}   given
+ *   the freshly fetched per-collection encryption markers (by WAS collection
+ *   id), to refresh the offline marker cache
+ * @returns {Promise<WasSyncBootstrap>}
  */
-export async function startWasSync({ parsed, zcapClient, collections, localStore, syncController, onRemoteChange, onAuthError }) {
+export async function startWasSync({ parsed, zcapClient, collections, localStore, syncController, onRemoteChange, sharedCollections = [], identityKeys, onAuthError, onMarkersFetched }) {
     const remoteStore = WasRemoteStore.fromGrants({
         parsed,
         zcapClient,
@@ -27,7 +39,10 @@ export async function startWasSync({ parsed, zcapClient, collections, localStore
     // collections it does not apply to (reported ok + skipped): the encryption
     // marker skips public collections, the indexes declaration skips private
     // ones and public ones with no declared indexes.
-    await Promise.all(Object.keys(parsed.byCollectionId).map(async (collectionId) => {
+    const sharedIds = new Set(sharedCollections.map(entry => entry.id));
+    await Promise.all(Object.keys(parsed.byCollectionId)
+        .filter(collectionId => !sharedIds.has(collectionId))
+        .map(async (collectionId) => {
         const marker = await remoteStore.markCollectionEncrypted(collectionId);
         if (!marker.ok) {
             console.warn(`Encryption marker PUT not authorized for "${collectionId}" (status ${marker.status ?? 'n/a'}).`);
@@ -37,12 +52,63 @@ export async function startWasSync({ parsed, zcapClient, collections, localStore
             console.warn(`Indexes declaration PUT not authorized for "${collectionId}" (status ${indexes.status ?? 'n/a'}).`);
         }
     }));
+    // Fetch each granted private collection's encryption marker: rebuild that
+    // collection's cipher when its epoch roster differs from what the local store
+    // opened with (a wallet-side rotation, or first-ever epochs), and hand the
+    // fresh set to the marker-cache refresher so an offline session can rebuild
+    // its epoch-aware ciphers without a live read.
+    const privateIds = collections
+        .filter(collection => collection.visibility !== 'public')
+        .map(collection => collection.id)
+        .filter(id => parsed.byCollectionId[id] !== undefined);
+    const markers = {};
+    await Promise.all(privateIds.map(async (collectionId) => {
+        const encryption = await remoteStore.readCollectionEncryption(collectionId);
+        if (encryption) {
+            markers[collectionId] = encryption;
+            await localStore.applyRemoteMarker({ collectionId, encryption });
+        }
+    }));
+    // Install the one-shot epoch refresher so a decrypt that meets an unseen epoch
+    // (a rotation on another device) re-reads the marker and rebuilds the cipher.
+    localStore.setEpochRefresher(collectionId => remoteStore.readCollectionEncryption(collectionId));
+    if (onMarkersFetched) {
+        await onMarkersFetched(markers);
+    }
+    // Shared collections stay entirely out of replication: one read-only reader
+    // each, opened over the delegated read zcap and the collection's epoch
+    // roster. Every failure mode here is a warn-and-skip -- an uncovered grant,
+    // a collection with no roster, an app that is not (or is no longer) a
+    // recipient -- so a removed share degrades one reader, never the session.
+    const sharedReaders = {};
+    for (const { key, id } of sharedCollections) {
+        if (!parsed.byCollectionId[id]) {
+            console.warn(`Skipping shared collection "${id}": no delegated capability covers it.`);
+            continue;
+        }
+        if (!identityKeys) {
+            console.warn(`Skipping shared collection "${id}": no identity key-agreement key was ` +
+                `supplied to decrypt it with.`);
+            continue;
+        }
+        try {
+            sharedReaders[key] = await SharedCollectionReader.open({
+                remoteStore,
+                keyAgreementKey: identityKeys.keyAgreementKey,
+                keyResolver: identityKeys.keyResolver,
+                collectionId: id
+            });
+        }
+        catch (err) {
+            console.warn(`Skipping shared collection "${id}":`, err);
+        }
+    }
     await syncController.start({
         remoteStore,
         localStore,
         onRemoteChange,
         ...(onAuthError && { onAuthError })
     });
-    return remoteStore;
+    return { remoteStore, sharedCollections: sharedReaders };
 }
 //# sourceMappingURL=wasSync.js.map

package/dist/storage/wasSync.js.map

@@ -1 +1 @@
-{"version":3,"file":"wasSync.js","sourceRoot":"","sources":["../../src/storage/wasSync.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAIpD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,EACjC,MAAM,EACN,UAAU,EACV,WAAW,EACX,UAAU,EACV,cAAc,EACd,cAAc,EACd,WAAW,EAYZ;IACC,MAAM,WAAW,GAAG,cAAc,CAAC,UAAU,CAAC;QAC5C,MAAM;QACN,UAAU;QACV,WAAW;KACZ,CAAC,CAAA;IAEF,2EAA2E;IAC3E,2EAA2E;IAC3E,0EAA0E;IAC1E,2EAA2E;IAC3E,yEAAyE;IACzE,iDAAiD;IACjD,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,KAAK,EAAC,YAAY,EAAC,EAAE;QAC1D,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAA;QACtE,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CACV,6CAA6C,YAAY,aAAa,MAAM,CAAC,MAAM,IAAI,KAAK,IAAI,CACjG,CAAA;QACH,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,wBAAwB,CAAC,YAAY,CAAC,CAAA;QACxE,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CACV,+CAA+C,YAAY,aAAa,OAAO,CAAC,MAAM,IAAI,KAAK,IAAI,CACpG,CAAA;QACH,CAAC;IACH,CAAC,CAAC,CACH,CAAA;IAED,MAAM,cAAc,CAAC,KAAK,CAAC;QACzB,WAAW;QACX,UAAU;QACV,cAAc;QACd,GAAG,CAAC,WAAW,IAAI,EAAE,WAAW,EAAE,CAAC;KACpC,CAAC,CAAA;IACF,OAAO,WAAW,CAAA;AACpB,CAAC"}
+{"version":3,"file":"wasSync.js","sourceRoot":"","sources":["../../src/storage/wasSync.ts"],"names":[],"mappings":"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"}

package/dist/sync/docCipher.d.ts

@@ -16,6 +16,7 @@
  * storage layer above needs no encrypted-vs-plaintext fork.
  */
 import type { IKeyAgreementKey, IKeyResolver } from '@interop/data-integrity-core';
+import type { CollectionEncryption } from '@interop/was-client';
 import type { Json } from './types.js';
 /**
  * A per-collection document cipher. `encrypt` is the create path (mints a random
@@ -70,21 +71,36 @@ export declare function createPlaintextDocCodec({ collectionId }: {
     collectionId: string;
 }): DocCipher;
 /**
- * Builds a {@link DocCipher} for one collection from its derived key material
- * (the per-collection X25519 key agreement key). Keys are supplied directly (no
+ * Builds a {@link DocCipher} for one collection from the caller's derived key
+ * material (the app's identity X25519 key agreement key, the same one every
+ * other collection uses). Keys are supplied directly (no
  * keystore lookup). `idDerivation: 'random'` mints a stable random id updated in
  * place via `sequence` -- the mutable head-document model every entity here uses
  * (constant bump / toggle / re-categorize edits).
  *
+ * Delegates to `@interop/was-client`'s `createEdvDocCipher`: with no
+ * `encryption` marker (or a marker with no key epochs) the cipher is
+ * single-recipient (the key-agreement key encrypts and decrypts directly, the
+ * behavior every collection has had); with epochs on the marker the cipher
+ * becomes multi-recipient -- writes stamp the marker's current epoch and reads
+ * route by the envelope's recipient key id, while a pre-epoch envelope still
+ * decrypts through the single-key path (a permanent tolerance, not a migration
+ * shim). The returned cipher's shape matches {@link DocCipher} exactly; only the
+ * nominal `Json` origin differs, so it crosses the boundary with a cast.
+ *
  * @param options {object}
  * @param options.keyAgreementKey {IKeyAgreementKey}
  * @param options.keyResolver {IKeyResolver}
  * @param options.collectionId {string}   labels errors; the codec is agnostic
+ * @param [options.encryption] {CollectionEncryption}   the collection's
+ *   encryption marker; when it carries key epochs the cipher becomes
+ *   multi-recipient
  * @returns {Promise<DocCipher>}
  */
-export declare function createDocCipher({ keyAgreementKey, keyResolver, collectionId }: {
+export declare function createDocCipher({ keyAgreementKey, keyResolver, collectionId, encryption }: {
     keyAgreementKey: IKeyAgreementKey;
     keyResolver: IKeyResolver;
     collectionId: string;
+    encryption?: CollectionEncryption;
 }): Promise<DocCipher>;
 //# sourceMappingURL=docCipher.d.ts.map

package/dist/sync/docCipher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"docCipher.d.ts","sourceRoot":"","sources":["../../src/sync/docCipher.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;GAaG;AACH,OAAO,KAAK,EACV,gBAAgB,EAChB,YAAY,EACb,MAAM,8BAA8B,CAAA;AAErC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEtC;;;;;GAKG;AACH,MAAM,WAAW,SAAS;IACxB,OAAO,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE,CAAC,CAAA;IACzE,aAAa,CAAC,OAAO,EAAE;QACrB,EAAE,EAAE,MAAM,CAAA;QACV,IAAI,EAAE,IAAI,CAAA;QACV,OAAO,EAAE,IAAI,CAAA;KACd,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE,CAAC,CAAA;IAC3C,OAAO,CAAC,OAAO,EAAE;QAAE,QAAQ,EAAE,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACpD;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,GAAG,OAAO,CAMnE;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,uBAAuB,CAAC,EACtC,YAAY,EACb,EAAE;IACD,YAAY,EAAE,MAAM,CAAA;CACrB,GAAG,SAAS,CAiCZ;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,eAAe,CAAC,EACpC,eAAe,EACf,WAAW,EACX,YAAY,EACb,EAAE;IACD,eAAe,EAAE,gBAAgB,CAAA;IACjC,WAAW,EAAE,YAAY,CAAA;IACzB,YAAY,EAAE,MAAM,CAAA;CACrB,GAAG,OAAO,CAAC,SAAS,CAAC,CA+ErB"}
+{"version":3,"file":"docCipher.d.ts","sourceRoot":"","sources":["../../src/sync/docCipher.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;GAaG;AACH,OAAO,KAAK,EACV,gBAAgB,EAChB,YAAY,EACb,MAAM,8BAA8B,CAAA;AACrC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAE/D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEtC;;;;;GAKG;AACH,MAAM,WAAW,SAAS;IACxB,OAAO,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE,CAAC,CAAA;IACzE,aAAa,CAAC,OAAO,EAAE;QACrB,EAAE,EAAE,MAAM,CAAA;QACV,IAAI,EAAE,IAAI,CAAA;QACV,OAAO,EAAE,IAAI,CAAA;KACd,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE,CAAC,CAAA;IAC3C,OAAO,CAAC,OAAO,EAAE;QAAE,QAAQ,EAAE,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACpD;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,GAAG,OAAO,CAMnE;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,uBAAuB,CAAC,EACtC,YAAY,EACb,EAAE;IACD,YAAY,EAAE,MAAM,CAAA;CACrB,GAAG,SAAS,CAiCZ;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,eAAe,CAAC,EACpC,eAAe,EACf,WAAW,EACX,YAAY,EACZ,UAAU,EACX,EAAE;IACD,eAAe,EAAE,gBAAgB,CAAA;IACjC,WAAW,EAAE,YAAY,CAAA;IACzB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,CAAC,EAAE,oBAAoB,CAAA;CAClC,GAAG,OAAO,CAAC,SAAS,CAAC,CASrB"}

package/dist/sync/docCipher.js

@@ -1,4 +1,4 @@
-import { createEdvEncryption } from '@interop/was-client/edv';
+import { createEdvDocCipher } from '@interop/was-client/edv';
 /**
  * Whether a stored body is an EDV encryption envelope (carries an object `jwe`)
  * rather than plaintext. Lets read paths stay tolerant of any legacy plaintext
@@ -57,75 +57,40 @@ export function createPlaintextDocCodec({ collectionId }) {
     };
 }
 /**
- * Builds a {@link DocCipher} for one collection from its derived key material
- * (the per-collection X25519 key agreement key). Keys are supplied directly (no
+ * Builds a {@link DocCipher} for one collection from the caller's derived key
+ * material (the app's identity X25519 key agreement key, the same one every
+ * other collection uses). Keys are supplied directly (no
  * keystore lookup). `idDerivation: 'random'` mints a stable random id updated in
  * place via `sequence` -- the mutable head-document model every entity here uses
  * (constant bump / toggle / re-categorize edits).
  *
+ * Delegates to `@interop/was-client`'s `createEdvDocCipher`: with no
+ * `encryption` marker (or a marker with no key epochs) the cipher is
+ * single-recipient (the key-agreement key encrypts and decrypts directly, the
+ * behavior every collection has had); with epochs on the marker the cipher
+ * becomes multi-recipient -- writes stamp the marker's current epoch and reads
+ * route by the envelope's recipient key id, while a pre-epoch envelope still
+ * decrypts through the single-key path (a permanent tolerance, not a migration
+ * shim). The returned cipher's shape matches {@link DocCipher} exactly; only the
+ * nominal `Json` origin differs, so it crosses the boundary with a cast.
+ *
  * @param options {object}
  * @param options.keyAgreementKey {IKeyAgreementKey}
  * @param options.keyResolver {IKeyResolver}
  * @param options.collectionId {string}   labels errors; the codec is agnostic
+ * @param [options.encryption] {CollectionEncryption}   the collection's
+ *   encryption marker; when it carries key epochs the cipher becomes
+ *   multi-recipient
  * @returns {Promise<DocCipher>}
  */
-export async function createDocCipher({ keyAgreementKey, keyResolver, collectionId }) {
-    const provider = createEdvEncryption({
-        resolveKeys: async () => null,
-        idDerivation: 'random'
-    });
-    const codec = await provider.codecFor({
-        spaceId: 'local',
+export async function createDocCipher({ keyAgreementKey, keyResolver, collectionId, encryption }) {
+    const cipher = await createEdvDocCipher({
+        keyAgreementKey,
+        keyResolver,
         collectionId,
-        scheme: 'edv',
-        keys: { keyAgreementKey, keyResolver }
+        idDerivation: 'random',
+        ...(encryption && { encryption })
     });
-    if (!codec) {
-        throw new Error(`Could not build the EDV cipher for collection "${collectionId}".`);
-    }
-    // Parses the codec's `EncodedWrite` (id + envelope body bytes) into the
-    // stored `{ id, envelope }` shape. Shared by the create and update paths.
-    const readEncoded = (encoded) => {
-        if (typeof encoded.id !== 'string' ||
-            !(encoded.body instanceof Uint8Array)) {
-            throw new Error(`EDV encrypt for collection "${collectionId}" returned no id/envelope body.`);
-        }
-        const envelope = JSON.parse(new TextDecoder().decode(encoded.body));
-        return { id: encoded.id, envelope };
-    };
-    return {
-        async encrypt({ data }) {
-            // `encode` with no caller id is the create path: encrypt, then use the
-            // minted random id.
-            const encoded = await codec.encode({
-                data: data
-            });
-            return readEncoded(encoded);
-        },
-        async encryptUpdate({ id, data, current }) {
-            // The update path: hand the codec the prior stored envelope so it advances
-            // `sequence` from it and re-encrypts under the same id. The codec reads
-            // `current.data` (the prior envelope) and its `etag` header (unused here;
-            // the wire `If-Match` is derived from the synced-doc `version`, not this).
-            const priorResponse = {
-                data: current,
-                json: async () => current,
-                headers: { get: () => null }
-            };
-            const encoded = await codec.encode({
-                id,
-                data: data,
-                current: priorResponse
-            });
-            return readEncoded(encoded);
-        },
-        async decrypt({ envelope }) {
-            const response = {
-                data: envelope,
-                json: async () => envelope
-            };
-            return (await codec.decode(response));
-        }
-    };
+    return cipher;
 }
 //# sourceMappingURL=docCipher.js.map

package/dist/sync/docCipher.js.map

@@ -1 +1 @@
-{"version":3,"file":"docCipher.js","sourceRoot":"","sources":["../../src/sync/docCipher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"docCipher.js","sourceRoot":"","sources":["../../src/sync/docCipher.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAmB5D;;;;;;;GAOG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAsB;IACxD,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpE,OAAO,KAAK,CAAA;IACd,CAAC;IACD,MAAM,GAAG,GAAI,IAA0B,CAAC,GAAG,CAAA;IAC3C,OAAO,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ,CAAA;AAChD,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,uBAAuB,CAAC,EACtC,YAAY,EAGb;IACC,MAAM,SAAS,GAAG,CAAC,IAAU,EAAU,EAAE;QACvC,MAAM,EAAE,GAAI,IAAgC,EAAE,EAAE,CAAA;QAChD,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9C,MAAM,IAAI,KAAK,CACb,kCAAkC,YAAY,2BAA2B,CAC1E,CAAA;QACH,CAAC;QACD,OAAO,EAAE,CAAA;IACX,CAAC,CAAA;IACD,MAAM,eAAe,GAAG,CAAC,IAAU,EAAQ,EAAE;QAC3C,IAAI,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CACb,eAAe,YAAY,yCAAyC;gBAClE,yBAAyB,CAC5B,CAAA;QACH,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC,CAAA;IAED,OAAO;QACL,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAkB;YACpC,OAAO,EAAE,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;QAChD,CAAC;QAED,KAAK,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,IAAI,EAA8B;YAC1D,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;QAC/B,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAsB;YAC5C,OAAO,eAAe,CAAC,QAAQ,CAAC,CAAA;QAClC,CAAC;KACF,CAAA;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EACpC,eAAe,EACf,WAAW,EACX,YAAY,EACZ,UAAU,EAMX;IACC,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC;QACtC,eAAe;QACf,WAAW;QACX,YAAY;QACZ,YAAY,EAAE,QAAQ;QACtB,GAAG,CAAC,UAAU,IAAI,EAAE,UAAU,EAAE,CAAC;KAClC,CAAC,CAAA;IACF,OAAO,MAA8B,CAAA;AACvC,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@interop/was-react",
   "description": "React library for building 'Bring Your Own Everything' (BYOE) apps on Wallet Attached Storage: DID Auth login via CHAPI wallet, local-first encrypted storage, and background sync to a WAS server.",
-  "version": "0.3.6",
+  "version": "0.5.0",
   "type": "module",
   "scripts": {
     "build": "pnpm run clear && tsc",
@@ -46,14 +46,14 @@
   "types": "dist/index.d.ts",
   "sideEffects": false,
   "dependencies": {
-    "@interop/data-integrity-core": "^8.3.0",
+    "@interop/data-integrity-core": "^8.4.0",
     "@interop/ed25519-signature": "^7.1.4",
     "@interop/ezcap": "^7.4.1",
     "@interop/security-document-loader": "^9.4.4",
     "@interop/vc": "^11.0.6",
-    "@interop/verifier-core": "^3.4.1",
+    "@interop/verifier-core": "^3.5.0",
     "@interop/wallet-core": "^0.5.0",
-    "@interop/was-client": "^0.19.0",
+    "@interop/was-client": "^0.20.0",
     "@interop/webkms-client": "^14.7.1",
     "@interop/x25519-key-agreement-key": "^5.2.1",
     "@scure/base": "^2.2.0",
@@ -109,7 +109,7 @@
     "typescript-eslint": "^8.59.4",
     "vite": "^8.0.14",
     "vitest": "^4.1.7",
-    "was-teaching-server": "^0.12.0",
+    "was-teaching-server": "^0.14.0",
     "zustand": "^5.0.12"
   },
   "publishConfig": {