@bsv/wallet-toolbox 2.13.0 → 2.13.2

package/out/src/storage/remoting/StorageClient.js

@@ -5,6 +5,56 @@ const WalletErrorFromJson_1 = require("../../sdk/WalletErrorFromJson");
 const WalletLogger_1 = require("../../WalletLogger");
 const StorageClientBase_1 = require("./StorageClientBase");
 const BinaryJson_1 = require("./BinaryJson");
+const MAX_REMOTE_LOG_ENTRIES = 1000;
+const MAX_REMOTE_LOG_MESSAGE_LENGTH = 4096;
+function invalidRemoteLog() {
+    throw new Error('Wallet storage returned invalid remote log data');
+}
+function validatedRemoteLog(result) {
+    if (result == null || typeof result !== 'object' || Array.isArray(result))
+        return undefined;
+    const log = Object.getOwnPropertyDescriptor(result, 'log');
+    if (log == null)
+        return undefined;
+    if (!('value' in log) || log.value == null || typeof log.value !== 'object' || Array.isArray(log.value)) {
+        return invalidRemoteLog();
+    }
+    const logProperties = Object.getOwnPropertyDescriptors(log.value);
+    if (Object.getOwnPropertySymbols(log.value).length !== 0 ||
+        Object.keys(logProperties).some(key => key !== 'logs') ||
+        Object.values(logProperties).some(property => property.get != null || property.set != null) ||
+        !Array.isArray(logProperties.logs?.value) ||
+        logProperties.logs.value.length > MAX_REMOTE_LOG_ENTRIES) {
+        return invalidRemoteLog();
+    }
+    const logs = logProperties.logs.value.map((entry) => {
+        if (entry == null || typeof entry !== 'object' || Array.isArray(entry))
+            return invalidRemoteLog();
+        const properties = Object.getOwnPropertyDescriptors(entry);
+        const keys = Object.keys(properties);
+        const booleanKeys = ['isError', 'isBegin', 'isEnd'];
+        if (Object.getOwnPropertySymbols(entry).length !== 0 ||
+            Object.values(properties).some(property => property.get != null || property.set != null) ||
+            keys.some(key => !['when', 'indent', 'log', ...booleanKeys].includes(key)) ||
+            !Number.isSafeInteger(properties.when?.value) ||
+            properties.when.value < 0 ||
+            !Number.isSafeInteger(properties.indent?.value) ||
+            properties.indent.value < 0 ||
+            properties.indent.value > 1000 ||
+            typeof properties.log?.value !== 'string' ||
+            properties.log.value.length > MAX_REMOTE_LOG_MESSAGE_LENGTH ||
+            booleanKeys.some(key => properties[key] != null && typeof properties[key].value !== 'boolean')) {
+            return invalidRemoteLog();
+        }
+        return {
+            when: properties.when.value,
+            indent: properties.indent.value,
+            log: properties.log.value,
+            ...Object.fromEntries(booleanKeys.filter(key => properties[key] != null).map(key => [key, properties[key].value]))
+        };
+    });
+    return { logs };
+}
 /**
  * `StorageClient` implements the `WalletStorageProvider` interface which allows it to
  * serve as a BRC-100 wallet's active storage.
@@ -15,7 +65,12 @@ const BinaryJson_1 = require("./BinaryJson");
  * The `AuthFetch` component is used to secure and authenticate the requests to the remote server.
  *
  * `AuthFetch` is initialized with a BRC-100 wallet which establishes the identity of
- * the party making requests of the remote service.
+ * the party making requests of the remote service. Responses must complete mutual
+ * authentication. By default, the first authenticated server identity is trusted for
+ * this client instance; callers can instead supply `serverIdentityKey` as an
+ * independently validated pin. The distinct storage-provider identity advertised by
+ * the authenticated `makeAvailable` response is authoritative by default; callers
+ * can independently pin it with `storageIdentityKey`.
  *
  * For details of the API implemented, follow the "See also" link for the `WalletStorageProvider` interface.
  */
@@ -36,7 +91,7 @@ class StorageClient extends StorageClientBase_1.StorageClientBase {
             const loggerState = this.startRpcLogging(method, params);
             const { logger } = loggerState;
             try {
-                const id = this.nextId++;
+                const id = this.nextRequestId();
                 const body = {
                     jsonrpc: '2.0',
                     method,
@@ -47,7 +102,7 @@ class StorageClient extends StorageClientBase_1.StorageClientBase {
                 const requestBody = await this.traceRpcStep('wallet.storage.request.serialize', rpcSpan, () => (0, BinaryJson_1.stringifyJsonRpc)(body, requestUsesBinary), { 'rpc.encoding': requestUsesBinary ? 'binary-json' : 'json' });
                 let response;
                 try {
-                    response = await this.traceRpcStep('wallet.storage.http', rpcSpan, async () => await this.authClient.fetch(this.endpointUrl, {
+                    response = await this.traceRpcStep('wallet.storage.http', rpcSpan, async () => await this.authenticatedFetch(this.endpointUrl, {
                         method: 'POST',
                         headers: {
                             'Content-Type': 'application/json',
@@ -74,18 +129,20 @@ class StorageClient extends StorageClientBase_1.StorageClientBase {
                     'http.response.status_code': response.status,
                     'rpc.encoding': responseUsesBinary ? 'binary-json' : 'json'
                 });
-                const json = await this.traceRpcStep('wallet.storage.response.parse', rpcSpan, () => (0, BinaryJson_1.parseJsonRpc)(responseText, responseUsesBinary), {
+                const json = await this.traceRpcStep('wallet.storage.response.parse', rpcSpan, () => (0, BinaryJson_1.validateJsonRpcResponse)((0, BinaryJson_1.parseJsonRpc)(responseText, responseUsesBinary), id), {
                     'rpc.encoding': responseUsesBinary ? 'binary-json' : 'json',
                     'response.size_bytes': responseText.length
                 });
-                if (json.error) {
+                if ('error' in json) {
                     (0, WalletLogger_1.logWalletError)(json.error, logger, 'error from remote service');
                     const werr = (0, WalletErrorFromJson_1.WalletErrorFromJson)(json.error);
                     throw werr;
                 }
                 if (logger != null) {
                     // merge log data from request processing
-                    logger.merge?.(json.result?.log);
+                    const remoteLog = validatedRemoteLog(json.result);
+                    if (remoteLog != null)
+                        logger.merge?.(remoteLog);
                     logger.groupEnd();
                 }
                 rpcSpan?.end({

package/out/src/storage/remoting/StorageClient.js.map

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

package/out/src/storage/remoting/StorageClientBase.d.ts

@@ -1,5 +1,6 @@
+import { type ValidCreateActionArgs, type ValidListActionsArgs, type ValidListCertificatesArgs, type ValidListOutputsArgs } from '@bsv/sdk/wallet/validationHelpers';
 import { type SyncTransferCapabilities } from './SyncTransfer';
-import { AbortActionArgs, AbortActionResult, InternalizeActionArgs, ListActionsResult, ListCertificatesResult, ListOutputsResult, RelinquishCertificateArgs, RelinquishOutputArgs, WalletInterface, AuthFetch, Validation, Telemetry, TelemetryConfig, TelemetrySpan } from '@bsv/sdk';
+import { AbortActionArgs, AbortActionResult, InternalizeActionArgs, ListActionsResult, ListCertificatesResult, ListOutputsResult, RelinquishCertificateArgs, RelinquishOutputArgs, WalletInterface, AuthFetch, Telemetry, TelemetryConfig, TelemetrySpan } from '@bsv/sdk';
 import { AuthId, FindCertificatesArgs, FindOutputBasketsArgs, FindOutputsArgs, FindProvenTxReqsArgs, ProcessSyncChunkResult, RequestSyncChunkArgs, StorageCreateActionResult, StorageInternalizeActionResult, StorageProcessActionArgs, StorageProcessActionResults, StoragePrepareNoSendExpiryResult, StorageActivateNoSendExpiryArgs, StorageActivateNoSendExpiryResult, StorageArmNoSendExpiryArgs, SyncChunk, SyncCheckpoint, UpdateProvenTxReqWithNewProvenTxArgs, UpdateProvenTxReqWithNewProvenTxResult, WalletStorageProvider } from '../../sdk/WalletStorage.interfaces';
 import { AbortActionBatchResult, ActionBatchManifest, BeginActionBatchArgs, BeginActionBatchResult, CommitActionBatchByDigestArgs, CommitActionBatchResult, ExtendActionBatchArgs, ExtendActionBatchResult, PrepareActionBatchCommitResult, PutActionBatchBlobArgs, PutActionBatchPackArgs, ResumeActionBatchArgs, ResumeActionBatchResult, RenewActionBatchResult, StorageCapabilities } from '../../sdk/ActionBatch.interfaces';
 import { TableSettings } from '../schema/tables/TableSettings';
@@ -28,6 +29,18 @@ export interface StorageClientOptions {
      * supplied. Request parameters and response payloads are never emitted.
      */
     telemetry?: TelemetryConfig;
+    /**
+     * Optional independently validated server identity key. When omitted, the
+     * first authenticated response is authoritative for this client instance.
+     */
+    serverIdentityKey?: string;
+    /**
+     * Optional independently validated storage-provider identity. The storage
+     * and authenticated server may use distinct keys. When omitted, the value
+     * advertised in the first authenticated `makeAvailable` response is
+     * authoritative for this client instance.
+     */
+    storageIdentityKey?: string;
 }
 /**
  * Abstract base class shared by `StorageClient` and `StorageMobile`.
@@ -43,6 +56,8 @@ export declare abstract class StorageClientBase implements WalletStorageProvider
     protected serverSupportsBinary: boolean;
     protected readonly binaryRequests: boolean;
     protected readonly telemetry: Telemetry;
+    private authenticatedServerIdentityKey?;
+    private readonly expectedStorageIdentityKey?;
     private syncChunkRoughSizeLimit?;
     /** Optional progress/cancellation hook for a bounded transfer; never receives wallet contents. */
     onSyncTransferProgress?: (progress: {
@@ -52,6 +67,7 @@ export declare abstract class StorageClientBase implements WalletStorageProvider
     }) => void;
     settings?: RemoteStorageSettings;
     constructor(wallet: WalletInterface, endpointUrl: string, options?: StorageClientOptions);
+    protected authenticatedFetch(url: string, config: Parameters<AuthFetch['fetch']>[1]): Promise<Response>;
     protected traceRpcCall<T>(method: string, params: unknown[], callback: (span?: TelemetrySpan) => Promise<T>): Promise<T>;
     protected traceRpcStep<T>(name: string, parent: TelemetrySpan | undefined, callback: (span?: TelemetrySpan) => Promise<T> | T, attributes?: Readonly<Record<string, unknown>>): Promise<T>;
     /**
@@ -68,6 +84,7 @@ export declare abstract class StorageClientBase implements WalletStorageProvider
      * @param params The array of parameters to pass to the method in order.
      */
     protected abstract rpcCall<T>(method: string, params: unknown[]): Promise<T>;
+    protected nextRequestId(): number;
     /**
      * @returns true once storage `TableSettings` have been retreived from remote storage.
      */
@@ -121,7 +138,7 @@ export declare abstract class StorageClientBase implements WalletStorageProvider
      * @param args Validated extension of original wallet `createAction` arguments.
      * @returns `StorageCreateActionResults` supporting additional wallet processing to yield `createAction` results.
      */
-    createAction(auth: AuthId, args: Validation.ValidCreateActionArgs): Promise<StorageCreateActionResult>;
+    createAction(auth: AuthId, args: ValidCreateActionArgs): Promise<StorageCreateActionResult>;
     /**
      * Storage level processing for wallet `createAction` and `signAction`.
      *
@@ -133,7 +150,7 @@ export declare abstract class StorageClientBase implements WalletStorageProvider
      * @returns `StorageProcessActionResults` supporting final wallet processing to yield `createAction` or `signAction` results.
      */
     processAction(auth: AuthId, args: StorageProcessActionArgs): Promise<StorageProcessActionResults>;
-    prepareNoSendExpiry(auth: AuthId, args: Validation.ValidCreateActionArgs): Promise<StoragePrepareNoSendExpiryResult>;
+    prepareNoSendExpiry(auth: AuthId, args: ValidCreateActionArgs): Promise<StoragePrepareNoSendExpiryResult>;
     activateNoSendExpiry(auth: AuthId, args: StorageActivateNoSendExpiryArgs): Promise<StorageActivateNoSendExpiryResult>;
     armNoSendExpiry(auth: AuthId, args: StorageArmNoSendExpiryArgs): Promise<void>;
     getCapabilities(): Promise<StorageCapabilities>;
@@ -194,7 +211,7 @@ export declare abstract class StorageClientBase implements WalletStorageProvider
      * @param args Validated extension of original wallet `listActions` arguments.
      * @returns `listActions` results.
      */
-    listActions(auth: AuthId, vargs: Validation.ValidListActionsArgs): Promise<ListActionsResult>;
+    listActions(auth: AuthId, vargs: ValidListActionsArgs): Promise<ListActionsResult>;
     /**
      * Storage level processing for wallet `listOutputs`.
      * @param auth Identifies client by identity key and the storage identity key of their currently active storage.
@@ -202,7 +219,7 @@ export declare abstract class StorageClientBase implements WalletStorageProvider
      * @param args Validated extension of original wallet `listOutputs` arguments.
      * @returns `listOutputs` results.
      */
-    listOutputs(auth: AuthId, vargs: Validation.ValidListOutputsArgs): Promise<ListOutputsResult>;
+    listOutputs(auth: AuthId, vargs: ValidListOutputsArgs): Promise<ListOutputsResult>;
     /**
      * Storage level processing for wallet `listCertificates`.
      * @param auth Identifies client by identity key and the storage identity key of their currently active storage.
@@ -210,7 +227,7 @@ export declare abstract class StorageClientBase implements WalletStorageProvider
      * @param args Validated extension of original wallet `listCertificates` arguments.
      * @returns `listCertificates` results.
      */
-    listCertificates(auth: AuthId, vargs: Validation.ValidListCertificatesArgs): Promise<ListCertificatesResult>;
+    listCertificates(auth: AuthId, vargs: ValidListCertificatesArgs): Promise<ListCertificatesResult>;
     /**
      * Find user certificates, optionally with fields.
      *

package/out/src/storage/remoting/StorageClientBase.d.ts.map

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

package/out/src/storage/remoting/StorageClientBase.js

@@ -14,6 +14,12 @@ const minimumSyncChunkRoughSize = 64 * 1024;
 function isSyncChunkResponseTooLarge(error) {
     return error instanceof Error && /WalletStorageClient rpcCall: network error 413(?:\s|$)/.test(error.message);
 }
+function hasControlCharacter(value) {
+    return Array.from(value).some(character => {
+        const point = character.codePointAt(0);
+        return point <= 0x1f || (point >= 0x7f && point <= 0x9f);
+    });
+}
 function isLoopbackStorageHost(hostname) {
     const normalized = hostname.toLowerCase();
     return (normalized === 'localhost' ||
@@ -22,6 +28,12 @@ function isLoopbackStorageHost(hostname) {
         normalized.endsWith('.localhost'));
 }
 function normalizeStorageEndpointUrl(endpointUrl) {
+    if (typeof endpointUrl !== 'string' ||
+        endpointUrl !== endpointUrl.trim() ||
+        endpointUrl.length > 8192 ||
+        hasControlCharacter(endpointUrl)) {
+        throw new TypeError('Wallet storage endpoint must be an exact bounded URL.');
+    }
     let parsed;
     try {
         parsed = new URL(endpointUrl);
@@ -40,6 +52,76 @@ function normalizeStorageEndpointUrl(endpointUrl) {
     // boundary; canonicalizing here would be an unrelated observable change.
     return endpointUrl;
 }
+function normalizeServerIdentityKey(value) {
+    if (typeof value !== 'string' || !/^(?:02|03)[0-9a-f]{64}$/.test(value)) {
+        throw new TypeError('Wallet storage server identity key must be canonical.');
+    }
+    try {
+        if (sdk_1.PublicKey.fromString(value).toString() !== value)
+            throw new Error();
+    }
+    catch {
+        throw new TypeError('Wallet storage server identity key must be canonical.');
+    }
+    return value;
+}
+function normalizeStorageIdentityKey(value) {
+    // Despite the historical "key" name, existing stores use both public keys
+    // and opaque identifiers, including legacy 32-byte and current 33-byte
+    // random values. Preserve that contract while enforcing the schema's
+    // bounded, non-control identifier domain.
+    if (typeof value !== 'string' || value.length < 1 || value.length > 130 || hasControlCharacter(value)) {
+        throw new TypeError('Wallet storage identity must be an exact bounded identifier.');
+    }
+    return value;
+}
+function validateRemoteStorageSettings(value) {
+    if (value == null || typeof value !== 'object' || Array.isArray(value)) {
+        throw new Error('Wallet storage returned invalid settings.');
+    }
+    const prototype = Object.getPrototypeOf(value);
+    const properties = Object.getOwnPropertyDescriptors(value);
+    if ((prototype !== Object.prototype && prototype !== null) ||
+        Object.getOwnPropertySymbols(value).length !== 0 ||
+        Object.values(properties).some(property => property.get != null || property.set != null)) {
+        throw new Error('Wallet storage returned invalid settings.');
+    }
+    normalizeStorageIdentityKey(properties.storageIdentityKey?.value);
+    const storageName = properties.storageName?.value;
+    if (storageName !== undefined &&
+        (typeof storageName !== 'string' ||
+            storageName.length < 1 ||
+            storageName.length > 255 ||
+            hasControlCharacter(storageName))) {
+        throw new Error('Wallet storage returned invalid settings.');
+    }
+    const chain = properties.chain?.value;
+    if (chain !== undefined && (typeof chain !== 'string' || !['main', 'test', 'stn', 'ttn', 'tstn'].includes(chain))) {
+        throw new Error('Wallet storage returned invalid settings.');
+    }
+    const dbtype = properties.dbtype?.value;
+    if (dbtype !== undefined && (typeof dbtype !== 'string' || !['SQLite', 'MySQL', 'IndexedDB'].includes(dbtype))) {
+        throw new Error('Wallet storage returned invalid settings.');
+    }
+    const maxOutputScript = properties.maxOutputScript?.value;
+    if (maxOutputScript !== undefined &&
+        (!Number.isSafeInteger(maxOutputScript) || maxOutputScript < 0 || maxOutputScript > 16 * 1024 * 1024)) {
+        throw new Error('Wallet storage returned invalid settings.');
+    }
+    for (const key of ['created_at', 'updated_at']) {
+        const date = properties[key]?.value;
+        if (date !== undefined && !(date instanceof Date) && !(typeof date === 'string' || typeof date === 'number')) {
+            throw new Error('Wallet storage returned invalid settings.');
+        }
+        if (date !== undefined && !Number.isFinite(new Date(date).getTime())) {
+            throw new Error('Wallet storage returned invalid settings.');
+        }
+    }
+    if (properties.syncCheckpointVersion != null && properties.syncCheckpointVersion.value !== 1) {
+        throw new Error('Wallet storage returned invalid settings.');
+    }
+    return value;
+}
 /**
  * Abstract base class shared by `StorageClient` and `StorageMobile`.
  *
@@ -54,6 +136,8 @@ class StorageClientBase {
     serverSupportsBinary = false;
     binaryRequests;
     telemetry;
+    authenticatedServerIdentityKey;
+    expectedStorageIdentityKey;
     syncChunkRoughSizeLimit;
     /** Optional progress/cancellation hook for a bounded transfer; never receives wallet contents. */
     onSyncTransferProgress;
@@ -64,6 +148,23 @@ class StorageClientBase {
         this.endpointUrl = normalizeStorageEndpointUrl(endpointUrl);
         this.binaryRequests = options.binaryRequests === true;
         this.telemetry = new sdk_1.Telemetry(options.telemetry);
+        this.authenticatedServerIdentityKey =
+            options.serverIdentityKey === undefined ? undefined : normalizeServerIdentityKey(options.serverIdentityKey);
+        this.expectedStorageIdentityKey =
+            options.storageIdentityKey === undefined ? undefined : normalizeStorageIdentityKey(options.storageIdentityKey);
+    }
+    async authenticatedFetch(url, config) {
+        const response = await this.authClient.fetch(url, config);
+        const authenticatedIdentityKey = response.headers.get('x-bsv-auth-identity-key');
+        if (authenticatedIdentityKey == null) {
+            throw new Error('Wallet storage response was not mutually authenticated.');
+        }
+        const identityKey = normalizeServerIdentityKey(authenticatedIdentityKey);
+        if (this.authenticatedServerIdentityKey !== undefined && identityKey !== this.authenticatedServerIdentityKey) {
+            throw new Error('Wallet storage authenticated server identity changed.');
+        }
+        this.authenticatedServerIdentityKey = identityKey;
+        return response;
     }
     async traceRpcCall(method, params, callback) {
         if (!this.telemetry.enabled)
@@ -99,6 +200,12 @@ class StorageClientBase {
     isStorageProvider() {
         return false;
     }
+    nextRequestId() {
+        if (!Number.isSafeInteger(this.nextId) || this.nextId < 1) {
+            throw new Error('Wallet storage request identifier space exhausted.');
+        }
+        return this.nextId++;
+    }
     /**
      * @returns true once storage `TableSettings` have been retreived from remote storage.
      */
@@ -122,7 +229,15 @@ class StorageClientBase {
      * @returns remote storage `TableSettings`
      */
     async makeAvailable() {
-        this.settings ??= await this.rpcCall('makeAvailable', []);
+        if (this.settings != null)
+            return this.settings;
+        const settings = validateRemoteStorageSettings(await this.rpcCall('makeAvailable', []));
+        const descriptor = Object.getOwnPropertyDescriptor(settings, 'storageIdentityKey');
+        const storageIdentityKey = normalizeStorageIdentityKey(descriptor != null && 'value' in descriptor ? descriptor.value : undefined);
+        if (this.expectedStorageIdentityKey !== undefined && storageIdentityKey !== this.expectedStorageIdentityKey) {
+            throw new Error('Wallet storage settings identity does not match the configured storage identity.');
+        }
+        this.settings = settings;
         return this.settings;
     }
     /// ///////////////////////////////////////////////////////////////////////////
@@ -194,7 +309,7 @@ class StorageClientBase {
             else {
                 let source;
                 try {
-                    source = sdk_1.Beef.fromBinary(args.inputBEEF);
+                    source = sdk_1.Beef.fromBinaryStrict(args.inputBEEF);
                 }
                 catch {
                     // Forward malformed proof data so the server preserves its established
@@ -258,14 +373,13 @@ class StorageClientBase {
         const baseUrl = this.endpointUrl.endsWith('/') ? this.endpointUrl.slice(0, -1) : this.endpointUrl;
         const url = `${baseUrl}/action-batch/${encodeURIComponent(args.batchId)}/blob/${encodeURIComponent(args.digest)}`;
         const bytes = args.bytes instanceof Uint8Array ? args.bytes : Uint8Array.from(args.bytes);
-        const response = await this.authClient.fetch(url, {
+        const response = await this.authenticatedFetch(url, {
             method: 'PUT',
             headers: { 'Content-Type': 'application/octet-stream' },
             body: bytes
         });
         if (!response.ok) {
-            const details = (await response.text()).slice(0, 512);
-            throw new Error(`WalletStorageClient putActionBatchBlob: network error ${response.status} ${response.statusText}: ${details}`);
+            throw new Error(`WalletStorageClient putActionBatchBlob: network error ${response.status}`);
         }
     }
     async putActionBatchPack(_auth, args) {
@@ -280,7 +394,7 @@ class StorageClientBase {
         }
         const baseUrl = this.endpointUrl.endsWith('/') ? this.endpointUrl.slice(0, -1) : this.endpointUrl;
         const url = `${baseUrl}/action-batch/${encodeURIComponent(args.batchId)}/pack`;
-        const response = await this.authClient.fetch(url, {
+        const response = await this.authenticatedFetch(url, {
             method: 'PUT',
             headers: {
                 'Content-Type': 'application/octet-stream',
@@ -289,8 +403,7 @@ class StorageClientBase {
             body
         });
         if (!response.ok) {
-            const details = (await response.text()).slice(0, 512);
-            throw new Error(`WalletStorageClient putActionBatchPack: network error ${response.status} ${response.statusText}: ${details}`);
+            throw new Error(`WalletStorageClient putActionBatchPack: network error ${response.status}`);
         }
     }
     async commitActionBatch(auth, manifest) {
@@ -556,7 +669,7 @@ class StorageClientBase {
         return (this.binaryRequests || transferPart) && this.serverSupportsBinary;
     }
     rpcResponseError(response) {
-        const error = new Error(`WalletStorageClient rpcCall: network error ${response.status} ${response.statusText}`);
+        const error = new Error(`WalletStorageClient rpcCall: network error ${response.status}`);
         if (response.status !== 429)
             return error;
         const after = response.headers.get('retry-after');
@@ -580,7 +693,8 @@ class StorageClientBase {
     }
     syncTransferRetryDelay(error, attempt) {
         const message = error instanceof Error ? error.message : '';
-        if (attempt >= 2 || !/network error (?:429|502|503|504)|timed out waiting for authenticated response|fetch failed|Failed to fetch/i.test(message))
+        if (attempt >= 2 ||
+            !/network error (?:429|502|503|504)|timed out waiting for authenticated response|fetch failed|Failed to fetch/i.test(message))
             return undefined;
         if (!/network error 429/.test(message))
             return 250 * 2 ** attempt;
@@ -612,16 +726,23 @@ class StorageClientBase {
         }
     }
     async downloadSyncTransfer(args, capabilities, suppliedManifest) {
-        const manifest = (0, SyncTransfer_1.validateSyncTransferManifest)(suppliedManifest ?? await this.transferPartCall('beginReadSyncTransfer', { identityKey: args.identityKey, args }), capabilities);
+        const manifest = (0, SyncTransfer_1.validateSyncTransferManifest)(suppliedManifest ??
+            (await this.transferPartCall('beginReadSyncTransfer', {
+                identityKey: args.identityKey,
+                args
+            })), capabilities);
         try {
-            const chunk = await (0, SyncTransfer_1.receiveSyncTransfer)(manifest, async (offset) => {
+            const chunk = (await (0, SyncTransfer_1.receiveSyncTransfer)(manifest, async (offset) => {
                 this.onSyncTransferProgress?.({ direction: 'read', bytes: offset, totalBytes: manifest.totalBytes });
                 return await this.transferPartCall('readSyncTransferPart', {
-                    identityKey: args.identityKey, transferId: manifest.transferId, offset
+                    identityKey: args.identityKey,
+                    transferId: manifest.transferId,
+                    offset
                 });
-            });
+            }));
             this.onSyncTransferProgress?.({ direction: 'read', bytes: manifest.totalBytes, totalBytes: manifest.totalBytes });
-            if (chunk?.userIdentityKey !== args.identityKey || chunk.fromStorageIdentityKey !== args.fromStorageIdentityKey ||
+            if (chunk?.userIdentityKey !== args.identityKey ||
+                chunk.fromStorageIdentityKey !== args.fromStorageIdentityKey ||
                 chunk.toStorageIdentityKey !== args.toStorageIdentityKey)
                 throw new Error('Wallet sync transfer identities changed');
             return (0, entityValidationHelpers_1.validateSyncChunkEntities)(chunk);
@@ -635,8 +756,11 @@ class StorageClientBase {
             throw new RangeError('Wallet sync record exceeds the negotiated transfer size limit');
         const response = await this.transferPartCall('beginWriteSyncTransfer', { identityKey, digest: (0, SyncTransfer_1.syncTransferDigest)(bytes), totalBytes: bytes.length });
         const manifest = (0, SyncTransfer_1.validateSyncTransferManifest)(response, capabilities);
-        if (manifest.digest !== (0, SyncTransfer_1.syncTransferDigest)(bytes) || manifest.totalBytes !== bytes.length ||
-            !Number.isSafeInteger(response.receivedBytes) || response.receivedBytes < 0 || response.receivedBytes > bytes.length ||
+        if (manifest.digest !== (0, SyncTransfer_1.syncTransferDigest)(bytes) ||
+            manifest.totalBytes !== bytes.length ||
+            !Number.isSafeInteger(response.receivedBytes) ||
+            response.receivedBytes < 0 ||
+            response.receivedBytes > bytes.length ||
             (response.receivedBytes !== bytes.length && response.receivedBytes % manifest.partBytes !== 0)) {
             throw new Error('Invalid wallet sync upload checkpoint');
         }
@@ -644,14 +768,19 @@ class StorageClientBase {
             this.onSyncTransferProgress?.({ direction: 'write', bytes: offset, totalBytes: bytes.length });
             const part = bytes.subarray(offset, offset + manifest.partBytes);
             const next = await this.transferPartCall('writeSyncTransferPart', {
-                identityKey, transferId: manifest.transferId, offset, bytes: part
+                identityKey,
+                transferId: manifest.transferId,
+                offset,
+                bytes: part
             });
             if (next !== offset + part.length)
                 throw new Error('Invalid wallet sync upload acknowledgement');
             offset = next;
         }
         // An uncertain commit is surfaced. The next sync starts from the writer's durable checkpoint.
-        const result = await this.rpcCall('commitSyncTransfer', [{ identityKey, transferId: manifest.transferId }]);
+        const result = await this.rpcCall('commitSyncTransfer', [
+            { identityKey, transferId: manifest.transferId }
+        ]);
         await this.releaseSyncTransfer(identityKey, manifest.transferId);
         return result;
     }