@agoric/smart-wallet 0.5.4-mainnet1B-dev-b0c1f78.0 → 0.5.4-orchestration-dev-096c4e8.0

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,9 +5,9 @@
  * 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 { OfferSpec } from './offers.js';
 
@@ -21,10 +21,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>>;
@@ -41,7 +40,7 @@ export type BridgeActionCapData = WalletCapData<
 /**
  * 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';
@@ -56,7 +55,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): {
     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>;
+        offerStatuses: Map<import("./offers.js").OfferId, import("./offers.js").OfferStatus>;
         balances: Map<Brand<AssetKind>, Amount<AssetKind>>;
     };
-    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?: 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>;
+    offerStatuses: Map<import("./offers.js").OfferId, import("./offers.js").OfferStatus>;
     balances: Map<Brand<AssetKind>, Amount<AssetKind>>;
 };
 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 function objectMapStoragePath(subscribers?: import("./types.js").PublicSubscribers | import("@agoric/zoe/src/contractSupport/topics.js").TopicsRecord | 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":"AAKA,sDAAuD;AAKhD;;;wBASsD,OAAO,aAAa,EAAE,OAAO;yBAAe,MAAM;sBAAY,QAAQ;;;;;2BAIrH,OAAO,kBAAkB,EAAE,YAAY,GAAG,EAAE;EA8DzD;AAaM,yCAHI,KAAK,WAAW,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,KAAK,OAAO,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,IAAI,CAW/C;mCArDa,WAAW,+BAA+B,CAAC,CAAC,OAAO,CAAC"}

package/src/utils.js

@@ -9,7 +9,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 +17,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 +93,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 +125,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,7 +1,7 @@
 export namespace customTermsShape {
-    const agoricNames: any;
-    const board: any;
-    const assetPublisher: any;
+    let agoricNames: any;
+    let board: any;
+    let assetPublisher: any;
 }
 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>;
@@ -13,38 +13,38 @@ 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: {
+}, baggage: import('@agoric/vat-data').Baggage): Promise<{
+    creatorFacet: import("@endo/exo/src/exo-makers.js").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(): {
+        provideSmartWallet(address: string, bank: ERef<import('@agoric/vats/src/vat-bank.js').Bank>, namesByAddressAdmin: ERef<import('@agoric/vats/src/types.js').NameAdmin>): Promise<[wallet: {
+            handleBridgeAction(actionCapData: import("@endo/marshal").CapData<string | null>, canSpend?: boolean | undefined): Promise<void>;
+            getDepositFacet(): import("@endo/exo/src/exo-makers.js").Guarded<{
                 receive(payment: Payment<AssetKind>): Promise<Amount<AssetKind>>;
-            };
-            getOffersFacet(): {
-                executeOffer(offerSpec: import("./offers.js").OfferSpec): Promise<void>;
-                tryExitOffer(offerId: import("./offers.js").OfferId): Promise<void>;
-            };
+            }>;
+            getOffersFacet(): import("@endo/exo/src/exo-makers.js").Guarded<{
+                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(): {
@@ -59,25 +59,64 @@ export function prepare(zcf: ZCF<SmartWalletContractTerms>, privateArgs: {
                     storagePath: Promise<string>;
                 };
             };
-        }, 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(): {
+            repairWalletForIncarnation2(key: any): void;
+        } & import("@endo/exo/src/get-interface.js").GetInterfaceGuard<{
+            handleBridgeAction(actionCapData: import("@endo/marshal").CapData<string | null>, canSpend?: boolean | undefined): Promise<void>;
+            getDepositFacet(): import("@endo/exo/src/exo-makers.js").Guarded<{
                 receive(payment: Payment<AssetKind>): Promise<Amount<AssetKind>>;
+            }>;
+            getOffersFacet(): import("@endo/exo/src/exo-makers.js").Guarded<{
+                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>;
+                };
             };
-            getOffersFacet(): {
-                executeOffer(offerSpec: import("./offers.js").OfferSpec): Promise<void>;
-                tryExitOffer(offerId: import("./offers.js").OfferId): Promise<void>;
+            repairWalletForIncarnation2(key: any): void;
+        }> & import("@endo/eventual-send").RemotableBrand<{}, {
+            handleBridgeAction(actionCapData: import("@endo/marshal").CapData<string | null>, canSpend?: boolean | undefined): Promise<void>;
+            getDepositFacet(): import("@endo/exo/src/exo-makers.js").Guarded<{
+                receive(payment: Payment<AssetKind>): Promise<Amount<AssetKind>>;
+            }>;
+            getOffersFacet(): import("@endo/exo/src/exo-makers.js").Guarded<{
+                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;
+        } & import("@endo/exo/src/get-interface.js").GetInterfaceGuard<{
+            handleBridgeAction(actionCapData: import("@endo/marshal").CapData<string | null>, canSpend?: boolean | undefined): Promise<void>;
+            getDepositFacet(): import("@endo/exo/src/exo-makers.js").Guarded<{
+                receive(payment: Payment<AssetKind>): Promise<Amount<AssetKind>>;
+            }>;
+            getOffersFacet(): import("@endo/exo/src/exo-makers.js").Guarded<{
+                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(): {
@@ -92,7 +131,8 @@ export function prepare(zcf: ZCF<SmartWalletContractTerms>, privateArgs: {
                     storagePath: Promise<string>;
                 };
             };
-        }, isNew: boolean]>;
+            repairWalletForIncarnation2(key: any): void;
+        }>>, isNew: boolean]>;
     }>;
 }>;
 export type SmartWalletContractTerms = {
@@ -102,11 +142,11 @@ export type SmartWalletContractTerms = {
 };
 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;

package/src/walletFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"walletFactory.d.ts","sourceRoot":"","sources":["walletFactory.js"],"names":[],"mappings":";;;;;AAwBA,gEAKE;AAUK,6CAJI,MAAM,UACN,OAAO,kBAAkB,EAAE,WAAW,uBACtC,KAAK,OAAO,cAAc,EAAE,SAAS,CAAC,oBAehD;AAWM,kDAFI,cAAc;IAwCrB,2BAA2B;iBAAf,KAAK;IAEjB,2BAA2B;iBAAf,KAAK;eApCP,KAAK;qBACC,WAAW;gBAChB,MAAM;iBACL,OAAO,SAAS,EAAE,OAAO;;;eAH3B,KAAK;qBACC,WAAW;gBAChB,MAAM;iBACL,OAAO,SAAS,EAAE,OAAO;;EAsCxC;AAmCM,6BARI,IAAI,wBAAwB,CAAC;iBAEtB,KAAK,WAAW,CAAC;;;;;QAiH7B;;;;;;;WAOG;oCANQ,MAAM,QACN,KAAK,OAAO,2BAA2B,EAAE,IAAI,CAAC,uBAC9C,KAAK,OAAO,eAAe,EAAE,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;QAHlD;;;;;;;WAOG;oCANQ,MAAM,QACN,KAAK,OAAO,2BAA2B,EAAE,IAAI,CAAC,uBAC9C,KAAK,OAAO,eAAe,EAAE,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;GAoDvD;uCAlMY;IACZ,WAAe,EAAE,KAAK,OAAO,CAAC,CAAC;IAC/B,KAAS,EAAE,KAAK,OAAO,cAAc,EAAE,KAAK,CAAC,CAAC;IAC9C,cAAkB,EAAE,cAAc,CAAC;CAChC;sBAES,OAAO,cAAc,EAAE,OAAO;6BAE9B;IACZ,oBAAwB,EAAE,MAAM,KAChC,kBAAwB,OAAO,2BAA2B,EAAE,eAAe,CAAC,CAAC,CAAA;CAC1E;uBAES,OAAO;;4BAES,MAAM,KAAK,QAAQ,OAAO,eAAe,EAAE,WAAW,CAAC;yBAC1D,MAAM,KAAK,QAAQ;;oBAuL/B,cAAc"}
+{"version":3,"file":"walletFactory.d.ts","sourceRoot":"","sources":["walletFactory.js"],"names":[],"mappings":";;;;;AA2BA,gEAKE;AAaK,6CAJI,MAAM,UACN,OAAO,kBAAkB,EAAE,WAAW,uBACtC,KAAK,OAAO,cAAc,EAAE,SAAS,CAAC,oBAehD;AAWM,kDAFI,cAAc;IAwCrB,2BAA2B;iBAAf,KAAK;IAEjB,2BAA2B;iBAAf,KAAK;eApCP,KAAK;qBACC,WAAW;gBAChB,MAAM;iBACL,OAAO,YAAY,EAAE,OAAO;;;eAH9B,KAAK;qBACC,WAAW;gBAChB,MAAM;iBACL,OAAO,YAAY,EAAE,OAAO;;EAsC3C;AAmCM,6BARI,IAAI,wBAAwB,CAAC;iBAEtB,KAAK,WAAW,CAAC;;;YAIxB,OAAO,kBAAkB,EAAE,OAAO;;QAuIvC;;;;;;;WAOG;oCANQ,MAAM,QACN,KAAK,OAAO,8BAA8B,EAAE,IAAI,CAAC,uBACjD,KAAK,OAAO,2BAA2B,EAAE,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoDnE;uCA5NY;IACZ,WAAe,EAAE,KAAK,OAAO,CAAC,CAAC;IAC/B,KAAS,EAAE,KAAK,OAAO,cAAc,EAAE,KAAK,CAAC,CAAC;IAC9C,cAAkB,EAAE,cAAc,CAAC;CAChC;sBAES,OAAO,cAAc,EAAE,OAAO;6BAE9B;IACZ,oBAAwB,EAAE,MAAM,KAChC,kBAAwB,OAAO,8BAA8B,EAAE,eAAe,CAAC,CAAC,CAAA;CAC7E;uBAES,OAAO;;4BAES,MAAM,KAAK,QAAQ,OAAO,kBAAkB,EAAE,WAAW,CAAC;yBAC7D,MAAM,KAAK,QAAQ;;oBAiN/B,cAAc"}

package/src/walletFactory.js

@@ -2,6 +2,9 @@
  * @file Wallet Factory
  *
  * Contract to make smart wallets.
+ *
+ * Note: The upgrade test uses a slightly modified copy of this file. When the
+ * interface changes here, that will also need to change.
  */
 
 import { makeTracer, WalletName } from '@agoric/internal';
@@ -29,6 +32,9 @@ export const privateArgsShape = harden(
   ),
 );
 
+const WALLETS_BY_ADDRESS = 'walletsByAddress';
+const UPGRADE_TO_INCARNATION_TWO = 'upgrade to incarnation two';
+
 /**
  * Provide a NameHub for this address and insert depositFacet only if not
  * already done.
@@ -68,7 +74,7 @@ export const makeAssetRegistry = assetPublisher => {
    *   brand: Brand,
    *   displayInfo: DisplayInfo,
    *   issuer: Issuer,
-   *   petname: import('./types').Petname
+   *   petname: import('./types.js').Petname
    * }} BrandDescriptor
    * For use by clients to describe brands to users. Includes `displayInfo` to save a remote call.
    */
@@ -119,17 +125,17 @@ export const makeAssetRegistry = assetPublisher => {
  *
  * @typedef {{
  *   getAssetSubscription: () => ERef<
- *     IterableEachTopic<import('@agoric/vats/src/vat-bank').AssetDescriptor>>
+ *     IterableEachTopic<import('@agoric/vats/src/vat-bank.js').AssetDescriptor>>
  * }} AssetPublisher
  *
  * @typedef {boolean} isRevive
  * @typedef {{
- *   reviveWallet: (address: string) => Promise<import('./smartWallet').SmartWallet>,
+ *   reviveWallet: (address: string) => Promise<import('./smartWallet.js').SmartWallet>,
  *   ackWallet: (address: string) => isRevive,
  * }} WalletReviver
  */
 
-// NB: even though all the wallets share this contract, they
+// NB: even though all the wallets share this contract,
 // 1. they should not rely on that; they may be partitioned later
 // 2. they should never be able to detect behaviors from another wallet
 /**
@@ -142,14 +148,14 @@ export const makeAssetRegistry = assetPublisher => {
  * @param {import('@agoric/vat-data').Baggage} baggage
  */
 export const prepare = async (zcf, privateArgs, baggage) => {
-  const upgrading = baggage.has('walletsByAddress');
+  const upgrading = baggage.has(WALLETS_BY_ADDRESS);
   const { agoricNames, board, assetPublisher } = zcf.getTerms();
 
   const zoe = zcf.getZoeService();
   const { storageNode, walletBridgeManager, walletReviver } = privateArgs;
 
   /** @type {MapStore<string, import('./smartWallet.js').SmartWallet>} */
-  const walletsByAddress = provideDurableMapStore(baggage, 'walletsByAddress');
+  const walletsByAddress = provideDurableMapStore(baggage, WALLETS_BY_ADDRESS);
   const provider = makeAtomicProvider(walletsByAddress);
 
   const handleWalletAction = makeExo(
@@ -220,6 +226,15 @@ export const prepare = async (zcf, privateArgs, baggage) => {
 
   const registry = makeAssetRegistry(assetPublisher);
 
+  /**
+   * An object known only to walletFactory and smartWallets. The WalletFactory
+   * only has the self facet for the pre-existing wallets that must be repaired.
+   * Self is too accessible, so use of the repair function requires use of a
+   * secret that clients won't have. This can be removed once the upgrade has
+   * taken place.
+   */
+  const upgradeToIncarnation2Key = harden({});
+
   const shared = harden({
     agoricNames,
     invitationBrand,
@@ -228,6 +243,7 @@ export const prepare = async (zcf, privateArgs, baggage) => {
     publicMarshaller,
     registry,
     zoe,
+    secretWalletFactoryKey: upgradeToIncarnation2Key,
   });
 
   /**
@@ -237,6 +253,22 @@ export const prepare = async (zcf, privateArgs, baggage) => {
    */
   const makeSmartWallet = prepareSmartWallet(baggage, shared);
 
+  // One time repair for incarnation 2. We're adding WatchedPromises to allow
+  // wallets to durably monitor offer outcomes, but wallets that already exist
+  // need to be backfilled. This code needs to run once at the beginning of
+  // incarnation 2, and then shouldn't be needed again.
+  if (!baggage.has(UPGRADE_TO_INCARNATION_TWO)) {
+    trace('Wallet Factory upgrading to incarnation 2');
+
+    // This could take a while, depending on how many outstanding wallets exist.
+    // The current plan is that it will run exactly once, and inside an upgrade
+    // handler, between blocks.
+    for (const wallet of walletsByAddress.values()) {
+      wallet.repairWalletForIncarnation2(upgradeToIncarnation2Key);
+    }
+    baggage.init(UPGRADE_TO_INCARNATION_TWO, 'done');
+  }
+
   const creatorFacet = prepareExo(
     baggage,
     'walletFactoryCreator',
@@ -250,16 +282,16 @@ export const prepare = async (zcf, privateArgs, baggage) => {
     {
       /**
        * @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, bank, namesByAddressAdmin) {
         let isNew = false;
 
-        /** @type {(address: string) => Promise<import('./smartWallet').SmartWallet>} */
+        /** @type {(address: string) => Promise<import('./smartWallet.js').SmartWallet>} */
         const maker = async _address => {
           const invitationPurse = await E(invitationIssuer).makeEmptyPurse();
           const walletStorageNode = E(storageNode).makeChildNode(address);