@agoric/smart-wallet 0.5.4-dev-6388a00.0 → 0.5.4-dev-376e47d.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/smart-wallet",
-  "version": "0.5.4-dev-6388a00.0+6388a00",
+  "version": "0.5.4-dev-376e47d.0+376e47d",
   "description": "Wallet contract",
   "type": "module",
   "scripts": {
@@ -16,8 +16,8 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-proto": "0.3.1-dev-6388a00.0+6388a00",
-    "@agoric/swingset-vat": "0.32.3-dev-6388a00.0+6388a00",
+    "@agoric/cosmic-proto": "0.3.1-dev-376e47d.0+376e47d",
+    "@agoric/swingset-vat": "0.32.3-dev-376e47d.0+376e47d",
     "@endo/bundle-source": "^3.0.1",
     "@endo/captp": "^4.0.1",
     "@endo/init": "^1.0.1",
@@ -25,15 +25,15 @@
     "import-meta-resolve": "^2.2.1"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-6388a00.0+6388a00",
-    "@agoric/casting": "0.4.3-dev-6388a00.0+6388a00",
-    "@agoric/ertp": "0.16.3-dev-6388a00.0+6388a00",
-    "@agoric/internal": "0.3.3-dev-6388a00.0+6388a00",
-    "@agoric/notifier": "0.6.3-dev-6388a00.0+6388a00",
-    "@agoric/store": "0.9.3-dev-6388a00.0+6388a00",
-    "@agoric/vat-data": "0.5.3-dev-6388a00.0+6388a00",
-    "@agoric/vats": "0.15.2-dev-6388a00.0+6388a00",
-    "@agoric/zoe": "0.26.3-dev-6388a00.0+6388a00",
+    "@agoric/assert": "0.6.1-dev-376e47d.0+376e47d",
+    "@agoric/casting": "0.4.3-dev-376e47d.0+376e47d",
+    "@agoric/ertp": "0.16.3-dev-376e47d.0+376e47d",
+    "@agoric/internal": "0.3.3-dev-376e47d.0+376e47d",
+    "@agoric/notifier": "0.6.3-dev-376e47d.0+376e47d",
+    "@agoric/store": "0.9.3-dev-376e47d.0+376e47d",
+    "@agoric/vat-data": "0.5.3-dev-376e47d.0+376e47d",
+    "@agoric/vats": "0.15.2-dev-376e47d.0+376e47d",
+    "@agoric/zoe": "0.26.3-dev-376e47d.0+376e47d",
     "@endo/eventual-send": "^1.0.1",
     "@endo/far": "^1.0.1",
     "@endo/marshal": "^1.0.1",
@@ -69,5 +69,5 @@
   "typeCoverage": {
     "atLeast": 94.07
   },
-  "gitHead": "6388a002b53593f17a8d936d4e937efb7d065d97"
+  "gitHead": "376e47d1b7eba11d1e587778489d8f199d53870f"
 }

package/src/offerWatcher.d.ts

@@ -0,0 +1,31 @@
+export function watchOfferOutcomes(watchers: OutcomeWatchers, seat: UserSeat): Promise<[unknown, 0 | 1, PaymentPKeywordRecord]>;
+export function prepareOfferWatcher(baggage: any): (walletHelper?: any, deposit?: any, offerSpec?: any, address?: any, iAmount?: any, seatRef?: any) => import("@endo/exo/src/exo-makers.js").GuardedKit<{
+    helper: {
+        updateStatus(offerStatusUpdates: any): void;
+        onNewContinuingOffer(offerId: any, invitationAmount: any, invitationMakers: any, publicSubscribers: any): void;
+        publishResult(result: any): void;
+    };
+    /** @type {OutcomeWatchers['paymentWatcher']} */
+    paymentWatcher: OutcomeWatchers['paymentWatcher'];
+    /** @type {OutcomeWatchers['resultWatcher']} */
+    resultWatcher: OutcomeWatchers['resultWatcher'];
+    /** @type {OutcomeWatchers['numWantsWatcher']} */
+    numWantsWatcher: OutcomeWatchers['numWantsWatcher'];
+}>;
+export type OfferStatus = import('./offers.js').OfferSpec & {
+    error?: string;
+    numWantsSatisfied?: number;
+    result?: unknown | typeof import('./offers.js').UNPUBLISHED_RESULT;
+    payouts?: AmountKeywordRecord;
+};
+/**
+ * <T, [UserSeat]
+ */
+export type OfferPromiseWatcher<T extends unknown> = import('@agoric/swingset-liveslots').PromiseWatcher<T, [UserSeat]>;
+export type OutcomeWatchers = {
+    resultWatcher: OfferPromiseWatcher<unknown>;
+    numWantsWatcher: OfferPromiseWatcher<number>;
+    paymentWatcher: OfferPromiseWatcher<PaymentPKeywordRecord>;
+};
+export type MakeOfferWatcher = ReturnType<typeof prepareOfferWatcher>;
+//# sourceMappingURL=offerWatcher.d.ts.map

package/src/offerWatcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"offerWatcher.d.ts","sourceRoot":"","sources":["offerWatcher.js"],"names":[],"mappings":"AAsEO,6CAHI,eAAe,QACf,QAAQ,oDAQlB;AA8BM;;;;;;IAwED,gDAAgD;oBAArC,eAAe,CAAC,gBAAgB,CAAC;IAyB5C,+CAA+C;mBAApC,eAAe,CAAC,eAAe,CAAC;IAkB3C,iDAAiD;qBAAtC,eAAe,CAAC,iBAAiB,CAAC;GAkBlD;0BAhOY,OAAO,aAAa,EAAE,SAAS,GAAG;IAC9C,KAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,MAAU,CAAC,EAAE,OAAO,GAAG,cAAc,aAAa,EAAE,kBAAkB,CAAC;IACvE,OAAW,CAAC,EAAE,mBAAmB,CAAC;CAC/B;;;;qDAKS,OAAO,4BAA4B,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;8BAIlE;IACZ,aAAe,EAAE,oBAAoB,OAAO,CAAC,CAAC;IAC9C,eAAiB,EAAE,oBAAoB,MAAM,CAAC,CAAC;IAC/C,cAAgB,EAAE,oBAAoB,qBAAqB,CAAC,CAAC;CAC1D;+BAiNU,WAAW,0BAA0B,CAAC"}

package/src/offerWatcher.js

@@ -0,0 +1,243 @@
+import { E, passStyleOf } from '@endo/far';
+
+import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
+import { prepareExoClassKit, watchPromise } from '@agoric/vat-data';
+import { M } from '@agoric/store';
+import {
+  PaymentPKeywordRecordShape,
+  SeatShape,
+} from '@agoric/zoe/src/typeGuards.js';
+import { AmountShape } from '@agoric/ertp/src/typeGuards.js';
+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
+ */
+
+/**
+ * @template {any} T
+ * @typedef {import('@agoric/swingset-liveslots').PromiseWatcher<T, [UserSeat]>} OfferPromiseWatcher<T, [UserSeat]
+ */
+
+/**
+ * @typedef {{
+ * resultWatcher: OfferPromiseWatcher<unknown>,
+ * numWantsWatcher: OfferPromiseWatcher<number>,
+ * paymentWatcher: OfferPromiseWatcher<PaymentPKeywordRecord>,
+ * }} OutcomeWatchers
+ */
+
+/**
+ * @param {OutcomeWatchers} watchers
+ * @param {UserSeat} seat
+ */
+const watchForOfferResult = ({ resultWatcher }, seat) => {
+  const p = E(seat).getOfferResult();
+  watchPromise(p, resultWatcher, seat);
+  return p;
+};
+
+/**
+ * @param {OutcomeWatchers} watchers
+ * @param {UserSeat} seat
+ */
+const watchForNumWants = ({ numWantsWatcher }, seat) => {
+  const p = E(seat).numWantsSatisfied();
+  watchPromise(p, numWantsWatcher, seat);
+  return p;
+};
+
+/**
+ * @param {OutcomeWatchers} watchers
+ * @param {UserSeat} seat
+ */
+const watchForPayout = ({ paymentWatcher }, seat) => {
+  const p = E(seat).getPayouts();
+  watchPromise(p, paymentWatcher, seat);
+  return p;
+};
+
+/**
+ * @param {OutcomeWatchers} watchers
+ * @param {UserSeat} seat
+ */
+export const watchOfferOutcomes = (watchers, seat) => {
+  return Promise.all([
+    watchForOfferResult(watchers, seat),
+    watchForNumWants(watchers, seat),
+    watchForPayout(watchers, seat),
+  ]);
+};
+
+const offerWatcherGuard = harden({
+  helper: M.interface('InstanceAdminStorage', {
+    updateStatus: M.call(M.any()).returns(),
+    onNewContinuingOffer: M.call(
+      M.or(M.number(), M.string()),
+      AmountShape,
+      M.any(),
+    )
+      .optional(M.record())
+      .returns(),
+    publishResult: M.call(M.any()).returns(),
+  }),
+  paymentWatcher: M.interface('paymentWatcher', {
+    onFulfilled: M.call(PaymentPKeywordRecordShape, SeatShape).returns(
+      M.promise(),
+    ),
+    onRejected: M.call(M.any(), SeatShape).returns(),
+  }),
+  resultWatcher: M.interface('resultWatcher', {
+    onFulfilled: M.call(M.any(), SeatShape).returns(),
+    onRejected: M.call(M.any(), SeatShape).returns(),
+  }),
+  numWantsWatcher: M.interface('numWantsWatcher', {
+    onFulfilled: M.call(M.number(), SeatShape).returns(),
+    onRejected: M.call(M.any(), SeatShape).returns(),
+  }),
+});
+
+export const prepareOfferWatcher = baggage => {
+  return prepareExoClassKit(
+    baggage,
+    'OfferWatcher',
+    offerWatcherGuard,
+    (walletHelper, deposit, offerSpec, address, iAmount, seatRef) => ({
+      walletHelper,
+      deposit,
+      status: offerSpec,
+      address,
+      invitationAmount: iAmount,
+      seatRef,
+    }),
+    {
+      helper: {
+        updateStatus(offerStatusUpdates) {
+          const { state } = this;
+          state.status = harden({ ...state.status, ...offerStatusUpdates });
+
+          state.walletHelper.updateStatus(state.status);
+        },
+        onNewContinuingOffer(
+          offerId,
+          invitationAmount,
+          invitationMakers,
+          publicSubscribers,
+        ) {
+          const { state } = this;
+
+          void state.walletHelper.addContinuingOffer(
+            offerId,
+            invitationAmount,
+            invitationMakers,
+            publicSubscribers,
+          );
+        },
+
+        publishResult(result) {
+          const { state, facets } = this;
+
+          const passStyle = passStyleOf(result);
+          // someday can we get TS to type narrow based on the passStyleOf result match?
+          switch (passStyle) {
+            case 'bigint':
+            case 'boolean':
+            case 'null':
+            case 'number':
+            case 'string':
+            case 'symbol':
+            case 'undefined':
+              facets.helper.updateStatus({ result });
+              break;
+            case 'copyRecord':
+              if ('invitationMakers' in result) {
+                // save for continuing invitation offer
+
+                void facets.helper.onNewContinuingOffer(
+                  String(state.status.id),
+                  state.invitationAmount,
+                  result.invitationMakers,
+                  result.publicSubscribers,
+                );
+              }
+              facets.helper.updateStatus({ result: UNPUBLISHED_RESULT });
+              break;
+            default:
+              // drop the result
+              facets.helper.updateStatus({ result: UNPUBLISHED_RESULT });
+          }
+        },
+      },
+
+      /** @type {OutcomeWatchers['paymentWatcher']} */
+      paymentWatcher: {
+        async onFulfilled(payouts) {
+          const { state, facets } = this;
+
+          // This will block until all payouts succeed, but user will be updated
+          // since each payout will trigger its corresponding purse notifier.
+          const amountPKeywordRecord = objectMap(payouts, paymentRef =>
+            E.when(paymentRef, payment => state.deposit.receive(payment)),
+          );
+          const amounts = await deeplyFulfilledObject(amountPKeywordRecord);
+          facets.helper.updateStatus({ payouts: amounts });
+        },
+        /**
+         * @param {Error} err
+         * @param {UserSeat} seat
+         */
+        onRejected(err, seat) {
+          const { facets } = this;
+          if (isUpgradeDisconnection(err)) {
+            void watchForPayout(facets, seat);
+          }
+        },
+      },
+
+      /** @type {OutcomeWatchers['resultWatcher']} */
+      resultWatcher: {
+        onFulfilled(result) {
+          const { facets } = this;
+          facets.helper.publishResult(result);
+        },
+        /**
+         * @param {Error} err
+         * @param {UserSeat} seat
+         */
+        onRejected(err, seat) {
+          const { facets } = this;
+          if (isUpgradeDisconnection(err)) {
+            void watchForOfferResult(facets, seat);
+          }
+        },
+      },
+
+      /** @type {OutcomeWatchers['numWantsWatcher']} */
+      numWantsWatcher: {
+        onFulfilled(numSatisfied) {
+          const { facets } = this;
+
+          facets.helper.updateStatus({ numWantsSatisfied: numSatisfied });
+        },
+        /**
+         * @param {Error} err
+         * @param {UserSeat} seat
+         */
+        onRejected(err, seat) {
+          const { facets } = this;
+          void watchForNumWants(facets, seat);
+        },
+      },
+    },
+  );
+};
+harden(prepareOfferWatcher);
+
+/** @typedef {ReturnType<typeof prepareOfferWatcher>} MakeOfferWatcher */

package/src/offers.d.ts

@@ -11,30 +11,6 @@
  */
 /** Value for "result" field when the result can't be published */
 export const UNPUBLISHED_RESULT: "UNPUBLISHED";
-export function makeOfferExecutor({ zoe, depositFacet, invitationIssuer, powers, onStatusChange, onNewContinuingOffer, }: {
-    zoe: ERef<ZoeService>;
-    depositFacet: {
-        receive: (payment: any) => Promise<Amount>;
-    };
-    invitationIssuer: ERef<Issuer<'set'>>;
-    powers: {
-        logger: Pick<Console, 'info' | 'error'>;
-        invitationFromSpec: (spec: import('./invitations.js').InvitationSpec) => ERef<Invitation>;
-        purseForBrand: (brand: Brand) => Promise<Purse>;
-    };
-    onStatusChange: (status: OfferStatus) => void;
-    onNewContinuingOffer: (offerId: string, invitationAmount: Amount<'set'>, invitationMakers: import('./types.js').InvitationMakers, publicSubscribers: import('./types.js').PublicSubscribers | import('@agoric/zoe/src/contractSupport/index.js').TopicsRecord) => Promise<void>;
-}): {
-    /**
-     * Take an offer description provided in capData, augment it with payments and call zoe.offer()
-     *
-     * @param {OfferSpec} offerSpec
-     * @param {(seatRef: UserSeat) => void} onSeatCreated
-     * @returns {Promise<void>} when the offer has been sent to Zoe; payouts go into this wallet's purses
-     * @throws if any parts of the offer are determined to be invalid before calling Zoe's `offer()`
-     */
-    executeOffer(offerSpec: OfferSpec, onSeatCreated: (seatRef: UserSeat) => void): Promise<void>;
-};
 export type OfferId = number | string;
 export type OfferSpec = {
     id: OfferId;

package/src/offers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"offers.d.ts","sourceRoot":"","sources":["offers.js"],"names":[],"mappings":"AAIA;;GAEG;AAEH;;;;;;;GAOG;AAEH,kEAAkE;AAClE,+CAAgD;AAwBzC;SAVI,KAAK,UAAU,CAAC;;mCACW,QAAQ,MAAM,CAAC;;sBAC1C,KAAK,OAAO,KAAK,CAAC,CAAC;;gBAEnB,KAAK,OAAO,EAAE,MAAM,GAAE,OAAO,CAAC;mCACvB,OAAO,kBAAkB,EAAE,cAAc,KAAK,KAAK,UAAU,CAAC;+BAC7D,KAAK,KAAK,QAAQ,KAAK,CAAC;;6BACvB,WAAW,KAAK,IAAI;oCACnB,MAAM,oBAAoB,OAAO,KAAK,CAAC,oBAAoB,OAAO,YAAY,EAAE,gBAAgB,qBAAqB,OAAO,YAAY,EAAE,iBAAiB,GAAG,OAAO,0CAA0C,EAAE,YAAY,KAAM,QAAQ,IAAI,CAAC;;IAajQ;;;;;;;OAOG;4BAJQ,SAAS,2BACC,QAAQ,KAAK,IAAI,GACzB,QAAQ,IAAI,CAAC;EAwI7B;sBA7LY,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,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,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"}

package/src/offers.js

@@ -1,7 +1,3 @@
-import { E, passStyleOf } from '@endo/far';
-import { deeplyFulfilledObject } from '@agoric/internal';
-import { makePaymentsHelper } from './payments.js';
-
 /**
  * @typedef {number | string} OfferId
  */
@@ -26,171 +22,3 @@ export const UNPUBLISHED_RESULT = 'UNPUBLISHED';
  * payouts?: AmountKeywordRecord,
  * }} OfferStatus
  */
-
-/* eslint-disable jsdoc/check-param-names -- bug(?) with nested objects */
-/**
- * @param {object} opts
- * @param {ERef<ZoeService>} opts.zoe
- * @param {{ receive: (payment: *) => Promise<Amount> }} opts.depositFacet
- * @param {ERef<Issuer<'set'>>} opts.invitationIssuer
- * @param {object} opts.powers
- * @param {Pick<Console, 'info'| 'error'>} opts.powers.logger
- * @param {(spec: import('./invitations.js').InvitationSpec) => ERef<Invitation>} opts.powers.invitationFromSpec
- * @param {(brand: Brand) => Promise<Purse>} opts.powers.purseForBrand
- * @param {(status: OfferStatus) => void} opts.onStatusChange
- * @param {(offerId: string, invitationAmount: Amount<'set'>, invitationMakers: import('./types.js').InvitationMakers, publicSubscribers: import('./types.js').PublicSubscribers | import('@agoric/zoe/src/contractSupport/index.js').TopicsRecord ) => Promise<void>} opts.onNewContinuingOffer
- */
-export const makeOfferExecutor = ({
-  zoe,
-  depositFacet,
-  invitationIssuer,
-  powers,
-  onStatusChange,
-  onNewContinuingOffer,
-}) => {
-  const { invitationFromSpec, logger, purseForBrand } = powers;
-
-  return {
-    /**
-     * Take an offer description provided in capData, augment it with payments and call zoe.offer()
-     *
-     * @param {OfferSpec} offerSpec
-     * @param {(seatRef: UserSeat) => void} onSeatCreated
-     * @returns {Promise<void>} when the offer has been sent to Zoe; payouts go into this wallet's purses
-     * @throws if any parts of the offer are determined to be invalid before calling Zoe's `offer()`
-     */
-    async executeOffer(offerSpec, onSeatCreated) {
-      logger.info('starting executeOffer', offerSpec.id);
-
-      const paymentsManager = makePaymentsHelper(purseForBrand, depositFacet);
-
-      /** @type {OfferStatus} */
-      let status = {
-        ...offerSpec,
-      };
-      /** @param {Partial<OfferStatus>} changes */
-      const updateStatus = changes => {
-        status = { ...status, ...changes };
-        onStatusChange(status);
-      };
-
-      /** @type {UserSeat} */
-      let seatRef;
-
-      const tryBody = async () => {
-        // 1. Prepare values and validate synchronously.
-        const { id, invitationSpec, proposal, offerArgs } = offerSpec;
-
-        /** @type {PaymentKeywordRecord | undefined} */
-        const paymentKeywordRecord = await (proposal?.give &&
-          deeplyFulfilledObject(paymentsManager.withdrawGive(proposal.give)));
-
-        const invitation = invitationFromSpec(invitationSpec);
-        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.
-
-        seatRef = await E(zoe).offer(
-          invitation,
-          proposal,
-          paymentKeywordRecord,
-          offerArgs,
-        );
-        logger.info(id, 'seated');
-        onSeatCreated(seatRef);
-
-        const publishResult = E.when(E(seatRef).getOfferResult(), result => {
-          const passStyle = passStyleOf(result);
-          logger.info(id, 'offerResult', passStyle, result);
-          // someday can we get TS to type narrow based on the passStyleOf result match?
-          switch (passStyle) {
-            case 'bigint':
-            case 'boolean':
-            case 'null':
-            case 'number':
-            case 'string':
-            case 'symbol':
-            case 'undefined':
-              updateStatus({ result });
-              break;
-            case 'copyRecord':
-              // @ts-expect-error result narrowed by passStyle
-              if ('invitationMakers' in result) {
-                // save for continuing invitation offer
-                void onNewContinuingOffer(
-                  String(id),
-                  invitationAmount,
-                  // @ts-expect-error result narrowed by passStyle
-                  result.invitationMakers,
-                  // @ts-expect-error result narrowed by passStyle
-                  result.publicSubscribers,
-                );
-              }
-              // copyRecord is valid to publish but not safe as it may have private info
-              updateStatus({ result: UNPUBLISHED_RESULT });
-              break;
-            default:
-              // drop the result
-              updateStatus({ result: UNPUBLISHED_RESULT });
-          }
-        });
-
-        const publishWantsSatisfied = E.when(
-          E(seatRef).numWantsSatisfied(),
-          numSatisfied => {
-            logger.info(id, 'numSatisfied', numSatisfied);
-            if (numSatisfied === 0) {
-              updateStatus({ numWantsSatisfied: 0 });
-            }
-            updateStatus({
-              numWantsSatisfied: numSatisfied,
-            });
-          },
-        );
-
-        // This will block until all payouts succeed, but user will be updated
-        // as each payout will trigger its corresponding purse notifier.
-        const publishPayouts = E.when(E(seatRef).getPayouts(), payouts =>
-          paymentsManager.depositPayouts(payouts).then(amountsOrDeferred => {
-            updateStatus({ payouts: amountsOrDeferred });
-          }),
-        );
-
-        // The offer is complete when these promises are resolved.
-        // If any reject then executeOffer rejects and that must be handled.
-        return Promise.all([
-          publishResult,
-          publishWantsSatisfied,
-          publishPayouts,
-        ]);
-      };
-
-      await tryBody().catch(err => {
-        logger.error('OFFER ERROR:', err);
-        // Notify the user
-        updateStatus({ error: err.toString() });
-        // Attempt to recover payments
-        void paymentsManager.tryReclaimingWithdrawnPayments().then(result => {
-          if (result) {
-            updateStatus({ result });
-          }
-        });
-        if (seatRef) {
-          void E(seatRef)
-            .hasExited()
-            .then(hasExited => {
-              if (!hasExited) {
-                void E(seatRef).tryExit();
-              }
-            });
-        }
-        // propagate to caller
-        throw err;
-      });
-    },
-  };
-};
-harden(makeOfferExecutor);

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

@@ -0,0 +1,23 @@
+export function upgradeWalletFactory({ consume: { walletFactoryStartResult, provisionPoolStartResult, chainStorage, walletBridgeManager: walletBridgeManagerP, }, }: BootstrapPowers & ChainBootstrapSpace, options: {
+    options: {
+        walletRef: VatSourceRef;
+    };
+}): Promise<void>;
+export function getManifestForUpgradeWallet(_powers: any, { walletRef }: {
+    walletRef: any;
+}): {
+    manifest: {
+        [x: string]: {
+            consume: {
+                walletFactoryStartResult: string;
+                provisionPoolStartResult: string;
+                chainStorage: string;
+                walletBridgeManager: string;
+            };
+        };
+    };
+    options: {
+        walletRef: any;
+    };
+};
+//# sourceMappingURL=upgrade-wallet-factory2-proposal.d.ts.map

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

@@ -0,0 +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;;kBAoCnC;AAEM;;;;;;;;;;;;;;;;EAYL"}

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

@@ -0,0 +1,58 @@
+// @ts-check
+import { E } from '@endo/far';
+import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
+
+/**
+ * @param {BootstrapPowers & ChainBootstrapSpace} powers
+ * @param {object} options
+ * @param {{ walletRef: VatSourceRef }} options.options
+ */
+export const upgradeWalletFactory = async (
+  {
+    consume: {
+      walletFactoryStartResult,
+      provisionPoolStartResult,
+      chainStorage,
+      walletBridgeManager: walletBridgeManagerP,
+    },
+  },
+  options,
+) => {
+  const WALLET_STORAGE_PATH_SEGMENT = 'wallet';
+
+  const { walletRef } = options.options;
+
+  const [walletBridgeManager, walletStorageNode, ppFacets] = await Promise.all([
+    walletBridgeManagerP,
+    makeStorageNodeChild(chainStorage, WALLET_STORAGE_PATH_SEGMENT),
+    provisionPoolStartResult,
+  ]);
+  const walletReviver = await E(ppFacets.creatorFacet).getWalletReviver();
+
+  const privateArgs = {
+    storageNode: walletStorageNode,
+    walletBridgeManager,
+    walletReviver,
+  };
+
+  const { adminFacet } = await walletFactoryStartResult;
+
+  assert(walletRef.bundleID);
+  await E(adminFacet).upgradeContract(walletRef.bundleID, privateArgs);
+
+  console.log(`Successfully upgraded WalletFactory`);
+};
+
+export const getManifestForUpgradeWallet = (_powers, { walletRef }) => ({
+  manifest: {
+    [upgradeWalletFactory.name]: {
+      consume: {
+        walletFactoryStartResult: 'walletFactoryStartResult',
+        provisionPoolStartResult: 'provisionPoolStartResult',
+        chainStorage: 'chainStorage',
+        walletBridgeManager: 'walletBridgeManager',
+      },
+    },
+  },
+  options: { walletRef },
+});