@agoric/client-utils 0.1.1-other-dev-fbe72e7.0.fbe72e7 → 0.1.1-other-dev-d15096d.0.d15096d

package/dist/signing-smart-wallet-kit.d.ts

@@ -1,21 +1,53 @@
-import type { InvokeEntryMessage, OfferSpec } from '@agoric/smart-wallet/src/offers.js';
+import type { OfferSpec, OfferStatus } from '@agoric/smart-wallet/src/offers.js';
 import type { BridgeAction } from '@agoric/smart-wallet/src/smartWallet.js';
-import type { SigningStargateClient } from '@cosmjs/stargate';
+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, SignerData, SigningStargateClient, StdFee } from '@cosmjs/stargate';
 import type { EReturn } from '@endo/far';
-import { type SmartWalletKit } from './smart-wallet-kit.js';
+import type { SmartWalletKit } from './smart-wallet-kit.js';
+import type { RetryOptionsAndPowers } from './sync-tools.js';
+type TxOptions = RetryOptionsAndPowers & {
+    sendOnly?: boolean;
+    makeNonce?: () => string;
+};
+/**
+ * A type-aware representation of an object saved in the wallet store, with
+ * methods that return information about their implementing "invokeEntry"
+ * submissions. If Recursive is true, then each method has an initial
+ * { name?: string, overwrite?: boolean } parameter for specifying how (or if)
+ * to save results back into the wallet store and responses for such saved
+ * results also include a WalletStoreEntryProxy `result` representing those
+ * results.
+ */
+type WalletStoreEntryProxy<T, Recursive extends true | false = false> = {
+    readonly [M in keyof T]: T[M] extends (...args: infer P) => infer R ? Recursive extends false ? ECallable<(...args: P) => {
+        id?: string;
+        tx: DeliverTxResponse;
+    }> : ECallable<(<SaveToName extends string | undefined>(options: SaveToName extends string ? {
+        name: SaveToName;
+        overwrite?: boolean;
+    } : undefined | Record<PropertyKey, never>, ...args: P) => {
+        id?: string;
+        tx: DeliverTxResponse;
+        result: SaveToName extends string ? WalletStoreEntryProxy<EUnwrap<R>, true> : undefined;
+    })> : never;
+};
 /**
  * Augment a read-only SmartWalletKit with signing ability
  */
 export declare const makeSigningSmartWalletKit: ({ connectWithSigner, walletUtils, }: {
     connectWithSigner: typeof SigningStargateClient.connectWithSigner;
     walletUtils: SmartWalletKit;
-}, MNEMONIC: string) => Promise<Readonly<{
-    networkConfig: import("./network-config.js").MinimalNetworkConfig;
-    marshaller: Omit<import("@endo/marshal").Marshal<string | null>, "serialize" | "unserialize">;
+}, MNEMONIC: string) => Promise<{
     query: {
         readPublished: <T extends string>(subpath: T) => Promise<import("./types.js").TypedPublished<T>>;
         vstorage: {
-            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" ? import("@agoric/cosmic-proto/agoric/vstorage/query.js").QueryChildrenResponse : import("@agoric/cosmic-proto/agoric/vstorage/query.js").QueryDataResponse>;
@@ -26,16 +58,85 @@ export declare const makeSigningSmartWalletKit: ({ connectWithSigner, walletUtil
         };
         getLastUpdate: () => Promise<import("@agoric/smart-wallet/src/smartWallet.js").UpdateRecord>;
         getCurrentWalletRecord: () => Promise<import("@agoric/smart-wallet/src/smartWallet.js").CurrentWalletRecord>;
-        pollOffer: (id: string | number, minHeight: string | number, untilNumWantsSatisfied?: boolean | undefined) => Promise<import("@agoric/smart-wallet/src/offers.js").OfferStatus>;
+        pollOffer: (id: string | number, minHeight?: string | number | undefined, untilNumWantsSatisfied?: boolean | undefined) => Promise<OfferStatus>;
     };
     address: string;
-    executeOffer: (offer: OfferSpec) => Promise<import("@agoric/smart-wallet/src/offers.js").OfferStatus>;
-    invokeEntry: (message: InvokeEntryMessage) => Promise<{
-        result: {
-            transaction: import("@cosmjs/stargate").DeliverTxResponse;
-        };
-    }>;
-    sendBridgeAction: (action: BridgeAction) => Promise<import("@cosmjs/stargate").DeliverTxResponse>;
-}>>;
+    /**
+     * Send an `executeOffer` bridge action and promise the resulting offer
+     * record once the offer has settled. If you don't need the offer record,
+     * consider using `sendBridgeAction` instead.
+     */
+    executeOffer: (offer: OfferSpec) => Promise<OfferStatus>;
+    sendBridgeAction: (action: BridgeAction, fee?: StdFee, memo?: string, signerData?: SignerData) => Promise<DeliverTxResponse>;
+    agoricNames: import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes;
+    getLastUpdate: (addr: string) => Promise<import("@agoric/smart-wallet/src/smartWallet.js").UpdateRecord>;
+    getCurrentWalletRecord: (addr: string) => Promise<import("@agoric/smart-wallet/src/smartWallet.js").CurrentWalletRecord>;
+    pollOffer: (from: string, id: string | number, minHeight?: number | string, untilNumWantsSatisfied?: boolean) => Promise<OfferStatus>;
+    fromBoard: {
+        convertSlotToVal: (boardId: any, iface: any) => any;
+    };
+    marshaller: Omit<import("@endo/marshal").Marshal<any>, "serialize" | "unserialize">;
+    networkConfig: import("./network-config.js").MinimalNetworkConfig;
+    readLatestHead: (path: string) => Promise<T>;
+    readPublished: <T extends string>(subpath: T) => Promise<import("./types.js").TypedPublished<T>>;
+    unserializeHead: (txt: string | {
+        value: string;
+    }) => unknown;
+    vstorage: {
+        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" ? 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 SigningSmartWalletKit = EReturn<typeof makeSigningSmartWalletKit>;
+/**
+ * @alpha
+ */
+export declare const reflectWalletStore: (sswk: SigningSmartWalletKit, baseTxOpts?: Partial<TxOptions>) => {
+    /**
+     * Return a previously-saved result as a remote object with type-aware
+     * methods that map to "invokeEntry" submissions. The methods will always
+     * await tx output from `sendBridgeAction`, and will also wait for
+     * confirmation in vstorage when sent with an `id` (e.g., derived from a
+     * `makeNonce` option) unless overridden by a `sendOnly: true` option.
+     */
+    get: <T>(name: string, options?: Partial<TxOptions>) => WalletStoreEntryProxy<T, false>;
+    /**
+     * Return a previously-saved result as a remote object with type-aware
+     * methods that map to "invokeEntry" submissions, each having an additional
+     * initial { name?: string, overwrite?: boolean } parameter for specifying
+     * how (or if) to save results in the wallet store. The methods will always
+     * await tx output from `sendBridgeAction`, and will also wait for
+     * confirmation in vstorage unless overridden by a `sendOnly: true` option
+     * (but note that when so overridden, the returned `result` is not yet
+     * usable).
+     */
+    getForSavingResults: <T>(name: string, options?: Partial<TxOptions>) => WalletStoreEntryProxy<T, true>;
+    /**
+     * Execute the offer specified by { instance, description } and save the
+     * result in the wallet store with the specified name (default to match the
+     * offer description), overwriting any prior entry for that name unless
+     * otherwise specified. Waits for confirmation in vstorage before returning.
+     */
+    saveOfferResult: ({ instance, description }: {
+        instance: Instance;
+        description: string;
+    }, name?: string, options?: Partial<TxOptions & {
+        overwrite: boolean;
+    }>) => Promise<{
+        id: string;
+        tx: DeliverTxResponse;
+        result: unknown;
+    }>;
+};
+export {};
 //# sourceMappingURL=signing-smart-wallet-kit.d.ts.map

package/dist/signing-smart-wallet-kit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signing-smart-wallet-kit.d.ts","sourceRoot":"","sources":["../src/signing-smart-wallet-kit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,SAAS,EACV,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,KAAK,EAAE,qBAAqB,EAAU,MAAM,kBAAkB,CAAC;AAEtE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAQ5D;;GAEG;AACH,eAAO,MAAM,yBAAyB,GACpC,qCAGG;IACD,iBAAiB,EAAE,OAAO,qBAAqB,CAAC,iBAAiB,CAAC;IAClE,WAAW,EAAE,cAAc,CAAC;CAC7B,EACD,UAAU,MAAM;;;;;;;;;;;;;;;;;;;;0BAoCmB,SAAS;2BAaR,kBAAkB;;;;;+BA1BpB,YAAY;GA8C/C,CAAC;AACF,MAAM,MAAM,qBAAqB,GAAG,OAAO,CAAC,OAAO,yBAAyB,CAAC,CAAC"}
+{"version":3,"file":"signing-smart-wallet-kit.d.ts","sourceRoot":"","sources":["../src/signing-smart-wallet-kit.ts"],"names":[],"mappings":"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"}

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

@@ -1,11 +1,13 @@
 import { toAccAddress } from '@cosmjs/stargate/build/queryclient/utils.js';
+import { Fail } from '@endo/errors';
 import { MsgWalletSpendAction } from './codegen/agoric/swingset/msgs.js';
+import { TxRaw } from './codegen/cosmos/tx/v1beta1/tx.js';
 import { makeStargateClientKit } from './signing-client.js';
-import {} from './smart-wallet-kit.js';
+import { getInvocationUpdate, getOfferResult } from './smart-wallet-kit.js';
 // TODO parameterize as part of https://github.com/Agoric/agoric-sdk/issues/5912
 const defaultFee = {
-    amount: [{ denom: 'ubld', amount: '30000' }], // XXX enough?
-    gas: '197000',
+    amount: [{ denom: 'ubld', amount: '500000' }], // XXX enough?
+    gas: '19700000',
 };
 /**
  * Augment a read-only SmartWalletKit with signing ability
@@ -16,43 +18,158 @@ export const makeSigningSmartWalletKit = async ({ connectWithSigner, walletUtils
         // XXX always the first
         rpcAddr: walletUtils.networkConfig.rpcAddrs[0],
     });
+    // Omit deprecated utilities
+    const { storedWalletState: _, ...swk } = walletUtils;
     const query = {
-        readPublished: walletUtils.readPublished,
-        vstorage: walletUtils.vstorage,
-        getLastUpdate: () => walletUtils.getLastUpdate(address),
-        getCurrentWalletRecord: () => walletUtils.getCurrentWalletRecord(address),
-        pollOffer: (...args) => walletUtils.pollOffer(address, ...args),
+        readPublished: swk.readPublished,
+        vstorage: swk.vstorage,
+        getLastUpdate: () => swk.getLastUpdate(address),
+        getCurrentWalletRecord: () => swk.getCurrentWalletRecord(address),
+        pollOffer: (...args) => swk.pollOffer(address, ...args),
     };
-    const sendBridgeAction = (action) => {
+    const sendBridgeAction = async (action, fee = defaultFee, memo = '', signerData) => {
+        // The caller should do this but it's more ergonomic to allow an object
+        // literal, and in that case this hardening does not create an external
+        // side-effect.
+        harden(action);
         const msgSpend = MsgWalletSpendAction.fromPartial({
             owner: toAccAddress(address),
-            spendAction: JSON.stringify(walletUtils.marshaller.toCapData(action)),
+            spendAction: JSON.stringify(swk.marshaller.toCapData(action)),
         });
-        return client.signAndBroadcast(address, [{ typeUrl: MsgWalletSpendAction.typeUrl, value: msgSpend }], defaultFee);
+        const messages = [
+            { typeUrl: MsgWalletSpendAction.typeUrl, value: msgSpend },
+        ];
+        if (!signerData) {
+            return client.signAndBroadcast(address, messages, fee, memo);
+        }
+        // Explicit signing data
+        const signedTx = await client.sign(address, messages, fee, memo, signerData);
+        const txBytes = TxRaw.encode(signedTx).finish();
+        return client.broadcastTx(txBytes);
     };
     const executeOffer = async (offer) => {
-        const before = await client.getBlock();
-        await sendBridgeAction(harden({
+        const offerP = swk.pollOffer(address, offer.id);
+        // Await for rejection handling
+        await sendBridgeAction({
             method: 'executeOffer',
             offer,
-        }));
-        return walletUtils.pollOffer(address, offer.id, before.header.height);
-    };
-    const invokeEntry = async (message) => {
-        const transaction = await sendBridgeAction(harden({
-            method: 'invokeEntry',
-            message,
-        }));
-        return { result: { transaction } };
+        });
+        return offerP;
     };
-    return Object.freeze({
-        networkConfig: walletUtils.networkConfig,
-        marshaller: walletUtils.marshaller,
+    return harden({
+        ...swk,
         query,
         address,
+        /**
+         * Send an `executeOffer` bridge action and promise the resulting offer
+         * record once the offer has settled. If you don't need the offer record,
+         * consider using `sendBridgeAction` instead.
+         */
         executeOffer,
-        invokeEntry,
         sendBridgeAction,
     });
 };
+/**
+ * @alpha
+ */
+export const reflectWalletStore = (sswk, baseTxOpts) => {
+    baseTxOpts = { log: () => { }, ...baseTxOpts };
+    const makeEntryProxy = (targetName, overrides, forSavingResults) => {
+        const combinedOpts = { ...baseTxOpts, ...overrides };
+        combinedOpts.setTimeout || Fail `missing setTimeout`;
+        const { sendOnly, makeNonce, ...retryOpts } = combinedOpts;
+        if (forSavingResults && !makeNonce && !sendOnly) {
+            throw Fail `makeNonce is required without sendOnly: true (to create an awaitable message id)`;
+        }
+        const { log = () => { } } = combinedOpts;
+        const logged = (label, x) => {
+            log(label, x);
+            return x;
+        };
+        return new Proxy(harden({}), {
+            get(_t, method, _rx) {
+                assert.typeof(method, 'string');
+                method !== 'then' || Fail `unsupported method name "then"`;
+                const boundMethod = async (...args) => {
+                    const options = forSavingResults ? args.shift() : {};
+                    const { name, overwrite = true } = options;
+                    const saveResult = forSavingResults && name ? { name, overwrite } : undefined;
+                    const id = makeNonce ? `${method}.${makeNonce()}` : undefined;
+                    const message = logged('invoke', {
+                        id,
+                        targetName,
+                        method,
+                        args,
+                        ...(saveResult ? { saveResult } : undefined),
+                    });
+                    const tx = await sswk.sendBridgeAction({
+                        method: 'invokeEntry',
+                        message,
+                    });
+                    if (tx.code !== 0) {
+                        throw Error(tx.rawLog);
+                    }
+                    if (!sendOnly && id) {
+                        await getInvocationUpdate(id, sswk.query.getLastUpdate, retryOpts);
+                    }
+                    const ret = { id, tx };
+                    if (forSavingResults) {
+                        const result = name
+                            ? makeEntryProxy(name, overrides, forSavingResults)
+                            : undefined;
+                        return { ...ret, result };
+                    }
+                    return ret;
+                };
+                return harden(boundMethod);
+            },
+        });
+    };
+    const saveOfferResult = async ({ instance, description }, name = description, options) => {
+        const combinedOpts = { ...baseTxOpts, ...options };
+        const { sendOnly: _sendOnly, makeNonce, overwrite = true, ...retryOpts } = combinedOpts;
+        if (!makeNonce)
+            throw Fail `missing makeNonce`;
+        const id = `${description}.${makeNonce()}`;
+        const tx = await sswk.sendBridgeAction({
+            method: 'executeOffer',
+            offer: {
+                id,
+                invitationSpec: { source: 'purse', instance, description },
+                proposal: {},
+                saveResult: { name, overwrite },
+            },
+        });
+        const status = await getOfferResult(id, sswk.query.getLastUpdate, retryOpts);
+        return { id, tx, result: status.result };
+    };
+    return harden({
+        /**
+         * Return a previously-saved result as a remote object with type-aware
+         * methods that map to "invokeEntry" submissions. The methods will always
+         * await tx output from `sendBridgeAction`, and will also wait for
+         * confirmation in vstorage when sent with an `id` (e.g., derived from a
+         * `makeNonce` option) unless overridden by a `sendOnly: true` option.
+         */
+        get: (name, options) => makeEntryProxy(name, options, false),
+        /**
+         * Return a previously-saved result as a remote object with type-aware
+         * methods that map to "invokeEntry" submissions, each having an additional
+         * initial { name?: string, overwrite?: boolean } parameter for specifying
+         * how (or if) to save results in the wallet store. The methods will always
+         * await tx output from `sendBridgeAction`, and will also wait for
+         * confirmation in vstorage unless overridden by a `sendOnly: true` option
+         * (but note that when so overridden, the returned `result` is not yet
+         * usable).
+         */
+        getForSavingResults: (name, options) => makeEntryProxy(name, options, true),
+        /**
+         * Execute the offer specified by { instance, description } and save the
+         * result in the wallet store with the specified name (default to match the
+         * offer description), overwriting any prior entry for that name unless
+         * otherwise specified. Waits for confirmation in vstorage before returning.
+         */
+        saveOfferResult,
+    });
+};
 //# sourceMappingURL=signing-smart-wallet-kit.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"signing-smart-wallet-kit.js","sourceRoot":"","sources":["../src/signing-smart-wallet-kit.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAE3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAuB,MAAM,uBAAuB,CAAC;AAE5D,gFAAgF;AAChF,MAAM,UAAU,GAAW;IACzB,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,cAAc;IAC5D,GAAG,EAAE,QAAQ;CACd,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,KAAK,EAC5C,EACE,iBAAiB,EACjB,WAAW,GAIZ,EACD,QAAgB,EAChB,EAAE;IACF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,qBAAqB,CAAC,QAAQ,EAAE;QAChE,iBAAiB;QACjB,uBAAuB;QACvB,OAAO,EAAE,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC;KAC/C,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG;QACZ,aAAa,EAAE,WAAW,CAAC,aAAa;QACxC,QAAQ,EAAE,WAAW,CAAC,QAAQ;QAC9B,aAAa,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC;QACvD,sBAAsB,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,sBAAsB,CAAC,OAAO,CAAC;QACzE,SAAS,EAAE,CACT,GAAG,IAKM,EACT,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC;KAC7C,CAAC;IAEF,MAAM,gBAAgB,GAAG,CAAC,MAAoB,EAAE,EAAE;QAChD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,WAAW,CAAC;YAChD,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;YAC5B,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;SACtE,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC,gBAAgB,CAC5B,OAAO,EACP,CAAC,EAAE,OAAO,EAAE,oBAAoB,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAC5D,UAAU,CACX,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,KAAK,EAAE,KAAgB,EAAE,EAAE;QAC9C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QAEvC,MAAM,gBAAgB,CACpB,MAAM,CAAC;YACL,MAAM,EAAE,cAAc;YACtB,KAAK;SACN,CAAC,CACH,CAAC;QAEF,OAAO,WAAW,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACxE,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,KAAK,EAAE,OAA2B,EAAE,EAAE;QACxD,MAAM,WAAW,GAAG,MAAM,gBAAgB,CACxC,MAAM,CAAC;YACL,MAAM,EAAE,aAAa;YACrB,OAAO;SACR,CAAC,CACH,CAAC;QAEF,OAAO,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,EAAE,CAAC;IACrC,CAAC,CAAC;IAEF,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,aAAa,EAAE,WAAW,CAAC,aAAa;QACxC,UAAU,EAAE,WAAW,CAAC,UAAU;QAClC,KAAK;QACL,OAAO;QACP,YAAY;QACZ,WAAW;QACX,gBAAgB;KACjB,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"signing-smart-wallet-kit.js","sourceRoot":"","sources":["../src/signing-smart-wallet-kit.ts"],"names":[],"mappings":"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"}

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

@@ -1,33 +1,42 @@
-export function makeSmartWalletKit({ fetch, delay, names }: {
+export function getInvocationUpdate(id: string | number, getLastUpdate: () => Promise<UpdateRecord>, retryOpts: RetryOptionsAndPowers): Promise<(UpdateRecord & {
+    updated: "invocation";
+})["result"]>;
+export function getOfferResult(id: string | number, getLastUpdate: () => Promise<UpdateRecord>, retryOpts: RetryOptionsAndPowers): Promise<OfferStatus>;
+export function getOfferWantsSatisfied(id: string | number, getLastUpdate: () => Promise<UpdateRecord>, retryOpts: RetryOptionsAndPowers): Promise<OfferStatus>;
+export function makeSmartWalletKit({ fetch, delay, names, }: {
     fetch: typeof globalThis.fetch;
     delay: (ms: number) => Promise<void>;
     names?: boolean | undefined;
 }, networkConfig: MinimalNetworkConfig): Promise<{
-    agoricNames: import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes;
+    agoricNames: AgoricNamesRemotes;
     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, {
+        invitationsReceived: Map<string, {
             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>;
+        offerStatuses: Map<import("@agoric/smart-wallet/src/offers.js").OfferId, 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>;
+    pollOffer: (from: string, id: string | number, minHeight?: number | string, untilNumWantsSatisfied?: boolean) => Promise<OfferStatus>;
     fromBoard: {
         convertSlotToVal: (boardId: any, iface: any) => any;
     };
-    marshaller: Omit<import("@endo/marshal").Marshal<string | null>, "serialize" | "unserialize">;
+    marshaller: Omit<import("@endo/marshal").Marshal<any>, "serialize" | "unserialize">;
     networkConfig: MinimalNetworkConfig;
-    readLatestHead: (path: string) => Promise<unknown>;
+    readLatestHead: (path: string) => Promise<T>;
     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 }?: {
+        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" ? import("@agoric/cosmic-proto/agoric/vstorage/query.js").QueryChildrenResponse : import("@agoric/cosmic-proto/agoric/vstorage/query.js").QueryDataResponse>;
@@ -38,8 +47,11 @@ export function makeSmartWalletKit({ fetch, delay, names }: {
     };
 }>;
 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 { RetryOptionsAndPowers } from './sync-tools.js';
+import type { OfferStatus } from '@agoric/smart-wallet/src/offers.js';
+import type { MinimalNetworkConfig } from './network-config.js';
+import type { AgoricNamesRemotes } from '@agoric/vats/tools/board-utils.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';

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

@@ -1 +1 @@
-{"version":3,"file":"smart-wallet-kit.d.ts","sourceRoot":"","sources":["../src/smart-wallet-kit.js"],"names":[],"mappings":"AAwBO,4DALJ;IAAuC,KAAK,EAApC,OAAO,UAAU,CAAC,KAAK;IACc,KAAK,EAA1C,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;IACb,KAAK;CAC7B,iBAAQ,oBAAoB;;0BAyElB,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;;;;;;;;;;;;;;;;;;;;;GAoDnB;6BACa,QAAQ,OAAO,kBAAkB,CAAC;0CA/GT,qBAAqB;kCADR,yCAAyC;yCAAzC,yCAAyC;2BAD7D,2BAA2B;4BAA3B,2BAA2B;6BADjC,WAAW"}
+{"version":3,"file":"smart-wallet-kit.d.ts","sourceRoot":"","sources":["../src/smart-wallet-kit.js"],"names":[],"mappings":"AAmCO,wCALI,MAAM,GAAG,MAAM,iBACf,MAAM,OAAO,CAAC,YAAY,CAAC,aAC3B,qBAAqB,GACnB,OAAO,CAAC,CAAC,YAAY,GAAG;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAYzE;AAcM,mCALI,MAAM,GAAG,MAAM,iBACf,MAAM,OAAO,CAAC,YAAY,CAAC,aAC3B,qBAAqB,GACnB,OAAO,CAAC,WAAW,CAAC,CAqBhC;AAcM,2CALI,MAAM,GAAG,MAAM,iBACf,MAAM,OAAO,CAAC,YAAY,CAAC,aAC3B,qBAAqB,GACnB,OAAO,CAAC,WAAW,CAAC,CAqBhC;AAeM,6DALJ;IAAuC,KAAK,EAApC,OAAO,UAAU,CAAC,KAAK;IACc,KAAK,EAA1C,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC;IACb,KAAK;CAC7B,iBAAQ,oBAAoB;;0BAkElB,MAAM,KACJ,OAAO,CAAC,YAAY,CAAC;mCAOvB,MAAM,KACJ,OAAO,CAAC,mBAAmB,CAAC;8BAzD9B,MAAM,cACN,MAAM,GAAC,MAAM;;;;;;;;;sBA0Bb,MAAM,MACN,MAAM,GAAC,MAAM,cACb,MAAM,GAAC,MAAM,2BACb,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;GA0CnB;6BACa,QAAQ,OAAO,kBAAkB,CAAC;kCA9MI,yCAAyC;2CAErD,iBAAiB;iCAH3B,oCAAoC;0CAE3B,qBAAqB;wCAEvB,mCAAmC;yCAHpB,yCAAyC;2BAF7D,2BAA2B;4BAA3B,2BAA2B;6BADjC,WAAW"}

package/dist/smart-wallet-kit.js

@@ -1,13 +1,102 @@
+import { Fail, q } from '@endo/errors';
 import { makeWalletStateCoalescer } from '@agoric/smart-wallet/src/utils.js';
-import { pollBlocks } from './chain.js';
-import { makeStargateClient } from './rpc.js';
+import { retryUntilCondition } from './sync-tools.js';
 import { makeAgoricNames, makeVstorageKit } from './vstorage-kit.js';
 /**
  * @import {EReturn} from '@endo/far';
  * @import {Amount, Brand} from '@agoric/ertp/src/types.js'
+ * @import {OfferStatus} from '@agoric/smart-wallet/src/offers.js';
  * @import {CurrentWalletRecord, UpdateRecord} from '@agoric/smart-wallet/src/smartWallet.js';
  * @import {MinimalNetworkConfig} from './network-config.js';
+ * @import {RetryOptionsAndPowers} from './sync-tools.js';
+ * @import {AgoricNamesRemotes} from '@agoric/vats/tools/board-utils.js';
  */
+/**
+ * @param {string | number} id
+ * @param {() => Promise<UpdateRecord>} getLastUpdate
+ * @param {RetryOptionsAndPowers} retryOpts
+ * @param {(update: UpdateRecord) => boolean} isMatch
+ * @returns {Promise<UpdateRecord>}
+ */
+const findUpdate = (id, getLastUpdate, retryOpts, isMatch) => retryUntilCondition(getLastUpdate, isMatch, `${id}`, retryOpts);
+/**
+ * Wait for an update indicating settlement of the specified invocation and
+ * return its result or throw its error.
+ * @alpha
+ *
+ * @param {string | number} id
+ * @param {() => Promise<UpdateRecord>} getLastUpdate
+ * @param {RetryOptionsAndPowers} retryOpts
+ * @returns {Promise<(UpdateRecord & { updated: 'invocation' })['result']>}
+ */
+export const getInvocationUpdate = async (id, getLastUpdate, retryOpts) => {
+    const isMatch = update => update.updated === 'invocation' &&
+        update.id === id &&
+        !!(update.error || update.result);
+    const found = /** @type {UpdateRecord & { updated: 'invocation' }} */ (await findUpdate(id, getLastUpdate, retryOpts, isMatch));
+    if (found.error)
+        throw Error(found.error);
+    return found.result;
+};
+harden(getInvocationUpdate);
+/**
+ * Wait for an update indicating settlement of the specified offer and return
+ * its status or throw its error.
+ * Used internally but not yet considered public.
+ * @alpha
+ *
+ * @param {string | number} id
+ * @param {() => Promise<UpdateRecord>} getLastUpdate
+ * @param {RetryOptionsAndPowers} retryOpts
+ * @returns {Promise<OfferStatus>}
+ */
+export const getOfferResult = async (id, getLastUpdate, retryOpts) => {
+    // "walletAction" indicates an error, "offerStatus" with the right id and
+    // either `result` or `error` indicates settlement.
+    const isMatch = update => update.updated === 'walletAction' ||
+        (update.updated === 'offerStatus' &&
+            update.status.id === id &&
+            !!(update.status.error || update.status.result));
+    const found = 
+    /** @type {UpdateRecord & { updated: 'walletAction' | 'offerStatus' }} */ (await findUpdate(id, getLastUpdate, retryOpts, isMatch));
+    if (found.updated !== 'offerStatus') {
+        throw Fail `${q(id)} ${q(found.updated)} failure: ${q(found.status?.error)}`;
+    }
+    const { error, result } = found.status;
+    !error || Fail `${q(id)} offerStatus failure: ${q(error)}`;
+    result || Fail `${q(id)} offerStatus missing result`;
+    return found.status;
+};
+harden(getOfferResult);
+/**
+ * Wait for an update indicating untilNumWantsSatisfied of the specified offer
+ * and return its status or throw its error.
+ * Used internally but not yet considered public.
+ * @alpha
+ *
+ * @param {string | number} id
+ * @param {() => Promise<UpdateRecord>} getLastUpdate
+ * @param {RetryOptionsAndPowers} retryOpts
+ * @returns {Promise<OfferStatus>}
+ */
+export const getOfferWantsSatisfied = async (id, getLastUpdate, retryOpts) => {
+    // "walletAction" indicates an error, "offerStatus" with the right id and
+    // either `result` or `error` indicates settlement.
+    const isMatch = update => update.updated === 'walletAction' ||
+        (update.updated === 'offerStatus' &&
+            update.status.id === id &&
+            !!(update.status.error || 'numWantsSatisfied' in update.status));
+    const found = 
+    /** @type {UpdateRecord & { updated: 'walletAction' | 'offerStatus' }} */ (await findUpdate(id, getLastUpdate, retryOpts, isMatch));
+    if (found.updated !== 'offerStatus') {
+        throw Fail `${q(id)} ${q(found.updated)} failure: ${q(found.status?.error)}`;
+    }
+    const { error, result } = found.status;
+    !error || Fail `${q(id)} offerStatus failure: ${q(error)}`;
+    result || Fail `${q(id)} offerStatus missing result`;
+    return found.status;
+};
+harden(getOfferWantsSatisfied);
 /**
  * Augment VstorageKit with addtional convenience methods for working with
  * Agoric smart wallets. This use of "kit" is unfortunate because it does not
@@ -20,12 +109,13 @@ import { makeAgoricNames, makeVstorageKit } from './vstorage-kit.js';
  * @param {boolean} [root0.names]
  * @param {MinimalNetworkConfig} networkConfig
  */
-export const makeSmartWalletKit = async ({ fetch, delay, names = true }, networkConfig) => {
+export const makeSmartWalletKit = async ({ fetch, 
+// eslint-disable-next-line no-unused-vars -- keep for removing ambient authority
+delay, names = true, }, networkConfig) => {
     const vsk = makeVstorageKit({ fetch }, networkConfig);
-    const client = makeStargateClient(networkConfig, { fetch });
     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 +141,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 getAddrLastUpdate = () => getLastUpdate(from);
+        // XXX ambient authority
+        const retryOpts = { setTimeout: global.setTimeout };
+        const status = await (untilNumWantsSatisfied
+            ? getOfferWantsSatisfied(id, getAddrLastUpdate, retryOpts)
+            : getOfferResult(id, getAddrLastUpdate, retryOpts));
+        return status;
     };
     /**
      * @param {string} addr

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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"}