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

package/dist/smart-wallet-kit.js

@@ -1,31 +1,32 @@
-import { makeWalletStateCoalescer } from '@agoric/smart-wallet/src/utils.js';
-import { pollBlocks } from './chain.js';
-import { makeStargateClient } from './rpc.js';
+/* global globalThis */
 import { makeAgoricNames, makeVstorageKit } from './vstorage-kit.js';
+import { getOfferResult, getOfferWantsSatisfied, makeWalletStateCoalescer, } from './smart-wallet-utils.js';
 /**
  * @import {EReturn} from '@endo/far';
  * @import {Amount, Brand} from '@agoric/ertp/src/types.js'
  * @import {CurrentWalletRecord, UpdateRecord} from '@agoric/smart-wallet/src/smartWallet.js';
  * @import {MinimalNetworkConfig} from './network-config.js';
+ * @import {VstorageKit} from './types.js';
+ * @import {AgoricNamesRemotes} from '@agoric/vats/tools/board-utils.js';
+ * @import {PublishedPathTypes} from './types.js';
+ * @import {SmartWalletPublishedPathTypes} from '@agoric/smart-wallet/src/types.js';
  */
 /**
- * Augment VstorageKit with addtional convenience methods for working with
+ * Augment VstorageKit with additional convenience methods for working with
  * Agoric smart wallets. This use of "kit" is unfortunate because it does not
  * pertain to a single smart wallet. (Whereas VstorageKit pertains to a single
  * vstorage tree.) It was once called WalletUtils, which is more accurate.
  *
- * @param {object} root0
- * @param {typeof globalThis.fetch} root0.fetch
- * @param {(ms: number) => Promise<void>} root0.delay
- * @param {boolean} [root0.names]
- * @param {MinimalNetworkConfig} networkConfig
+ * @template {PublishedPathTypes & SmartWalletPublishedPathTypes} [Ext=Record<never, never>]
+ * @param {VstorageKit<Ext>} vsk
+ * @param {object} [options]
+ * @param {boolean} [options.names]
+ * @alpha
  */
-export const makeSmartWalletKit = async ({ fetch, delay, names = true }, networkConfig) => {
-    const vsk = makeVstorageKit({ fetch }, networkConfig);
-    const client = makeStargateClient(networkConfig, { fetch });
+export const makeSmartWalletKitFromVstorageKit = async (vsk, { names = true } = {}) => {
     const agoricNames = await (names
         ? makeAgoricNames(vsk.fromBoard, vsk.vstorage)
-        : /** @type {import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes} */ ({}));
+        : /** @type {AgoricNamesRemotes} */ ({}));
     /**
      * @param {string} from
      * @param {number|string} [minHeight]
@@ -51,27 +52,17 @@ export const makeSmartWalletKit = async ({ fetch, delay, names = true }, network
      *
      * @param {string} from
      * @param {string|number} id
-     * @param {number|string} minHeight
+     * @param {number|string} [_minHeight] - deprecated, start polling before broadcasting the offer
      * @param {boolean} [untilNumWantsSatisfied]
      */
-    const pollOffer = async (from, id, minHeight, untilNumWantsSatisfied = false) => {
-        const poll = pollBlocks({
-            client,
-            delay,
-            retryMessage: 'offer not in wallet at block',
-        });
-        const lookup = async () => {
-            const { offerStatuses } = await storedWalletState(from, minHeight);
-            const offerStatus = [...offerStatuses.values()].find(s => s.id === id);
-            if (!offerStatus)
-                throw Error('retry');
-            harden(offerStatus);
-            if (untilNumWantsSatisfied && !('numWantsSatisfied' in offerStatus)) {
-                throw Error('retry (no numWantsSatisfied yet)');
-            }
-            return offerStatus;
-        };
-        return poll(lookup);
+    const pollOffer = async (from, id, _minHeight = undefined, untilNumWantsSatisfied = false) => {
+        const getAddrLastUpdate = () => getLastUpdate(from);
+        // XXX ambient authority
+        const retryOpts = { setTimeout: globalThis.setTimeout };
+        const status = await (untilNumWantsSatisfied
+            ? getOfferWantsSatisfied(id, getAddrLastUpdate, retryOpts)
+            : getOfferResult(id, getAddrLastUpdate, retryOpts));
+        return status;
     };
     /**
      * @param {string} addr
@@ -97,5 +88,25 @@ export const makeSmartWalletKit = async ({ fetch, delay, names = true }, network
         pollOffer,
     };
 };
+harden(makeSmartWalletKitFromVstorageKit);
+/**
+ * Augment VstorageKit with additional convenience methods for working with
+ * Agoric smart wallets. This use of "kit" is unfortunate because it does not
+ * pertain to a single smart wallet. (Whereas VstorageKit pertains to a single
+ * vstorage tree.) It was once called WalletUtils, which is more accurate.
+ *
+ * @param {object} root0
+ * @param {typeof globalThis.fetch} root0.fetch
+ * @param {(ms: number) => Promise<void>} root0.delay
+ * @param {boolean} [root0.names]
+ * @param {MinimalNetworkConfig} networkConfig
+ */
+export const makeSmartWalletKit = async ({ fetch, 
+// unused but keep for eventually removing ambient authority
+delay: _delay, names = true, }, networkConfig) => {
+    const vsk = makeVstorageKit({ fetch }, networkConfig);
+    return makeSmartWalletKitFromVstorageKit(vsk, { names });
+};
+harden(makeSmartWalletKit);
 /** @typedef {EReturn<typeof makeSmartWalletKit>} SmartWalletKit */
 //# sourceMappingURL=smart-wallet-kit.js.map

package/dist/smart-wallet-kit.js.map

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

package/dist/sync-tools.d.ts

@@ -1,22 +1,16 @@
-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 sleep(ms: number, { log, setTimeout }: RetryPowers): Promise<any>;
+export function retryUntilCondition<T = unknown>(operation: () => Promise<T>, condition: (result: T) => boolean, message: string, { maxRetries, retryIntervalMs, reusePromise, renderResult, log, setTimeout, }: RetryOptionsAndPowers): Promise<T>;
 export function waitUntilContractDeployed(contractName: string, ambientAuthority: {
     log: (message: string) => void;
     follow: () => object;
-    setTimeout: typeof global.setTimeout;
+    setTimeout: typeof globalThis.setTimeout;
 }, options: WaitUntilOptions): Promise<{
     [k: string]: any;
 }>;
 export function waitUntilAccountFunded(destAcct: string, io: {
     log?: (message: string) => void;
     query: () => Promise<object>;
-    setTimeout: typeof global.setTimeout;
+    setTimeout: typeof globalThis.setTimeout;
 }, threshold: {
     denom: string;
     value: number;
@@ -24,25 +18,25 @@ export function waitUntilAccountFunded(destAcct: string, io: {
 export function waitUntilOfferResult(addr: string, offerId: string, waitForPayouts: boolean, io: {
     log?: typeof console.log;
     follow: () => object;
-    setTimeout: typeof global.setTimeout;
+    setTimeout: typeof globalThis.setTimeout;
 }, options: WaitUntilOptions): Promise<any>;
 export function waitUntilInvitationReceived(addr: string, io: {
     follow: () => object;
     log: typeof console.log;
-    setTimeout: typeof global.setTimeout;
+    setTimeout: typeof globalThis.setTimeout;
 }, options: WaitUntilOptions): Promise<any>;
 export function waitUntilOfferExited(addr: string, offerId: string, io: {
     follow: () => object;
     log: typeof console.log;
-    setTimeout: typeof global.setTimeout;
+    setTimeout: typeof globalThis.setTimeout;
 }, options: WaitUntilOptions): Promise<any>;
 export function waitUntilElectionResult(committeePathBase: string, expectedResult: {
     outcome: string;
     deadline: bigint;
 }, io: {
-    vstorage: import("./vstorage-kit").VstorageKit;
+    vstorage: VstorageKit;
     log: typeof console.log;
-    setTimeout: typeof global.setTimeout;
+    setTimeout: typeof globalThis.setTimeout;
 }, options: WaitUntilOptions): Promise<ElectionResult>;
 export type RetryOptions = {
     maxRetries?: number | undefined;
@@ -50,6 +44,14 @@ export type RetryOptions = {
     reusePromise?: boolean | undefined;
     renderResult?: ((value: unknown) => unknown) | undefined;
 };
+export type RetryPowers = {
+    setTimeout: typeof globalThis.setTimeout;
+    log?: ((...args: unknown[]) => void) | undefined;
+};
+/**
+ * mixes ocaps with configuration
+ */
+export type RetryOptionsAndPowers = RetryOptions & RetryPowers;
 export type WaitUntilOptions = RetryOptions & {
     errorMessage: string;
 };
@@ -60,13 +62,15 @@ export type CosmosBalanceThreshold = {
 export type ElectionResult = {
     latestOutcome: {
         outcome: string;
-        question: import("@endo/marshal").RemotableObject;
+        question: RemotableObject;
     };
     latestQuestion: {
         closingRule: {
             deadline: bigint;
         };
-        questionHandle: import("@endo/marshal").RemotableObject;
+        questionHandle: RemotableObject;
     };
 };
+import type { VstorageKit } from './types.js';
+import type { RemotableObject } from '@endo/marshal';
 //# sourceMappingURL=sync-tools.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"sync-tools.d.ts","sourceRoot":"","sources":["../src/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"}
+{"version":3,"file":"sync-tools.d.ts","sourceRoot":"","sources":["../src/sync-tools.js"],"names":[],"mappings":"AA8CO,0BAHI,MAAM,uBACN,WAAW,gBAMlB;AAYG,oCAPO,CAAC,uBACJ,MAAM,OAAO,CAAC,CAAC,CAAC,aAChB,CAAC,MAAM,EAAE,CAAC,KAAK,OAAO,WACtB,MAAM,iFACN,qBAAqB,GACnB,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,UAAU,CAAC,UAAU,CAAA;CAAE,WAClG,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,UAAU,CAAC,UAAU,CAAA;CAAC,aAC1G;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,UAAU,CAAC,UAAU,CAAA;CAAE,WAC5F,gBAAgB,gBAmB1B;AAwBM,kDAJI,MAAM,MACN;IAAE,MAAM,EAAE,MAAM,MAAM,CAAC;IAAC,GAAG,EAAE,OAAO,OAAO,CAAC,GAAG,CAAC;IAAC,UAAU,EAAE,OAAO,UAAU,CAAC,UAAU,CAAA;CAAC,WAC1F,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,UAAU,CAAC,UAAU,CAAA;CAAC,WAC1F,gBAAgB,gBAa1B;AA+EM,2DAZI,MAAM,kBACN;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB,MACO;IACN,QAAQ,EAAE,WAAW,CAAC;IACtB,GAAG,EAAE,OAAO,OAAO,CAAC,GAAG,CAAC;IACxB,UAAU,EAAE,OAAO,UAAU,CAAC,UAAU,CAAA;CACzC,WACO,gBAAgB,2BAoB1B;;;;;4BA5ZqB,OAAO,KAAK,OAAO;;;gBAG3B,OAAO,UAAU,CAAC,UAAU;qBAClB,OAAO,EAAE,KAAK,IAAI;;;;;oCAE7B,YAAY,GAAG,WAAW;+BAE1B,YAAY,GAAG;IAAC,YAAY,EAAE,MAAM,CAAA;CAAC;;WAGpC,MAAM;WACN,MAAM;;6BAqTP;IACR,aAAa,EAAE;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,EAAE,eAAe,CAAA;KAC1B,CAAC;IACF,cAAc,EAAE;QACd,WAAW,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAC;QAClC,cAAc,EAAE,eAAe,CAAA;KAChC,CAAA;CACF;iCAlV0B,YAAY;qCADR,eAAe"}

package/dist/sync-tools.js

@@ -12,6 +12,10 @@
  * - Making sure an offer was exited successfully
  * - Make sure an election held by a given committee (see @agoric/governance) turned out as expected
  */
+/**
+ * @import {RemotableObject} from '@endo/marshal';
+ * @import {VstorageKit} from './types.js';
+ */
 /**
  * @typedef {object} RetryOptions
  * @property {number} [maxRetries]
@@ -19,6 +23,12 @@
  * @property {boolean} [reusePromise]
  * @property {(value: unknown) => unknown} [renderResult]
  *
+ * @typedef {object} RetryPowers
+ * @property {typeof globalThis.setTimeout} setTimeout
+ * @property {(...args: unknown[]) => void} [log]
+ *
+ * @typedef {RetryOptions & RetryPowers} RetryOptionsAndPowers mixes ocaps with configuration
+ *
  * @typedef {RetryOptions & {errorMessage: string}} WaitUntilOptions
  *
  * @typedef {object} CosmosBalanceThreshold
@@ -29,7 +39,7 @@
  * From https://github.com/Agoric/agoric-sdk/blob/442f07c8f0af03281b52b90e90c27131eef6f331/multichain-testing/tools/sleep.ts#L10
  *
  * @param {number} ms
- * @param {{log: (message: string) => void, setTimeout: typeof global.setTimeout}} io
+ * @param {RetryPowers} io
  */
 export const sleep = (ms, { log = () => { }, setTimeout }) => new Promise(resolve => {
     log(`Sleeping for ${ms}ms...`);
@@ -42,7 +52,7 @@ export const sleep = (ms, { log = () => { }, setTimeout }) => new Promise(resolv
  * @param {() => Promise<T>} operation
  * @param {(result: T) => boolean} condition
  * @param {string} message
- * @param {RetryOptions & {log?: typeof console.log, setTimeout: typeof global.setTimeout}} options
+ * @param {RetryOptionsAndPowers} options
  * @returns {Promise<T>}
  */
 export const retryUntilCondition = async (operation, condition, message, { maxRetries = 6, retryIntervalMs = 3500, reusePromise = false, renderResult = x => x, 
@@ -120,7 +130,7 @@ const makeGetInstances = follow => async () => {
 /**
  *
  * @param {string} contractName
- * @param {{ log: (message: string) => void, follow: () => object, setTimeout: typeof global.setTimeout }} ambientAuthority
+ * @param {{ log: (message: string) => void, follow: () => object, setTimeout: typeof globalThis.setTimeout }} ambientAuthority
  * @param {WaitUntilOptions} options
  */
 export const waitUntilContractDeployed = (contractName, ambientAuthority, options) => {
@@ -146,7 +156,7 @@ const checkCosmosBalance = (balances, threshold) => {
 };
 /**
  * @param {string} destAcct
- * @param {{ log?: (message: string) => void, query: () => Promise<object>, setTimeout: typeof global.setTimeout}} io
+ * @param {{ log?: (message: string) => void, query: () => Promise<object>, setTimeout: typeof globalThis.setTimeout}} io
  * @param {{denom: string, value: number}} threshold
  * @param {WaitUntilOptions} options
  */
@@ -188,7 +198,7 @@ const checkOfferState = (offerStatus, waitForPayouts, offerId) => {
  * @param {string} addr
  * @param {string} offerId
  * @param {boolean} waitForPayouts
- * @param {{ log?: typeof console.log, follow: () => object, setTimeout: typeof global.setTimeout }} io
+ * @param {{ log?: typeof console.log, follow: () => object, setTimeout: typeof globalThis.setTimeout }} io
  * @param {WaitUntilOptions} options
  */
 export const waitUntilOfferResult = (addr, offerId, waitForPayouts, io, options) => {
@@ -214,7 +224,7 @@ const checkForInvitation = update => {
 /**
  *
  * @param {string} addr
- * @param {{ follow: () => object, log: typeof console.log, setTimeout: typeof global.setTimeout}} io
+ * @param {{ follow: () => object, log: typeof console.log, setTimeout: typeof globalThis.setTimeout}} io
  * @param {WaitUntilOptions} options
  */
 export const waitUntilInvitationReceived = (addr, io, options) => {
@@ -240,7 +250,7 @@ const checkLiveOffers = (update, offerId) => {
 /**
  * @param {string} addr
  * @param {string} offerId
- * @param {{ follow: () => object, log: typeof console.log, setTimeout: typeof global.setTimeout}} io
+ * @param {{ follow: () => object, log: typeof console.log, setTimeout: typeof globalThis.setTimeout}} io
  * @param {WaitUntilOptions} options
  */
 export const waitUntilOfferExited = async (addr, offerId, io, options) => {
@@ -255,17 +265,17 @@ export const waitUntilOfferExited = async (addr, offerId, io, options) => {
  * @typedef {{
  *   latestOutcome: {
  *     outcome: string;
- *     question: import('@endo/marshal').RemotableObject
+ *     question: RemotableObject
  *   },
  *   latestQuestion: {
  *     closingRule: { deadline: bigint },
- *     questionHandle: import('@endo/marshal').RemotableObject
+ *     questionHandle: RemotableObject
  *   }
  * }} ElectionResult
  */
 /**
  * @param {string} basePath
- * @param {import('./vstorage-kit').VstorageKit} vstorage
+ * @param {VstorageKit} vstorage
  * @returns {Promise<ElectionResult>}
  */
 const fetchLatestEcQuestion = async (basePath, vstorage) => {
@@ -300,9 +310,9 @@ const checkCommitteeElectionResult = (electionResult, expectedResult) => {
  *   deadline: bigint;
  * }} expectedResult
  * @param {{
- *   vstorage: import('./vstorage-kit').VstorageKit;
+ *   vstorage: VstorageKit;
  *   log: typeof console.log,
- *   setTimeout: typeof global.setTimeout
+ *   setTimeout: typeof globalThis.setTimeout
  * }} io
  * @param {WaitUntilOptions} options
  */

package/dist/sync-tools.js.map

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

package/dist/types.d.ts

@@ -1,33 +1,45 @@
-import type { Brand, Issuer } 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 { AssetInfo } from '@agoric/vats/src/vat-bank.js';
-import type { StatusFor } from '@aglocal/portfolio-contract/src/type-guards.js';
-import type { Instance } from '@agoric/zoe/src/zoeService/types.js';
-type PublishedTypeMap = {
-    'auction.governance': {
-        current: AuctionParamRecord;
-    };
-    'auction.schedule': ScheduleNotification;
-    'vaultFactory.metrics': VaultDirectorMetrics;
-    'agoricNames.instance': Array<[string, Instance]>;
-    'agoricNames.brand': Array<[string, Brand]>;
-    'agoricNames.issuer': Array<[string, Issuer]>;
-    'agoricNames.vbankAsset': Array<[string, AssetInfo]>;
-    fastUsdc: ContractRecord;
-    'fastUsdc.feeConfig': FeeConfig;
-    'fastUsdc.poolMetrics': PoolMetrics;
-    'ymax0.portfolios': StatusFor['portfolios'];
+import type { SmartWalletPublishedPathTypes, SmartWalletPublishedPathValue } from '@agoric/smart-wallet/src/types.js';
+import type { AgoricNamesPublishedPathTypes } from '@agoric/vats/src/types.js';
+import type { Marshal } from '@endo/marshal';
+import type { MinimalNetworkConfig } from './network-config.js';
+import type { VStorage } from './vstorage.js';
+/**
+ * Additional published path mappings supplied by VstorageKit consumers.
+ *
+ * Keys can be either exact path strings or template literal path types.
+ */
+export type PublishedPathTypes = Record<string, unknown>;
+/**
+ * Built-in published path mappings for exact `agoricNames.*` paths.
+ */
+export type CorePublishedPathTypes = AgoricNamesPublishedPathTypes;
+/**
+ * Built-in typing for values under the `agoricNames.` and `wallet.`
+ * hierarchies.
+ */
+export type CoreTypedPublished<P extends string> = P extends keyof CorePublishedPathTypes ? CorePublishedPathTypes[P] : P extends keyof SmartWalletPublishedPathTypes ? SmartWalletPublishedPathValue<P> : never;
+/**
+ * Utility type for the value that results from unmarshalling the latest value
+ * at a vstorage `published` path.
+ */
+export type TypedPublishedFor<P extends string, Ext extends PublishedPathTypes> = P extends keyof Ext ? Exclude<Ext[P], undefined> : CoreTypedPublished<P>;
+type IdMapLike = {
+    convertSlotToVal: (boardId: string, iface?: string) => unknown;
+};
+export type VstorageKit<Ext extends PublishedPathTypes = Record<never, never>> = {
+    fromBoard: IdMapLike;
+    marshaller: Pick<Marshal<string>, 'fromCapData' | 'toCapData'>;
+    networkConfig: MinimalNetworkConfig;
+    readLatestHead: <T = any>(path: string) => Promise<T>;
+    readPublished: <P extends string>(subpath: P) => Promise<TypedPublishedFor<P, Ext>>;
+    unserializeHead: (txt: string | {
+        value: string;
+    }) => unknown;
+    vstorage: VStorage;
 };
 /**
- * Utility type to the type that would result from unmarshalling the latest
- * value at a vstorage `published` path.
+ * @deprecated Use `TypedPublishedFor<P, Ext>` with `VstorageKit<Ext>` instead.
  */
-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 type TypedPublished<P extends string> = CoreTypedPublished<P>;
 export {};
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAClD,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,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAC;AAChF,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,oBAAoB,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC9C,wBAAwB,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IACrD,QAAQ,EAAE,cAAc,CAAC;IACzB,oBAAoB,EAAE,SAAS,CAAC;IAChC,sBAAsB,EAAE,WAAW,CAAC;IACpC,kBAAkB,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;CAC7C,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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,6BAA6B,EAC7B,6BAA6B,EAC9B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEzD;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG,6BAA6B,CAAC;AAEnE;;;GAGG;AACH,MAAM,MAAM,kBAAkB,CAAC,CAAC,SAAS,MAAM,IAC7C,CAAC,SAAS,MAAM,sBAAsB,GAClC,sBAAsB,CAAC,CAAC,CAAC,GACzB,CAAC,SAAS,MAAM,6BAA6B,GAC3C,6BAA6B,CAAC,CAAC,CAAC,GAChC,KAAK,CAAC;AAEd;;;GAGG;AACH,MAAM,MAAM,iBAAiB,CAC3B,CAAC,SAAS,MAAM,EAChB,GAAG,SAAS,kBAAkB,IAC5B,CAAC,SAAS,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;AAE7E,KAAK,SAAS,GAAG;IACf,gBAAgB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;CAChE,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,GAAG,SAAS,kBAAkB,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAC3E;IACE,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC,CAAC;IAC/D,aAAa,EAAE,oBAAoB,CAAC;IACpC,cAAc,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACtD,aAAa,EAAE,CAAC,CAAC,SAAS,MAAM,EAC9B,OAAO,EAAE,CAAC,KACP,OAAO,CAAC,iBAAiB,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IACxC,eAAe,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC;IAC9D,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,SAAS,MAAM,IAAI,kBAAkB,CAAC,CAAC,CAAC,CAAC"}

package/dist/types.js

@@ -1,5 +1,4 @@
 // @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
 export {};
-// static string keys are defined in PublishedTypeMap
 //# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,2CAA2C;AAC3C,6GAA6G;;AA6D7G,qDAAqD"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,2CAA2C;AAC3C,6GAA6G"}

package/dist/vstorage-kit.d.ts

@@ -20,35 +20,21 @@ export namespace storageHelper {
         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;
-}, networkConfig: MinimalNetworkConfig): {
-    fromBoard: {
-        convertSlotToVal: (boardId: any, iface: any) => any;
-    };
-    marshaller: Omit<import("@endo/marshal").Marshal<string | null>, "serialize" | "unserialize">;
+export function makeAgoricNames(ctx: IdMap, vstorage: VStorage): Promise<AgoricNamesRemotes>;
+export function makeVstorageKitFromVstorage<Ext extends PublishedPathTypes = Record<never, never>>({ vstorage, networkConfig, marshaller, }: {
+    vstorage: VStorage;
     networkConfig: MinimalNetworkConfig;
-    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[]>;
-    };
-};
+    marshaller?: Pick<Marshal<string>, "toCapData" | "fromCapData"> | undefined;
+}): VstorageKit<Ext>;
+export function makeVstorageKit<Ext extends PublishedPathTypes = Record<never, never>>({ fetch }: {
+    fetch: typeof window.fetch;
+}, networkConfig: MinimalNetworkConfig): VstorageKit<Ext>;
 export type IdMap = ReturnType<typeof makeFromBoard>;
-export type VstorageKit = ReturnType<typeof makeVstorageKit>;
-import { boardSlottingMarshaller } from '@agoric/vats/tools/board-utils.js';
+import { boardSlottingMarshaller } from '@agoric/internal/src/marshal/board-client-utils.js';
 import type { VStorage } from './vstorage.js';
+import type { AgoricNamesRemotes } from '@agoric/vats/tools/board-utils.js';
+import type { PublishedPathTypes } from './types.js';
 import type { MinimalNetworkConfig } from './network-config.js';
-import type { TypedPublished } from './types.js';
+import type { Marshal } from '@endo/marshal';
+import type { VstorageKit } from './types.js';
 //# sourceMappingURL=vstorage-kit.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"vstorage-kit.d.ts","sourceRoot":"","sources":["../src/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,iBAC9B,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;;;;;;;;;;;EAqCxD;oBAnHa,UAAU,CAAC,OAAO,aAAa,CAAC;0BAoHhC,UAAU,CAAC,OAAO,eAAe,CAAC;wCA7IzC,mCAAmC;8BASf,eAAe;0CAFH,qBAAqB;oCAC3B,YAAY"}
+{"version":3,"file":"vstorage-kit.d.ts","sourceRoot":"","sources":["../src/vstorage-kit.js"],"names":[],"mappings":";AAmBO;;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,kBAAkB,CAAC,CAqBvC;AAWM,4CAR4B,GAAG,SAAzB,kBAAoB,mEAE9B;IAAyB,QAAQ,EAAzB,QAAQ;IACqB,aAAa,EAA1C,oBAAoB;IACwC,UAAU;CAC9E,GAAU,YAAY,GAAG,CAAC,CAkE5B;AASM,gCAL4B,GAAG,SAAzB,kBAAoB,oCACtB;IAAE,KAAK,EAAE,OAAO,MAAM,CAAC,KAAK,CAAA;CAAE,iBAC9B,oBAAoB,GAClB,YAAY,GAAG,CAAC,CAU5B;oBA5Ja,UAAU,CAAC,OAAO,aAAa,CAAC;wCA5BvC,oDAAoD;8BAUhC,eAAe;wCACL,mCAAmC;wCAFH,YAAY;0CAD1C,qBAAqB;6BADlC,eAAe;iCAE4B,YAAY"}