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

package/src/smartWallet.js

@@ -59,7 +59,7 @@ const trace = makeTracer('SmrtWlt');
  *   id: OfferId,
  *   invitationSpec: import('./invitations').InvitationSpec,
  *   proposal: Proposal,
- *   offerArgs?: unknown
+ *   offerArgs?: any
  * }} OfferSpec
  */
 
@@ -147,7 +147,7 @@ const trace = makeTracer('SmrtWlt');
  *   address: string,
  *   bank: ERef<import('@agoric/vats/src/vat-bank.js').Bank>,
  *   currentStorageNode: StorageNode,
- *   invitationPurse: Purse<'set'>,
+ *   invitationPurse: Purse<'set', InvitationDetails>,
  *   walletStorageNode: StorageNode,
  * }} UniqueParams
  *
@@ -171,9 +171,9 @@ const trace = makeTracer('SmrtWlt');
  *
  * @typedef {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>,
@@ -456,6 +456,7 @@ export const prepareSmartWallet = (baggage, shared) => {
     }),
   };
 
+  // TODO move to top level so its type can be exported
   /**
    * Make the durable object to return, but taking some parameters that are awaited by a wrapping function.
    * This is necessary because the class kit construction helpers, `initState` and `finish` run synchronously
@@ -547,13 +548,11 @@ export const prepareSmartWallet = (baggage, shared) => {
           // publish purse's balance and changes
           const notifier = await E(purse).getCurrentAmountNotifier();
           const startP = E(notifier).getUpdateSince(undefined);
-          // @ts-expect-error import watchPromise's type is unknown
           watchPromise(startP, handler, notifier);
         },
 
         watchNextBalance(handler, notifier, updateCount) {
           const nextP = E(notifier).getUpdateSince(updateCount);
-          // @ts-expect-error import watchPromise's type is unknown
           watchPromise(nextP, handler, notifier);
         },
 
@@ -645,24 +644,47 @@ export const prepareSmartWallet = (baggage, shared) => {
             const offerSpec = liveOffers.get(seatId);
             const seat = liveOfferSeats.get(seatId);
 
-            const invitation = invitationFromSpec(offerSpec.invitationSpec);
-            watcherPromises.push(
-              E.when(
-                E(invitationIssuer).getAmountOf(invitation),
-                invitationAmount => {
-                  const watcher = makeOfferWatcher(
-                    facets.helper,
-                    facets.deposit,
-                    offerSpec,
-                    address,
-                    invitationAmount,
-                    seat,
-                  );
-                  return watchOfferOutcomes(watcher, seat);
-                },
-              ),
-            );
+            const watchOutcome = (async () => {
+              await null;
+              let invitationAmount = state.offerToUsedInvitation.has(
+                // @ts-expect-error older type allowed number
+                offerSpec.id,
+              )
+                ? state.offerToUsedInvitation.get(
+                    // @ts-expect-error older type allowed number
+                    offerSpec.id,
+                  )
+                : undefined;
+              if (invitationAmount) {
+                facets.helper.logWalletInfo(
+                  'recovered invitation amount for offer',
+                  offerSpec.id,
+                );
+              } else {
+                facets.helper.logWalletInfo(
+                  'inferring invitation amount for offer',
+                  offerSpec.id,
+                );
+                const tempInvitation = invitationFromSpec(
+                  offerSpec.invitationSpec,
+                );
+                invitationAmount =
+                  await E(invitationIssuer).getAmountOf(tempInvitation);
+                void E(invitationIssuer).burn(tempInvitation);
+              }
+
+              const watcher = makeOfferWatcher(
+                facets.helper,
+                facets.deposit,
+                offerSpec,
+                address,
+                invitationAmount,
+                seat,
+              );
+              return watchOfferOutcomes(watcher, seat);
+            })();
             trace(`Repaired seat ${seatId} for wallet ${address}`);
+            watcherPromises.push(watchOutcome);
           }
 
           await Promise.all(watcherPromises);
@@ -711,6 +733,13 @@ export const prepareSmartWallet = (baggage, shared) => {
             }
           }
         },
+
+        /**
+         * @param {string} offerId
+         * @param {Amount<"set">} invitationAmount
+         * @param {import("./types.js").InvitationMakers} invitationMakers
+         * @param {import("./types.js").PublicSubscribers} publicSubscribers
+         */
         async addContinuingOffer(
           offerId,
           invitationAmount,
@@ -738,7 +767,6 @@ export const prepareSmartWallet = (baggage, shared) => {
           const { registry, invitationBrand } = shared;
 
           if (registry.has(brand)) {
-            // @ts-expect-error virtual purse
             return E(state.bank).getPurse(brand);
           } else if (invitationBrand === brand) {
             return state.invitationPurse;
@@ -809,6 +837,7 @@ export const prepareSmartWallet = (baggage, shared) => {
           // When there is a purse deposit into it
           if (registry.has(brand)) {
             const purse = E(bank).getPurse(brand);
+            // @ts-expect-error narrow assetKind to 'nat'
             return E(purse).deposit(payment);
           } else if (invitationBrand === brand) {
             // @ts-expect-error narrow assetKind to 'set'
@@ -832,6 +861,10 @@ export const prepareSmartWallet = (baggage, shared) => {
 
       payments: {
         /**
+         * Withdraw the offered amount from the appropriate purse of this wallet.
+         *
+         * Save its amount in liveOfferPayments in case we need to reclaim the payment.
+         *
          * @param {AmountKeywordRecord} give
          * @param {OfferId} offerId
          * @returns {PaymentPKeywordRecord}
@@ -847,8 +880,8 @@ export const prepareSmartWallet = (baggage, shared) => {
             .getLiveOfferPayments()
             .init(offerId, brandPaymentRecord);
 
-          // Add each payment to liveOfferPayments as it is withdrawn. If
-          // there's an error partway through, we can recover the withdrawals.
+          // Add each payment amount to brandPaymentRecord as it is withdrawn. If
+          // there's an error later, we can use it to redeposit the correct amount.
           return objectMap(give, amount => {
             /** @type {Promise<Purse>} */
             const purseP = facets.helper.purseForBrand(amount.brand);
@@ -869,28 +902,43 @@ export const prepareSmartWallet = (baggage, shared) => {
           });
         },
 
+        /**
+         * Find the live payments for the offer and deposit them back in the appropriate purses.
+         *
+         * @param {OfferId} offerId
+         * @returns {Promise<Amount[]>}
+         */
         async tryReclaimingWithdrawnPayments(offerId) {
           const { facets } = this;
 
+          await null;
+
           const liveOfferPayments = facets.helper.getLiveOfferPayments();
           if (liveOfferPayments.has(offerId)) {
             const brandPaymentRecord = liveOfferPayments.get(offerId);
             if (!brandPaymentRecord) {
-              return Promise.resolve(undefined);
+              return [];
             }
+            const out = [];
             // Use allSettled to ensure we attempt all the deposits, regardless of
             // individual rejections.
-            return Promise.allSettled(
-              Array.from(brandPaymentRecord.entries()).map(async ([b, p]) => {
+            await Promise.allSettled(
+              Array.from(brandPaymentRecord.entries()).map(([b, p]) => {
                 // Wait for the withdrawal to complete.  This protects against a
                 // race when updating paymentToPurse.
                 const purseP = facets.helper.purseForBrand(b);
 
                 // Now send it back to the purse.
-                return E(purseP).deposit(p);
+                return E(purseP)
+                  .deposit(p)
+                  .then(amt => {
+                    out.push(amt);
+                  });
               }),
             );
+            return harden(out);
           }
+          return [];
         },
       },
 
@@ -912,6 +960,7 @@ export const prepareSmartWallet = (baggage, shared) => {
 
           await null;
 
+          /** @type {UserSeat} */
           let seatRef;
           let watcher;
           try {
@@ -930,23 +979,23 @@ export const prepareSmartWallet = (baggage, shared) => {
 
             const invitation = invitationFromSpec(offerSpec.invitationSpec);
 
-            const [paymentKeywordRecord, invitationAmount] = await Promise.all([
-              proposal?.give &&
-                deeplyFulfilledObject(
-                  facets.payments.withdrawGive(proposal.give, offerSpec.id),
-                ),
-              E(invitationIssuer).getAmountOf(invitation),
-            ]);
+            const invitationAmount =
+              await E(invitationIssuer).getAmountOf(invitation);
 
             // 2. Begin executing offer
             // No explicit signal to user that we reached here but if anything above
             // failed they'd get an 'error' status update.
 
-            /** @type {UserSeat} */
+            const withdrawnPayments =
+              proposal?.give &&
+              (await deeplyFulfilledObject(
+                facets.payments.withdrawGive(proposal.give, offerSpec.id),
+              ));
+
             seatRef = await E(zoe).offer(
               invitation,
               proposal,
-              paymentKeywordRecord,
+              withdrawnPayments,
               offerSpec.offerArgs,
             );
             facets.helper.logWalletInfo(offerSpec.id, 'seated');
@@ -968,22 +1017,24 @@ export const prepareSmartWallet = (baggage, shared) => {
 
             // await so that any errors are caught and handled below
             await watchOfferOutcomes(watcher, seatRef);
-          } catch (err) {
-            facets.helper.logWalletError('OFFER ERROR:', err);
+          } catch (reason) {
+            // This block only runs if the block above fails during one vat incarnation.
+            facets.helper.logWalletError('IMMEDIATE OFFER ERROR:', reason);
 
-            // Notify the user
-            if (err.upgradeMessage === 'vat upgraded') {
+            // Update status to observers
+            if (isUpgradeDisconnection(reason)) {
               // The offer watchers will reconnect. Don't reclaim or exit
               return;
             } else if (watcher) {
-              watcher.helper.updateStatus({ error: err.toString() });
+              // The watcher's onRejected will updateStatus()
             } else {
               facets.helper.updateStatus({
-                error: err.toString(),
+                error: reason.toString(),
                 ...offerSpec,
               });
             }
 
+            // Backstop recovery, in case something very basic fails.
             if (offerSpec?.proposal?.give) {
               facets.payments
                 .tryReclaimingWithdrawnPayments(offerSpec.id)
@@ -995,15 +1046,9 @@ export const prepareSmartWallet = (baggage, shared) => {
                 );
             }
 
-            if (seatRef) {
-              void E.when(E(seatRef).hasExited(), hasExited => {
-                if (!hasExited) {
-                  void E(seatRef).tryExit();
-                }
-              });
-            }
-
-            throw err;
+            // XXX tests rely on throwing immediate errors, not covering the
+            // error handling in the event the failure is after an upgrade
+            throw reason;
           }
         },
         /**
@@ -1014,6 +1059,19 @@ export const prepareSmartWallet = (baggage, shared) => {
          * @throws if the seat can't be found or E(seatRef).tryExit() fails.
          */
         async tryExitOffer(offerId) {
+          const { facets } = this;
+          const amts = await facets.payments
+            .tryReclaimingWithdrawnPayments(offerId)
+            .catch(e => {
+              facets.helper.logWalletError(
+                'recovery failed reclaiming payments',
+                e,
+              );
+              return [];
+            });
+          if (amts.length > 0) {
+            facets.helper.logWalletInfo('reclaimed', amts, 'from', offerId);
+          }
           const seatRef = this.state.liveOfferSeats.get(offerId);
           await E(seatRef).tryExit();
         },
@@ -1022,7 +1080,7 @@ export const prepareSmartWallet = (baggage, shared) => {
         /**
          * 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>}
          */
@@ -1104,9 +1162,9 @@ export const prepareSmartWallet = (baggage, shared) => {
             },
           });
         },
+        // TODO remove this and repairUnwatchedSeats once the repair has taken place.
         /**
-         * one-time use function. Remove this and repairUnwatchedSeats once the
-         * repair has taken place.
+         * To be called once ever per wallet.
          *
          * @param {object} key
          */
@@ -1117,8 +1175,12 @@ export const prepareSmartWallet = (baggage, shared) => {
             return;
           }
 
-          void facets.helper.repairUnwatchedSeats();
-          void facets.helper.repairUnwatchedPurses();
+          facets.helper.repairUnwatchedSeats().catch(e => {
+            console.error('repairUnwatchedSeats rejection', e);
+          });
+          facets.helper.repairUnwatchedPurses().catch(e => {
+            console.error('repairUnwatchedPurses rejection', e);
+          });
           trace(`repaired wallet ${state.address}`);
         },
       },

package/src/typeGuards.d.ts

@@ -1,4 +1,4 @@
 export namespace shape {
-    const WalletBridgeMsg: import("@endo/patterns").Matcher;
+    let WalletBridgeMsg: import("@endo/patterns").Matcher;
 }
 //# sourceMappingURL=typeGuards.d.ts.map

package/src/types.d.ts

@@ -5,10 +5,11 @@
  * Downside is it can't reference any ambient types, which most of agoric-sdk type are presently.
  */
 
-import type { ERef, FarRef } from '@endo/far';
+import type { ERef } from '@endo/far';
 import type { CapData } from '@endo/marshal';
-import type { MsgWalletSpendAction } from '@agoric/cosmic-proto/swingset/msgs';
+import type { agoric } from '@agoric/cosmic-proto';
 import type { AgoricNamesRemotes } from '@agoric/vats/tools/board-utils.js';
+import type { StoredFacet } from '@agoric/internal/src/lib-chainStorage.js';
 import type { OfferSpec } from './offers.js';
 
 declare const CapDataShape: unique symbol;
@@ -21,10 +22,9 @@ declare const CapDataShape: unique symbol;
  */
 export type Petname = string | string[];
 
-export type RemotePurse<T = unknown> = FarRef<Purse<T>>;
-
-export type RemoteInvitationMakers = FarRef<
-  Record<string, (...args: any[]) => Promise<Invitation>>
+export type InvitationMakers = Record<
+  string,
+  (...args: any[]) => Promise<Invitation>
 >;
 
 export type PublicSubscribers = Record<string, ERef<StoredFacet>>;
@@ -34,20 +34,16 @@ export type Cell<T> = {
   set(val: T): void;
 };
 
-export type BridgeActionCapData = WalletCapData<
-  import('./smartWallet.js').BridgeAction
->;
-
 /**
  * Defined by walletAction struct in msg_server.go
  *
- * @see {MsgWalletSpendAction} and walletSpendAction in msg_server.go
+ * @see {agoric.swingset.MsgWalletAction} and walletSpendAction in msg_server.go
  */
 export type WalletActionMsg = {
   type: 'WALLET_ACTION';
   /** base64 of Uint8Array of bech32 data  */
   owner: string;
-  /** JSON of BridgeActionCapData */
+  /** JSON of marshalled BridgeAction */
   action: string;
   blockHeight: unknown; // int64
   blockTime: unknown; // int64
@@ -56,7 +52,7 @@ export type WalletActionMsg = {
 /**
  * Defined by walletSpendAction struct in msg_server.go
  *
- * @see {MsgWalletSpendAction} and walletSpendAction in msg_server.go
+ * @see {agoric.swingset.MsgWalletSpendAction} and walletSpendAction in msg_server.go
  */
 export type WalletSpendActionMsg = {
   type: 'WALLET_SPEND_ACTION';

package/src/utils.d.ts

@@ -1,26 +1,26 @@
 export const NO_SMART_WALLET_ERROR: "no smart wallet";
-export function makeWalletStateCoalescer(invitationBrand?: Brand<"set"> | undefined): {
+export function makeWalletStateCoalescer(invitationBrand?: globalThis.Brand<"set"> | undefined): {
     state: {
-        invitationsReceived: Map<import("./offers").OfferId, {
-            acceptedIn: import('./offers').OfferId;
+        invitationsReceived: Map<import("./offers.js").OfferId, {
+            acceptedIn: import("./offers.js").OfferId;
             description: string;
             instance: Instance;
         }>;
-        offerStatuses: Map<import("./offers").OfferId, import("./offers").OfferStatus>;
-        balances: Map<Brand<AssetKind>, Amount<AssetKind>>;
+        offerStatuses: Map<import("./offers.js").OfferId, import("./offers.js").OfferStatus>;
+        balances: Map<globalThis.Brand, globalThis.Amount>;
     };
-    update: (updateRecord: import('./smartWallet').UpdateRecord | {}) => void;
+    update: (updateRecord: import("./smartWallet.js").UpdateRecord | {}) => void;
 };
-export function coalesceUpdates(updates: ERef<Subscriber<import('./smartWallet').UpdateRecord>>, invitationBrand?: Brand<"set"> | undefined): {
-    invitationsReceived: Map<import("./offers").OfferId, {
-        acceptedIn: import('./offers').OfferId;
+export function coalesceUpdates(updates: ERef<Subscriber<import("./smartWallet.js").UpdateRecord>>, invitationBrand?: globalThis.Brand<"set"> | undefined): {
+    invitationsReceived: Map<import("./offers.js").OfferId, {
+        acceptedIn: import("./offers.js").OfferId;
         description: string;
         instance: Instance;
     }>;
-    offerStatuses: Map<import("./offers").OfferId, import("./offers").OfferStatus>;
-    balances: Map<Brand<AssetKind>, Amount<AssetKind>>;
+    offerStatuses: Map<import("./offers.js").OfferId, import("./offers.js").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").TopicsRecord | import("./types.js").PublicSubscribers | undefined): ERef<Record<string, string>> | null;
-export type CoalescedWalletState = ReturnType<typeof makeWalletStateCoalescer>['state'];
+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 type CoalescedWalletState = ReturnType<typeof makeWalletStateCoalescer>["state"];
 //# sourceMappingURL=utils.d.ts.map

package/src/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AAKA,sDAAuD;AAKhD;;;wBASmD,OAAO,UAAU,EAAE,OAAO;yBAAe,MAAM;sBAAY,QAAQ;;;;;2BAI/G,OAAO,eAAe,EAAE,YAAY,GAAG,EAAE;EA8DtD;AAaM,yCAHI,KAAK,WAAW,OAAO,eAAe,EAAE,YAAY,CAAC,CAAC;;oBA5EP,OAAO,UAAU,EAAE,OAAO;qBAAe,MAAM;kBAAY,QAAQ;;;;EAwF5H;AAMM,wCAHI,OAAO,iBAAiB,EAAE,QAAQ,CAAC,GAAG,CAAC,iBAYjD;AAQM,iKAFM,KAAK,OAAO,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,IAAI,CAW/C;mCArDa,WAAW,+BAA+B,CAAC,CAAC,OAAO,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.js"],"names":[],"mappings":"AAIA,sDAAuD;AAKhD;;;wBASsD,OAAO,aAAa,EAAE,OAAO;yBAAe,MAAM;sBAAY,QAAQ;;;;;2BAIrH,OAAO,kBAAkB,EAAE,YAAY,GAAG,EAAE;EA8DzD;AAaM,yCAHI,IAAI,CAAC,UAAU,CAAC,OAAO,kBAAkB,EAAE,YAAY,CAAC,CAAC;;oBA5EP,OAAO,aAAa,EAAE,OAAO;qBAAe,MAAM;kBAAY,QAAQ;;;;EAwFlI;AAMM,wCAHI,OAAO,iBAAiB,EAAE,QAAQ,CAAC,GAAG,CAAC,iBAYjD;AAQM,2KAFM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,IAAI,CAW/C;mCArDa,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC,OAAO,CAAC"}

package/src/utils.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-undef-init */
 import { deeplyFulfilledObject, objectMap, makeTracer } from '@agoric/internal';
 import { observeIteration, subscribeEach } from '@agoric/notifier';
 import { E } from '@endo/far';
@@ -9,7 +8,7 @@ const trace = makeTracer('WUTIL', false);
 
 /** @param {Brand<'set'>} [invitationBrand] */
 export const makeWalletStateCoalescer = (invitationBrand = undefined) => {
-  /** @type {Map<import('./offers').OfferId, import('./offers').OfferStatus>} */
+  /** @type {Map<import('./offers.js').OfferId, import('./offers.js').OfferStatus>} */
   const offerStatuses = new Map();
   /** @type {Map<Brand, Amount>} */
   const balances = new Map();
@@ -17,11 +16,11 @@ export const makeWalletStateCoalescer = (invitationBrand = undefined) => {
   /**
    * keyed by description; xxx assumes unique
    *
-   * @type {Map<import('./offers').OfferId, { acceptedIn: import('./offers').OfferId, description: string, instance: Instance }>}
+   * @type {Map<import('./offers.js').OfferId, { acceptedIn: import('./offers.js').OfferId, description: string, instance: Instance }>}
    */
   const invitationsReceived = new Map();
 
-  /** @param {import('./smartWallet').UpdateRecord | {}} updateRecord newer than previous */
+  /** @param {import('./smartWallet.js').UpdateRecord | {}} updateRecord newer than previous */
   const update = updateRecord => {
     if (!('updated' in updateRecord)) {
       return;
@@ -93,7 +92,7 @@ export const makeWalletStateCoalescer = (invitationBrand = undefined) => {
  * If this proves to be a problem we can add an option to this or a related
  * utility to reset state from RPC.
  *
- * @param {ERef<Subscriber<import('./smartWallet').UpdateRecord>>} updates
+ * @param {ERef<Subscriber<import('./smartWallet.js').UpdateRecord>>} updates
  * @param {Brand<'set'>} [invitationBrand]
  */
 export const coalesceUpdates = (updates, invitationBrand) => {
@@ -125,7 +124,7 @@ export const assertHasData = async follower => {
 /**
  * Handles the case of falsy argument so the caller can consistently await.
  *
- * @param {import('./types.js').PublicSubscribers | import('@agoric/zoe/src/contractSupport').TopicsRecord} [subscribers]
+ * @param {import('./types.js').PublicSubscribers | import('@agoric/zoe/src/contractSupport/index.js').TopicsRecord} [subscribers]
  * @returns {ERef<Record<string, string>> | null}
  */
 export const objectMapStoragePath = subscribers => {

package/src/walletFactory.d.ts

@@ -1,10 +1,10 @@
 export namespace customTermsShape {
-    const agoricNames: any;
-    const board: any;
-    const assetPublisher: any;
+    let agoricNames: globalThis.Pattern;
+    let board: globalThis.Pattern;
+    let assetPublisher: globalThis.Pattern;
 }
 export const privateArgsShape: import("@endo/patterns").Matcher;
-export function publishDepositFacet(address: string, wallet: import('./smartWallet.js').SmartWallet, namesByAddressAdmin: ERef<import('@agoric/vats').NameAdmin>): Promise<unknown>;
+export function publishDepositFacet(address: string, wallet: import("./smartWallet.js").SmartWallet, namesByAddressAdmin: ERef<import("@agoric/vats").NameAdmin>): Promise<unknown>;
 export function makeAssetRegistry(assetPublisher: AssetPublisher): {
     /** @param {Brand} brand */
     has: (brand: Brand) => boolean;
@@ -13,103 +13,45 @@ export function makeAssetRegistry(assetPublisher: AssetPublisher): {
         brand: Brand;
         displayInfo: DisplayInfo;
         issuer: Issuer;
-        petname: import('./types').Petname;
+        petname: import("./types.js").Petname;
     };
     values: () => Iterable<{
         brand: Brand;
         displayInfo: DisplayInfo;
         issuer: Issuer;
-        petname: import('./types').Petname;
+        petname: import("./types.js").Petname;
     }>;
 };
 export function prepare(zcf: ZCF<SmartWalletContractTerms>, privateArgs: {
     storageNode: ERef<StorageNode>;
-    walletBridgeManager?: ERef<import("@agoric/vats").ScopedBridgeManager> | undefined;
-    walletReviver?: ERef<WalletReviver> | undefined;
-}, baggage: MapStore<string, unknown>): Promise<{
-    creatorFacet: {
+    walletBridgeManager?: ERef<import("@agoric/vats").ScopedBridgeManager<"wallet">>;
+    walletReviver?: ERef<WalletReviver>;
+}, baggage: import("@agoric/vat-data").Baggage): Promise<{
+    creatorFacet: import("@endo/exo").Guarded<{
         /**
          * @param {string} address
-         * @param {ERef<import('@agoric/vats/src/vat-bank').Bank>} bank
-         * @param {ERef<import('@agoric/vats/').NameAdmin>} namesByAddressAdmin
-         * @returns {Promise<[wallet: import('./smartWallet').SmartWallet, isNew: boolean]>} wallet
+         * @param {ERef<import('@agoric/vats/src/vat-bank.js').Bank>} bank
+         * @param {ERef<import('@agoric/vats/src/types.js').NameAdmin>} namesByAddressAdmin
+         * @returns {Promise<[wallet: import('./smartWallet.js').SmartWallet, isNew: boolean]>} wallet
          *   along with a flag to distinguish between looking up an existing wallet
          *   and creating a new one.
          */
-        provideSmartWallet(address: string, bank: ERef<import('@agoric/vats/src/vat-bank').Bank>, namesByAddressAdmin: ERef<import('@agoric/vats/').NameAdmin>): Promise<[wallet: {
-            handleBridgeAction(actionCapData: import("@endo/marshal").CapData<string>, canSpend?: boolean | undefined): Promise<void>;
-            getDepositFacet(): {
-                receive(payment: Payment<AssetKind>): Promise<Amount<AssetKind>>;
-            };
-            getOffersFacet(): {
-                executeOffer(offerSpec: import("./smartWallet.js").OfferSpec): Promise<void>;
-                tryExitOffer(offerId: import("./smartWallet.js").OfferId): Promise<void>;
-            };
-            getCurrentSubscriber(): Subscriber<import("./smartWallet.js").CurrentWalletRecord>;
-            getUpdatesSubscriber(): Subscriber<import("./smartWallet.js").UpdateRecord>;
-            getPublicTopics(): {
-                current: {
-                    description: string;
-                    subscriber: Subscriber<import("./smartWallet.js").CurrentWalletRecord>;
-                    storagePath: Promise<string>;
-                };
-                updates: {
-                    description: string;
-                    subscriber: Subscriber<import("./smartWallet.js").UpdateRecord>;
-                    storagePath: Promise<string>;
-                };
-            };
-            repairWalletForIncarnation2(key: any): void;
-        }, isNew: boolean]>;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
-        /**
-         * @param {string} address
-         * @param {ERef<import('@agoric/vats/src/vat-bank').Bank>} bank
-         * @param {ERef<import('@agoric/vats/').NameAdmin>} namesByAddressAdmin
-         * @returns {Promise<[wallet: import('./smartWallet').SmartWallet, isNew: boolean]>} wallet
-         *   along with a flag to distinguish between looking up an existing wallet
-         *   and creating a new one.
-         */
-        provideSmartWallet(address: string, bank: ERef<import('@agoric/vats/src/vat-bank').Bank>, namesByAddressAdmin: ERef<import('@agoric/vats/').NameAdmin>): Promise<[wallet: {
-            handleBridgeAction(actionCapData: import("@endo/marshal").CapData<string>, canSpend?: boolean | undefined): Promise<void>;
-            getDepositFacet(): {
-                receive(payment: Payment<AssetKind>): Promise<Amount<AssetKind>>;
-            };
-            getOffersFacet(): {
-                executeOffer(offerSpec: import("./smartWallet.js").OfferSpec): Promise<void>;
-                tryExitOffer(offerId: import("./smartWallet.js").OfferId): Promise<void>;
-            };
-            getCurrentSubscriber(): Subscriber<import("./smartWallet.js").CurrentWalletRecord>;
-            getUpdatesSubscriber(): Subscriber<import("./smartWallet.js").UpdateRecord>;
-            getPublicTopics(): {
-                current: {
-                    description: string;
-                    subscriber: Subscriber<import("./smartWallet.js").CurrentWalletRecord>;
-                    storagePath: Promise<string>;
-                };
-                updates: {
-                    description: string;
-                    subscriber: Subscriber<import("./smartWallet.js").UpdateRecord>;
-                    storagePath: Promise<string>;
-                };
-            };
-            repairWalletForIncarnation2(key: any): void;
-        }, isNew: boolean]>;
+        provideSmartWallet(address: string, bank: ERef<import("@agoric/vats/src/vat-bank.js").Bank>, namesByAddressAdmin: ERef<import("@agoric/vats/src/types.js").NameAdmin>): Promise<[wallet: import("./smartWallet.js").SmartWallet, isNew: boolean]>;
     }>;
 }>;
 export type SmartWalletContractTerms = {
-    agoricNames: ERef<NameHub>;
-    board: ERef<import('@agoric/vats').Board>;
+    agoricNames: globalThis.ERef<NameHub>;
+    board: ERef<import("@agoric/vats").Board>;
     assetPublisher: AssetPublisher;
 };
-export type NameHub = import('@agoric/vats').NameHub;
 export type AssetPublisher = {
-    getAssetSubscription: () => ERef<IterableEachTopic<import('@agoric/vats/src/vat-bank').AssetDescriptor>>;
+    getAssetSubscription: () => ERef<IterableEachTopic<import("@agoric/vats/src/vat-bank.js").AssetDescriptor>>;
 };
 export type isRevive = boolean;
 export type WalletReviver = {
-    reviveWallet: (address: string) => Promise<import('./smartWallet').SmartWallet>;
+    reviveWallet: (address: string) => Promise<import("./smartWallet.js").SmartWallet>;
     ackWallet: (address: string) => isRevive;
 };
 export type start = typeof prepare;
+import type { NameHub } from '@agoric/vats';
 //# sourceMappingURL=walletFactory.d.ts.map