@interop/wallet-core 0.108.0 → 0.110.0

package/dist/webvh/logLocation.d.ts

@@ -0,0 +1,75 @@
+/**
+ * The `did:webvh:{SCID}:<host>:<prefix...>:space:<spaceId>:<collectionId>`
+ * controller template, with the literal `{SCID}` placeholder the library
+ * replaces at creation. The host segment percent-encodes a port
+ * (`localhost:8080` becomes `localhost%3A8080`), and the prefix segments are
+ * the base server URL's path, one colon segment each and absent for an
+ * origin-root base, both exactly as the library's own address normalization
+ * produces them, so the DID is self-locating under any mount
+ * ({@link didWebvhLogLocation} is the inverse). The collection defaults to
+ * the account log's `id` collection; a client-annex generation's log passes
+ * its own `gen-` generation id.
+ *
+ * @param options {object}
+ * @param options.baseServerUrl {string}   the server's base server URL
+ * @param options.spaceId {string}
+ * @param [options.collectionId] {string}   the collection holding `did.jsonl`
+ *   (defaults to the `id` collection)
+ * @returns {string}
+ */
+export declare function didWebvhControllerTemplate({ baseServerUrl, spaceId, collectionId }: {
+    baseServerUrl: string;
+    spaceId: string;
+    collectionId?: string;
+}): string;
+/**
+ * The path segments beneath the base server URL a log's did:webvh encodes:
+ * `space/<spaceId>/<collectionId>`, the Space and the collection holding
+ * `did.jsonl`. One definition serves the template and every `createDID`
+ * call, so a log is always created at the location its DID names.
+ *
+ * @param options {object}
+ * @param options.spaceId {string}
+ * @param options.collectionId {string}
+ * @returns {string[]}
+ */
+export declare function didWebvhLogPaths({ spaceId, collectionId }: {
+    spaceId: string;
+    collectionId: string;
+}): string[];
+/**
+ * Where a did:webvh minted by {@link didWebvhControllerTemplate} publishes
+ * its log, read off the identifier alone: the log URL (`.../did.jsonl`), the
+ * Space URL, the Space id, and the base server URL the Space sits under (the
+ * parent of the `space` segment, as the server layout fixes it). A wallet
+ * holding the DID therefore holds the server, and stores neither a host nor
+ * a base. Refuses, with the library's or was-client's own error, a DID whose
+ * path does not have the `space/<spaceId>/<collectionId>` shape.
+ *
+ * @param options {object}
+ * @param options.did {string}   a did:webvh with a real SCID (not a template)
+ * @returns {{ logUrl: string, spaceUrl: string, spaceId: string,
+ *   baseServerUrl: string, collectionId: string }}
+ */
+export declare function didWebvhLogLocation({ did }: {
+    did: string;
+}): {
+    logUrl: string;
+    spaceUrl: string;
+    spaceId: string;
+    baseServerUrl: string;
+    collectionId: string;
+};
+/**
+ * The URL of the account log beneath a Space URL: `id/did.jsonl`. The
+ * Space-URL twin of {@link didWebvhLogLocation}'s `logUrl`, for a reader
+ * holding the Space URL and no DID yet.
+ *
+ * @param options {object}
+ * @param options.spaceUrl {string}
+ * @returns {string}
+ */
+export declare function accountLogUrl({ spaceUrl }: {
+    spaceUrl: string;
+}): string;
+//# sourceMappingURL=logLocation.d.ts.map

package/dist/webvh/logLocation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logLocation.d.ts","sourceRoot":"","sources":["../../src/webvh/logLocation.ts"],"names":[],"mappings":"AA+BA;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,0BAA0B,CAAC,EACzC,aAAa,EACb,OAAO,EACP,YAA+B,EAChC,EAAE;IACD,aAAa,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,GAAG,MAAM,CAOT;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,EAC/B,OAAO,EACP,YAAY,EACb,EAAE;IACD,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;CACrB,GAAG,MAAM,EAAE,CAEX;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,mBAAmB,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG;IAC7D,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,MAAM,CAAA;IACrB,YAAY,EAAE,MAAM,CAAA;CACrB,CASA;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,EAAE,QAAQ,EAAE,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAMxE"}

package/dist/webvh/logLocation.js

@@ -0,0 +1,102 @@
+/*!
+ * Copyright (c) 2026 Interop Alliance. All rights reserved.
+ */
+/**
+ * Where a wallet's did:webvh log lives, in both directions: the controller
+ * template a log is created under, which encodes the base server URL (host
+ * and path prefix) and the Space and collection holding `did.jsonl`, and its
+ * inverse, which reads the log URL, the Space URL and the base server URL
+ * back off an identifier. The server layout fixes a Space at
+ * `{base}space/{spaceId}/`, so the base is the parent of the DID's `space`
+ * segment, and a wallet holding the DID stores no host and no base.
+ *
+ * A leaf beside `didWebvh.ts` (which re-exports it) and `verifyLog.ts`, over
+ * the library's address normalization, was-client's path rules and the
+ * collection ids alone, so the ceremonies and the readers share one
+ * definition without a file-level cycle between them.
+ */
+import { getBaseUrl, getFileUrl, normalizeCreateDidAddress, SCID_PLACEHOLDER } from '@interop/did-method-webvh';
+import { baseServerUrlOf, resourceUrl, spaceIdOfUrl, splitCollectionUrl } from '@interop/was-client/paths';
+import { DID_LOG_RESOURCE, ID_COLLECTION } from '../space/collections.js';
+/**
+ * The `did:webvh:{SCID}:<host>:<prefix...>:space:<spaceId>:<collectionId>`
+ * controller template, with the literal `{SCID}` placeholder the library
+ * replaces at creation. The host segment percent-encodes a port
+ * (`localhost:8080` becomes `localhost%3A8080`), and the prefix segments are
+ * the base server URL's path, one colon segment each and absent for an
+ * origin-root base, both exactly as the library's own address normalization
+ * produces them, so the DID is self-locating under any mount
+ * ({@link didWebvhLogLocation} is the inverse). The collection defaults to
+ * the account log's `id` collection; a client-annex generation's log passes
+ * its own `gen-` generation id.
+ *
+ * @param options {object}
+ * @param options.baseServerUrl {string}   the server's base server URL
+ * @param options.spaceId {string}
+ * @param [options.collectionId] {string}   the collection holding `did.jsonl`
+ *   (defaults to the `id` collection)
+ * @returns {string}
+ */
+export function didWebvhControllerTemplate({ baseServerUrl, spaceId, collectionId = ID_COLLECTION.id }) {
+    return normalizeCreateDidAddress({
+        address: baseServerUrl,
+        scid: SCID_PLACEHOLDER,
+        paths: didWebvhLogPaths({ spaceId, collectionId }),
+        context: 'did:webvh controller template'
+    }).controller;
+}
+/**
+ * The path segments beneath the base server URL a log's did:webvh encodes:
+ * `space/<spaceId>/<collectionId>`, the Space and the collection holding
+ * `did.jsonl`. One definition serves the template and every `createDID`
+ * call, so a log is always created at the location its DID names.
+ *
+ * @param options {object}
+ * @param options.spaceId {string}
+ * @param options.collectionId {string}
+ * @returns {string[]}
+ */
+export function didWebvhLogPaths({ spaceId, collectionId }) {
+    return ['space', spaceId, collectionId];
+}
+/**
+ * Where a did:webvh minted by {@link didWebvhControllerTemplate} publishes
+ * its log, read off the identifier alone: the log URL (`.../did.jsonl`), the
+ * Space URL, the Space id, and the base server URL the Space sits under (the
+ * parent of the `space` segment, as the server layout fixes it). A wallet
+ * holding the DID therefore holds the server, and stores neither a host nor
+ * a base. Refuses, with the library's or was-client's own error, a DID whose
+ * path does not have the `space/<spaceId>/<collectionId>` shape.
+ *
+ * @param options {object}
+ * @param options.did {string}   a did:webvh with a real SCID (not a template)
+ * @returns {{ logUrl: string, spaceUrl: string, spaceId: string,
+ *   baseServerUrl: string, collectionId: string }}
+ */
+export function didWebvhLogLocation({ did }) {
+    const { spaceUrl, collectionId } = splitCollectionUrl(`${getBaseUrl(did)}/`);
+    return {
+        logUrl: getFileUrl(did),
+        spaceUrl,
+        spaceId: spaceIdOfUrl(spaceUrl),
+        baseServerUrl: baseServerUrlOf(spaceUrl),
+        collectionId
+    };
+}
+/**
+ * The URL of the account log beneath a Space URL: `id/did.jsonl`. The
+ * Space-URL twin of {@link didWebvhLogLocation}'s `logUrl`, for a reader
+ * holding the Space URL and no DID yet.
+ *
+ * @param options {object}
+ * @param options.spaceUrl {string}
+ * @returns {string}
+ */
+export function accountLogUrl({ spaceUrl }) {
+    return resourceUrl({
+        spaceUrl,
+        collectionId: ID_COLLECTION.id,
+        resourceId: DID_LOG_RESOURCE
+    });
+}
+//# sourceMappingURL=logLocation.js.map

package/dist/webvh/logLocation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logLocation.js","sourceRoot":"","sources":["../../src/webvh/logLocation.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;GAaG;AACH,OAAO,EACL,UAAU,EACV,UAAU,EACV,yBAAyB,EACzB,gBAAgB,EACjB,MAAM,2BAA2B,CAAA;AAClC,OAAO,EACL,eAAe,EACf,WAAW,EACX,YAAY,EACZ,kBAAkB,EACnB,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAEzE;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,0BAA0B,CAAC,EACzC,aAAa,EACb,OAAO,EACP,YAAY,GAAG,aAAa,CAAC,EAAE,EAKhC;IACC,OAAO,yBAAyB,CAAC;QAC/B,OAAO,EAAE,aAAa;QACtB,IAAI,EAAE,gBAAgB;QACtB,KAAK,EAAE,gBAAgB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;QAClD,OAAO,EAAE,+BAA+B;KACzC,CAAC,CAAC,UAAU,CAAA;AACf,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,gBAAgB,CAAC,EAC/B,OAAO,EACP,YAAY,EAIb;IACC,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;AACzC,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,mBAAmB,CAAC,EAAE,GAAG,EAAmB;IAO1D,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,kBAAkB,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC5E,OAAO;QACL,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC;QACvB,QAAQ;QACR,OAAO,EAAE,YAAY,CAAC,QAAQ,CAAC;QAC/B,aAAa,EAAE,eAAe,CAAC,QAAQ,CAAC;QACxC,YAAY;KACb,CAAA;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,aAAa,CAAC,EAAE,QAAQ,EAAwB;IAC9D,OAAO,WAAW,CAAC;QACjB,QAAQ;QACR,YAAY,EAAE,aAAa,CAAC,EAAE;QAC9B,UAAU,EAAE,gBAAgB;KAC7B,CAAC,CAAA;AACJ,CAAC"}

package/dist/webvh/verifyLog.d.ts

@@ -133,12 +133,11 @@ export declare function checkAndAdvanceAccountLogPin({ pinStore, logId, log }: {
  *
  * @param options {object}
  * @param options.did {string}   the account's did:webvh, as the caller's
- *   stored account pointer names it
- * @param options.spaceId {string}   the account's Space id
- * @param options.host {string}   the storage server the account lives on
+ *   stored account pointer names it; it locates its own log
+ *   ({@link didWebvhLogLocation})
  * @param [options.pinStore] {ResourceLogPinStore}   this client's chain-head
  *   pins; the account log's slot is keyed by {@link accountLogPinId} over the
- *   `spaceId` above
+ *   Space id the DID names
  * @param [options.published] {PublishedWebvhLog}   a head this same run
  *   already read and resolved (an establishment handing its `accountLog`
  *   forward), reused in place of the fetch. Every check below still runs on
@@ -152,10 +151,8 @@ export declare function checkAndAdvanceAccountLogPin({ pinStore, logId, log }: {
  * @returns {Promise<VerifiedAccountLog>}   the resolved document, the raw
  *   log, and the log's effective `updateKeys` / `nextKeyHashes`
  */
-export declare function verifyAccountLog({ did, spaceId, host, pinStore, published }: {
+export declare function verifyAccountLog({ did, pinStore, published }: {
     did: string;
-    spaceId: string;
-    host: string;
     pinStore?: ResourceLogPinStore;
     published?: PublishedWebvhLog;
 }): Promise<VerifiedAccountLog>;
@@ -178,16 +175,14 @@ export declare function verifyAccountLog({ did, spaceId, host, pinStore, publish
  * check-and-advance {@link verifyAccountLog} runs, under the same slot.
  *
  * @param options {object}
- * @param options.spaceId {string}   the Space whose owner is wanted
- * @param options.host {string}   the storage server the Space lives on
+ * @param options.spaceUrl {string}   the Space whose owner is wanted
  * @param [options.pinStore] {ResourceLogPinStore}   this client's chain-head
- *   pins, keyed by {@link accountLogPinId} over the `spaceId` above
+ *   pins, keyed by {@link accountLogPinId} over the Space's id
  * @returns {Promise<PublishedWebvhLog>}   the owner's DID, the resolved
  *   document, the raw log, and the log's effective update-key parameters
  */
-export declare function discoverAccountLog({ spaceId, host, pinStore }: {
-    spaceId: string;
-    host: string;
+export declare function discoverAccountLog({ spaceUrl, pinStore }: {
+    spaceUrl: string;
     pinStore?: ResourceLogPinStore;
 }): Promise<PublishedWebvhLog>;
 /**
@@ -238,18 +233,14 @@ export declare function verifiedAccountLogOf({ published }: {
  *
  * @param options {object}
  * @param options.did {string}   the account's did:webvh
- * @param options.spaceId {string}   the data Space id
- * @param options.host {string}   the storage server the account lives on
  * @param options.pinStore {ResourceLogPinStore}   the account log's
  *   chain-head pin, checked and advanced when the log is fetched here
  * @param [options.log] {DIDLog}   the account log this run already stands on
  *   (a ceremony that just read or published it); given, no fetch runs
  * @returns {function}   `() => Promise<WebvhResourceLogController>`
  */
-export declare function accountControllerResolver({ did, spaceId, host, pinStore, log }: {
+export declare function accountControllerResolver({ did, pinStore, log }: {
     did: string;
-    spaceId: string;
-    host: string;
     pinStore: ResourceLogPinStore;
     log?: DIDLog;
 }): () => Promise<WebvhResourceLogController>;

package/dist/webvh/verifyLog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verifyLog.d.ts","sourceRoot":"","sources":["../../src/webvh/verifyLog.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"verifyLog.d.ts","sourceRoot":"","sources":["../../src/webvh/verifyLog.ts"],"names":[],"mappings":"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"}

package/dist/webvh/verifyLog.js

@@ -35,8 +35,8 @@
  * {@link ResourceLogPinStore} gets a served log refused when it is a
  * rollback, a fork, or an SCID/method switch relative to the pinned head.
  */
-import { getFileUrl, readLogFromString, resolveDIDFromLog } from '@interop/did-method-webvh';
-import { resourcePath, toUrl } from '@interop/was-client/paths';
+import { readLogFromString, resolveDIDFromLog } from '@interop/did-method-webvh';
+import { accountLogUrl, didWebvhLogLocation } from './logLocation.js';
 import { webvhResourceLogController } from '../resourceLog/controller.js';
 import { DID_LOG_RESOURCE, ID_COLLECTION } from '../space/collections.js';
 import { ResourceLogContinuityError, resourceLogPinId } from '@interop/vh-resource-log';
@@ -225,12 +225,11 @@ export async function checkAndAdvanceAccountLogPin({ pinStore, logId, log }) {
  *
  * @param options {object}
  * @param options.did {string}   the account's did:webvh, as the caller's
- *   stored account pointer names it
- * @param options.spaceId {string}   the account's Space id
- * @param options.host {string}   the storage server the account lives on
+ *   stored account pointer names it; it locates its own log
+ *   ({@link didWebvhLogLocation})
  * @param [options.pinStore] {ResourceLogPinStore}   this client's chain-head
  *   pins; the account log's slot is keyed by {@link accountLogPinId} over the
- *   `spaceId` above
+ *   Space id the DID names
  * @param [options.published] {PublishedWebvhLog}   a head this same run
  *   already read and resolved (an establishment handing its `accountLog`
  *   forward), reused in place of the fetch. Every check below still runs on
@@ -244,15 +243,18 @@ export async function checkAndAdvanceAccountLogPin({ pinStore, logId, log }) {
  * @returns {Promise<VerifiedAccountLog>}   the resolved document, the raw
  *   log, and the log's effective `updateKeys` / `nextKeyHashes`
  */
-export async function verifyAccountLog({ did, spaceId, host, pinStore, published }) {
-    const head = published ?? (await readAccountLog({ spaceId, host }));
+export async function verifyAccountLog({ did, pinStore, published }) {
+    const location = didWebvhLogLocation({ did });
+    const read = published === undefined
+        ? await readAccountLog({ logUrl: location.logUrl })
+        : { published, spaceId: location.spaceId };
     await adoptAccountLog({
-        published: head,
+        published: read.published,
         expectedDid: did,
-        spaceId,
+        spaceId: read.spaceId,
         pinStore
     });
-    return verifiedAccountLogOf({ published: head });
+    return verifiedAccountLogOf({ published: read.published });
 }
 /**
  * Resolves the account published at a Space with no DID known in advance:
@@ -273,15 +275,16 @@ export async function verifyAccountLog({ did, spaceId, host, pinStore, published
  * check-and-advance {@link verifyAccountLog} runs, under the same slot.
  *
  * @param options {object}
- * @param options.spaceId {string}   the Space whose owner is wanted
- * @param options.host {string}   the storage server the Space lives on
+ * @param options.spaceUrl {string}   the Space whose owner is wanted
  * @param [options.pinStore] {ResourceLogPinStore}   this client's chain-head
- *   pins, keyed by {@link accountLogPinId} over the `spaceId` above
+ *   pins, keyed by {@link accountLogPinId} over the Space's id
  * @returns {Promise<PublishedWebvhLog>}   the owner's DID, the resolved
  *   document, the raw log, and the log's effective update-key parameters
  */
-export async function discoverAccountLog({ spaceId, host, pinStore }) {
-    const published = await readAccountLog({ spaceId, host });
+export async function discoverAccountLog({ spaceUrl, pinStore }) {
+    const { published, spaceId } = await readAccountLog({
+        logUrl: accountLogUrl({ spaceUrl })
+    });
     return adoptAccountLog({ published, spaceId, pinStore });
 }
 /**
@@ -308,25 +311,20 @@ async function adoptAccountLog({ published, spaceId, expectedDid, pinStore }) {
     return published;
 }
 /**
- * The one fetch-parse-resolve body both readers share: fetch `id/did.jsonl`
+ * The one fetch-parse-resolve body both readers share: fetch `did.jsonl`
  * unauthenticated, parse and resolve it, and refuse a resolved DID whose
  * published log location is not the URL it was served from. The location
- * check compares the host of `getFileUrl(did)` against the fetched URL, and
- * its path against the fetched path past the server's base path (the DID
- * encodes no base path); anything else is a log published for another
- * location and served here.
+ * check compares the log URL the resolved DID encodes
+ * ({@link didWebvhLogLocation}) against the fetched URL; anything else is a
+ * log published for another location and served here.
  *
  * @param options {object}
- * @param options.spaceId {string}
- * @param options.host {string}
- * @returns {Promise<PublishedWebvhLog>}   the resolved head, with no ETag
- *   (the read is a plain fetch, not a store read)
+ * @param options.logUrl {string}   the `did.jsonl` URL to fetch
+ * @returns {Promise<{ published: PublishedWebvhLog, spaceId: string }>}
+ *   the resolved head, with no ETag (the read is a plain fetch, not a store
+ *   read), beside the Space id its DID locates, read in the location check
  */
-async function readAccountLog({ spaceId, host }) {
-    const url = toUrl({
-        baseUrl: host,
-        path: resourcePath(spaceId, ID_COLLECTION.id, DID_LOG_RESOURCE)
-    });
+async function readAccountLog({ logUrl: url }) {
     const response = await fetch(url);
     if (response.status === 404) {
         throw new AccountLogMissingError();
@@ -339,25 +337,22 @@ async function readAccountLog({ spaceId, host }) {
     if (resolved.meta.error || !resolved.did || !resolved.doc) {
         throw new Error(`The account's DID log failed to resolve (${resolved.meta.error ?? 'the resolver returned no DID document'}).`);
     }
-    const publishedAt = new URL(getFileUrl(resolved.did));
-    const fetchedFrom = new URL(url);
-    // The DID encodes the server's host and the Space path, not a base path a
-    // sub-path deployment serves under (`toUrl` keeps that prefix), so the
-    // expected path is the server's base path joined with the DID's own.
-    const basePath = new URL(host).pathname.replace(/\/$/, '');
-    if (publishedAt.host !== fetchedFrom.host ||
-        basePath + publishedAt.pathname !== fetchedFrom.pathname) {
+    const location = didWebvhLogLocation({ did: resolved.did });
+    if (location.logUrl !== new URL(url).href) {
         throw new Error(`did:webvh: the published did.jsonl resolves to ${resolved.did}, ` +
-            `whose log location (${publishedAt.href}) is not where it was ` +
-            `served from (${fetchedFrom.href}).`);
+            `whose log location (${location.logUrl}) is not where it was ` +
+            `served from (${url}).`);
     }
     return {
-        did: resolved.did,
-        doc: resolved.doc,
-        log,
-        updateKeys: resolved.meta.updateKeys ?? [],
-        nextKeyHashes: resolved.meta.nextKeyHashes ?? [],
-        meta: resolved.meta
+        published: {
+            did: resolved.did,
+            doc: resolved.doc,
+            log,
+            updateKeys: resolved.meta.updateKeys ?? [],
+            nextKeyHashes: resolved.meta.nextKeyHashes ?? [],
+            meta: resolved.meta
+        },
+        spaceId: location.spaceId
     };
 }
 /**
@@ -398,19 +393,17 @@ export function verifiedAccountLogOf({ published }) {
  *
  * @param options {object}
  * @param options.did {string}   the account's did:webvh
- * @param options.spaceId {string}   the data Space id
- * @param options.host {string}   the storage server the account lives on
  * @param options.pinStore {ResourceLogPinStore}   the account log's
  *   chain-head pin, checked and advanced when the log is fetched here
  * @param [options.log] {DIDLog}   the account log this run already stands on
  *   (a ceremony that just read or published it); given, no fetch runs
  * @returns {function}   `() => Promise<WebvhResourceLogController>`
  */
-export function accountControllerResolver({ did, spaceId, host, pinStore, log }) {
+export function accountControllerResolver({ did, pinStore, log }) {
     let pending;
     return async () => {
         pending ??= (log === undefined
-            ? verifyAccountLog({ did, spaceId, host, pinStore }).then(({ log: served }) => served)
+            ? verifyAccountLog({ did, pinStore }).then(({ log: served }) => served)
             : Promise.resolve(log)).then(served => webvhResourceLogController({ did, log: served }), err => {
             pending = undefined;
             throw err;

package/dist/webvh/verifyLog.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifyLog.js","sourceRoot":"","sources":["../../src/webvh/verifyLog.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,2BAA2B,CAAA;AAMlC,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AAE/D,OAAO,EACL,0BAA0B,EAE3B,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AACzE,OAAO,EACL,0BAA0B,EAC1B,gBAAgB,EAGjB,MAAM,0BAA0B,CAAA;AAEjC;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,gBAAgB,CAAC,EAC/B,OAAO,EACP,YAAY,EAIb;IACC,OAAO,gBAAgB,CAAC;QACtB,OAAO;QACP,YAAY;QACZ,UAAU,EAAE,gBAAgB;KAC7B,CAAC,CAAA;AACJ,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,eAAe,CAAC,EAAE,OAAO,EAAuB;IAC9D,OAAO,gBAAgB,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,aAAa,CAAC,EAAE,EAAE,CAAC,CAAA;AACtE,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,qBAAqB,CAAC,EACpC,SAAS,EACT,WAAW,EAIZ;IACC,IAAI,WAAW,KAAK,SAAS,IAAI,SAAS,CAAC,GAAG,KAAK,WAAW,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CACb,iEAAiE;YAC/D,IAAI,SAAS,CAAC,GAAG,oBAAoB,WAAW,IAAI,CACvD,CAAA;IACH,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,OAAO,sBAAuB,SAAQ,KAAK;IAC/C,YAAY,OAAO,GAAG,uCAAuC;QAC3D,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,wBAAwB,CAAA;IACtC,CAAC;CACF;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,yBAAyB,CAAC,EACxC,GAAG,EACH,GAAG,EAIJ;IACC,MAAM,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;IACtB,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAChC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;IAClD,CAAC;IACD,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,IAAI,EAAE,CAAA;IAC9C,MAAM,IAAI,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAA;IAC1C,IAAI,GAAG,EAAE,CAAC;QACR,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC1B,MAAM,IAAI,0BAA0B,CAAC;gBACnC,MAAM,EAAE,eAAe;gBACvB,UAAU,EAAE,GAAG,CAAC,IAAI;aACrB,CAAC,CAAA;QACJ,CAAC;QACD,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YACtB,MAAM,IAAI,0BAA0B,CAAC;gBACnC,MAAM,EAAE,aAAa;gBACrB,UAAU,EAAE,GAAG,CAAC,IAAI;aACrB,CAAC,CAAA;QACJ,CAAC;QACD,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QACnD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YAC1D,MAAM,IAAI,0BAA0B,CAAC;gBACnC,MAAM,EAAE,MAAM;gBACd,UAAU,EAAE,GAAG,CAAC,IAAI;gBACpB,aAAa,EAAE,GAAG;aACnB,CAAC,CAAA;QACJ,CAAC;QACD,IAAI,GAAG,CAAC,MAAM,GAAG,aAAa,EAAE,CAAC;YAC/B,MAAM,IAAI,0BAA0B,CAAC;gBACnC,MAAM,EAAE,UAAU;gBAClB,UAAU,EAAE,GAAG,CAAC,IAAI;aACrB,CAAC,CAAA;QACJ,CAAC;QACD,IAAI,GAAG,CAAC,aAAa,GAAG,CAAC,CAAE,CAAC,SAAS,KAAK,GAAG,CAAC,IAAI,EAAE,CAAC;YACnD,MAAM,IAAI,0BAA0B,CAAC;gBACnC,MAAM,EAAE,MAAM;gBACd,UAAU,EAAE,GAAG,CAAC,IAAI;gBACpB,aAAa,EAAE,GAAG;aACnB,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,CAAA;AAC/C,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAC,EACjD,QAAQ,EACR,KAAK,EACL,GAAG,EAKJ;IACC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;IAC1C,MAAM,MAAM,GAAG,yBAAyB,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAA;IACtD,wEAAwE;IACxE,+DAA+D;IAC/D,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC;QACrC,MAAM,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAA;IAC9C,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EACrC,GAAG,EACH,OAAO,EACP,IAAI,EACJ,QAAQ,EACR,SAAS,EAOV;IACC,MAAM,IAAI,GAAG,SAAS,IAAI,CAAC,MAAM,cAAc,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IACnE,MAAM,eAAe,CAAC;QACpB,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,GAAG;QAChB,OAAO;QACP,QAAQ;KACT,CAAC,CAAA;IACF,OAAO,oBAAoB,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;AAClD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,EACvC,OAAO,EACP,IAAI,EACJ,QAAQ,EAKT;IACC,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;IACzD,OAAO,eAAe,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAA;AAC1D,CAAC;AAED;;;;;;;;;;;GAWG;AACH,KAAK,UAAU,eAAe,CAAC,EAC7B,SAAS,EACT,OAAO,EACP,WAAW,EACX,QAAQ,EAMT;IACC,qBAAqB,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAA;IACjD,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,4BAA4B,CAAC;YACjC,QAAQ;YACR,KAAK,EAAE,eAAe,CAAC,EAAE,OAAO,EAAE,CAAC;YACnC,GAAG,EAAE,SAAS,CAAC,GAAG;SACnB,CAAC,CAAA;IACJ,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,KAAK,UAAU,cAAc,CAAC,EAC5B,OAAO,EACP,IAAI,EAIL;IACC,MAAM,GAAG,GAAG,KAAK,CAAC;QAChB,OAAO,EAAE,IAAI;QACb,IAAI,EAAE,YAAY,CAAC,OAAO,EAAE,aAAa,CAAC,EAAE,EAAE,gBAAgB,CAAC;KAChE,CAAC,CAAA;IACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAA;IACjC,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC5B,MAAM,IAAI,sBAAsB,EAAE,CAAA;IACpC,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CACb,+CAA+C,QAAQ,CAAC,MAAM,IAAI,CACnE,CAAA;IACH,CAAC;IACD,MAAM,GAAG,GAAG,iBAAiB,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;IACpD,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAA;IAC7C,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CACb,4CACE,QAAQ,CAAC,IAAI,CAAC,KAAK,IAAI,uCACzB,IAAI,CACL,CAAA;IACH,CAAC;IACD,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAA;IACrD,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;IAChC,0EAA0E;IAC1E,uEAAuE;IACvE,qEAAqE;IACrE,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;IAC1D,IACE,WAAW,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI;QACrC,QAAQ,GAAG,WAAW,CAAC,QAAQ,KAAK,WAAW,CAAC,QAAQ,EACxD,CAAC;QACD,MAAM,IAAI,KAAK,CACb,kDAAkD,QAAQ,CAAC,GAAG,IAAI;YAChE,uBAAuB,WAAW,CAAC,IAAI,wBAAwB;YAC/D,gBAAgB,WAAW,CAAC,IAAI,IAAI,CACvC,CAAA;IACH,CAAC;IACD,OAAO;QACL,GAAG,EAAE,QAAQ,CAAC,GAAG;QACjB,GAAG,EAAE,QAAQ,CAAC,GAAG;QACjB,GAAG;QACH,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE;QAC1C,aAAa,EAAE,QAAQ,CAAC,IAAI,CAAC,aAAa,IAAI,EAAE;QAChD,IAAI,EAAE,QAAQ,CAAC,IAAI;KACpB,CAAA;AACH,CAAC;AAmBD;;;;;;;;;;GAUG;AACH,MAAM,UAAU,oBAAoB,CAAC,EACnC,SAAS,EAGV;IACC,OAAO;QACL,GAAG,EAAE,SAAS,CAAC,GAAG;QAClB,GAAG,EAAE,SAAS,CAAC,GAAG;QAClB,UAAU,EAAE,SAAS,CAAC,UAAU;QAChC,aAAa,EAAE,SAAS,CAAC,aAAa;QACtC,IAAI,EAAE,SAAS,CAAC,IAAI;KACrB,CAAA;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,UAAU,yBAAyB,CAAC,EACxC,GAAG,EACH,OAAO,EACP,IAAI,EACJ,QAAQ,EACR,GAAG,EAOJ;IACC,IAAI,OAAwD,CAAA;IAC5D,OAAO,KAAK,IAAI,EAAE;QAChB,OAAO,KAAK,CACV,GAAG,KAAK,SAAS;YACf,CAAC,CAAC,gBAAgB,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,CACrD,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAC5B;YACH,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CACzB,CAAC,IAAI,CACJ,MAAM,CAAC,EAAE,CAAC,0BAA0B,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAC1D,GAAG,CAAC,EAAE;YACJ,OAAO,GAAG,SAAS,CAAA;YACnB,MAAM,GAAG,CAAA;QACX,CAAC,CACF,CAAA;QACD,OAAO,MAAM,OAAO,CAAA;IACtB,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"verifyLog.js","sourceRoot":"","sources":["../../src/webvh/verifyLog.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@interop/wallet-core",
   "description": "Shared wallet-domain logic (WAS sync engine core and wallet Space layout contracts) for Interop wallet apps.",
-  "version": "0.108.0",
+  "version": "0.110.0",
   "type": "module",
   "scripts": {
     "build": "pnpm run clear && tsc",
@@ -24,7 +24,7 @@
     "@interop/capability-agent": "^0.2.2",
     "@interop/data-integrity-core": "^8.9.0",
     "@interop/data-integrity-proof": "^3.4.8",
-    "@interop/did-method-webvh": "^5.17.0",
+    "@interop/did-method-webvh": "^5.18.0",
     "@interop/ed25519-signature": "^7.2.5",
     "@interop/ed25519-verification-key": "^8.2.2",
     "@interop/ezcap": "^7.5.4",
@@ -39,8 +39,8 @@
   "devDependencies": {
     "@eslint/js": "^10.0.1",
     "@interop/logger": "^0.2.0",
-    "@interop/storage-core": "^0.41.0",
-    "@interop/was-client": "^0.99.1",
+    "@interop/storage-core": "^0.42.0",
+    "@interop/was-client": "^0.101.0",
     "@playwright/test": "^1.60.0",
     "@types/node": "^26.0.1",
     "@vitest/coverage-v8": "^4.1.7",
@@ -56,7 +56,7 @@
     "was-teaching-server": "^0.42.3"
   },
   "peerDependencies": {
-    "@interop/was-client": ">=0.96.0 <1.0.0"
+    "@interop/was-client": ">=0.100.1 <1.0.0"
   },
   "files": [
     "dist",

package/dist/space/wasLink.d.ts

@@ -1,57 +0,0 @@
-/**
- * The decoded link: the WAS server plus the controller secret AS A STRING.
- */
-export interface WasLinkPayload {
-    serverUrl: string;
-    /**
-     * The controller secret (already decoded back to the passphrase string).
-     */
-    secret: string;
-}
-/**
- * The `t` discriminator member every `was-link` payload carries.
- */
-export declare const WAS_LINK_TYPE = "was-link";
-/**
- * Whether some scanned or pasted text has a `was-link` payload's JSON shape.
- * Matched structurally on the `t` member rather than by calling the parser,
- * so an unrelated JSON blob is not refused with a connection-code error
- * message. This is the recognizer a wallet hands `@interop/wallet-request`'s
- * input classifier for its `was-link` branch; whether the payload is valid
- * is {@link parseWasLinkPayload}'s answer.
- *
- * @param text {string}
- * @returns {boolean}
- */
-export declare function isWasLinkPayload(text: string): boolean;
-/**
- * Encodes a passphrase into the payload's `secret` field: `base64url(utf8(...))`,
- * no padding.
- *
- * @param passphrase {string}
- * @returns {string}
- */
-export declare function encodeWasLinkSecret(passphrase: string): string;
-/**
- * Builds the full `was-link` payload string a QR encodes.
- *
- * @param options {object}
- * @param options.serverUrl {string}
- * @param options.passphrase {string}
- * @returns {string}
- */
-export declare function buildWasLinkPayload({ serverUrl, passphrase }: {
-    serverUrl: string;
-    passphrase: string;
-}): string;
-/**
- * Parses and validates a scanned payload, returning the server URL and the
- * decoded string secret. Throws {@link HumanReadableError} for anything that is
- * not a valid current-version `was-link` payload (so the scanner shows a clean
- * message rather than mis-handling an unrelated QR).
- *
- * @param raw {string}   the raw scanned code value
- * @returns {WasLinkPayload}
- */
-export declare function parseWasLinkPayload(raw: string): WasLinkPayload;
-//# sourceMappingURL=wasLink.d.ts.map

package/dist/space/wasLink.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"wasLink.d.ts","sourceRoot":"","sources":["../../src/space/wasLink.ts"],"names":[],"mappings":"AAgBA;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAA;IACjB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;GAEG;AACH,eAAO,MAAM,aAAa,aAAa,CAAA;AAEvC;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAgBtD;AA4CD;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,SAAS,EACT,UAAU,EACX,EAAE;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;CACnB,GAAG,MAAM,CAOT;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAyC/D"}

package/dist/space/wasLink.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"wasLink.js","sourceRoot":"","sources":["../../src/space/wasLink.ts"],"names":[],"mappings":"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"}