@agoric/smart-wallet 0.5.4-upgrade-14-dev-c8f9e7b.0 → 0.5.4-upgrade-16-dev-8879538.0

package/src/offerWatcher.js

@@ -12,18 +12,12 @@ import { deeplyFulfilledObject, objectMap } from '@agoric/internal';
 
 import { UNPUBLISHED_RESULT } from './offers.js';
 
-/**
- * @typedef {import('./offers.js').OfferSpec & {
- *   error?: string,
- *   numWantsSatisfied?: number
- *   result?: unknown | typeof import('./offers.js').UNPUBLISHED_RESULT,
- *   payouts?: AmountKeywordRecord,
- * }} OfferStatus
- */
+/** @import {OfferSpec} from "./offers.js" */
+/** @import {PromiseWatcher} from '@agoric/swingset-liveslots' */
 
 /**
  * @template {any} T
- * @typedef {{ onFulfilled: (any) => any, onRejected: (err: Error, seat: any) => void }} OfferPromiseWatcher<T, [UserSeat]
+ * @typedef {PromiseWatcher<T, [UserSeat]>} OfferPromiseWatcher<T, [UserSeat]
  */
 
 /**
@@ -40,7 +34,6 @@ import { UNPUBLISHED_RESULT } from './offers.js';
  */
 const watchForOfferResult = ({ resultWatcher }, seat) => {
   const p = E(seat).getOfferResult();
-  // @ts-expect-error missing declarations?
   watchPromise(p, resultWatcher, seat);
   return p;
 };
@@ -51,7 +44,6 @@ const watchForOfferResult = ({ resultWatcher }, seat) => {
  */
 const watchForNumWants = ({ numWantsWatcher }, seat) => {
   const p = E(seat).numWantsSatisfied();
-  // @ts-expect-error missing declarations?
   watchPromise(p, numWantsWatcher, seat);
   return p;
 };
@@ -62,7 +54,6 @@ const watchForNumWants = ({ numWantsWatcher }, seat) => {
  */
 const watchForPayout = ({ paymentWatcher }, seat) => {
   const p = E(seat).getPayouts();
-  // @ts-expect-error missing declarations?
   watchPromise(p, paymentWatcher, seat);
   return p;
 };
@@ -90,6 +81,7 @@ const offerWatcherGuard = harden({
       .optional(M.record())
       .returns(),
     publishResult: M.call(M.any()).returns(),
+    handleError: M.call(M.error()).returns(),
   }),
   paymentWatcher: M.interface('paymentWatcher', {
     onFulfilled: M.call(PaymentPKeywordRecordShape, SeatShape).returns(
@@ -107,27 +99,48 @@ const offerWatcherGuard = harden({
   }),
 });
 
+/**
+ * @param {import('@agoric/vat-data').Baggage} baggage
+ */
 export const prepareOfferWatcher = baggage => {
   return prepareExoClassKit(
     baggage,
     'OfferWatcher',
     offerWatcherGuard,
-    (walletHelper, deposit, offerSpec, address, iAmount, seatRef) => ({
+    /**
+     *
+     * @param {*} walletHelper
+     * @param {*} deposit
+     * @param {OfferSpec} offerSpec
+     * @param {string} address
+     * @param {Amount<'set'>} invitationAmount
+     * @param {UserSeat} seatRef
+     */
+    (walletHelper, deposit, offerSpec, address, invitationAmount, seatRef) => ({
       walletHelper,
       deposit,
       status: offerSpec,
       address,
-      invitationAmount: iAmount,
+      invitationAmount,
       seatRef,
     }),
     {
       helper: {
+        /**
+         * @param {Record<string, unknown>} offerStatusUpdates
+         */
         updateStatus(offerStatusUpdates) {
           const { state } = this;
           state.status = harden({ ...state.status, ...offerStatusUpdates });
 
           state.walletHelper.updateStatus(state.status);
         },
+        /**
+         * @param {string} offerId
+         * @param {Amount<"set">} invitationAmount
+         * @param {import('./types.js').InvitationMakers} invitationMakers
+         * @param {import("./types.js").PublicSubscribers} publicSubscribers
+         */
         onNewContinuingOffer(
           offerId,
           invitationAmount,
@@ -144,6 +157,7 @@ export const prepareOfferWatcher = baggage => {
           );
         },
 
+        /** @param {unknown} result */
         publishResult(result) {
           const { state, facets } = this;
 
@@ -160,13 +174,16 @@ export const prepareOfferWatcher = baggage => {
               facets.helper.updateStatus({ result });
               break;
             case 'copyRecord':
+              // @ts-expect-error narrowed by passStyle
               if ('invitationMakers' in result) {
                 // save for continuing invitation offer
 
                 void facets.helper.onNewContinuingOffer(
                   String(state.status.id),
                   state.invitationAmount,
+                  // @ts-expect-error narrowed by passStyle
                   result.invitationMakers,
+                  // @ts-expect-error narrowed by passStyle
                   result.publicSubscribers,
                 );
               }
@@ -177,6 +194,22 @@ export const prepareOfferWatcher = baggage => {
               facets.helper.updateStatus({ result: UNPUBLISHED_RESULT });
           }
         },
+        /**
+         * Called when the offer result promise rejects. The other two watchers
+         * are waiting for particular values out of Zoe but they settle at the same time
+         * and don't need their own error handling.
+         * @param {Error} err
+         */
+        handleError(err) {
+          const { facets } = this;
+          facets.helper.updateStatus({ error: err.toString() });
+          const { seatRef } = this.state;
+          void E.when(E(seatRef).hasExited(), hasExited => {
+            if (!hasExited) {
+              void E(seatRef).tryExit();
+            }
+          });
+        },
       },
 
       /** @type {OutcomeWatchers['paymentWatcher']} */
@@ -193,13 +226,17 @@ export const prepareOfferWatcher = baggage => {
           facets.helper.updateStatus({ payouts: amounts });
         },
         /**
-         * @param {Error} err
+         * If promise disconnected, watch again. Or if there's an Error, handle it.
+         *
+         * @param {Error | import('@agoric/internal/src/upgrade-api.js').UpgradeDisconnection} reason
          * @param {UserSeat} seat
          */
-        onRejected(err, seat) {
+        onRejected(reason, seat) {
           const { facets } = this;
-          if (isUpgradeDisconnection(err)) {
+          if (isUpgradeDisconnection(reason)) {
             void watchForPayout(facets, seat);
+          } else {
+            facets.helper.handleError(reason);
           }
         },
       },
@@ -211,13 +248,17 @@ export const prepareOfferWatcher = baggage => {
           facets.helper.publishResult(result);
         },
         /**
-         * @param {Error} err
+         * If promise disconnected, watch again. Or if there's an Error, handle it.
+         *
+         * @param {Error | import('@agoric/internal/src/upgrade-api.js').UpgradeDisconnection} reason
          * @param {UserSeat} seat
          */
-        onRejected(err, seat) {
+        onRejected(reason, seat) {
           const { facets } = this;
-          if (isUpgradeDisconnection(err)) {
+          if (isUpgradeDisconnection(reason)) {
             void watchForOfferResult(facets, seat);
+          } else {
+            facets.helper.handleError(reason);
           }
         },
       },
@@ -230,12 +271,18 @@ export const prepareOfferWatcher = baggage => {
           facets.helper.updateStatus({ numWantsSatisfied: numSatisfied });
         },
         /**
-         * @param {Error} err
+         * If promise disconnected, watch again.
+         *
+         * Errors are handled by the paymentWatcher because numWantsSatisfied()
+         * and getPayouts() settle the same (they await the same promise and
+         * then synchronously return a local value).
+         *
+         * @param {Error | import('@agoric/internal/src/upgrade-api.js').UpgradeDisconnection} reason
          * @param {UserSeat} seat
          */
-        onRejected(err, seat) {
+        onRejected(reason, seat) {
           const { facets } = this;
-          if (isUpgradeDisconnection(err)) {
+          if (isUpgradeDisconnection(reason)) {
             void watchForNumWants(facets, seat);
           }
         },
@@ -246,3 +293,4 @@ export const prepareOfferWatcher = baggage => {
 harden(prepareOfferWatcher);
 
 /** @typedef {ReturnType<typeof prepareOfferWatcher>} MakeOfferWatcher */
+/** @typedef {ReturnType<MakeOfferWatcher>} OfferWatcher */

package/src/offers.d.ts

@@ -4,9 +4,9 @@
 /**
  * @typedef {{
  *   id: OfferId,
- *   invitationSpec: import('./invitations').InvitationSpec,
+ *   invitationSpec: import('./invitations.js').InvitationSpec,
  *   proposal: Proposal,
- *   offerArgs?: unknown
+ *   offerArgs?: any
  * }} OfferSpec
  */
 /** Value for "result" field when the result can't be published */
@@ -14,11 +14,11 @@ export const UNPUBLISHED_RESULT: "UNPUBLISHED";
 export type OfferId = number | string;
 export type OfferSpec = {
     id: OfferId;
-    invitationSpec: import('./invitations').InvitationSpec;
+    invitationSpec: import("./invitations.js").InvitationSpec;
     proposal: Proposal;
-    offerArgs?: unknown;
+    offerArgs?: any;
 };
-export type OfferStatus = import('./offers.js').OfferSpec & {
+export type OfferStatus = OfferSpec & {
     error?: string;
     numWantsSatisfied?: number;
     result?: unknown | typeof UNPUBLISHED_RESULT;

package/src/offers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"offers.d.ts","sourceRoot":"","sources":["offers.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;;;;GAOG;AAEH,kEAAkE;AAClE,+CAAgD;sBAbnC,MAAM,GAAG,MAAM;wBAIf;IACZ,EAAM,EAAE,OAAO,CAAC;IAChB,cAAkB,EAAE,OAAO,eAAe,EAAE,cAAc,CAAC;IAC3D,QAAY,EAAE,QAAQ,CAAC;IACvB,SAAa,CAAC,EAAE,OAAO,CAAA;CACpB;0BAOS,OAAO,aAAa,EAAE,SAAS,GAAG;IAC9C,KAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,MAAQ,CAAC,EAAE,OAAO,GAAG,yBAAyB,CAAC;IAC/C,OAAS,CAAC,EAAE,mBAAmB,CAAC;CAC7B"}
+{"version":3,"file":"offers.d.ts","sourceRoot":"","sources":["offers.js"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;;;;;;GAOG;AAEH,kEAAkE;AAClE,+CAAgD;sBAbnC,MAAM,GAAG,MAAM;wBAIf;IACZ,EAAM,EAAE,OAAO,CAAC;IAChB,cAAkB,EAAE,OAAO,kBAAkB,EAAE,cAAc,CAAC;IAC9D,QAAY,EAAE,QAAQ,CAAC;IACvB,SAAa,CAAC,EAAE,GAAG,CAAA;CAChB;0BAOS,SAAS,GAAG;IACxB,KAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,MAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,kBAAkB,CAAC;IAC/C,OAAS,CAAC,EAAE,mBAAmB,CAAC;CAC7B"}

package/src/offers.js

@@ -5,9 +5,9 @@
 /**
  * @typedef {{
  *   id: OfferId,
- *   invitationSpec: import('./invitations').InvitationSpec,
+ *   invitationSpec: import('./invitations.js').InvitationSpec,
  *   proposal: Proposal,
- *   offerArgs?: unknown
+ *   offerArgs?: any
  * }} OfferSpec
  */
 
@@ -15,7 +15,7 @@
 export const UNPUBLISHED_RESULT = 'UNPUBLISHED';
 
 /**
- * @typedef {import('./offers.js').OfferSpec & {
+ * @typedef {OfferSpec & {
  * error?: string,
  * numWantsSatisfied?: number
  * result?: unknown | typeof UNPUBLISHED_RESULT,

package/src/proposals/upgrade-wallet-factory2-proposal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade-wallet-factory2-proposal.d.ts","sourceRoot":"","sources":["upgrade-wallet-factory2-proposal.js"],"names":[],"mappings":"AASO,qKAJI,eAAe,GAAG,mBAAmB;;mBAExB,YAAY;;kBAqCnC;AAEM;;;;;;;;;;;;;;;;EAYL"}
+{"version":3,"file":"upgrade-wallet-factory2-proposal.d.ts","sourceRoot":"","sources":["upgrade-wallet-factory2-proposal.js"],"names":[],"mappings":"AAWO,qKAJI,eAAe,GAAG,mBAAmB;IAEA,OAAO,EAA5C;QAAE,SAAS,EAAE,YAAY,CAAA;KAAE;kBAoCrC;AAEM;;;;;;;;;;;;;;;;EAYL"}

package/src/proposals/upgrade-wallet-factory2-proposal.js

@@ -1,4 +1,6 @@
 // @ts-check
+/// <reference types="@agoric/vats/src/core/types-ambient" />
+
 import { E } from '@endo/far';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 
@@ -27,7 +29,6 @@ export const upgradeWalletFactory = async (
     makeStorageNodeChild(chainStorage, WALLET_STORAGE_PATH_SEGMENT),
     provisionPoolStartResult,
   ]);
-  // @ts-expect-error missing type declaration?
   const walletReviver = await E(ppFacets.creatorFacet).getWalletReviver();
 
   const privateArgs = {

package/src/proposals/upgrade-walletFactory-proposal.d.ts

@@ -1,4 +1,4 @@
-export function upgradeWalletFactory({ consume: { contractKits: kitsP, instancePrivateArgs: argsP }, instance: { consume: { walletFactory: wfInstanceP }, }, }: BootstrapPowers, config: {
+export function upgradeWalletFactory({ consume: { contractKits, governedContractKits, chainStorage, walletBridgeManager: walletBridgeManagerP, }, instance: { consume: { walletFactory: wfInstanceP, provisionPool: ppInstanceP }, }, }: BootstrapPowers, config: {
     options: {
         walletFactoryRef: VatSourceRef & {
             bundleID: string;

package/src/proposals/upgrade-walletFactory-proposal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade-walletFactory-proposal.d.ts","sourceRoot":"","sources":["upgrade-walletFactory-proposal.js"],"names":[],"mappings":"AAoBO,gKALK,eAAe;;0BAGI,YAAY,GAAG;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE;;kBA6BjE;AAMM,mGAFK,eAAe,iBAwB1B;AAsBM;;;;;;;EAKN"}
+{"version":3,"file":"upgrade-walletFactory-proposal.d.ts","sourceRoot":"","sources":["upgrade-walletFactory-proposal.js"],"names":[],"mappings":"AAqBO,yOALK,eAAe;IAGkD,OAAO,EAAzE;QAAE,gBAAgB,EAAE,YAAY,GAAG;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE;kBAkDnE;AAMM,mGAFK,eAAe,iBAwB1B;AAyBM;;;;;;;EAKN"}

package/src/proposals/upgrade-walletFactory-proposal.js

@@ -8,6 +8,7 @@ console.warn('upgrade-walletFactory-proposal.js module evaluating');
 const { Fail } = assert;
 
 // vstorage paths under published.*
+const WALLET_STORAGE_PATH_SEGMENT = 'wallet';
 const BOARD_AUX = 'boardAux';
 
 const marshalData = makeMarshal(_val => Fail`data only`);
@@ -20,9 +21,14 @@ const marshalData = makeMarshal(_val => Fail`data only`);
  */
 export const upgradeWalletFactory = async (
   {
-    consume: { contractKits: kitsP, instancePrivateArgs: argsP },
+    consume: {
+      contractKits,
+      governedContractKits,
+      chainStorage,
+      walletBridgeManager: walletBridgeManagerP,
+    },
     instance: {
-      consume: { walletFactory: wfInstanceP },
+      consume: { walletFactory: wfInstanceP, provisionPool: ppInstanceP },
     },
   },
   config,
@@ -30,20 +36,36 @@ export const upgradeWalletFactory = async (
   console.log('upgradeWalletFactory: config', config);
   const { walletFactoryRef } = config.options;
 
-  console.log('upgradeWalletFactory: awaiting instance');
-  const wfInstance = await wfInstanceP;
-  console.log('upgradeWalletFactory: awaiting contract kits');
-  const { contractKits, instancePrivateArgs } = await allValues({
-    contractKits: kitsP,
-    instancePrivateArgs: argsP,
+  // console.log('upgradeWalletFactory: awaiting instances etc.');
+  const { wfInstance, ppInstance, walletBridgeManager, storageNode } =
+    await allValues({
+      wfInstance: wfInstanceP,
+      ppInstance: ppInstanceP,
+      walletBridgeManager: walletBridgeManagerP,
+      // @ts-expect-error chainStorage is only falsy in testing
+      storageNode: E(chainStorage).makeChildNode(WALLET_STORAGE_PATH_SEGMENT),
+    });
+  // console.log('upgradeWalletFactory: awaiting contract kits');
+  const { wfKit, ppKit } = await allValues({
+    wfKit: E(contractKits).get(wfInstance),
+    ppKit: E(governedContractKits).get(ppInstance),
   });
-  const { adminFacet } = contractKits.get(wfInstance);
-  /** @type {Parameters<typeof import('../walletFactory').prepare>[1]} */
-  // @ts-expect-error cast
-  const unsettledArgs = instancePrivateArgs.get(wfInstance);
-  const privateArgs = await allValues(unsettledArgs);
-  console.log('upgradeWalletFactory: upgrading with privateArgs', privateArgs);
-  await E(adminFacet).upgradeContract(walletFactoryRef.bundleID, privateArgs);
+  // console.log('upgradeWalletFactory: awaiting walletReviver');
+  const walletReviver = await E(ppKit.creatorFacet).getWalletReviver();
+  const newPrivateArgs = harden({
+    storageNode,
+    walletBridgeManager,
+    walletReviver,
+  });
+
+  console.log(
+    'upgradeWalletFactory: upgrading with newPrivateArgs',
+    newPrivateArgs,
+  );
+  await E(wfKit.adminFacet).upgradeContract(
+    walletFactoryRef.bundleID,
+    newPrivateArgs,
+  );
   console.log('upgradeWalletFactory: done');
 };
 harden(upgradeWalletFactory);
@@ -68,7 +90,7 @@ export const publishAgoricBrandsDisplayInfo = async ({
     await E(node).setValue(JSON.stringify(aux));
   };
 
-  /** @type {ERef<NameHub>} */
+  /** @type {ERef<import('@agoric/vats').NameHub>} */
   const brandHub = E(agoricNames).lookup('brand');
   const brands = await E(brandHub).values();
   // tolerate failure; in particular, for the timer brand
@@ -82,7 +104,10 @@ const manifest = {
     // include rationale for closely-held, high authority capabilities
     consume: {
       contractKits: `to upgrade walletFactory using its adminFacet`,
-      instancePrivateArgs: `to get privateArgs for walletFactory`,
+      governedContractKits:
+        'to get walletReviver from provisionPool.creatorFacet',
+      chainStorage: 'to allow walletFactory to (continue) write to vstorage',
+      walletBridgeManager: 'to handle bridged cosmos SpendAction messages',
     },
     // widely-shared, low authority instance handles need no rationale
     instance: {

package/src/smartWallet.d.ts

@@ -1,16 +1,16 @@
 export const BRAND_TO_PURSES_KEY: "brandToPurses";
-export function prepareSmartWallet(baggage: MapStore<string, unknown>, shared: SharedParams): (uniqueWithoutChildNodes: Omit<UniqueParams, "currentStorageNode" | "walletStorageNode"> & {
+export function prepareSmartWallet(baggage: import("@agoric/vat-data").Baggage, shared: SharedParams): (uniqueWithoutChildNodes: Omit<UniqueParams, "currentStorageNode" | "walletStorageNode"> & {
     walletStorageNode: ERef<StorageNode>;
-}) => Promise<{
+}) => Promise<import("@endo/exo").Guarded<{
     /**
      * Umarshals the actionCapData and delegates to the appropriate action handler.
      *
-     * @param {import('@endo/marshal').CapData<string>} actionCapData of type BridgeAction
+     * @param {import('@endo/marshal').CapData<string | null>} actionCapData of type BridgeAction
      * @param {boolean} [canSpend]
      * @returns {Promise<void>}
      */
-    handleBridgeAction(actionCapData: import('@endo/marshal').CapData<string>, canSpend?: boolean | undefined): Promise<void>;
-    getDepositFacet(): {
+    handleBridgeAction(actionCapData: import("@endo/marshal").CapData<string | null>, canSpend?: boolean | undefined): Promise<void>;
+    getDepositFacet(): import("@endo/exo").Guarded<{
         /**
          * Put the assets from the payment into the appropriate purse.
          *
@@ -21,8 +21,8 @@ export function prepareSmartWallet(baggage: MapStore<string, unknown>, shared: S
          * @throws if there's not yet a purse, though the payment is held to try again when there is
          */
         receive(payment: Payment): Promise<Amount>;
-    };
-    getOffersFacet(): {
+    }>;
+    getOffersFacet(): import("@endo/exo").Guarded<{
         /**
          * Take an offer description provided in capData, augment it with payments and call zoe.offer()
          *
@@ -39,52 +39,51 @@ export function prepareSmartWallet(baggage: MapStore<string, unknown>, shared: S
          * @throws if the seat can't be found or E(seatRef).tryExit() fails.
          */
         tryExitOffer(offerId: OfferId): Promise<void>;
-    };
+    }>;
     /** @deprecated use getPublicTopics */
-    getCurrentSubscriber(): Subscriber<CurrentWalletRecord>;
+    getCurrentSubscriber(): globalThis.Subscriber<CurrentWalletRecord>;
     /** @deprecated use getPublicTopics */
-    getUpdatesSubscriber(): Subscriber<UpdateRecord>;
+    getUpdatesSubscriber(): globalThis.Subscriber<UpdateRecord>;
     getPublicTopics(): {
         current: {
             description: string;
-            subscriber: Subscriber<CurrentWalletRecord>;
+            subscriber: globalThis.Subscriber<CurrentWalletRecord>;
             storagePath: Promise<string>;
         };
         updates: {
             description: string;
-            subscriber: Subscriber<UpdateRecord>;
+            subscriber: globalThis.Subscriber<UpdateRecord>;
             storagePath: Promise<string>;
         };
     };
     /**
-     * one-time use function. Remove this and repairUnwatchedSeats once the
-     * repair has taken place.
+     * To be called once ever per wallet.
      *
      * @param {object} key
      */
     repairWalletForIncarnation2(key: object): void;
-}>;
+}>>;
 export type OfferId = number | string;
 export type OfferSpec = {
     id: OfferId;
-    invitationSpec: import('./invitations').InvitationSpec;
+    invitationSpec: import("./invitations").InvitationSpec;
     proposal: Proposal;
-    offerArgs?: unknown;
+    offerArgs?: any;
 };
 export type ExecutorPowers = {
     logger: {
         info: (...args: any[]) => void;
         error: (...args: any[]) => void;
     };
-    makeOfferWatcher: import('./offerWatcher.js').MakeOfferWatcher;
+    makeOfferWatcher: import("./offerWatcher.js").MakeOfferWatcher;
     invitationFromSpec: ERef<Invitation>;
 };
 export type ExecuteOfferAction = {
-    method: 'executeOffer';
+    method: "executeOffer";
     offer: OfferSpec;
 };
 export type TryExitOfferAction = {
-    method: 'tryExitOffer';
+    method: "tryExitOffer";
     offerId: OfferId;
 };
 export type BridgeAction = ExecuteOfferAction | TryExitOfferAction;
@@ -110,10 +109,10 @@ export type CurrentWalletRecord = {
         balance: Amount;
     }>;
     offerToUsedInvitation: Array<[offerId: string, usedInvitation: Amount]>;
-    offerToPublicSubscriberPaths: [offerId: string, publicTopics: {
+    offerToPublicSubscriberPaths: Array<[offerId: string, publicTopics: {
         [subscriberName: string]: string;
-    }][];
-    liveOffers: Array<[OfferId, import('./offers.js').OfferStatus]>;
+    }]>;
+    liveOffers: Array<[OfferId, import("./offers.js").OfferStatus]>;
 };
 /**
  * Record of an update to the state of this wallet.
@@ -128,13 +127,13 @@ export type CurrentWalletRecord = {
  * the amount suffices.
  */
 export type UpdateRecord = {
-    updated: 'offerStatus';
-    status: import('./offers.js').OfferStatus;
+    updated: "offerStatus";
+    status: import("./offers.js").OfferStatus;
 } | {
-    updated: 'balance';
+    updated: "balance";
     currentAmount: Amount;
 } | {
-    updated: 'walletAction';
+    updated: "walletAction";
     status: {
         error: string;
     };
@@ -146,21 +145,21 @@ export type BrandDescriptor = {
     brand: Brand;
     displayInfo: DisplayInfo;
     issuer: Issuer;
-    petname: import('./types.js').Petname;
+    petname: import("./types.js").Petname;
 };
 export type UniqueParams = {
     address: string;
-    bank: ERef<import('@agoric/vats/src/vat-bank.js').Bank>;
+    bank: ERef<import("@agoric/vats/src/vat-bank.js").Bank>;
     currentStorageNode: StorageNode;
-    invitationPurse: Purse<'set'>;
+    invitationPurse: Purse<"set", InvitationDetails>;
     walletStorageNode: StorageNode;
 };
-export type BrandDescriptorRegistry = Pick<MapStore<Brand, BrandDescriptor>, 'has' | 'get' | 'values'>;
+export type BrandDescriptorRegistry = Pick<MapStore<Brand, BrandDescriptor>, "has" | "get" | "values">;
 export type SharedParams = {
-    agoricNames: ERef<import('@agoric/vats').NameHub>;
+    agoricNames: ERef<import("@agoric/vats").NameHub>;
     registry: BrandDescriptorRegistry;
-    invitationIssuer: Issuer<'set'>;
-    invitationBrand: Brand<'set'>;
+    invitationIssuer: Issuer<"set">;
+    invitationBrand: Brand<"set">;
     invitationDisplayInfo: DisplayInfo;
     publicMarshaller: Marshaller;
     zoe: ERef<ZoeService>;
@@ -175,13 +174,13 @@ export type SharedParams = {
 export type State = ImmutableState & MutableState;
 export type ImmutableState = Readonly<UniqueParams & {
     paymentQueues: MapStore<Brand, Array<Payment>>;
-    offerToInvitationMakers: MapStore<string, import('./types').RemoteInvitationMakers>;
+    offerToInvitationMakers: MapStore<string, import("./types.js").InvitationMakers>;
     offerToPublicSubscriberPaths: MapStore<string, Record<string, string>>;
-    offerToUsedInvitation: MapStore<string, Amount>;
+    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>;
-    liveOffers: MapStore<OfferId, import('./offers.js').OfferStatus>;
+    updateRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").RecorderKit<UpdateRecord>;
+    currentRecorderKit: import("@agoric/zoe/src/contractSupport/recorder.js").RecorderKit<CurrentWalletRecord>;
+    liveOffers: MapStore<OfferId, import("./offers.js").OfferStatus>;
     liveOfferSeats: MapStore<OfferId, UserSeat<unknown>>;
     liveOfferPayments: MapStore<OfferId, MapStore<Brand, Payment>>;
 }>;

package/src/smartWallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"smartWallet.d.ts","sourceRoot":"","sources":["smartWallet.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"smartWallet.d.ts","sourceRoot":"","sources":["smartWallet.js"],"names":[],"mappings":"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"}