@agoric/smart-wallet 0.5.4-other-dev-3eb1a1d.0 → 0.5.4-other-dev-d15096d.0.d15096d

package/src/smartWallet.js

@@ -1,5 +1,5 @@
 import { Fail, q } from '@endo/errors';
-import { E } from '@endo/far';
+import { E, passStyleOf } from '@endo/far';
 import {
   AmountShape,
   BrandShape,
@@ -15,7 +15,7 @@ import {
   StorageNodeShape,
 } from '@agoric/internal';
 import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
-import { M, mustMatch } from '@agoric/store';
+import { M, matches, mustMatch } from '@agoric/store';
 import {
   appendToStoredArray,
   provideLazy,
@@ -36,6 +36,7 @@ import {
 import {
   AmountKeywordRecordShape,
   PaymentPKeywordRecordShape,
+  InvitationElementShape,
 } from '@agoric/zoe/src/typeGuards.js';
 import { prepareVowTools } from '@agoric/vow';
 import { makeDurableZone } from '@agoric/zone/durable.js';
@@ -45,7 +46,25 @@ import { shape } from './typeGuards.js';
 import { objectMapStoragePath } from './utils.js';
 import { prepareOfferWatcher, makeWatchOfferOutcomes } from './offerWatcher.js';
 
-/** @import {OfferId, OfferStatus} from './offers.js'; */
+/**
+ * @import {ERemote, Remote} from '@agoric/internal';
+ * @import {EMarshaller} from '@agoric/internal/src/marshal/wrap-marshaller.js';
+ * @import {Amount, Brand, Issuer, Payment, Purse} from '@agoric/ertp';
+ * @import {WeakMapStore, MapStore} from '@agoric/store'
+ * @import {InvitationAmount, InvitationDetails, PaymentPKeywordRecord, Proposal, UserSeat} from '@agoric/zoe';
+ * @import {CopyRecord} from '@endo/pass-style';
+ * @import {EReturn} from '@endo/far';
+ * @import {OfferId, OfferStatus, OfferSpec, InvokeEntryMessage, ResultPlan} from './offers.js';
+ * @import {MakeOfferWatcher} from './offerWatcher.js';
+ * @import {Petname} from './types.js';
+ * @import {Bank} from '@agoric/vats/src/vat-bank.js';
+ * @import {NameHub} from '@agoric/vats';
+ * @import {InvitationMakers} from './types.js';
+ * @import {RecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
+ * @import {Baggage} from '@agoric/vat-data';
+ * @import {PublicSubscribers} from './types.js';
+ * @import {CapData} from '@endo/marshal';
+ */
 
 const trace = makeTracer('SmrtWlt');
 
@@ -54,24 +73,13 @@ const trace = makeTracer('SmrtWlt');
  * @see {@link ../README.md} }
  */
 
-/** @typedef {number | string} OfferId */
-
-/**
- * @typedef {{
- *   id: OfferId;
- *   invitationSpec: import('./invitations').InvitationSpec;
- *   proposal: Proposal;
- *   offerArgs?: any;
- * }} OfferSpec
- */
-
 /**
  * @typedef {{
  *   logger: {
  *     info: (...args: any[]) => void;
  *     error: (...args: any[]) => void;
  *   };
- *   makeOfferWatcher: import('./offerWatcher.js').MakeOfferWatcher;
+ *   makeOfferWatcher: MakeOfferWatcher;
  *   invitationFromSpec: ERef<Invitation>;
  * }} ExecutorPowers
  */
@@ -90,10 +98,16 @@ const trace = makeTracer('SmrtWlt');
  * }} TryExitOfferAction
  */
 
+/**
+ * @typedef {object} InvokeStoreEntryAction
+ * @property {'invokeEntry'} method BridgeAction discriminator
+ * @property {InvokeEntryMessage} message object method call to make
+ */
+
 // Discriminated union. Possible future messages types:
 // maybe suggestIssuer for https://github.com/Agoric/agoric-sdk/issues/6132
 // setting petnames and adding brands for https://github.com/Agoric/agoric-sdk/issues/6126
-/** @typedef {ExecuteOfferAction | TryExitOfferAction} BridgeAction */
+/** @typedef {ExecuteOfferAction | TryExitOfferAction | InvokeStoreEntryAction} BridgeAction */
 
 /**
  * Purses is an array to support a future requirement of multiple purses per
@@ -132,7 +146,13 @@ const trace = makeTracer('SmrtWlt');
 /**
  * @typedef {{ updated: 'offerStatus'; status: OfferStatus }
  *   | { updated: 'balance'; currentAmount: Amount }
- *   | { updated: 'walletAction'; status: { error: string } }} UpdateRecord
+ *   | { updated: 'walletAction'; status: { error: string } }
+ *   | {
+ *       updated: 'invocation';
+ *       id: string | number;
+ *       error?: string;
+ *       result?: { name?: string; passStyle: string };
+ *     }} UpdateRecord
  *   Record of an update to the state of this wallet.
  *
  *   Client is responsible for coalescing updates into a current state. See
@@ -151,7 +171,7 @@ const trace = makeTracer('SmrtWlt');
  *   brand: Brand;
  *   displayInfo: DisplayInfo;
  *   issuer: Issuer;
- *   petname: import('./types.js').Petname;
+ *   petname: Petname;
  * }} BrandDescriptor
  *   For use by clients to describe brands to users. Includes `displayInfo` to
  *   save a remote call.
@@ -160,10 +180,10 @@ const trace = makeTracer('SmrtWlt');
 /**
  * @typedef {{
  *   address: string;
- *   bank: ERef<import('@agoric/vats/src/vat-bank.js').Bank>;
- *   currentStorageNode: StorageNode;
+ *   bank: ERef<Bank>;
+ *   currentStorageNode: Remote<StorageNode>;
  *   invitationPurse: Purse<'set', InvitationDetails>;
- *   walletStorageNode: StorageNode;
+ *   walletStorageNode: Remote<StorageNode>;
  * }} UniqueParams
  *
  *
@@ -171,12 +191,12 @@ const trace = makeTracer('SmrtWlt');
  *
  *
  * @typedef {{
- *   agoricNames: ERef<import('@agoric/vats').NameHub>;
+ *   agoricNames: ERef<NameHub>;
  *   registry: BrandDescriptorRegistry;
  *   invitationIssuer: Issuer<'set'>;
  *   invitationBrand: Brand<'set'>;
  *   invitationDisplayInfo: DisplayInfo;
- *   publicMarshaller: Marshaller;
+ *   publicMarshaller: ERemote<EMarshaller>;
  *   zoe: ERef<ZoeService>;
  * }} SharedParams
  *
@@ -193,18 +213,16 @@ const trace = makeTracer('SmrtWlt');
  * @typedef {Readonly<
  *   UniqueParams & {
  *     paymentQueues: MapStore<Brand, Payment[]>;
- *     offerToInvitationMakers: MapStore<
- *       string,
- *       import('./types.js').InvitationMakers
- *     >;
+ *     offerToInvitationMakers: MapStore<string, InvitationMakers>;
  *     offerToPublicSubscriberPaths: MapStore<string, Record<string, string>>;
  *     offerToUsedInvitation: MapStore<string, Amount<'set'>>;
  *     purseBalances: MapStore<Purse, Amount>;
- *     updateRecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<UpdateRecord>;
- *     currentRecorderKit: import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<CurrentWalletRecord>;
+ *     updateRecorderKit: RecorderKit<UpdateRecord>;
+ *     currentRecorderKit: RecorderKit<CurrentWalletRecord>;
  *     liveOffers: MapStore<OfferId, OfferStatus>;
  *     liveOfferSeats: MapStore<OfferId, UserSeat<unknown>>;
  *     liveOfferPayments: MapStore<OfferId, MapStore<Brand, Payment>>;
+ *     myStore: MapStore;
  *   }
  * >} ImmutableState
  *
@@ -220,17 +238,17 @@ const trace = makeTracer('SmrtWlt');
  * TODO: consider moving to nameHub.js?
  *
  * @param {unknown} target - passable Key
- * @param {ERef<import('@agoric/vats').NameHub>} nameHub
+ * @param {ERef<NameHub>} nameHub
  */
 const namesOf = async (target, nameHub) => {
   const entries = await E(nameHub).entries();
-  const matches = [];
+  const results = [];
   for (const [name, candidate] of entries) {
     if (candidate === target) {
-      matches.push(name);
+      results.push(name);
     }
   }
-  return harden(matches);
+  return harden(results);
 };
 
 /**
@@ -264,7 +282,7 @@ const getBrandToPurses = (walletPurses, key) => {
 };
 
 /**
- * @param {import('@agoric/vat-data').Baggage} baggage
+ * @param {Baggage} baggage
  * @param {SharedParams} shared
  */
 export const prepareSmartWallet = (baggage, shared) => {
@@ -315,7 +333,9 @@ export const prepareSmartWallet = (baggage, shared) => {
       amountWatcherGuard,
       /**
        * @param {Purse} purse
-       * @param {ReturnType<makeWalletWithResolvedStorageNodes>['helper']} helper
+       * @param {ReturnType<
+       *   typeof makeWalletWithResolvedStorageNodes
+       * >['helper']} helper
        */
       (purse, helper) => ({ purse, helper }),
       {
@@ -350,6 +370,31 @@ export const prepareSmartWallet = (baggage, shared) => {
 
   const makeAmountWatcher = prepareAmountWatcher();
 
+  /**
+   * @param {Amount} amount
+   * @returns {Amount}
+   */
+  const cleanAmountForPublish = amount => {
+    mustMatch(amount, AmountShape);
+    if (
+      !matches(amount.brand, shared.invitationBrand) ||
+      !matches(amount.value, M.arrayOf(InvitationElementShape))
+    ) {
+      return amount;
+    }
+
+    const invitationAmount = /** @type {InvitationAmount} */ (amount);
+    const filteredInvitationValue = invitationAmount.value.map(
+      ({ handle: _, ...filteredInvitationDetails }) =>
+        filteredInvitationDetails,
+    );
+
+    return harden({
+      brand: shared.invitationBrand,
+      value: filteredInvitationValue,
+    });
+  };
+
   /**
    * @param {UniqueParams} unique
    * @returns {State}
@@ -362,6 +407,7 @@ export const prepareSmartWallet = (baggage, shared) => {
         address: M.string(),
         bank: M.eref(M.remotable()),
         invitationPurse: PurseShape,
+        // Should not be M.eref, makeRecordedKit assumes resolved
         currentStorageNode: M.eref(StorageNodeShape),
         walletStorageNode: M.eref(StorageNodeShape),
       }),
@@ -394,14 +440,17 @@ export const prepareSmartWallet = (baggage, shared) => {
           durable: true,
         },
       ),
+      // NB: Wallets before this state property was added do not support
+      // saving results or invoking the saved items.
+      myStore: zone.detached().mapStore('my items'),
     };
 
-    /** @type {import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<UpdateRecord>} */
+    /** @type {RecorderKit<UpdateRecord>} */
     const updateRecorderKit = makeRecorderKit(unique.walletStorageNode);
     // NB: state size must not grow monotonically
     // This is the node that UIs subscribe to for everything they need.
     // e.g. agoric follow :published.wallet.agoric1nqxg4pye30n3trct0hf7dclcwfxz8au84hr3ht
-    /** @type {import('@agoric/zoe/src/contractSupport/recorder.js').RecorderKit<CurrentWalletRecord>} */
+    /** @type {RecorderKit<CurrentWalletRecord>} */
     const currentRecorderKit = makeRecorderKit(unique.currentStorageNode);
 
     const nonpreciousState = {
@@ -426,6 +475,11 @@ export const prepareSmartWallet = (baggage, shared) => {
     };
   };
 
+  const invocationResultShape = M.splitRecord(
+    {},
+    { id: M.or(M.string(), M.number()), saveResult: shape.ResultPlan },
+  );
+
   const behaviorGuards = {
     helper: M.interface('helperFacetI', {
       assertUniqueOfferId: M.call(M.string()).returns(),
@@ -447,6 +501,8 @@ export const prepareSmartWallet = (baggage, shared) => {
       logWalletInfo: M.call().rest(M.arrayOf(M.any())).returns(),
       logWalletError: M.call().rest(M.arrayOf(M.any())).returns(),
       getLiveOfferPayments: M.call().returns(M.remotable('mapStore')),
+      saveEntry: M.call(shape.ResultPlan, M.any()).returns(M.string()),
+      findUnusedName: M.call(M.string()).returns(M.string()),
     }),
 
     deposit: M.interface('depositFacetI', {
@@ -465,11 +521,19 @@ export const prepareSmartWallet = (baggage, shared) => {
       executeOffer: M.call(shape.OfferSpec).returns(M.promise()),
       tryExitOffer: M.call(M.scalar()).returns(M.promise()),
     }),
+    invoke: M.interface('invoke', {
+      invokeEntry: M.callWhen(shape.InvokeEntryMessage).returns(),
+    }),
+    resultStepWatcher: M.interface('resultStepWatcher', {
+      onFulfilled: M.call(M.any(), invocationResultShape).returns(),
+      onRejected: M.call(M.any(), invocationResultShape).returns(),
+    }),
     self: M.interface('selfFacetI', {
       handleBridgeAction: M.call(shape.StringCapData, M.boolean()).returns(
         M.promise(),
       ),
       getDepositFacet: M.call().returns(M.remotable()),
+      getInvokeFacet: M.call().returns(M.remotable()),
       getOffersFacet: M.call().returns(M.remotable()),
       getCurrentSubscriber: M.call().returns(SubscriberShape),
       getUpdatesSubscriber: M.call().returns(SubscriberShape),
@@ -529,7 +593,7 @@ export const prepareSmartWallet = (baggage, shared) => {
           }
           void updateRecorderKit.recorder.write({
             updated: 'balance',
-            currentAmount: balance,
+            currentAmount: cleanAmountForPublish(balance),
           });
           const { helper } = this.facets;
           helper.publishCurrentState();
@@ -546,9 +610,11 @@ export const prepareSmartWallet = (baggage, shared) => {
           void currentRecorderKit.recorder.write({
             purses: [...purseBalances.values()].map(a => ({
               brand: a.brand,
-              balance: a,
+              balance: cleanAmountForPublish(a),
             })),
-            offerToUsedInvitation: [...offerToUsedInvitation.entries()],
+            offerToUsedInvitation: [...offerToUsedInvitation.entries()].map(
+              ([offerId, a]) => [offerId, cleanAmountForPublish(a)],
+            ),
             offerToPublicSubscriberPaths: [
               ...offerToPublicSubscriberPaths.entries(),
             ],
@@ -586,8 +652,7 @@ export const prepareSmartWallet = (baggage, shared) => {
          * transition to decentralized introductions.
          *
          * @param {Brand} brand
-         * @param {ERef<import('@agoric/vats').NameHub>} known - namehub with
-         *   brand, issuer branches
+         * @param {ERef<NameHub>} known - namehub with brand, issuer branches
          * @returns {Promise<Purse | undefined>} undefined if brand is not known
          */
         async getPurseIfKnownBrand(brand, known) {
@@ -666,8 +731,8 @@ export const prepareSmartWallet = (baggage, shared) => {
         /**
          * @param {string} offerId
          * @param {Amount<'set'>} invitationAmount
-         * @param {import('./types.js').InvitationMakers} invitationMakers
-         * @param {import('./types.js').PublicSubscribers} publicSubscribers
+         * @param {InvitationMakers} invitationMakers
+         * @param {PublicSubscribers} publicSubscribers
          */
         async addContinuingOffer(
           offerId,
@@ -739,6 +804,35 @@ export const prepareSmartWallet = (baggage, shared) => {
           }
           return baggage.get(state.address);
         },
+        /** @param {string} suggestion */
+        findUnusedName(suggestion) {
+          const { myStore } = this.state;
+          let nonce = 0;
+          let name = suggestion;
+          while (myStore.has(name)) {
+            nonce += myStore.getSize(); // avoid linear work
+            name = `${suggestion}.${nonce}`;
+          }
+          return name;
+        },
+        /**
+         * @param {ResultPlan} plan
+         * @param {unknown} value
+         */
+        saveEntry(plan, value) {
+          const { myStore } = this.state;
+          const name = plan.overwrite
+            ? plan.name
+            : this.facets.helper.findUnusedName(plan.name);
+
+          if (myStore.has(name)) {
+            myStore.set(name, value);
+          } else {
+            myStore.init(name, value);
+          }
+          trace('set', name, '=', value);
+          return name;
+        },
       },
       /**
        * Similar to {DepositFacet} but async because it has to look up the
@@ -1013,19 +1107,90 @@ export const prepareSmartWallet = (baggage, shared) => {
           await E(seatRef).tryExit();
         },
       },
+
+      invoke: {
+        /**
+         * @param {InvokeEntryMessage} message
+         */
+        async invokeEntry(message) {
+          trace('invokeEntry', message);
+          const { myStore } = this.state;
+          const { resultStepWatcher } = this.facets;
+
+          const { targetName: name, method, args, saveResult, id } = message;
+          myStore.has(name) || Fail`cannot invoke ${q(name)}: no such item`;
+          const value = myStore.get(name);
+          trace('entry', name, value);
+          trace('invoke', value, '.', method, '(', args, ')');
+          if (id) {
+            const { updateRecorderKit } = this.state;
+            void updateRecorderKit.recorder.write({
+              updated: 'invocation',
+              id,
+            });
+          }
+          const callP = E(value)[method](...args);
+          if (id || saveResult) {
+            vowTools.watch(callP, resultStepWatcher, { id, saveResult });
+          } else {
+            void callP;
+          }
+        },
+      },
+
+      resultStepWatcher: {
+        /**
+         * @param {unknown} result
+         * @param {{ id?: string | number; saveResult?: ResultPlan }} opts
+         */
+        onFulfilled(result, opts) {
+          trace('resultStepWatcher opts', opts);
+          const { id, saveResult } = opts;
+          if (saveResult) {
+            this.facets.helper.saveEntry(saveResult, result);
+          }
+          const passStyle = passStyleOf(result);
+          const { updateRecorderKit } = this.state;
+          if (id) {
+            void updateRecorderKit.recorder.write({
+              updated: 'invocation',
+              id,
+              result: {
+                ...(saveResult?.name ? { name: saveResult.name } : {}),
+                passStyle,
+              },
+            });
+          }
+        },
+        /**
+         * @param {unknown} reason
+         * @param {{ id: string | number; saveResult?: ResultPlan }} opts
+         */
+        onRejected(reason, opts) {
+          trace('rejected', reason, opts);
+          if (opts.id) {
+            const { updateRecorderKit } = this.state;
+            void updateRecorderKit.recorder.write({
+              updated: 'invocation',
+              id: opts.id,
+              error: String(reason),
+            });
+          }
+        },
+      },
+
       self: {
         /**
          * Umarshals the actionCapData and delegates to the appropriate action
          * handler.
          *
-         * @param {import('@endo/marshal').CapData<string | null>} actionCapData
-         *   of type BridgeAction
+         * @param {CapData<string | null>} actionCapData of type BridgeAction
          * @param {boolean} [canSpend]
          * @returns {Promise<void>}
          */
         handleBridgeAction(actionCapData, canSpend = false) {
-          const { facets } = this;
-          const { offers } = facets;
+          const { facets, state } = this;
+          const { offers, invoke } = facets;
           const { publicMarshaller } = shared;
 
           /** @param {Error} err */
@@ -1038,6 +1203,8 @@ export const prepareSmartWallet = (baggage, shared) => {
             });
           };
 
+          const walletHasNameHub = 'myStore' in state && state.myStore != null;
+
           // use E.when to retain distributed stack trace
           return E.when(
             E(publicMarshaller).fromCapData(actionCapData),
@@ -1047,12 +1214,21 @@ export const prepareSmartWallet = (baggage, shared) => {
                 switch (action.method) {
                   case 'executeOffer': {
                     canSpend || Fail`executeOffer requires spend authority`;
+                    if (action.offer.saveResult != null && !walletHasNameHub) {
+                      Fail`executeOffer saveResult requires a new smart wallet with myStore`;
+                    }
+
                     return offers.executeOffer(action.offer);
                   }
                   case 'tryExitOffer': {
                     assert(canSpend, 'tryExitOffer requires spend authority');
                     return offers.tryExitOffer(action.offerId);
                   }
+                  case 'invokeEntry': {
+                    walletHasNameHub ||
+                      Fail`invokeEntry requires a new smart wallet with myStore`;
+                    return invoke.invokeEntry(action.message);
+                  }
                   default: {
                     throw Fail`invalid handle bridge action ${q(action)}`;
                   }
@@ -1071,6 +1247,9 @@ export const prepareSmartWallet = (baggage, shared) => {
         getDepositFacet() {
           return this.facets.deposit;
         },
+        getInvokeFacet() {
+          return this.facets.invoke;
+        },
         getOffersFacet() {
           return this.facets.offers;
         },
@@ -1118,7 +1297,7 @@ export const prepareSmartWallet = (baggage, shared) => {
    *   UniqueParams,
    *   'currentStorageNode' | 'walletStorageNode'
    * > & {
-   *   walletStorageNode: ERef<StorageNode>;
+   *   walletStorageNode: ERemote<StorageNode>;
    * }} uniqueWithoutChildNodes
    */
   const makeSmartWallet = async uniqueWithoutChildNodes => {
@@ -1138,5 +1317,4 @@ export const prepareSmartWallet = (baggage, shared) => {
   return makeSmartWallet;
 };
 harden(prepareSmartWallet);
-
-/** @typedef {Awaited<ReturnType<ReturnType<typeof prepareSmartWallet>>>} SmartWallet */
+/** @typedef {EReturn<EReturn<typeof prepareSmartWallet>>} SmartWallet */

package/src/typeGuards.js

@@ -4,6 +4,28 @@ import {
   ProposalShape,
 } from '@agoric/zoe/src/typeGuards.js';
 
+/**
+ * @import {TypedPattern} from '@agoric/internal';
+ * @import {InvokeEntryMessage, ResultPlan} from './offers.js';
+ */
+
+/** @type {TypedPattern<ResultPlan>} */
+const ResultPlanShape = M.splitRecord(
+  { name: M.string() },
+  { overwrite: M.boolean() },
+  {},
+);
+/** @type {TypedPattern<InvokeEntryMessage>} */
+const InvokeEntryMessageShape = M.splitRecord(
+  {
+    targetName: M.string(),
+    method: M.string(),
+    args: M.array(),
+  },
+  { saveResult: ResultPlanShape, id: M.or(M.number(), M.string()) },
+  {},
+);
+
 export const shape = {
   // smartWallet
   StringCapData: {
@@ -51,8 +73,14 @@ export const shape = {
       invitationSpec: M.any(),
       proposal: ProposalShape,
     },
-    { offerArgs: M.any() },
+    {
+      offerArgs: M.any(),
+      saveResult: ResultPlanShape,
+    },
+    {},
   ),
+  ResultPlan: ResultPlanShape,
+  InvokeEntryMessage: InvokeEntryMessageShape,
 
   // walletFactory
   /**

package/src/types.d.ts

@@ -4,11 +4,12 @@
  * Similar to types.js but in TypeScript syntax because some types here need it.
  * Downside is it can't reference any ambient types, which most of agoric-sdk type are presently.
  */
+import type { Payment } from '@agoric/ertp';
 import type { AgoricNamesRemotes } from '@agoric/vats/tools/board-utils.js';
+import type { InvitationDetails } from '@agoric/zoe';
 import type { PublicTopic } from '@agoric/zoe/src/contractSupport/topics.js';
-import type { Payment } from '@agoric/ertp';
 import type { OfferSpec } from './offers.js';
-type Invitation = Payment<'set'>;
+type Invitation = Payment<'set', InvitationDetails>;
 /**
  * A petname can either be a plain string or a path for which the first element
  * is a petname for the origin, and the rest of the elements are a snapshot of

package/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAM7C,KAAK,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;AAEjC;;;;;GAKG;AACH,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;AAExC,MAAM,MAAM,gBAAgB,GAAG,MAAM,CACnC,MAAM,EACN,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,UAAU,CAAC,CACxC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;AAErE,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,iBAAiB,EAAE,iBAAiB,CAAC;CACtC;AAED,MAAM,MAAM,IAAI,CAAC,CAAC,IAAI;IACpB,GAAG,EAAE,MAAM,CAAC,CAAC;IACb,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC;CACnB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,eAAe,CAAC;IACtB,2CAA2C;IAC3C,KAAK,EAAE,MAAM,CAAC;IACd,sCAAsC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,qBAAqB,CAAC;IAC5B,2CAA2C;IAC3C,KAAK,EAAE,MAAM,CAAC;IACd,kCAAkC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG,eAAe,GAAG,oBAAoB,CAAC;AAErE;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,CACvB,WAAW,EAAE,kBAAkB,EAC/B,GAAG,IAAI,EAAE,GAAG,EAAE,KACX,SAAS,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAI7C,KAAK,UAAU,GAAG,OAAO,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;AAEpD;;;;;GAKG;AACH,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;AAExC,MAAM,MAAM,gBAAgB,GAAG,MAAM,CACnC,MAAM,EACN,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,UAAU,CAAC,CACxC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;AAErE,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,iBAAiB,EAAE,iBAAiB,CAAC;CACtC;AAED,MAAM,MAAM,IAAI,CAAC,CAAC,IAAI;IACpB,GAAG,EAAE,MAAM,CAAC,CAAC;IACb,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC;CACnB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,eAAe,CAAC;IACtB,2CAA2C;IAC3C,KAAK,EAAE,MAAM,CAAC;IACd,sCAAsC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,qBAAqB,CAAC;IAC5B,2CAA2C;IAC3C,KAAK,EAAE,MAAM,CAAC;IACd,kCAAkC;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG,eAAe,GAAG,oBAAoB,CAAC;AAErE;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,CACvB,WAAW,EAAE,kBAAkB,EAC/B,GAAG,IAAI,EAAE,GAAG,EAAE,KACX,SAAS,CAAC"}

package/src/types.ts

@@ -5,17 +5,17 @@
  * Downside is it can't reference any ambient types, which most of agoric-sdk type are presently.
  */
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars -- fails to notice the @see uses
 import type { agoric } from '@agoric/cosmic-proto/agoric/bundle.js';
+import type { Payment } from '@agoric/ertp';
 import type { AgoricNamesRemotes } from '@agoric/vats/tools/board-utils.js';
+import type { InvitationDetails } from '@agoric/zoe';
 import type { PublicTopic } from '@agoric/zoe/src/contractSupport/topics.js';
-import type { Payment } from '@agoric/ertp';
 import type { OfferSpec } from './offers.js';
 
-declare const CapDataShape: unique symbol;
-
 // Match the type in Zoe, which can't be imported because it's ambient.
 // This omits the parameters that aren't used in this module.
-type Invitation = Payment<'set'>;
+type Invitation = Payment<'set', InvitationDetails>;
 
 /**
  * A petname can either be a plain string or a path for which the first element

package/src/utils.d.ts

@@ -1,8 +1,14 @@
-/** @import {OfferId, OfferStatus} from './offers.js'; */
+/**
+ * @import {OfferId, OfferStatus} from './offers.js';
+ * @import {UpdateRecord} from './smartWallet.js';
+ * @import {Follower} from '@agoric/casting';
+ * @import {PublicSubscribers} from './types.js';
+ * @import {TopicsRecord} from '@agoric/zoe/src/contractSupport/index.js';
+ */
 export const NO_SMART_WALLET_ERROR: "no smart wallet";
-export function makeWalletStateCoalescer(invitationBrand?: globalThis.Brand<"set"> | undefined): {
+export function makeWalletStateCoalescer(invitationBrand?: Brand<"set">): {
     state: {
-        invitationsReceived: Map<OfferId, {
+        invitationsReceived: Map<string, {
             acceptedIn: OfferId;
             description: string;
             instance: Instance;
@@ -10,10 +16,10 @@ export function makeWalletStateCoalescer(invitationBrand?: globalThis.Brand<"set
         offerStatuses: Map<OfferId, OfferStatus>;
         balances: Map<globalThis.Brand, globalThis.Amount>;
     };
-    update: (updateRecord: import("./smartWallet.js").UpdateRecord | {}) => void;
+    update: (updateRecord: UpdateRecord | {}) => void;
 };
-export function coalesceUpdates(updates: ERef<Subscriber<import("./smartWallet.js").UpdateRecord>>, invitationBrand?: globalThis.Brand<"set"> | undefined): {
-    invitationsReceived: Map<OfferId, {
+export function coalesceUpdates(updates: ERef<Subscriber<UpdateRecord>>, invitationBrand?: Brand<"set">): {
+    invitationsReceived: Map<string, {
         acceptedIn: OfferId;
         description: string;
         instance: Instance;
@@ -21,9 +27,13 @@ export function coalesceUpdates(updates: ERef<Subscriber<import("./smartWallet.j
     offerStatuses: Map<OfferId, OfferStatus>;
     balances: Map<globalThis.Brand, globalThis.Amount>;
 };
-export function assertHasData(follower: import("@agoric/casting").Follower<any>): Promise<void>;
-export function objectMapStoragePath(subscribers?: import("@agoric/zoe/src/contractSupport/topics.js").TopicsRecord | import("./types.js").PublicSubscribers | undefined): ERef<Record<string, string>> | null;
+export function assertHasData(follower: Follower<any>): Promise<void>;
+export function objectMapStoragePath(subscribers?: PublicSubscribers | TopicsRecord): ERef<Record<string, string>> | null;
 export type CoalescedWalletState = ReturnType<typeof makeWalletStateCoalescer>["state"];
 import type { OfferId } from './offers.js';
 import type { OfferStatus } from './offers.js';
+import type { UpdateRecord } from './smartWallet.js';
+import type { Follower } from '@agoric/casting';
+import type { PublicSubscribers } from './types.js';
+import type { TopicsRecord } from '@agoric/zoe/src/contractSupport/index.js';
 //# sourceMappingURL=utils.d.ts.map