@agoric/client-utils 0.1.1-upgrade-20-dev-086463b.0 → 0.1.1-upgrade-21-dev-43b4090.0

package/README.md

@@ -15,6 +15,14 @@ This package will be used in several kinds of clients:
 
 As such the modules cannot assume they're running in Node. There are some ambient authorities in common in the above environments (e.g. `setTimeout`) but a further constraint is that these modules will not export ambient authority. Instead they will provide interfaces that are ergonomic for creating empowered objects in the client context.
 
+### Layering
+
+1. HTTP (fetch)
+2. RPC (fetch + cosmic-proto)
+3. vstorage - layer at which protobuf is involved (vstorage.js)
+4. marshalling (vstorage-kit.js)
+5. agoricNames / board (smart-wallet-kit.js)
+
 ## Related packages
 
 ### cli

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/client-utils",
-  "version": "0.1.1-upgrade-20-dev-086463b.0+086463b",
+  "version": "0.1.1-upgrade-21-dev-43b4090.0+43b4090",
   "description": "Utilities for building Agoric clients",
   "license": "Apache-2.0",
   "publishConfig": {
@@ -13,26 +13,28 @@
   ],
   "scripts": {
     "build": "exit 0",
+    "prepack": "tsc --build tsconfig.build.json",
+    "postpack": "git clean -f '*.d.ts*' '*.tsbuildinfo'",
     "test": "ava",
     "test:c8": "c8 --all $C8_OPTIONS ava",
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint": "run-s --continue-on-error lint:*",
-    "lint:types": "tsc",
-    "lint:eslint": "eslint ."
+    "lint": "yarn run -T run-s --continue-on-error 'lint:*'",
+    "lint:eslint": "yarn run -T eslint .",
+    "lint:types": "yarn run -T tsc"
   },
   "devDependencies": {
     "ava": "^5.3.0",
-    "c8": "^10.1.2",
-    "ts-blank-space": "^0.4.4"
+    "c8": "^10.1.3",
+    "ts-blank-space": "^0.6.1"
   },
   "dependencies": {
-    "@agoric/casting": "0.4.3-upgrade-20-dev-086463b.0+086463b",
-    "@agoric/cosmic-proto": "0.4.1-upgrade-20-dev-086463b.0+086463b",
-    "@agoric/ertp": "0.16.3-upgrade-20-dev-086463b.0+086463b",
-    "@agoric/internal": "0.3.3-upgrade-20-dev-086463b.0+086463b",
-    "@agoric/smart-wallet": "0.5.4-upgrade-20-dev-086463b.0+086463b",
-    "@agoric/vats": "0.15.2-upgrade-20-dev-086463b.0+086463b",
+    "@agoric/casting": "workspace:*",
+    "@agoric/cosmic-proto": "workspace:*",
+    "@agoric/ertp": "workspace:*",
+    "@agoric/internal": "workspace:*",
+    "@agoric/smart-wallet": "workspace:*",
+    "@agoric/vats": "workspace:*",
     "@cosmjs/stargate": "^0.33.0",
     "@cosmjs/tendermint-rpc": "^0.33.0",
     "@endo/base64": "^1.0.9",
@@ -60,5 +62,5 @@
     ],
     "timeout": "20m"
   },
-  "gitHead": "086463b1a157a30d0382d7dadc56e751f4479028"
+  "gitHead": "43b409040628dd3706a1279098534d3cf1d18ab7"
 }

package/src/chain.d.ts

@@ -0,0 +1,11 @@
+export function pollBlocks(opts: {
+    client: StargateClient;
+    delay: (ms: number) => Promise<void>;
+    period?: number;
+    retryMessage?: string;
+}): <T>(l: (b: {
+    time: string;
+    height: number;
+}) => Promise<T>) => Promise<T>;
+import type { StargateClient } from '@cosmjs/stargate';
+//# sourceMappingURL=chain.d.ts.map

package/src/chain.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"chain.d.ts","sourceRoot":"","sources":["chain.js"],"names":[],"mappings":"AAaO,iCARI;IACN,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GACS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CA2BrF;oCArCgC,kBAAkB"}

package/src/cli.d.ts

@@ -0,0 +1,6 @@
+export function fetchEnvNetworkConfig({ env, fetch }: {
+    env: typeof process.env;
+    fetch: typeof globalThis.fetch;
+}): Promise<MinimalNetworkConfig>;
+import type { MinimalNetworkConfig } from './network-config.js';
+//# sourceMappingURL=cli.d.ts.map

package/src/cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["cli.js"],"names":[],"mappings":"AAeO,sDAJI;IAAE,GAAG,EAAE,OAAO,OAAO,CAAC,GAAG,CAAC;IAAC,KAAK,EAAE,uBAAY,CAAA;CAAE,GAC9C,OAAO,CAAC,oBAAoB,CAAC,CAOzC;0CAhBsC,qBAAqB"}

package/src/clock-timer.d.ts

@@ -0,0 +1,9 @@
+export function makeIntervalIterable(intervalMs: number, { setTimeout, clearTimeout, now }: IntervalIO): {
+    [Symbol.asyncIterator]: () => AsyncGenerator<number, void, void>;
+};
+export type IntervalIO = {
+    setTimeout: typeof setTimeout;
+    clearTimeout: typeof clearTimeout;
+    now: typeof Date.now;
+};
+//# sourceMappingURL=clock-timer.d.ts.map

package/src/clock-timer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clock-timer.d.ts","sourceRoot":"","sources":["clock-timer.js"],"names":[],"mappings":"AAiBO,iDANI,MAAM,qCACN,UAAU,GACR;IACZ,CAAK,MAAM,CAAC,aAAa,CAAC,EAAE,MAAM,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;CACjE,CAkCH;;gBA7Ca,OAAO,UAAU;kBACjB,OAAO,YAAY;SACnB,OAAO,IAAI,CAAC,GAAG"}

package/src/main.d.ts

@@ -0,0 +1,12 @@
+export { VBankAccount };
+export * from "./cli.js";
+export * from "./network-config.js";
+export * from "./rpc.js";
+export * from "./smart-wallet-kit.js";
+export * from "./sync-tools.js";
+export * from "./vstorage.js";
+export * from "./vstorage-kit.js";
+export * from "./wallet-utils.js";
+export * from "./types-index.js";
+import { VBankAccount } from '@agoric/internal/src/config.js';
+//# sourceMappingURL=main.d.ts.map

package/src/main.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["main.js"],"names":[],"mappings":";;;;;;;;;;6BAA6B,gCAAgC"}

package/src/main.js

@@ -1,3 +1,6 @@
+import { VBankAccount } from '@agoric/internal/src/config.js';
+
+export { VBankAccount };
 export * from './cli.js';
 export * from './network-config.js';
 export * from './rpc.js';
@@ -8,4 +11,4 @@ export * from './vstorage-kit.js';
 export * from './wallet-utils.js';
 
 // eslint-disable-next-line import/export -- just types
-export * from './types.js';
+export * from './types-index.js';

package/src/network-config.d.ts

@@ -0,0 +1,15 @@
+export function toNetworkConfigUrl(agoricNetSubdomain: any): string;
+export function toRpcUrl(agoricNetSubdomain: any): string;
+export namespace LOCAL_CONFIG {
+    let rpcAddrs: string[];
+    let chainName: string;
+}
+export const LOCAL_CONFIG_KEY: "local";
+export function fetchNetworkConfig(spec: string, { fetch }: {
+    fetch: typeof globalThis.fetch;
+}): Promise<MinimalNetworkConfig>;
+export type MinimalNetworkConfig = {
+    rpcAddrs: string[];
+    chainName: string;
+};
+//# sourceMappingURL=network-config.d.ts.map

package/src/network-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"network-config.d.ts","sourceRoot":"","sources":["network-config.js"],"names":[],"mappings":"AAIO,oEACoD;AAEpD,0DAC6C;;;;;AAQpD,+BAAgC,OAAO,CAAC;AASjC,yCAJI,MAAM,aACN;IAAE,KAAK,EAAE,uBAAY,CAAA;CAAE,GACrB,OAAO,CAAC,oBAAoB,CAAC,CAkBzC;mCAxCY;IAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE"}

package/src/rpc.d.ts

@@ -0,0 +1,13 @@
+export function pickEndpoint({ rpcAddrs }: {
+    rpcAddrs: any;
+}): any;
+export function makeTendermint34Client(endpoint: string, { fetch }: {
+    fetch: typeof window.fetch;
+}): Promise<Tendermint34Client>;
+export function makeStargateClient(config: MinimalNetworkConfig, { fetch }: {
+    fetch: typeof window.fetch;
+}): Promise<StargateClient>;
+import { Tendermint34Client } from '@cosmjs/tendermint-rpc';
+import type { MinimalNetworkConfig } from './network-config.js';
+import { StargateClient } from '@cosmjs/stargate';
+//# sourceMappingURL=rpc.d.ts.map

package/src/rpc.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["rpc.js"],"names":[],"mappings":"AASO;;QAAkD;AAOlD,iDAJI,MAAM,aACN;IAAE,KAAK,EAAE,OAAO,MAAM,CAAC,KAAK,CAAA;CAAE,GAC5B,OAAO,CAAC,kBAAkB,CAAC,CAKvC;AAOM,2CAJI,oBAAoB,aACpB;IAAE,KAAK,EAAE,OAAO,MAAM,CAAC,KAAK,CAAA;CAAE,GAC5B,OAAO,CAAC,cAAc,CAAC,CAMnC;mCA5BkC,wBAAwB;0CAGpB,qBAAqB;+BAJ7B,kBAAkB"}

package/src/smart-wallet-kit.d.ts

@@ -0,0 +1,46 @@
+export function makeSmartWalletKit({ fetch, delay }: {
+    fetch: typeof globalThis.fetch;
+    delay: (ms: number) => Promise<void>;
+}, networkConfig: MinimalNetworkConfig): Promise<{
+    agoricNames: import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes;
+    networkConfig: MinimalNetworkConfig;
+    getLastUpdate: (addr: string) => Promise<UpdateRecord>;
+    getCurrentWalletRecord: (addr: string) => Promise<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;
+            description: string;
+            instance: Instance;
+        }>;
+        offerStatuses: Map<import("@agoric/smart-wallet/src/offers.js").OfferId, import("@agoric/smart-wallet/src/offers.js").OfferStatus>;
+        balances: Map<Brand, Amount>;
+    }>;
+    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;
+    };
+    marshaller: Omit<import("@endo/marshal").Marshal<string | null>, "serialize" | "unserialize">;
+    readLatestHead: (path: string) => Promise<unknown>;
+    readPublished: <T extends string>(subpath: T) => Promise<import("./types.js").TypedPublished<T>>;
+    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[]>;
+    };
+}>;
+export type SmartWalletKit = EReturn<typeof makeSmartWalletKit>;
+import type { MinimalNetworkConfig } from './network-config.js';
+import type { UpdateRecord } from '@agoric/smart-wallet/src/smartWallet.js';
+import type { CurrentWalletRecord } from '@agoric/smart-wallet/src/smartWallet.js';
+import type { Brand } from '@agoric/ertp/src/types.js';
+import type { Amount } from '@agoric/ertp/src/types.js';
+import type { EReturn } from '@endo/far';
+//# sourceMappingURL=smart-wallet-kit.d.ts.map

package/src/smart-wallet-kit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"smart-wallet-kit.d.ts","sourceRoot":"","sources":["smart-wallet-kit.js"],"names":[],"mappings":"AAqBO,qDAJJ;IAAuC,KAAK,EAApC,OAAO,UAAU,CAAC,KAAK;IACc,KAAK,EAA1C,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;CACrC,iBAAQ,oBAAoB;;;0BAoElB,MAAM,KACJ,OAAO,CAAC,YAAY,CAAC;mCAOvB,MAAM,KACJ,OAAO,CAAC,mBAAmB,CAAC;8BAnE9B,MAAM,cACN,MAAM,GAAC,MAAM;;;;;;;;;sBA0Bb,MAAM,MACN,MAAM,GAAC,MAAM,aACb,MAAM,GAAC,MAAM,2BACb,OAAO;;;;;;;;;;;;;;;;;;;;GAqDnB;6BACa,QAAQ,OAAO,kBAAkB,CAAC;0CAxGT,qBAAqB;kCADR,yCAAyC;yCAAzC,yCAAyC;2BAD7D,2BAA2B;4BAA3B,2BAA2B;6BADjC,WAAW"}

package/src/sync-tools.d.ts

@@ -0,0 +1,72 @@
+export function sleep(ms: number, { log, setTimeout }: {
+    log: (message: string) => void;
+    setTimeout: typeof global.setTimeout;
+}): Promise<any>;
+export function retryUntilCondition<T = unknown>(operation: () => Promise<T>, condition: (result: T) => boolean, message: string, { maxRetries, retryIntervalMs, reusePromise, renderResult, log, setTimeout, }: RetryOptions & {
+    log?: typeof console.log;
+    setTimeout: typeof global.setTimeout;
+}): Promise<T>;
+export function waitUntilContractDeployed(contractName: string, ambientAuthority: {
+    log: (message: string) => void;
+    follow: () => object;
+    setTimeout: typeof global.setTimeout;
+}, options: WaitUntilOptions): Promise<{
+    [k: string]: any;
+}>;
+export function waitUntilAccountFunded(destAcct: string, io: {
+    log?: (message: string) => void;
+    query: () => Promise<object>;
+    setTimeout: typeof global.setTimeout;
+}, threshold: {
+    denom: string;
+    value: number;
+}, options: WaitUntilOptions): Promise<any>;
+export function waitUntilOfferResult(addr: string, offerId: string, waitForPayouts: boolean, io: {
+    log?: typeof console.log;
+    follow: () => object;
+    setTimeout: typeof global.setTimeout;
+}, options: WaitUntilOptions): Promise<any>;
+export function waitUntilInvitationReceived(addr: string, io: {
+    follow: () => object;
+    log: typeof console.log;
+    setTimeout: typeof global.setTimeout;
+}, options: WaitUntilOptions): Promise<any>;
+export function waitUntilOfferExited(addr: string, offerId: string, io: {
+    follow: () => object;
+    log: typeof console.log;
+    setTimeout: typeof global.setTimeout;
+}, options: WaitUntilOptions): Promise<any>;
+export function waitUntilElectionResult(committeePathBase: string, expectedResult: {
+    outcome: string;
+    deadline: bigint;
+}, io: {
+    vstorage: import("./vstorage-kit").VstorageKit;
+    log: typeof console.log;
+    setTimeout: typeof global.setTimeout;
+}, options: WaitUntilOptions): Promise<ElectionResult>;
+export type RetryOptions = {
+    maxRetries?: number | undefined;
+    retryIntervalMs?: number | undefined;
+    reusePromise?: boolean | undefined;
+    renderResult?: ((value: unknown) => unknown) | undefined;
+};
+export type WaitUntilOptions = RetryOptions & {
+    errorMessage: string;
+};
+export type CosmosBalanceThreshold = {
+    denom: string;
+    value: number;
+};
+export type ElectionResult = {
+    latestOutcome: {
+        outcome: string;
+        question: import("@endo/marshal").RemotableObject;
+    };
+    latestQuestion: {
+        closingRule: {
+            deadline: bigint;
+        };
+        questionHandle: import("@endo/marshal").RemotableObject;
+    };
+};
+//# sourceMappingURL=sync-tools.d.ts.map

package/src/sync-tools.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-tools.d.ts","sourceRoot":"","sources":["sync-tools.js"],"names":[],"mappings":"AAmCO,0BAHI,MAAM,uBACN;IAAC,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,UAAU,EAAE,OAAO,MAAM,CAAC,UAAU,CAAA;CAAC,gBAM7E;AAYG,oCAPO,CAAC,uBACJ,MAAM,OAAO,CAAC,CAAC,CAAC,aAChB,CAAC,MAAM,EAAE,CAAC,KAAK,OAAO,WACtB,MAAM,iFACN,YAAY,GAAG;IAAC,GAAG,CAAC,EAAE,OAAO,OAAO,CAAC,GAAG,CAAC;IAAC,UAAU,EAAE,OAAO,MAAM,CAAC,UAAU,CAAA;CAAC,GAC7E,OAAO,CAAC,CAAC,CAAC,CAqEtB;AAiCM,wDAJI,MAAM,oBACN;IAAE,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,MAAM,CAAC,UAAU,CAAA;CAAE,WAC9F,gBAAgB;;GAiB1B;AA0BM,iDALI,MAAM,MACN;IAAE,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAAC,UAAU,EAAE,OAAO,MAAM,CAAC,UAAU,CAAA;CAAC,aACtG;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAC,WAC9B,gBAAgB,gBAa1B;AAqCM,2CANI,MAAM,WACN,MAAM,kBACN,OAAO,MACP;IAAE,GAAG,CAAC,EAAE,OAAO,OAAO,CAAC,GAAG,CAAC;IAAC,MAAM,EAAE,MAAM,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,MAAM,CAAC,UAAU,CAAA;CAAE,WACxF,gBAAgB,gBAmB1B;AAwBM,kDAJI,MAAM,MACN;IAAE,MAAM,EAAE,MAAM,MAAM,CAAC;IAAC,GAAG,EAAE,OAAO,OAAO,CAAC,GAAG,CAAC;IAAC,UAAU,EAAE,OAAO,MAAM,CAAC,UAAU,CAAA;CAAC,WACtF,gBAAgB,gBAa1B;AA0BM,2CALI,MAAM,WACN,MAAM,MACN;IAAE,MAAM,EAAE,MAAM,MAAM,CAAC;IAAC,GAAG,EAAE,OAAO,OAAO,CAAC,GAAG,CAAC;IAAC,UAAU,EAAE,OAAO,MAAM,CAAC,UAAU,CAAA;CAAC,WACtF,gBAAgB,gBAa1B;AA+EM,2DAZI,MAAM,kBACN;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,MACO;IACN,QAAQ,EAAE,OAAO,gBAAgB,EAAE,WAAW,CAAC;IAC/C,GAAG,EAAE,OAAO,OAAO,CAAC,GAAG,CAAC;IACxB,UAAU,EAAE,OAAO,MAAM,CAAC,UAAU,CAAA;CACrC,WACO,gBAAgB,2BAoB1B;;;;;4BAtZqB,OAAO,KAAK,OAAO;;+BAE5B,YAAY,GAAG;IAAC,YAAY,EAAE,MAAM,CAAA;CAAC;;WAGpC,MAAM;WACN,MAAM;;6BAqTP;IACR,aAAa,EAAE;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,OAAO,eAAe,EAAE,eAAe,CAAA;KAClD,CAAC;IACF,cAAc,EAAE;QACd,WAAW,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC;QAClC,cAAc,EAAE,OAAO,eAAe,EAAE,eAAe,CAAA;KACxD,CAAA;CACF"}

package/src/sync-tools.js

@@ -63,7 +63,7 @@ export const retryUntilCondition = async (
     setTimeout,
   },
 ) => {
-  console.log({ maxRetries, retryIntervalMs, message });
+  log({ maxRetries, retryIntervalMs, message });
 
   await null; // separate sync prologue
 
@@ -109,7 +109,7 @@ export const retryUntilCondition = async (
     }
 
     retries += 1;
-    console.log(
+    log(
       `Retry ${retries}/${maxRetries} - Waiting for ${retryIntervalMs}ms for ${message}...`,
     );
     await sleep(retryIntervalMs, { log, setTimeout });
@@ -120,14 +120,13 @@ export const retryUntilCondition = async (
 
 /**
  * @param {WaitUntilOptions} options
- * @returns {WaitUntilOptions & {log?: typeof console.log}}
+ * @returns {WaitUntilOptions}
  */
 const overrideDefaultOptions = options => {
   const defaultValues = {
     maxRetries: 6,
     retryIntervalMs: 3500,
     errorMessage: 'Error',
-    log: console.log,
   };
 
   return { ...defaultValues, ...options };
@@ -155,7 +154,7 @@ export const waitUntilContractDeployed = (
   ambientAuthority,
   options,
 ) => {
-  const { follow, setTimeout } = ambientAuthority;
+  const { log, follow, setTimeout } = ambientAuthority;
   const getInstances = makeGetInstances(follow);
   const { errorMessage, ...resolvedOptions } = overrideDefaultOptions(options);
 
@@ -163,7 +162,7 @@ export const waitUntilContractDeployed = (
     getInstances,
     instanceObject => Object.keys(instanceObject).includes(contractName),
     errorMessage,
-    { setTimeout, ...resolvedOptions },
+    { log, setTimeout, ...resolvedOptions },
   );
 };
 
@@ -192,7 +191,7 @@ const checkCosmosBalance = (balances, threshold) => {
  * @param {WaitUntilOptions} options
  */
 export const waitUntilAccountFunded = (destAcct, io, threshold, options) => {
-  const { query, setTimeout } = io;
+  const { log, query, setTimeout } = io;
   const queryCosmosBalance = makeQueryCosmosBalance(query);
   const { errorMessage, ...resolvedOptions } = overrideDefaultOptions(options);
 
@@ -200,7 +199,7 @@ export const waitUntilAccountFunded = (destAcct, io, threshold, options) => {
     async () => queryCosmosBalance(destAcct),
     balances => checkCosmosBalance(balances, threshold),
     errorMessage,
-    { setTimeout, ...resolvedOptions },
+    { log, setTimeout, ...resolvedOptions },
   );
 };
 
@@ -246,7 +245,7 @@ export const waitUntilOfferResult = (
   io,
   options,
 ) => {
-  const { follow, setTimeout } = io;
+  const { log, follow, setTimeout } = io;
   const queryWallet = makeQueryWallet(follow);
   const { errorMessage, ...resolvedOptions } = overrideDefaultOptions(options);
 
@@ -254,7 +253,7 @@ export const waitUntilOfferResult = (
     async () => queryWallet(addr),
     status => checkOfferState(status, waitForPayouts, offerId),
     errorMessage,
-    { reusePromise: true, setTimeout, ...resolvedOptions },
+    { log, reusePromise: true, setTimeout, ...resolvedOptions },
   );
 };
 
@@ -281,7 +280,7 @@ const checkForInvitation = update => {
  * @param {WaitUntilOptions} options
  */
 export const waitUntilInvitationReceived = (addr, io, options) => {
-  const { follow, setTimeout } = io;
+  const { log, follow, setTimeout } = io;
   const queryWallet = makeQueryWallet(follow);
   const { errorMessage, ...resolvedOptions } = overrideDefaultOptions(options);
 
@@ -289,7 +288,7 @@ export const waitUntilInvitationReceived = (addr, io, options) => {
     async () => queryWallet(addr),
     checkForInvitation,
     errorMessage,
-    { reusePromise: true, setTimeout, ...resolvedOptions },
+    { log, reusePromise: true, setTimeout, ...resolvedOptions },
   );
 };
 
@@ -318,7 +317,7 @@ const checkLiveOffers = (update, offerId) => {
  * @param {WaitUntilOptions} options
  */
 export const waitUntilOfferExited = async (addr, offerId, io, options) => {
-  const { follow, setTimeout } = io;
+  const { log, follow, setTimeout } = io;
   const queryWalletCurrent = makeQueryWalletCurrent(follow);
   const { errorMessage, ...resolvedOptions } = overrideDefaultOptions(options);
 
@@ -326,7 +325,7 @@ export const waitUntilOfferExited = async (addr, offerId, io, options) => {
     async () => queryWalletCurrent(addr),
     update => checkLiveOffers(update, offerId),
     errorMessage,
-    { setTimeout, ...resolvedOptions },
+    { log, setTimeout, ...resolvedOptions },
   );
 };
 

package/src/types-index.d.ts

@@ -0,0 +1,2 @@
+// Export all the types this package provides
+export type * from './types.js';

package/src/types.d.ts

@@ -1,54 +1,28 @@
-// @file types for the client-utils package
-// NB: this doesn't follow best practices for TS in JS because this package will likely soon be written in TS
-
-import type {
-  OutcomeRecord,
-  QuestionDetails,
-} from '@agoric/governance/src/types.js';
-import type { MetricsNotification as VaultManagerMetrics } from '@agoric/inter-protocol/src/vaultFactory/vaultManager.js';
-import type {
-  CurrentWalletRecord,
-  UpdateRecord,
-} from '@agoric/smart-wallet/src/smartWallet.js';
-import type {
-  ContractRecord,
-  PoolMetrics,
-  TransactionRecord,
-} from '@agoric/fast-usdc';
-
-// For static string key types. String template matching has to be in the ternary below.
+import type { Brand } from '@agoric/ertp';
+import type { ContractRecord, FeeConfig, PoolMetrics, TransactionRecord } from '@agoric/fast-usdc';
+import type { OutcomeRecord, QuestionDetails } from '@agoric/governance/src/types.js';
+import type { BookDataNotification } from '@agoric/inter-protocol/src/auction/auctionBook.js';
+import type { AuctionParamRecord } from '@agoric/inter-protocol/src/auction/params.js';
+import type { ScheduleNotification } from '@agoric/inter-protocol/src/auction/scheduler.js';
+import type { MetricsNotification as VaultDirectorMetrics } from '@agoric/inter-protocol/src/vaultFactory/vaultDirector.js';
+import type { CurrentWalletRecord, UpdateRecord } from '@agoric/smart-wallet/src/smartWallet.js';
+import type { Instance } from '@agoric/zoe/src/zoeService/types.js';
 type PublishedTypeMap = {
-  'auction.governance': { current: AuctionParamRecord };
-  'auction.schedule': ScheduleNotification;
-  'vaultFactory.metrics': { rewardPoolAllocation: RewardPoolAllocationRecord };
+    'auction.governance': {
+        current: AuctionParamRecord;
+    };
+    'auction.schedule': ScheduleNotification;
+    'vaultFactory.metrics': VaultDirectorMetrics;
+    'agoricNames.instance': Array<[string, Instance]>;
+    'agoricNames.brand': Array<[string, Brand]>;
+    fastUsdc: ContractRecord;
+    'fastUsdc.feeConfig': FeeConfig;
+    'fastUsdc.poolMetrics': PoolMetrics;
 };
-
 /**
  * Utility type to the type that would result from unmarshalling the latest
  * value at a vstorage `published` path.
  */
-export type TypedPublished<T extends string> = T extends keyof PublishedTypeMap
-  ? PublishedTypeMap[T]
-  : T extends `wallet.${string}.current`
-    ? CurrentWalletRecord
-    : T extends `wallet.${string}`
-      ? UpdateRecord
-      : T extends `committees.${string}.latestQuestion`
-        ? QuestionDetails
-        : T extends `committees.${string}.latestOutcome`
-          ? OutcomeRecord
-          : T extends `vaultFactory.managers.manager${number}.metrics`
-            ? VaultManagerMetrics
-            : T extends 'agoricNames.instance'
-              ? Array<[string, Instance]>
-              : T extends 'agoricNames.brand'
-                ? Array<[string, Brand]>
-                : T extends 'fastUsdc'
-                  ? ContractRecord
-                  : T extends 'fastUsdc.feeConfig'
-                    ? FeeConfig
-                    : T extends 'fastUsdc.poolMetrics'
-                      ? PoolMetrics
-                      : T extends `fastUsdc.txns.${string}`
-                        ? TransactionRecord
-                        : unknown;
+export type TypedPublished<T extends string> = T extends keyof PublishedTypeMap ? PublishedTypeMap[T] : T extends `wallet.${string}.current` ? CurrentWalletRecord : T extends `wallet.${string}` ? UpdateRecord : T extends `committees.${string}.latestQuestion` ? QuestionDetails : T extends `committees.${string}.latestOutcome` ? OutcomeRecord : T extends `vaultFactory.managers.manager${number}.metrics` ? VaultDirectorMetrics : T extends `fastUsdc.txns.${string}` ? TransactionRecord : T extends `auction.book${number}` ? BookDataNotification : unknown;
+export {};
+//# sourceMappingURL=types.d.ts.map

package/src/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EACV,cAAc,EACd,SAAS,EACT,WAAW,EACX,iBAAiB,EAClB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EACV,aAAa,EACb,eAAe,EAChB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AACvF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,KAAK,EAAE,mBAAmB,IAAI,oBAAoB,EAAE,MAAM,0DAA0D,CAAC;AAC5H,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACb,MAAM,yCAAyC,CAAC;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAGpE,KAAK,gBAAgB,GAAG;IACtB,oBAAoB,EAAE;QAAE,OAAO,EAAE,kBAAkB,CAAA;KAAE,CAAC;IACtD,kBAAkB,EAAE,oBAAoB,CAAC;IACzC,sBAAsB,EAAE,oBAAoB,CAAC;IAC7C,sBAAsB,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAClD,mBAAmB,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;IAC5C,QAAQ,EAAE,cAAc,CAAC;IACzB,oBAAoB,EAAE,SAAS,CAAC;IAChC,sBAAsB,EAAE,WAAW,CAAC;CACrC,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,MAAM,gBAAgB,GAC3E,gBAAgB,CAAC,CAAC,CAAC,GACnB,CAAC,SAAS,UAAU,MAAM,UAAU,GAClC,mBAAmB,GACnB,CAAC,SAAS,UAAU,MAAM,EAAE,GAC1B,YAAY,GACZ,CAAC,SAAS,cAAc,MAAM,iBAAiB,GAC7C,eAAe,GACf,CAAC,SAAS,cAAc,MAAM,gBAAgB,GAC5C,aAAa,GACb,CAAC,SAAS,gCAAgC,MAAM,UAAU,GACxD,oBAAoB,GACpB,CAAC,SAAS,iBAAiB,MAAM,EAAE,GACjC,iBAAiB,GACjB,CAAC,SAAS,eAAe,MAAM,EAAE,GAC/B,oBAAoB,GACpB,OAAO,CAAC"}

package/src/types.ts

@@ -0,0 +1,58 @@
+// @file types for the client-utils package
+// NB: this doesn't follow best practices for TS in JS because this package will likely soon be written in TS
+
+import type { Brand } from '@agoric/ertp';
+import type {
+  ContractRecord,
+  FeeConfig,
+  PoolMetrics,
+  TransactionRecord,
+} from '@agoric/fast-usdc';
+import type {
+  OutcomeRecord,
+  QuestionDetails,
+} from '@agoric/governance/src/types.js';
+import type { BookDataNotification } from '@agoric/inter-protocol/src/auction/auctionBook.js';
+import type { AuctionParamRecord } from '@agoric/inter-protocol/src/auction/params.js';
+import type { ScheduleNotification } from '@agoric/inter-protocol/src/auction/scheduler.js';
+import type { MetricsNotification as VaultDirectorMetrics } from '@agoric/inter-protocol/src/vaultFactory/vaultDirector.js';
+import type {
+  CurrentWalletRecord,
+  UpdateRecord,
+} from '@agoric/smart-wallet/src/smartWallet.js';
+import type { Instance } from '@agoric/zoe/src/zoeService/types.js';
+
+// For static string key types. String template matching has to be in the ternary below.
+type PublishedTypeMap = {
+  'auction.governance': { current: AuctionParamRecord };
+  'auction.schedule': ScheduleNotification;
+  'vaultFactory.metrics': VaultDirectorMetrics;
+  'agoricNames.instance': Array<[string, Instance]>;
+  'agoricNames.brand': Array<[string, Brand]>;
+  fastUsdc: ContractRecord;
+  'fastUsdc.feeConfig': FeeConfig;
+  'fastUsdc.poolMetrics': PoolMetrics;
+};
+
+/**
+ * Utility type to the type that would result from unmarshalling the latest
+ * value at a vstorage `published` path.
+ */
+export type TypedPublished<T extends string> = T extends keyof PublishedTypeMap
+  ? PublishedTypeMap[T]
+  : T extends `wallet.${string}.current`
+    ? CurrentWalletRecord
+    : T extends `wallet.${string}`
+      ? UpdateRecord
+      : T extends `committees.${string}.latestQuestion`
+        ? QuestionDetails
+        : T extends `committees.${string}.latestOutcome`
+          ? OutcomeRecord
+          : T extends `vaultFactory.managers.manager${number}.metrics`
+            ? VaultDirectorMetrics
+            : T extends `fastUsdc.txns.${string}`
+              ? TransactionRecord
+              : T extends `auction.book${number}`
+                ? BookDataNotification
+                : unknown;
+// static string keys are defined in PublishedTypeMap

package/src/vstorage-kit.d.ts

@@ -0,0 +1,53 @@
+export { boardSlottingMarshaller };
+export function makeFromBoard(): {
+    convertSlotToVal: (boardId: any, iface: any) => any;
+};
+export namespace storageHelper {
+    function parseCapData(txt: {
+        value: string;
+    } | string): {
+        blockHeight: any;
+        capDatas: {
+            body: string;
+            slots: string[];
+        }[];
+    };
+    function unserializeTxt(txt: {
+        value: string;
+    } | string, ctx: IdMap): any[];
+    function parseMany(capDataStrings: string[]): {
+        body: string;
+        slots: string[];
+    }[];
+}
+export function makeAgoricNames(ctx: IdMap, vstorage: VStorage): Promise<import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes>;
+export function makeVstorageKit({ fetch }: {
+    fetch: typeof window.fetch;
+}, config: MinimalNetworkConfig): {
+    fromBoard: {
+        convertSlotToVal: (boardId: any, iface: any) => any;
+    };
+    marshaller: Omit<import("@endo/marshal").Marshal<string | null>, "serialize" | "unserialize">;
+    readLatestHead: (path: string) => Promise<unknown>;
+    readPublished: <T extends string>(subpath: T) => Promise<TypedPublished<T>>;
+    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[]>;
+    };
+};
+export type IdMap = ReturnType<typeof makeFromBoard>;
+export type VstorageKit = ReturnType<typeof makeVstorageKit>;
+import { boardSlottingMarshaller } from '@agoric/vats/tools/board-utils.js';
+import type { VStorage } from './vstorage.js';
+import type { MinimalNetworkConfig } from './network-config.js';
+import type { TypedPublished } from './types-index.js';
+//# sourceMappingURL=vstorage-kit.d.ts.map

package/src/vstorage-kit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vstorage-kit.d.ts","sourceRoot":"","sources":["vstorage-kit.js"],"names":[],"mappings":";AAgBO;;EAWN;;IAMe,2BADD;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM;;;kBAuBhB,MAAM;mBAAS,MAAM,EAAE;;MAd3C;IAKe,6BAHJ;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM,OACzB,KAAK,SAOf;IAEU,mCADC,MAAM,EAAE;cAGC,MAAM;eAAS,MAAM,EAAE;QAS3C;;AAUI,qCAJI,KAAK,YACL,QAAQ,GACN,OAAO,CAAC,OAAO,mCAAmC,EAAE,kBAAkB,CAAC,CAqBnF;AAMM,2CAHI;IAAE,KAAK,EAAE,OAAO,MAAM,CAAC,KAAK,CAAA;CAAE,UAC9B,oBAAoB;;;;;2BAeV,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC;oBAajC,CAAC,SAAS,MAAM,WAAW,CAAC,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;2BAnBrD,MAAM,GAAG;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,KAAK,OAAO;;;;;;;;;;;EAoCxD;oBAlHa,UAAU,CAAC,OAAO,aAAa,CAAC;0BAmHhC,UAAU,CAAC,OAAO,eAAe,CAAC;wCA5IzC,mCAAmC;8BASf,eAAe;0CAFH,qBAAqB;oCAC3B,kBAAkB"}

package/src/vstorage-kit.js

@@ -9,7 +9,7 @@ export { boardSlottingMarshaller };
 
 /**
  * @import {MinimalNetworkConfig} from './network-config.js';
- * @import {TypedPublished} from './types.js';
+ * @import {TypedPublished} from './types-index.js';
  * @import {VStorage} from './vstorage.js';
  */
 
@@ -30,11 +30,10 @@ export const makeFromBoard = () => {
 
 /** @deprecated */
 export const storageHelper = {
-  /** @param { string } txt */
+  /** @param { {value: string} | string } txt */
   parseCapData: txt => {
-    assert(typeof txt === 'string', typeof txt);
     /** @type {{ value: string }} */
-    const { value } = JSON.parse(txt);
+    const { value } = typeof txt === 'string' ? JSON.parse(txt) : txt;
     const specimen = JSON.parse(value);
     const { blockHeight, values } = specimen;
     assert(values, `empty values in specimen ${value}`);
@@ -42,7 +41,7 @@ export const storageHelper = {
     return { blockHeight, capDatas };
   },
   /**
-   * @param {string} txt
+   * @param { {value: string} | string } txt
    * @param {IdMap} ctx
    */
   unserializeTxt: (txt, ctx) => {
@@ -105,7 +104,7 @@ export const makeVstorageKit = ({ fetch }, config) => {
 
     const marshaller = boardSlottingMarshaller(fromBoard.convertSlotToVal);
 
-    /** @type {(txt: string) => unknown} */
+    /** @type {(txt: string | {value: string}) => unknown} */
     const unserializeHead = txt =>
       storageHelper.unserializeTxt(txt, fromBoard).at(-1);
 

package/src/vstorage.d.ts

@@ -0,0 +1,45 @@
+export function makeAbciQuery<T extends "data" | "children">(path?: string, { kind, height }?: {
+    kind?: T | undefined;
+    height?: number | bigint | undefined;
+}): `/abci_query?${string}`;
+export function makeVStorage({ fetch }: {
+    fetch: typeof window.fetch;
+}, config: MinimalNetworkConfig): {
+    readStorage: <T extends "children" | "data">(path?: string, { kind, height }?: {
+        kind?: T | undefined;
+        height?: number | bigint | undefined;
+    }) => Promise<T extends "children" ? QueryChildrenResponse : QueryDataResponse>;
+    /**
+     *
+     * @param {string} path
+     * @returns {Promise<QueryDataResponse>} latest vstorage value at path
+     */
+    readLatest(path?: string): Promise<QueryDataResponse>;
+    /**
+     * Keys of children at the path
+     *
+     * @param {string} path
+     * @returns {Promise<string[]>}
+     */
+    keys(path?: string): Promise<string[]>;
+    /**
+     * @param {string} path
+     * @param {number} [height] default is highest
+     * @returns {Promise<StreamCell<unknown>>}
+     */
+    readAt(path: string, height?: number): Promise<StreamCell<unknown>>;
+    /**
+     * Read values going back as far as available
+     *
+     * @param {string} path
+     * @param {number | string} [minHeight]
+     * @returns {Promise<string[]>}
+     */
+    readFully(path: string, minHeight?: number | string): Promise<string[]>;
+};
+export type VStorage = ReturnType<typeof makeVStorage>;
+import type { MinimalNetworkConfig } from './network-config.js';
+import { QueryChildrenResponse } from '@agoric/cosmic-proto/agoric/vstorage/query.js';
+import { QueryDataResponse } from '@agoric/cosmic-proto/agoric/vstorage/query.js';
+import type { StreamCell } from '@agoric/internal/src/lib-chainStorage.js';
+//# sourceMappingURL=vstorage.d.ts.map

package/src/vstorage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vstorage.d.ts","sourceRoot":"","sources":["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;IAsCpF;;;;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;0CA3LN,qBAAqB;sCANrD,+CAA+C;kCAA/C,+CAA+C;gCAKzB,0CAA0C"}

package/src/vstorage.js

@@ -1,30 +1,59 @@
+import { decodeBase64 } from '@endo/base64';
+import { encodeHex } from '@agoric/internal/src/hex.js';
+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 { decodeBase64 } from '@endo/base64';
-import { encodeHex } from '@agoric/internal/src/hex.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';
  */
 
+const kindToRpc = /** @type {const} */ ({
+  __proto__: null,
+  children: '/agoric.vstorage.Query/Children',
+  data: '/agoric.vstorage.Query/Data',
+});
+
+// TODO move down to cosmic-proto, probably generated with Telescope
 const codecs = {
-  children: {
-    rpc: '/agoric.vstorage.Query/Children',
+  __proto__: null,
+  '/agoric.vstorage.Query/Children': {
     request: QueryChildrenRequest,
     response: QueryChildrenResponse,
   },
-  data: {
-    rpc: '/agoric.vstorage.Query/Data',
+  '/agoric.vstorage.Query/Data': {
     request: QueryDataRequest,
     response: QueryDataResponse,
   },
 };
 
-/** @typedef {(typeof codecs)[keyof typeof codecs]['response']} ResponseCodec */
+/**
+ * @template {'data' | 'children'} 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 {`/abci_query?${string}`}
+ */
+export const makeAbciQuery = (
+  path = 'published',
+  { kind = /** @type {T} */ ('children'), height = 0 } = {},
+) => {
+  const rpc = kindToRpc[kind];
+  const { request } = codecs[rpc];
+  const buf = request.toProto({ path });
+
+  const hexData = encodeHex(buf);
+  return `/abci_query?path=%22${rpc}%22&data=0x${hexData}&height=${height}`;
+};
 
 /**
  * @param {object} powers
@@ -33,114 +62,96 @@ const codecs = {
  */
 export const makeVStorage = ({ fetch }, config) => {
   /**
-   * @param {string} path
+   * @template {'data' | 'children'} T
+   * @param {string} vstoragePath
+   * @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<{result: {response: JsonSafe<AbciQueryResponse>}}>}
    */
-  const getJSON = async path => {
-    const url = config.rpcAddrs[0] + path;
-    // console.warn('fetching', url);
+  const getVstorageJson = async (
+    vstoragePath,
+    { kind = /** @type {T} */ ('children'), height = 0 } = {},
+  ) => {
+    const url =
+      config.rpcAddrs[0] + makeAbciQuery(vstoragePath, { kind, height });
     const res = await fetch(url, { keepalive: true });
     return res.json();
   };
 
   /**
-   * @template {keyof codecs} T
+   * @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 url = (
+  const readStorage = async (
     path = 'published',
     { kind = /** @type {T} */ ('children'), height = 0 } = {},
   ) => {
-    const codec = codecs[kind];
-    if (!codec) {
-      throw Error(`unknown rpc kind: ${kind}`);
-    }
+    await null;
 
-    const { rpc, request } = codec;
-    const buf = request.toProto({ path });
+    const rpc = kindToRpc[kind];
+    const codec = codecs[rpc];
 
-    const hexData = encodeHex(buf);
-    return `/abci_query?path=%22${rpc}%22&data=0x${hexData}&height=${height}`;
-  };
+    let data;
+    try {
+      data = await getVstorageJson(path, { kind, height });
+    } catch (err) {
+      throw Error(`cannot read ${kind} of ${path}: ${err.message}`);
+    }
 
-  /**
-   * @template {keyof codecs} 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
-   */
-  const readStorage = (
-    path = 'published',
-    { kind = /** @type {T} */ ('children'), height = 0 } = {},
-  ) =>
-    getJSON(url(path, { kind, height }))
-      .catch(err => {
-        throw Error(`cannot read ${kind} of ${path}: ${err.message}`);
-      })
-      .then(data => {
-        const {
-          result: { response },
-        } = data;
-        if (response?.code !== 0) {
-          /** @type {any} */
-          const err = Error(
-            `error code ${response?.code} reading ${kind} of ${path}: ${response.log}`,
-          );
-          err.code = response?.code;
-          err.codespace = response?.codespace;
-          throw err;
-        }
+    const {
+      result: { response },
+    } = data;
+    if (response?.code !== 0) {
+      /** @type {any} */
+      const err = Error(
+        `error code ${response?.code} reading ${kind} of ${path}: ${response.log}`,
+      );
+      err.code = response?.code;
+      err.codespace = response?.codespace;
+      throw err;
+    }
 
-        const codec = codecs[kind];
-        if (!codec) {
-          throw Error(`unknown codec for kind: ${kind}`);
-        }
-        return { ...data, codec: codec.response };
-      });
+    const { value: b64Value } = response;
+    // @ts-expect-error cast
+    return codec.response.decode(decodeBase64(b64Value));
+  };
 
   const vstorage = {
-    url,
+    readStorage,
     /**
-     * @param {{ result: { response: { value: string, code: number } }, codec?: ResponseCodec }} param0
+     *
+     * @param {string} path
+     * @returns {Promise<QueryDataResponse>} latest vstorage value at path
      */
-    decode({ result: { response }, codec }) {
-      const { code } = response;
-      if (code !== 0) {
-        throw response;
-      }
-      const { value: b64Value } = response;
-      if (!codec) {
-        return atob(b64Value);
-      }
-      return JSON.stringify(codec.decode(decodeBase64(b64Value)));
+    async readLatest(path = 'published') {
+      return readStorage(path, { kind: 'data' });
     },
     /**
+     * Keys of children at the path
      *
      * @param {string} path
-     * @returns {Promise<string>} latest vstorage value at path
+     * @returns {Promise<string[]>}
      */
-    async readLatest(path = 'published') {
-      const raw = await readStorage(path, { kind: 'data' });
-      return vstorage.decode(raw);
-    },
     async keys(path = 'published') {
-      const raw = await readStorage(path, { kind: 'children' });
-      return JSON.parse(vstorage.decode(raw)).children;
+      const response = await readStorage(path, { kind: 'children' });
+      return response.children;
     },
     /**
      * @param {string} path
      * @param {number} [height] default is highest
-     * @returns {Promise<{blockHeight: number, values: string[]}>}
+     * @returns {Promise<StreamCell<unknown>>}
      */
     async readAt(path, height = undefined) {
-      const raw = await readStorage(path, { kind: 'data', height });
-      const txt = vstorage.decode(raw);
-      /** @type {{ value: string }} */
-      const { value } = JSON.parse(txt);
-      return JSON.parse(value);
+      const response = await readStorage(path, { kind: 'data', height });
+      /** @type {unknown} */
+      const cell = harden(JSON.parse(response.value));
+      mustMatch(cell, StreamCellShape);
+      return cell;
     },
     /**
      * Read values going back as far as available
@@ -152,6 +163,7 @@ export const makeVStorage = ({ fetch }, config) => {
     async readFully(path, minHeight = undefined) {
       const parts = [];
       // undefined the first iteration, to query at the highest
+      /** @type {string | undefined} */
       let blockHeight;
       await null;
       do {
@@ -160,7 +172,7 @@ export const makeVStorage = ({ fetch }, config) => {
         try {
           ({ blockHeight, values } = await vstorage.readAt(
             path,
-            blockHeight && Number(blockHeight) - 1,
+            blockHeight === undefined ? undefined : Number(blockHeight) - 1,
           ));
           // console.debug('readAt returned', { blockHeight });
         } catch (err) {
@@ -182,8 +194,8 @@ export const makeVStorage = ({ fetch }, config) => {
         // console.debug('PUSHED', values);
         // console.debug('NEW', { blockHeight, minHeight });
         if (minHeight && Number(blockHeight) <= Number(minHeight)) break;
-      } while (blockHeight > 0);
-      return parts.flat();
+      } while (Number(blockHeight) > 0);
+      return /** @type {string[]} */ (parts.flat());
     },
   };
   return vstorage;

package/src/wallet-utils.d.ts

@@ -0,0 +1,42 @@
+/** @typedef {import('./smart-wallet-kit.js').SmartWalletKit} WalletUtils  */
+/** @deprecated use `makeSmartWalletKit` */
+export const makeWalletUtils: ({ fetch, delay }: {
+    fetch: typeof globalThis.fetch;
+    delay: (ms: number) => Promise<void>;
+}, networkConfig: import("./network-config.js").MinimalNetworkConfig) => Promise<{
+    agoricNames: import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes;
+    networkConfig: import("./network-config.js").MinimalNetworkConfig;
+    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;
+            description: string;
+            instance: 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>;
+    }>;
+    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;
+    };
+    marshaller: Omit<import("@endo/marshal").Marshal<string | null>, "serialize" | "unserialize">;
+    readLatestHead: (path: string) => Promise<unknown>;
+    readPublished: <T extends string>(subpath: T) => Promise<import("./types.js").TypedPublished<T>>;
+    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[]>;
+    };
+}>;
+export type WalletUtils = import("./smart-wallet-kit.js").SmartWalletKit;
+//# sourceMappingURL=wallet-utils.d.ts.map

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

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