@agoric/client-utils 0.2.0 → 0.2.1-upgrade-23-dev-bd79330.0.bd79330

package/dist/vstorage-kit.js

@@ -1,11 +1,14 @@
-import { boardSlottingMarshaller, makeBoardRemote, } from '@agoric/vats/tools/board-utils.js';
-import { assertAllDefined } from '@agoric/internal';
+import { boardSlottingMarshaller, makeBoardRemote, } from '@agoric/internal/src/marshal/board-client-utils.js';
+import { assertAllDefined, tryNow } from '@agoric/internal';
 import { makeVStorage } from './vstorage.js';
 export { boardSlottingMarshaller };
 /**
+ * @import {Marshal} from '@endo/marshal';
  * @import {MinimalNetworkConfig} from './network-config.js';
- * @import {TypedPublished} from './types.js';
+ * @import {PublishedPathTypes, TypedPublishedFor, VstorageKit} from './types.js';
  * @import {VStorage} from './vstorage.js';
+ * @import {AgoricNamesRemotes} from '@agoric/vats/tools/board-utils.js';
+ * @import {BoardRemote} from '@agoric/vats/tools/board-utils.js';
  */
 /** @deprecated */
 export const makeFromBoard = () => {
@@ -60,14 +63,14 @@ harden(storageHelper);
  * @deprecated
  * @param {IdMap} ctx
  * @param {VStorage} vstorage
- * @returns {Promise<import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes>}
+ * @returns {Promise<AgoricNamesRemotes>}
  */
 export const makeAgoricNames = async (ctx, vstorage) => {
     assertAllDefined({ ctx, vstorage });
     const reverse = {};
     const entries = await Promise.all(['brand', 'instance', 'vbankAsset'].map(async (kind) => {
         const content = await vstorage.readLatest(`published.agoricNames.${kind}`);
-        /** @type {Array<[string, import('@agoric/vats/tools/board-utils.js').BoardRemote]>} */
+        /** @type {Array<[string, BoardRemote]>} */
         const parts = storageHelper.unserializeTxt(content, ctx).at(-1);
         for (const [name, remote] of parts) {
             if ('getBoardId' in remote) {
@@ -79,47 +82,78 @@ export const makeAgoricNames = async (ctx, vstorage) => {
     return { ...Object.fromEntries(entries), reverse };
 };
 /**
+ * @template {PublishedPathTypes} [Ext=Record<never, never>]
+ * @param {object} config
+ * @param {VStorage} config.vstorage
+ * @param {MinimalNetworkConfig} config.networkConfig
+ * @param {Pick<Marshal<string>, 'fromCapData' | 'toCapData'>} [config.marshaller]
+ * @returns {VstorageKit<Ext>}
+ * @alpha
+ */
+export const makeVstorageKitFromVstorage = ({ vstorage, networkConfig, marshaller, }) => {
+    /** @type {IdMap} */
+    const fromBoard = marshaller
+        ? {
+            // XXX Route conversions through a provided marshaller.
+            // Note that the fromBoard pattern is deprecated.
+            convertSlotToVal: (boardId, iface) => {
+                const boardRemote = makeBoardRemote({ boardId, iface });
+                // @ts-expect-error TS18048 marshaller won't be undefined here.
+                return marshaller.fromCapData(marshaller.toCapData(boardRemote));
+            },
+        }
+        : makeFromBoard();
+    marshaller ??= boardSlottingMarshaller(fromBoard.convertSlotToVal);
+    /** @type {(txt: string | {value: string}) => unknown} */
+    const unserializeHead = txt => {
+        const { capDatas } = storageHelper.parseCapData(txt);
+        // XXX For backwards compatibility with the old implementation
+        // (`storageHelper.unserializeTxt(txt, fromBoard).at(-1)`), parse every
+        // capDatas item even though we only care about the last one.
+        // This is almost certainly safe to improve in a dedicated PR.
+        const values = capDatas.map(capData => marshaller.fromCapData(capData));
+        return values.at(-1);
+    };
+    /**
+     * Read latest at path and unmarshal it
+     * @type {<T extends unknown = any>(path: string) => Promise<T>}
+     */
+    const readLatestHead = path => 
+    /** @type {Promise<any>} */ (vstorage.readLatest(path).then(unserializeHead));
+    /**
+     * Read latest at published path and unmarshal it.
+     *
+     * Note this does not perform a runtime check to verify the shape. The
+     * static types come from the spec of what is supposed to be written to
+     * vstorage, which is validated in testing of the chain code that is run
+     * in consensus.
+     *
+     * @type {<T extends string>(subpath: T) => Promise<TypedPublishedFor<T, Ext>>}
+     */
+    const readPublished = subpath => 
+    /** @type {Promise<TypedPublishedFor<any, Ext>>} */ (readLatestHead(`published.${subpath}`));
+    return {
+        fromBoard,
+        marshaller,
+        networkConfig,
+        readLatestHead,
+        readPublished,
+        unserializeHead,
+        vstorage,
+    };
+};
+harden(makeVstorageKitFromVstorage);
+/**
+ * @template {PublishedPathTypes} [Ext=Record<never, never>]
  * @param {{ fetch: typeof window.fetch }} io
  * @param {MinimalNetworkConfig} networkConfig
+ * @returns {VstorageKit<Ext>}
  */
 export const makeVstorageKit = ({ fetch }, networkConfig) => {
-    try {
-        const vstorage = makeVStorage({ fetch }, networkConfig);
-        const fromBoard = makeFromBoard();
-        const marshaller = boardSlottingMarshaller(fromBoard.convertSlotToVal);
-        /** @type {(txt: string | {value: string}) => unknown} */
-        const unserializeHead = txt => storageHelper.unserializeTxt(txt, fromBoard).at(-1);
-        /**
-         * Read latest at path and unmarshal it
-         * @type {(path: string) => Promise<unknown>}
-         */
-        const readLatestHead = path => vstorage.readLatest(path).then(unserializeHead);
-        /**
-         * Read latest at published path and unmarshal it.
-         *
-         * Note this does not perform a runtime check to verify the shape. The
-         * static types come from the spec of what is supposed to be written to
-         * vstorage, which is validated in testing of the chain code that is run
-         * in consensus.
-         *
-         * @type {<T extends string>(subpath: T) => Promise<TypedPublished<T>>}
-         */
-        const readPublished = subpath => 
-        // @ts-expect-error cast
-        readLatestHead(`published.${subpath}`);
-        return {
-            fromBoard,
-            marshaller,
-            networkConfig,
-            readLatestHead,
-            readPublished,
-            unserializeHead,
-            vstorage,
-        };
-    }
-    catch (err) {
+    const vstorage = tryNow(() => makeVStorage({ fetch }, networkConfig), err => {
         throw Error(`RPC failure (${networkConfig.rpcAddrs}): ${err.message}`);
-    }
+    });
+    return makeVstorageKitFromVstorage({ vstorage, networkConfig });
 };
-/** @typedef {ReturnType<typeof makeVstorageKit>} VstorageKit */
+harden(makeVstorageKit);
 //# sourceMappingURL=vstorage-kit.js.map

package/dist/vstorage-kit.js.map

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

package/dist/vstorage.d.ts

@@ -5,7 +5,11 @@ export function makeAbciQuery<T extends "data" | "children">(path?: string, { ki
 export function makeVStorage({ fetch }: {
     fetch: typeof window.fetch;
 }, config: MinimalNetworkConfig): {
-    readStorage: <T extends "children" | "data">(path?: string, { kind, height }?: {
+    readStorageMeta: <T extends "children" | "data">(path?: string, { kind, height }?: {
+        kind?: T | undefined;
+        height?: number | bigint | undefined;
+    }) => Promise<T extends "children" ? QueryChildrenMetaResponse : QueryDataMetaResponse>;
+    readStorage: <T extends "children" | "data">(path?: string, opts?: {
         kind?: T | undefined;
         height?: number | bigint | undefined;
     }) => Promise<T extends "children" ? QueryChildrenResponse : QueryDataResponse>;
@@ -37,6 +41,23 @@ export function makeVStorage({ fetch }: {
      */
     readFully(path: string, minHeight?: number | string): Promise<string[]>;
 };
+export type AbciQueryResponse = {
+    code?: number;
+    codespace?: string;
+    height?: string | number;
+    log?: string;
+    value?: string;
+};
+export type QueryMetaResponseBase = {
+    blockHeight?: bigint;
+    log?: string;
+};
+export type QueryChildrenMetaResponse = QueryMetaResponseBase & {
+    result: QueryChildrenResponse;
+};
+export type QueryDataMetaResponse = QueryMetaResponseBase & {
+    result: QueryDataResponse;
+};
 export type VStorage = ReturnType<typeof makeVStorage>;
 import type { MinimalNetworkConfig } from './network-config.js';
 import { QueryChildrenResponse } from '@agoric/cosmic-proto/agoric/vstorage/query.js';

package/dist/vstorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vstorage.d.ts","sourceRoot":"","sources":["../src/vstorage.js"],"names":[],"mappings":"AA6CO,8BAP4B,CAAC,SAAtB,MAAM,GAAG,UAAW,SACvB,MAAM,qBAEd;IAAiB,IAAI;IACU,MAAM;CACrC,GAAU,eAAe,MAAM,EAAE,CAYnC;AAOM,wCAHJ;IAAoC,KAAK,EAAjC,OAAO,MAAM,CAAC,KAAK;CAC3B,UAAQ,oBAAoB;kBAsBM,CAAC,SAAtB,UAAU,GAAG,MAAO,SACvB,MAAM,qBAEd;QAAiB,IAAI;QACU,MAAM;KACrC,KAAU,OAAO,CAAC,CAAC,SAAS,UAAU,GAAG,qBAAqB,GAAE,iBAAiB,CAAE;IAuCpF;;;;OAIG;sBAFQ,MAAM,GACJ,OAAO,CAAC,iBAAiB,CAAC;IAKvC;;;;;OAKG;gBAFQ,MAAM,GACJ,OAAO,CAAC,MAAM,EAAE,CAAC;IAM9B;;;;OAIG;iBAHQ,MAAM,WACN,MAAM,GACJ,OAAO,CAAC,WAAW,OAAO,CAAC,CAAC;IASzC;;;;;;OAMG;oBAHQ,MAAM,cACN,MAAM,GAAG,MAAM,GACb,OAAO,CAAC,MAAM,EAAE,CAAC;EAyCjC;uBACa,UAAU,CAAC,OAAO,YAAY,CAAC;0CA5LN,qBAAqB;sCANrD,+CAA+C;kCAA/C,+CAA+C;gCAKzB,0CAA0C"}
+{"version":3,"file":"vstorage.d.ts","sourceRoot":"","sources":["../src/vstorage.js"],"names":[],"mappings":"AAsDO,8BAP4B,CAAC,SAAtB,MAAM,GAAG,UAAW,SACvB,MAAM,qBAEd;IAAiB,IAAI;IACU,MAAM;CACrC,GAAU,eAAe,MAAM,EAAE,CAYnC;AAaM,wCAHJ;IAAoC,KAAK,EAAjC,OAAO,MAAM,CAAC,KAAK;CAC3B,UAAQ,oBAAoB;sBA4BM,CAAC,SAAtB,UAAU,GAAG,MAAO,SACvB,MAAM,qBAEd;QAAiB,IAAI;QACU,MAAM;KACrC,KAAU,OAAO,CAAC,CAAC,SAAS,UAAU,GAAG,yBAAyB,GAAG,qBAAqB,CAAC;kBAgD3D,CAAC,SAAtB,UAAU,GAAG,MAAO,SACvB,MAAM,SAEd;QAAiB,IAAI;QACU,MAAM;KACrC,KAAU,OAAO,CAAC,CAAC,SAAS,UAAU,GAAG,qBAAqB,GAAG,iBAAiB,CAAC;IAWpF;;;;OAIG;sBAFQ,MAAM,GACJ,OAAO,CAAC,iBAAiB,CAAC;IAKvC;;;;;OAKG;gBAFQ,MAAM,GACJ,OAAO,CAAC,MAAM,EAAE,CAAC;IAM9B;;;;OAIG;iBAHQ,MAAM,WACN,MAAM,GACJ,OAAO,CAAC,WAAW,OAAO,CAAC,CAAC;IASzC;;;;;;OAMG;oBAHQ,MAAM,cACN,MAAM,GAAG,MAAM,GACb,OAAO,CAAC,MAAM,EAAE,CAAC;EAyCjC;gCAtOY;IACR,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;oCA2CS;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE;wCACtC,qBAAqB,GAAG;IAAE,MAAM,EAAE,qBAAqB,CAAA;CAAE;oCACzD,qBAAqB,GAAG;IAAE,MAAM,EAAE,iBAAiB,CAAA;CAAE;uBAoLpD,UAAU,CAAC,OAAO,YAAY,CAAC;0CA3ON,qBAAqB;sCALrD,+CAA+C;kCAA/C,+CAA+C;gCAIzB,0CAA0C"}

package/dist/vstorage.js

@@ -4,11 +4,19 @@ import { StreamCellShape } from '@agoric/internal/src/lib-chainStorage.js';
 import { mustMatch } from '@agoric/internal';
 import { QueryChildrenRequest, QueryChildrenResponse, QueryDataRequest, QueryDataResponse, } from '@agoric/cosmic-proto/agoric/vstorage/query.js';
 /**
- * @import {AbciQueryResponse} from '@cosmjs/tendermint-rpc';
  * @import {JsonSafe} from '@agoric/cosmic-proto';
  * @import {StreamCell} from '@agoric/internal/src/lib-chainStorage.js';
  * @import {MinimalNetworkConfig} from './network-config.js';
  */
+/**
+ * @typedef {{
+ *   code?: number;
+ *   codespace?: string;
+ *   height?: string | number;
+ *   log?: string;
+ *   value?: string;
+ * }} AbciQueryResponse
+ */
 const kindToRpc = /** @type {const} */ ({
     __proto__: null,
     children: '/agoric.vstorage.Query/Children',
@@ -41,6 +49,11 @@ export const makeAbciQuery = (path = 'published', { kind = /** @type {T} */ ('ch
     const hexData = encodeHex(buf);
     return `/abci_query?path=%22${rpc}%22&data=0x${hexData}&height=${height}`;
 };
+/**
+ * @typedef {{ blockHeight?: bigint, log?: string }} QueryMetaResponseBase
+ * @typedef {QueryMetaResponseBase & { result: QueryChildrenResponse }} QueryChildrenMetaResponse
+ * @typedef {QueryMetaResponseBase & { result: QueryDataResponse }} QueryDataMetaResponse
+ */
 /**
  * @param {object} powers
  * @param {typeof window.fetch} powers.fetch
@@ -61,14 +74,20 @@ export const makeVStorage = ({ fetch }, config) => {
         return res.json();
     };
     /**
+     * Make a vstorage Children or Data query, returning the decoded result along
+     * with response metadata derived from fields documented at
+     * https://docs.cometbft.com/v0.38/spec/abci/abci++_methods#query (for
+     * successful responses, `log` and `height` [as `blockHeight`], and for error
+     * responses, `codespace` and `code`).
+     *
      * @template {'children' | 'data'} T
      * @param {string} [path]
      * @param {object} [opts]
      * @param {T} [opts.kind]
      * @param {number | bigint} [opts.height] 0 is the same as omitting height and implies the highest block
-     * @returns {Promise<T extends 'children' ? QueryChildrenResponse :QueryDataResponse >}
+     * @returns {Promise<T extends 'children' ? QueryChildrenMetaResponse : QueryDataMetaResponse>}
      */
-    const readStorage = async (path = 'published', { kind = /** @type {T} */ ('children'), height = 0 } = {}) => {
+    const readStorageMeta = async (path = 'published', { kind = /** @type {T} */ ('children'), height = 0 } = {}) => {
         await null;
         const rpc = kindToRpc[kind];
         const codec = codecs[rpc];
@@ -89,10 +108,33 @@ export const makeVStorage = ({ fetch }, config) => {
             throw err;
         }
         const { value: b64Value } = response;
+        if (typeof b64Value !== 'string') {
+            throw Error(`missing value reading ${kind} of ${path}`);
+        }
+        const result = codec.response.decode(decodeBase64(b64Value));
+        /** @type {QueryMetaResponseBase} */
+        const metaResponseBase = {
+            blockHeight: response.height === undefined ? undefined : BigInt(response.height),
+            log: response.log,
+        };
+        // @ts-expect-error cast
+        return { ...metaResponseBase, result };
+    };
+    /**
+     * @template {'children' | 'data'} T
+     * @param {string} [path]
+     * @param {object} [opts]
+     * @param {T} [opts.kind]
+     * @param {number | bigint} [opts.height] 0 is the same as omitting height and implies the highest block
+     * @returns {Promise<T extends 'children' ? QueryChildrenResponse : QueryDataResponse>}
+     */
+    const readStorage = async (path = 'published', opts = {}) => {
+        const respWithMetadata = await readStorageMeta(path, opts);
         // @ts-expect-error cast
-        return codec.response.decode(decodeBase64(b64Value));
+        return respWithMetadata.result;
     };
     const vstorage = {
+        readStorageMeta,
         readStorage,
         /**
          *

package/dist/vstorage.js.map

@@ -1 +1 @@
-{"version":3,"file":"vstorage.js","sourceRoot":"","sources":["../src/vstorage.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"vstorage.js","sourceRoot":"","sources":["../src/vstorage.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,GAClB,MAAM,+CAA+C,CAAC;AAEvD;;;;GAIG;AAEH;;;;;;;;GAQG;AAEH,MAAM,SAAS,GAAG,oBAAoB,CAAC,CAAC;IACtC,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,iCAAiC;IAC3C,IAAI,EAAE,6BAA6B;CACpC,CAAC,CAAC;AAEH,oEAAoE;AACpE,MAAM,MAAM,GAAG;IACb,SAAS,EAAE,IAAI;IACf,iCAAiC,EAAE;QACjC,OAAO,EAAE,oBAAoB;QAC7B,QAAQ,EAAE,qBAAqB;KAChC;IACD,6BAA6B,EAAE;QAC7B,OAAO,EAAE,gBAAgB;QACzB,QAAQ,EAAE,iBAAiB;KAC5B;CACF,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,IAAI,GAAG,WAAW,EAClB,EAAE,IAAI,GAAG,gBAAgB,CAAC,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,EAAE,EACzD,EAAE;IACF,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAC5B,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;IAC/B,OAAO,uBAAuB,GAAG,cAAc,OAAO,WAAW,MAAM,EAAE,CAAC;AAC5E,CAAC,CAAC;AAEF;;;;GAIG;AAEH;;;;GAIG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE;IAChD;;;;;;;OAOG;IACH,MAAM,eAAe,GAAG,KAAK,EAC3B,YAAY,EACZ,EAAE,IAAI,GAAG,gBAAgB,CAAC,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,EAAE,EACzD,EAAE;QACF,MAAM,GAAG,GACP,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACrE,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAClD,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;IACpB,CAAC,CAAC;IAEF;;;;;;;;;;;;;OAaG;IACH,MAAM,eAAe,GAAG,KAAK,EAC3B,IAAI,GAAG,WAAW,EAClB,EAAE,IAAI,GAAG,gBAAgB,CAAC,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,EAAE,EACzD,EAAE;QACF,MAAM,IAAI,CAAC;QAEX,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAE1B,0DAA0D;QAC1D,IAAI,IAAI,CAAC;QACT,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,KAAK,CAAC,eAAe,IAAI,OAAO,IAAI,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,EACJ,MAAM,EAAE,EAAE,QAAQ,EAAE,GACrB,GAAG,IAAI,CAAC;QACT,IAAI,QAAQ,EAAE,IAAI,KAAK,CAAC,EAAE,CAAC;YACzB,kBAAkB;YAClB,MAAM,GAAG,GAAG,KAAK,CACf,cAAc,QAAQ,EAAE,IAAI,YAAY,IAAI,OAAO,IAAI,KAAK,QAAQ,CAAC,GAAG,EAAE,CAC3E,CAAC;YACF,GAAG,CAAC,IAAI,GAAG,QAAQ,EAAE,IAAI,CAAC;YAC1B,GAAG,CAAC,SAAS,GAAG,QAAQ,EAAE,SAAS,CAAC;YACpC,MAAM,GAAG,CAAC;QACZ,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;QACrC,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACjC,MAAM,KAAK,CAAC,yBAAyB,IAAI,OAAO,IAAI,EAAE,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC7D,oCAAoC;QACpC,MAAM,gBAAgB,GAAG;YACvB,WAAW,EACT,QAAQ,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YACrE,GAAG,EAAE,QAAQ,CAAC,GAAG;SAClB,CAAC;QACF,wBAAwB;QACxB,OAAO,EAAE,GAAG,gBAAgB,EAAE,MAAM,EAAE,CAAC;IACzC,CAAC,CAAC;IAEF;;;;;;;OAOG;IACH,MAAM,WAAW,GAAG,KAAK,EAAE,IAAI,GAAG,WAAW,EAAE,IAAI,GAAG,EAAE,EAAE,EAAE;QAC1D,MAAM,gBAAgB,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC3D,wBAAwB;QACxB,OAAO,gBAAgB,CAAC,MAAM,CAAC;IACjC,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAG;QACf,eAAe;QACf,WAAW;QACX;;;;WAIG;QACH,KAAK,CAAC,UAAU,CAAC,IAAI,GAAG,WAAW;YACjC,OAAO,WAAW,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAC7C,CAAC;QACD;;;;;WAKG;QACH,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,WAAW;YAC3B,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;YAC/D,OAAO,QAAQ,CAAC,QAAQ,CAAC;QAC3B,CAAC;QACD;;;;WAIG;QACH,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS;YACnC,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;YACnE,sBAAsB;YACtB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;YAChD,SAAS,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YACjC,OAAO,IAAI,CAAC;QACd,CAAC;QACD;;;;;;WAMG;QACH,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,GAAG,SAAS;YACzC,MAAM,KAAK,GAAG,EAAE,CAAC;YACjB,yDAAyD;YACzD,iCAAiC;YACjC,IAAI,WAAW,CAAC;YAChB,MAAM,IAAI,CAAC;YACX,GAAG,CAAC;gBACF,6CAA6C;gBAC7C,IAAI,MAAM,CAAC;gBACX,IAAI,CAAC;oBACH,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAC9C,IAAI,EACJ,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAChE,CAAC,CAAC;oBACH,qDAAqD;gBACvD,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb;oBACE,4DAA4D;oBAC5D,mCAAmC;oBACnC,4CAA4C;oBAC5C,oDAAoD;oBACpD,GAAG,CAAC,SAAS,KAAK,KAAK;wBACvB,GAAG,CAAC,IAAI,KAAK,EAAE;wBACf,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAC3B,CAAC;wBACD,sBAAsB;wBACtB,MAAM;oBACR,CAAC;oBACD,MAAM,GAAG,CAAC;gBACZ,CAAC;gBACD,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC7B,mCAAmC;gBACnC,oDAAoD;gBACpD,IAAI,SAAS,IAAI,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAAC,SAAS,CAAC;oBAAE,MAAM;YACnE,CAAC,QAAQ,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;YAClC,OAAO,uBAAuB,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC;KACF,CAAC;IACF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AACF,0DAA0D"}

package/dist/wallet-store.d.ts

@@ -2,7 +2,7 @@ import type { ECallable } from '@agoric/vow/src/E.js';
 import type { EUnwrap } from '@agoric/vow/src/types.js';
 import type { Instance } from '@agoric/zoe';
 import type { DeliverTxResponse, StdFee } from '@cosmjs/stargate';
-import type { SigningSmartWalletKit } from './signing-smart-wallet-kit.ts';
+import type { SigningSmartWalletKit } from './signing-smart-wallet-kit.js';
 import type { RetryOptionsAndPowers } from './sync-tools.js';
 /**
  * A type-aware representation of an object saved in the wallet store, with

package/dist/wallet-utils.d.ts

@@ -1,6 +1,6 @@
-/** @typedef {import('./smart-wallet-kit.js').SmartWalletKit} WalletUtils  */
+/** @import {SmartWalletKit} from './smart-wallet-kit.js';  */
 /** @deprecated use `makeSmartWalletKit` */
-export const makeWalletUtils: ({ fetch, delay, names }: {
+export const makeWalletUtils: ({ fetch, delay: _delay, names, }: {
     fetch: typeof globalThis.fetch;
     delay: (ms: number) => Promise<void>;
     names?: boolean | undefined;
@@ -9,35 +9,25 @@ export const makeWalletUtils: ({ fetch, delay, names }: {
     getLastUpdate: (addr: string) => Promise<import("@agoric/smart-wallet/src/smartWallet.js").UpdateRecord>;
     getCurrentWalletRecord: (addr: string) => Promise<import("@agoric/smart-wallet/src/smartWallet.js").CurrentWalletRecord>;
     storedWalletState: (from: string, minHeight?: number | string) => Promise<{
-        invitationsReceived: Map<import("@agoric/smart-wallet/src/offers.js").OfferId, {
-            acceptedIn: import("@agoric/smart-wallet/src/offers.js").OfferId;
+        invitationsReceived: Map<string, {
+            acceptedIn?: import("@agoric/smart-wallet/src/offers.js").OfferId;
             description: string;
-            instance: Instance;
+            instance: import("@agoric/zoe").Instance;
         }>;
         offerStatuses: Map<import("@agoric/smart-wallet/src/offers.js").OfferId, import("@agoric/smart-wallet/src/offers.js").OfferStatus>;
-        balances: Map<globalThis.Brand, globalThis.Amount>;
+        balances: Map<import("@agoric/ertp").Brand, import("@agoric/ertp").Amount>;
     }>;
-    pollOffer: (from: string, id: string | number, minHeight: number | string, untilNumWantsSatisfied?: boolean) => Promise<import("@agoric/smart-wallet/src/offers.js").OfferStatus>;
+    pollOffer: (from: string, id: string | number, _minHeight?: number | string, untilNumWantsSatisfied?: boolean) => Promise<import("@agoric/smart-wallet/src/offers.js").OfferStatus>;
     fromBoard: {
-        convertSlotToVal: (boardId: any, iface: any) => any;
+        convertSlotToVal: (boardId: string, iface?: string) => unknown;
     };
-    marshaller: Omit<import("@endo/marshal").Marshal<string | null>, "serialize" | "unserialize">;
+    marshaller: Pick<import("@endo/marshal").Marshal<string>, "fromCapData" | "toCapData">;
     networkConfig: import("./network-config.js").MinimalNetworkConfig;
-    readLatestHead: (path: string) => Promise<unknown>;
-    readPublished: <T extends string>(subpath: T) => Promise<import("./types.js").TypedPublished<T>>;
+    readLatestHead: <T = any>(path: string) => Promise<T>;
+    readPublished: <P extends string>(subpath: P) => Promise<import("./types.js").TypedPublishedFor<P, Record<never, never>>>;
     unserializeHead: (txt: string | {
         value: string;
     }) => unknown;
-    vstorage: {
-        readStorage: <T extends "children" | "data">(path?: string, { kind, height }?: {
-            kind?: T | undefined;
-            height?: number | bigint | undefined;
-        }) => Promise<T extends "children" ? import("@agoric/cosmic-proto/agoric/vstorage/query.js").QueryChildrenResponse : import("@agoric/cosmic-proto/agoric/vstorage/query.js").QueryDataResponse>;
-        readLatest(path?: string): Promise<import("@agoric/cosmic-proto/agoric/vstorage/query.js").QueryDataResponse>;
-        keys(path?: string): Promise<string[]>;
-        readAt(path: string, height?: number): Promise<import("@agoric/internal/src/lib-chainStorage.js").StreamCell<unknown>>;
-        readFully(path: string, minHeight?: number | string): Promise<string[]>;
-    };
+    vstorage: import("./vstorage.js").VStorage;
 }>;
-export type WalletUtils = import("./smart-wallet-kit.js").SmartWalletKit;
 //# sourceMappingURL=wallet-utils.d.ts.map

package/dist/wallet-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-utils.d.ts","sourceRoot":"","sources":["../src/wallet-utils.js"],"names":[],"mappings":"AAIA,6EAA6E;AAE7E,2CAA2C;AAC3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAAkD;0BAHpC,OAAO,uBAAuB,EAAE,cAAc"}
+{"version":3,"file":"wallet-utils.d.ts","sourceRoot":"","sources":["../src/wallet-utils.js"],"names":[],"mappings":"AAIA,8DAA8D;AAE9D,2CAA2C;AAC3C;;;;;;;;;;;;;;;;;;;iDACuxC,CAAC;;;;;;;;;;GADtuC"}

package/dist/wallet-utils.js

@@ -1,6 +1,6 @@
 /** @file backwards compat */
 import { makeSmartWalletKit } from './smart-wallet-kit.js';
-/** @typedef {import('./smart-wallet-kit.js').SmartWalletKit} WalletUtils  */
+/** @import {SmartWalletKit} from './smart-wallet-kit.js';  */
 /** @deprecated use `makeSmartWalletKit` */
 export const makeWalletUtils = makeSmartWalletKit;
 //# sourceMappingURL=wallet-utils.js.map

package/dist/wallet-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"wallet-utils.js","sourceRoot":"","sources":["../src/wallet-utils.js"],"names":[],"mappings":"AAAA,6BAA6B;AAE7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,6EAA6E;AAE7E,2CAA2C;AAC3C,MAAM,CAAC,MAAM,eAAe,GAAG,kBAAkB,CAAC"}
+{"version":3,"file":"wallet-utils.js","sourceRoot":"","sources":["../src/wallet-utils.js"],"names":[],"mappings":"AAAA,6BAA6B;AAE7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,8DAA8D;AAE9D,2CAA2C;AAC3C,MAAM,CAAC,MAAM,eAAe,GAAG,kBAAkB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/client-utils",
-  "version": "0.2.0",
+  "version": "0.2.1-upgrade-23-dev-bd79330.0.bd79330",
   "description": "Utilities for building Agoric clients",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -14,30 +14,31 @@
   "scripts": {
     "build": "yarn run -T tsc --build tsconfig.build.json",
     "codegen": "scripts/codegen.cjs",
-    "prepack": "yarn run -T tsc --build tsconfig.build.json",
-    "postpack": "git clean -f '*.d.*ts*' '*.tsbuildinfo'",
+    "prepack": "yarn run -T prepack-package",
+    "postpack": "yarn run -T postpack-package",
     "test": "ava",
     "test:c8": "c8 --all ${C8_OPTIONS:-} ava",
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "yarn run -T run-s --continue-on-error 'lint:*'",
-    "lint:eslint": "yarn run -T eslint .",
+    "lint:eslint": "node ../../scripts/eslint-repo.mjs .",
     "lint:types": "yarn run -T tsc"
   },
   "devDependencies": {
-    "@cosmology/telescope": "^1.12.21",
-    "ava": "^5.3.0",
+    "@agoric/smart-wallet": "0.6.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/vats": "0.16.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/zoe": "0.27.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@hyperweb/telescope": "^2.2.1",
+    "ava": "^6.4.1",
     "c8": "^10.1.3",
     "rimraf": "^6.0.1",
     "ts-blank-space": "^0.6.2"
   },
   "dependencies": {
-    "@agoric/casting": "0.5.0",
-    "@agoric/cosmic-proto": "0.5.0",
-    "@agoric/ertp": "0.17.0",
-    "@agoric/internal": "0.4.0",
-    "@agoric/smart-wallet": "0.6.0",
-    "@agoric/vats": "0.16.0",
+    "@agoric/casting": "0.5.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/cosmic-proto": "0.5.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/ertp": "0.17.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/internal": "0.4.1-upgrade-23-dev-bd79330.0.bd79330",
     "@cosmjs/crypto": "^0.36.0",
     "@cosmjs/proto-signing": "^0.36.0",
     "@cosmjs/stargate": "^0.36.0",
@@ -48,7 +49,9 @@
     "@endo/marshal": "^1.8.0",
     "@endo/pass-style": "^1.6.3",
     "@endo/patterns": "^1.7.0",
-    "@endo/promise-kit": "^1.1.13"
+    "@endo/promise-kit": "^1.1.13",
+    "@interchainjs/cosmos": "^1.19.3",
+    "@interchainjs/types": "^1.19.1"
   },
   "ava": {
     "extensions": {
@@ -68,10 +71,10 @@
     "timeout": "20m"
   },
   "typeCoverage": {
-    "atLeast": 93.39
+    "atLeast": 93.99
   },
   "engines": {
     "node": "^20.9 || ^22.11"
   },
-  "gitHead": "0922d0447ab8fae9d2d87415964403330b5ca313"
+  "gitHead": "bd79330f78dae2faf9cc3d8b10063567700da07b"
 }