@agoric/smart-wallet 0.5.4-dev-70fb93a.0.70fb93a → 0.5.4-dev-3edcc4d.0.3edcc4d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/smart-wallet",
-  "version": "0.5.4-dev-70fb93a.0.70fb93a",
+  "version": "0.5.4-dev-3edcc4d.0.3edcc4d",
   "description": "Wallet contract",
   "type": "module",
   "main": "src/index.js",
@@ -18,9 +18,9 @@
     "lint:eslint": "yarn run -T eslint ."
   },
   "devDependencies": {
-    "@agoric/casting": "0.4.3-dev-70fb93a.0.70fb93a",
-    "@agoric/cosmic-proto": "0.4.1-dev-70fb93a.0.70fb93a",
-    "@agoric/swingset-vat": "0.32.3-dev-70fb93a.0.70fb93a",
+    "@agoric/casting": "0.4.3-dev-3edcc4d.0.3edcc4d",
+    "@agoric/cosmic-proto": "0.4.1-dev-3edcc4d.0.3edcc4d",
+    "@agoric/swingset-vat": "0.32.3-dev-3edcc4d.0.3edcc4d",
     "@endo/bundle-source": "^4.1.2",
     "@endo/captp": "^4.4.8",
     "@endo/init": "^1.1.12",
@@ -28,15 +28,15 @@
     "import-meta-resolve": "^4.1.0"
   },
   "dependencies": {
-    "@agoric/ertp": "0.16.3-dev-70fb93a.0.70fb93a",
-    "@agoric/internal": "0.3.3-dev-70fb93a.0.70fb93a",
-    "@agoric/notifier": "0.6.3-dev-70fb93a.0.70fb93a",
-    "@agoric/store": "0.9.3-dev-70fb93a.0.70fb93a",
-    "@agoric/vat-data": "0.5.3-dev-70fb93a.0.70fb93a",
-    "@agoric/vats": "0.15.2-dev-70fb93a.0.70fb93a",
-    "@agoric/vow": "0.1.1-dev-70fb93a.0.70fb93a",
-    "@agoric/zoe": "0.26.3-dev-70fb93a.0.70fb93a",
-    "@agoric/zone": "0.2.3-dev-70fb93a.0.70fb93a",
+    "@agoric/ertp": "0.16.3-dev-3edcc4d.0.3edcc4d",
+    "@agoric/internal": "0.3.3-dev-3edcc4d.0.3edcc4d",
+    "@agoric/notifier": "0.6.3-dev-3edcc4d.0.3edcc4d",
+    "@agoric/store": "0.9.3-dev-3edcc4d.0.3edcc4d",
+    "@agoric/vat-data": "0.5.3-dev-3edcc4d.0.3edcc4d",
+    "@agoric/vats": "0.15.2-dev-3edcc4d.0.3edcc4d",
+    "@agoric/vow": "0.1.1-dev-3edcc4d.0.3edcc4d",
+    "@agoric/zoe": "0.26.3-dev-3edcc4d.0.3edcc4d",
+    "@agoric/zone": "0.2.3-dev-3edcc4d.0.3edcc4d",
     "@endo/errors": "^1.2.13",
     "@endo/eventual-send": "^1.3.4",
     "@endo/far": "^1.1.14",
@@ -77,5 +77,5 @@
   "engines": {
     "node": "^20.9 || ^22.11"
   },
-  "gitHead": "70fb93afcb746d40510dcbe3a20370786fb627db"
+  "gitHead": "3edcc4d1483769738ef20da7a712ed93b46a32eb"
 }

package/src/smartWallet.d.ts

@@ -1,5 +1,6 @@
+export const EXISTING_WALLET_MY_STORES_KEY: "existingWalletMyStores";
 export const BRAND_TO_PURSES_KEY: "brandToPurses";
-export function prepareSmartWallet(baggage: Baggage, shared: SharedParams): (uniqueWithoutChildNodes: Omit<UniqueParams, "currentStorageNode" | "walletStorageNode"> & {
+export function prepareSmartWallet(baggage: Baggage, shared: SharedParams, setTestJig?: SetTestJig): (uniqueWithoutChildNodes: Omit<UniqueParams, "currentStorageNode" | "walletStorageNode"> & {
     walletStorageNode: ERemote<StorageNode>;
 }) => Promise<import("@endo/exo").Guarded<{
     /**
@@ -210,14 +211,18 @@ export type ImmutableState = Readonly<UniqueParams & {
     liveOffers: MapStore<OfferId, OfferStatus>;
     liveOfferSeats: MapStore<OfferId, UserSeat<unknown>>;
     liveOfferPayments: MapStore<OfferId, MapStore<Brand, Payment>>;
-    myStore: MapStore;
+    myStore?: MapStore<string, unknown> | undefined;
 }>;
 export type PurseRecord = BrandDescriptor & {
     purse: Purse;
 };
 export type MutableState = {};
+export type SmartWalletTestJig = {
+    setWithMyStore: (enabled: boolean) => void;
+};
 export type SmartWallet = EReturn<EReturn<typeof prepareSmartWallet>>;
 import type { Baggage } from '@agoric/vat-data';
+import type { SetTestJig } from '@agoric/zoe';
 import type { ERemote } from '@agoric/internal';
 import type { CapData } from '@endo/marshal';
 import type { Payment } from '@agoric/ertp';

package/src/smartWallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"smartWallet.d.ts","sourceRoot":"","sources":["smartWallet.js"],"names":[],"mappings":"AA8QA,kCAAmC,eAAe,CAAC;AAiB5C,4CAHI,OAAO,UACP,YAAY,6BAk/BV,IAAI,CACV,YAAY,EAChB,oBAAwB,GAAG,mBAAmB,CAC3C,GAAG;IACF,iBAAiB,EAAE,QAAQ,WAAW,CAAC,CAAC;CACzC;IAtHE;;;;;;;OAOG;sCAHQ,QAAQ,MAAM,GAAG,IAAI,CAAC,aACtB,OAAO,GACL,OAAO,CAAC,IAAI,CAAC;;QA3V1B;;;;;;;;;WASG;yBAJQ,OAAO,GACL,OAAO,CAAC,MAAM,CAAC;;;QAwQ5B;;WAEG;6BADQ,kBAAkB;;;QA3I7B;;;;;;;;;WASG;gCALQ,SAAS,GACP,OAAO,CAAC,IAAI,CAAC;QA0G1B;;;;;;WAMG;8BAHQ,OAAO,GACL,OAAO,CAAC,IAAI,CAAC;;IAuK1B,sCAAsC;;IAKtC,sCAAsC;;;;;;;;;;;;;;IAyD7C;6BAztCY;IACR,MAAM,EAAE;QACN,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;QAC/B,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;KACjC,CAAC;IACF,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,kBAAkB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;CACtC;iCAIS;IACR,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,SAAS,CAAC;CAClB;iCAIS;IACR,MAAM,EAAE,cAAc,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;CAClB;;;;;YAKU,aAAa;;;;aACb,kBAAkB;;2BAMlB,kBAAkB,GAAG,kBAAkB,GAAG,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;kCAyBjE;IACR,MAAM,EAAE;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,qBAAqB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,CAAC;IACnE,4BAA4B,EAAE,CAC5B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE;QAAE,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CACnD,EAAE,CAAC;IACJ,UAAU,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC;CACtC;;;;;;;;;;;;;;2BAIS;IAAE,OAAO,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAE,GACrD;IAAE,OAAO,EAAE,SAAS,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GAC7C;IAAE,OAAO,EAAE,cAAc,CAAC;IAAC,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,GACtD;IACE,OAAO,EAAE,YAAY,CAAC;IACtB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/C;;;;;8BAeK;IACR,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;2BAMS;IACR,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,kBAAkB,EAAE,OAAO,WAAW,CAAC,CAAC;IACxC,eAAe,EAAE,MAAM,KAAK,EAAE,iBAAiB,CAAC,CAAC;IACjD,iBAAiB,EAAE,OAAO,WAAW,CAAC,CAAC;CACxC;sCAGS,IAAI,CAAC,SAAS,KAAK,EAAE,eAAe,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,QAAQ,CAAC;2BAGhE;IACR,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3B,QAAQ,EAAE,uBAAuB,CAAC;IAClC,gBAAgB,EAAE,OAAO,KAAK,CAAC,CAAC;IAChC,eAAe,EAAE,MAAM,KAAK,CAAC,CAAC;IAC9B,qBAAqB,EAAE,WAAW,CAAC;IACnC,gBAAgB,EAAE,QAAQ,WAAW,CAAC,CAAC;IACvC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;CACvB;;;;;;;;;;oBAGS,cAAc,GAAG,YAAY;6BAS7B,QAAQ,CAChB,YAAY,GAAG;IACb,aAAa,EAAE,SAAS,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;IAC1C,uBAAuB,EAAE,SAAS,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC5D,4BAA4B,EAAE,SAAS,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACvE,qBAAqB,EAAE,SAAS,MAAM,EAAE,OAAO,KAAK,CAAC,CAAC,CAAC;IACvD,aAAa,EAAE,SAAS,KAAK,EAAE,MAAM,CAAC,CAAC;IACvC,iBAAiB,EAAE,YAAY,YAAY,CAAC,CAAC;IAC7C,kBAAkB,EAAE,YAAY,mBAAmB,CAAC,CAAC;IACrD,UAAU,EAAE,SAAS,OAAO,EAAE,WAAW,CAAC,CAAC;IAC3C,cAAc,EAAE,SAAS,OAAO,EAAE,SAAS,OAAO,CAAC,CAAC,CAAC;IACrD,iBAAiB,EAAE,SAAS,OAAO,EAAE,SAAS,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IAC/D,OAAO,EAAE,QAAQ,CAAC;CACnB,CACF;0BAGS,eAAe,GAAG;IAAE,KAAK,EAAE,KAAK,CAAA;CAAE;2BAElC,EAAE;0BAgkCD,QAAQ,QAAQ,OAAO,kBAAkB,CAAC,CAAC;6BAxuC/B,kBAAkB;6BAdV,kBAAkB;6BAgB1B,eAAe;6BAde,cAAc;4BAAd,cAAc;wCAKY,aAAa;+BAAb,aAAa;6BAAb,aAAa;sCAC5D,mBAAmB;2BANE,cAAc;iCAKY,aAAa;4BALvC,cAAc;6BAO5C,YAAY;0BACf,8BAA8B;4BAVnB,kBAAkB;uCAI6C,aAAa;2BAFtD,cAAc;8BAC7B,eAAe;6BAQ9B,cAAc;iCAVV,iDAAiD;sCAW5C,YAAY;iCACjB,6CAA6C;8BATsB,aAAa;6BAEpF,WAAW"}
+{"version":3,"file":"smartWallet.d.ts","sourceRoot":"","sources":["smartWallet.js"],"names":[],"mappings":"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"}

package/src/smartWallet.js

@@ -51,7 +51,7 @@ import { prepareOfferWatcher, makeWatchOfferOutcomes } from './offerWatcher.js';
  * @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 {InvitationAmount, InvitationDetails, PaymentPKeywordRecord, Proposal, UserSeat, SetTestJig} from '@agoric/zoe';
  * @import {CopyRecord} from '@endo/pass-style';
  * @import {EReturn} from '@endo/far';
  * @import {OfferId, OfferStatus, OfferSpec, InvokeEntryMessage, ResultPlan} from './offers.js';
@@ -222,7 +222,7 @@ const trace = makeTracer('SmrtWlt');
  *     liveOffers: MapStore<OfferId, OfferStatus>;
  *     liveOfferSeats: MapStore<OfferId, UserSeat<unknown>>;
  *     liveOfferPayments: MapStore<OfferId, MapStore<Brand, Payment>>;
- *     myStore: MapStore;
+ *     myStore?: MapStore<string, unknown> | undefined;
  *   }
  * >} ImmutableState
  *
@@ -232,6 +232,11 @@ const trace = makeTracer('SmrtWlt');
  * @typedef {{}} MutableState
  */
 
+/**
+ * @typedef {object} SmartWalletTestJig
+ * @property {(enabled: boolean) => void} setWithMyStore
+ */
+
 /**
  * NameHub reverse-lookup, finding 0 or more names for a target value
  *
@@ -268,6 +273,8 @@ const checkMutual = (issuer, brand) =>
     E(brand).isMyIssuer(issuer),
   ]).then(checks => checks.every(Boolean));
 
+export const EXISTING_WALLET_MY_STORES_KEY = 'existingWalletMyStores';
+
 export const BRAND_TO_PURSES_KEY = 'brandToPurses';
 
 const getBrandToPurses = (walletPurses, key) => {
@@ -284,8 +291,9 @@ const getBrandToPurses = (walletPurses, key) => {
 /**
  * @param {Baggage} baggage
  * @param {SharedParams} shared
+ * @param {SetTestJig} [setTestJig]
  */
-export const prepareSmartWallet = (baggage, shared) => {
+export const prepareSmartWallet = (baggage, shared, setTestJig) => {
   const { registry: _r, ...passableShared } = shared;
   mustMatch(
     harden(passableShared),
@@ -310,6 +318,19 @@ export const prepareSmartWallet = (baggage, shared) => {
     return store;
   });
 
+  const existingWalletMyStores = zone.weakMapStore('myStore by wallet');
+
+  let withMyStore = true;
+
+  setTestJig?.(
+    () =>
+      /** @type {SmartWalletTestJig} */ ({
+        setWithMyStore: value => {
+          withMyStore = value;
+        },
+      }),
+  );
+
   const vowTools = prepareVowTools(zone.subZone('vow'));
 
   const makeOfferWatcher = prepareOfferWatcher(baggage, vowTools);
@@ -440,9 +461,10 @@ 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'),
+      // NB: Wallets before this state property was added also support saving
+      // results or invoking the saved items, but through the alternate
+      // EXISTING_WALLET_MY_STORES_KEY baggage map.
+      myStore: withMyStore ? zone.detached().mapStore('my items') : undefined,
     };
 
     /** @type {RecorderKit<UpdateRecord>} */
@@ -501,6 +523,7 @@ 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')),
+      getMyStore: M.call().returns(M.remotable('my items store')),
       saveEntry: M.call(shape.ResultPlan, M.any()).returns(M.string()),
       findUnusedName: M.call(M.string()).returns(M.string()),
     }),
@@ -522,7 +545,7 @@ export const prepareSmartWallet = (baggage, shared) => {
       tryExitOffer: M.call(M.scalar()).returns(M.promise()),
     }),
     invoke: M.interface('invoke', {
-      invokeEntry: M.callWhen(shape.InvokeEntryMessage).returns(),
+      invokeEntry: M.call(shape.InvokeEntryMessage).returns(M.promise()),
     }),
     resultStepWatcher: M.interface('resultStepWatcher', {
       onFulfilled: M.call(M.any(), invocationResultShape).returns(),
@@ -804,9 +827,25 @@ export const prepareSmartWallet = (baggage, shared) => {
           }
           return baggage.get(state.address);
         },
+        /**
+         * @returns {NonNullable<ImmutableState['myStore']>}
+         */
+        getMyStore() {
+          const {
+            state,
+            facets: { self },
+          } = this;
+          if ('myStore' in state && state.myStore != null) {
+            return state.myStore;
+          }
+
+          return provideLazy(existingWalletMyStores, self, _k =>
+            zone.detached().mapStore('my items'),
+          );
+        },
         /** @param {string} suggestion */
         findUnusedName(suggestion) {
-          const { myStore } = this.state;
+          const myStore = this.facets.helper.getMyStore();
           let nonce = 0;
           let name = suggestion;
           while (myStore.has(name)) {
@@ -820,7 +859,7 @@ export const prepareSmartWallet = (baggage, shared) => {
          * @param {unknown} value
          */
         saveEntry(plan, value) {
-          const { myStore } = this.state;
+          const myStore = this.facets.helper.getMyStore();
           const name = plan.overwrite
             ? plan.name
             : this.facets.helper.findUnusedName(plan.name);
@@ -1112,28 +1151,49 @@ export const prepareSmartWallet = (baggage, shared) => {
         /**
          * @param {InvokeEntryMessage} message
          */
-        async invokeEntry(message) {
+        invokeEntry(message) {
           trace('invokeEntry', message);
-          const { myStore } = this.state;
-          const { resultStepWatcher } = this.facets;
+          const { resultStepWatcher, helper } = 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;
+          // From here on we can report status records related to the id
+          try {
+            const myStore = helper.getMyStore();
+            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;
+            }
+            return Promise.resolve();
+          } catch (reason) {
+            if (id) {
+              const { updateRecorderKit } = this.state;
+              void updateRecorderKit.recorder.write({
+                updated: 'invocation',
+                id,
+                error: String(reason),
+              });
+              // handleBridgeAction records sync error so return a rejected
+              // Promise to avoid overriding our update, but still report an
+              // error to any test caller of `handleBridgeAction`
+              return Promise.reject(reason);
+            } else {
+              // We could'd report the failure, so let `handleBridgeAction` do
+              // some best effort reporting
+              throw reason;
+            }
           }
         },
       },
@@ -1189,7 +1249,7 @@ export const prepareSmartWallet = (baggage, shared) => {
          * @returns {Promise<void>}
          */
         handleBridgeAction(actionCapData, canSpend = false) {
-          const { facets, state } = this;
+          const { facets } = this;
           const { offers, invoke } = facets;
           const { publicMarshaller } = shared;
 
@@ -1203,8 +1263,6 @@ 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),
@@ -1214,9 +1272,6 @@ 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);
                   }
@@ -1225,8 +1280,6 @@ export const prepareSmartWallet = (baggage, shared) => {
                     return offers.tryExitOffer(action.offerId);
                   }
                   case 'invokeEntry': {
-                    walletHasNameHub ||
-                      Fail`invokeEntry requires a new smart wallet with myStore`;
                     return invoke.invokeEntry(action.message);
                   }
                   default: {

package/src/walletFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"walletFactory.d.ts","sourceRoot":"","sources":["walletFactory.js"],"names":[],"mappings":";;;;;AA4CA,gEAKE;AAYK,6CAJI,MAAM,UACN,WAAW,uBACX,IAAI,CAAC,SAAS,CAAC,oBAezB;AAWM,kDAFI,cAAc;IAyCrB,2BAA2B;iBAAf,KAAK;IAEjB,2BAA2B;iBAAf,KAAK;eArCP,KAAK;qBACC,WAAW;gBAChB,MAAM;iBACL,OAAO;;;eAHT,KAAK;qBACC,WAAW;gBAChB,MAAM;iBACL,OAAO;;EAuCtB;AAmCM,6BARI,GAAG,CAAC,wBAAwB,CAAC,eAC7B;IACN,WAAW,EAAE,QAAQ,WAAW,CAAC,CAAC;IAClC,mBAAmB,CAAC,EAAE,IAAI,CAAC,oBAAoB,QAAQ,CAAC,CAAC,CAAC;IAC1D,aAAa,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;CACrC,WACO,OAAO;;QAkHZ;;;;;;;WAOG;oCANQ,MAAM,QACN,IAAI,CAAC,IAAI,CAAC,uBACV,IAAI,CAAC,SAAS,CAAC,GACb,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;;GAqDhE;uCAzMY;IACR,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3B,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;CAChC;6BAGS;IACR,oBAAoB,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC,CAAC;CACtE;uBAGS,OAAO;4BAEP;IACR,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IACxD,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,QAAQ,CAAC;CAC1C;oBA6LU,OAAO,OAAO;iCA3TE,kBAAkB;+BACpB,cAAc;6BAChB,YAAY;iCALR,0CAA0C;6BAD9C,kBAAkB;yCASN,cAAc;6BAC1B,kBAAkB;0BAErB,8BAA8B;6BAT3B,cAAc;2BAIhB,cAAc;qCACJ,8BAA8B"}
+{"version":3,"file":"walletFactory.d.ts","sourceRoot":"","sources":["walletFactory.js"],"names":[],"mappings":";;;;;AA8CA,gEAKE;AAYK,6CAJI,MAAM,UACN,WAAW,uBACX,IAAI,CAAC,SAAS,CAAC,oBAezB;AAWM,kDAFI,cAAc;IAyCrB,2BAA2B;iBAAf,KAAK;IAEjB,2BAA2B;iBAAf,KAAK;eArCP,KAAK;qBACC,WAAW;gBAChB,MAAM;iBACL,OAAO;;;eAHT,KAAK;qBACC,WAAW;gBAChB,MAAM;iBACL,OAAO;;EAuCtB;AAmCM,6BARI,GAAG,CAAC,wBAAwB,CAAC,eAC7B;IACN,WAAW,EAAE,QAAQ,WAAW,CAAC,CAAC;IAClC,mBAAmB,CAAC,EAAE,IAAI,CAAC,oBAAoB,QAAQ,CAAC,CAAC,CAAC;IAC1D,aAAa,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;CACrC,WACO,OAAO;;QAyHZ;;;;;;;WAOG;oCANQ,MAAM,QACN,IAAI,CAAC,IAAI,CAAC,uBACV,IAAI,CAAC,SAAS,CAAC,GACb,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;;GAyDhE;uCApNY;IACR,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3B,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACnB,cAAc,EAAE,cAAc,CAAC;CAChC;6BAGS;IACR,oBAAoB,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC,CAAC;CACtE;uBAGS,OAAO;4BAEP;IACR,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IACxD,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,QAAQ,CAAC;CAC1C;oBAwMU,OAAO,OAAO;iCAvUsB,kBAAkB;+BACxC,cAAc;6BAChB,YAAY;iCALR,0CAA0C;6BAD9C,kBAAkB;yCASN,cAAc;6BAC1B,kBAAkB;0BAErB,8BAA8B;6BAT3B,cAAc;2BAIhB,cAAc;qCACJ,8BAA8B"}

package/src/walletFactory.js

@@ -14,6 +14,7 @@ import { M, makeExo, makeScalarMapStore, mustMatch } from '@agoric/store';
 import { makeAtomicProvider } from '@agoric/store/src/stores/store-utils.js';
 import { prepareExo, provideDurableMapStore } from '@agoric/vat-data';
 import { provideAll } from '@agoric/zoe/src/contractSupport/durability.js';
+import { makeJigKit } from '@agoric/zoe/src/contractSupport/testJigHelpers.js';
 import { E } from '@endo/far';
 import { prepareSmartWallet } from './smartWallet.js';
 import { shape } from './typeGuards.js';
@@ -23,7 +24,7 @@ import { shape } from './typeGuards.js';
  * @import {StorageNode} from '@agoric/internal/src/lib-chainStorage.js';
  * @import {MapStore} from '@agoric/swingset-liveslots';
  * @import {NameHub} from '@agoric/vats';
- * @import {SmartWallet} from './smartWallet.js';
+ * @import {SmartWallet, SmartWalletTestJig} from './smartWallet.js';
  * @import {NameAdmin} from '@agoric/vats';
  * @import {Petname} from './types.js';
  * @import {Board} from '@agoric/vats';
@@ -32,6 +33,7 @@ import { shape } from './typeGuards.js';
  * @import {Baggage} from '@agoric/vat-data';
  * @import {WalletBridgeMsg} from './types.js';
  * @import {Bank} from '@agoric/vats/src/vat-bank.js';
+ * @import {TestJigKit} from '@agoric/zoe/src/contractSupport/testJigHelpers.js';
  */
 
 const trace = makeTracer('WltFct');
@@ -257,13 +259,20 @@ export const prepare = async (zcf, privateArgs, baggage) => {
     zoe,
   });
 
+  /** @type {TestJigKit<SmartWalletTestJig>} */
+  const smartWalletJigKit = makeJigKit();
+
   /**
    * Holders of this object:
    *
    * - vat (transitively from holding the wallet factory)
    * - wallet-ui (which has key material; dapps use wallet-ui to propose actions)
    */
-  const makeSmartWallet = prepareSmartWallet(baggage, shared);
+  const makeSmartWallet = prepareSmartWallet(
+    baggage,
+    shared,
+    smartWalletJigKit.setTestJig,
+  );
 
   const creatorFacet = prepareExo(
     baggage,
@@ -330,6 +339,10 @@ export const prepare = async (zcf, privateArgs, baggage) => {
     }
   }
 
+  zcf.setTestJig(() => {
+    return { ...smartWalletJigKit.getTestJig() };
+  });
+
   return {
     creatorFacet,
   };