@agoric/smart-wallet 0.5.4-dev-8430b4d.0.8430b4d → 0.5.4-dev-d5eddaf.0.d5eddaf

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/smart-wallet",
-  "version": "0.5.4-dev-8430b4d.0.8430b4d",
+  "version": "0.5.4-dev-d5eddaf.0.d5eddaf",
   "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-8430b4d.0.8430b4d",
-    "@agoric/cosmic-proto": "0.4.1-dev-8430b4d.0.8430b4d",
-    "@agoric/swingset-vat": "0.32.3-dev-8430b4d.0.8430b4d",
+    "@agoric/casting": "0.4.3-dev-d5eddaf.0.d5eddaf",
+    "@agoric/cosmic-proto": "0.4.1-dev-d5eddaf.0.d5eddaf",
+    "@agoric/swingset-vat": "0.32.3-dev-d5eddaf.0.d5eddaf",
     "@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-8430b4d.0.8430b4d",
-    "@agoric/internal": "0.3.3-dev-8430b4d.0.8430b4d",
-    "@agoric/notifier": "0.6.3-dev-8430b4d.0.8430b4d",
-    "@agoric/store": "0.9.3-dev-8430b4d.0.8430b4d",
-    "@agoric/vat-data": "0.5.3-dev-8430b4d.0.8430b4d",
-    "@agoric/vats": "0.15.2-dev-8430b4d.0.8430b4d",
-    "@agoric/vow": "0.1.1-dev-8430b4d.0.8430b4d",
-    "@agoric/zoe": "0.26.3-dev-8430b4d.0.8430b4d",
-    "@agoric/zone": "0.2.3-dev-8430b4d.0.8430b4d",
+    "@agoric/ertp": "0.16.3-dev-d5eddaf.0.d5eddaf",
+    "@agoric/internal": "0.3.3-dev-d5eddaf.0.d5eddaf",
+    "@agoric/notifier": "0.6.3-dev-d5eddaf.0.d5eddaf",
+    "@agoric/store": "0.9.3-dev-d5eddaf.0.d5eddaf",
+    "@agoric/vat-data": "0.5.3-dev-d5eddaf.0.d5eddaf",
+    "@agoric/vats": "0.15.2-dev-d5eddaf.0.d5eddaf",
+    "@agoric/vow": "0.1.1-dev-d5eddaf.0.d5eddaf",
+    "@agoric/zoe": "0.26.3-dev-d5eddaf.0.d5eddaf",
+    "@agoric/zone": "0.2.3-dev-d5eddaf.0.d5eddaf",
     "@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": "8430b4d9c89bf8b9212fa31580f6c673a2ea9447"
+  "gitHead": "d5eddafd1d0d753e222640ce22eb00da23acca03"
 }

package/src/offerWatcher.d.ts

@@ -1,5 +1,5 @@
 export function makeWatchOfferOutcomes(vowTools: VowTools): (watchers: OutcomeWatchers, seat: UserSeat) => Promise<(void | 0 | 1 | PaymentPKeywordRecord)[]>;
-export function prepareOfferWatcher(baggage: Baggage, vowTools: VowTools): (walletHelper: any, deposit: {
+export function prepareOfferWatcher(baggage: Baggage, vowTools: VowTools, zone: Zone): (walletHelper: any, deposit: {
     receive: (payment: Payment) => Promise<Amount>;
 }, offerSpec: OfferSpec, address: string, invitationAmount: import("@agoric/ertp").SetAmount<import("@endo/patterns").Key>, seatRef: UserSeat) => import("@endo/exo").GuardedKit<{
     helper: {
@@ -47,6 +47,7 @@ import type { VowTools } from '@agoric/vow';
 import type { UserSeat } from '@agoric/zoe';
 import type { PaymentPKeywordRecord } from '@agoric/zoe';
 import type { Baggage } from '@agoric/vat-data';
+import type { Zone } from '@agoric/base-zone';
 import type { OfferSpec } from './offers.js';
 import type { InvitationMakers } from './types.js';
 import type { PublicSubscribers } from './types.js';

package/src/offerWatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"offerWatcher.d.ts","sourceRoot":"","sources":["offerWatcher.js"],"names":[],"mappings":"AA4EO,iDADK,QAAQ,cAKP,eAAe,QACf,QAAQ,uDAiBpB;AAmCM,6CAHI,OAAO,YACP,QAAQ;aAWO,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;;;QAgBvD;;WAEG;yCADQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;QAQlC;;;;;WAKG;sCAJQ,MAAM,oBACN,MAAM,CAAC,KAAK,CAAC,oBACb,gBAAgB,qBAChB,iBAAiB;QAkB5B,uDAAuD;8BAA3C,QAAQ,GAAG,qBAAqB;QAoC5C;;;;;;WAMG;yBADQ,KAAK;;IAclB,gDAAgD;oBAArC,eAAe,CAAC,gBAAgB,CAAC;IA8B5C,+CAA+C;mBAApC,eAAe,CAAC,eAAe,CAAC;IAsC3C,iDAAiD;qBAAtC,eAAe,CAAC,iBAAiB,CAAC;GA0BlD;;;;gCAtTkB,CAAC,oBACP,eAAe,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;8BAI7B;IACR,aAAa,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC7C,eAAe,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC7C,cAAc,EAAE,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;CAC5D;+BAgTU,UAAU,CAAC,OAAO,mBAAmB,CAAC;2BACtC,UAAU,CAAC,gBAAgB,CAAC;8BAlUV,aAAa;8BAC2B,aAAa;2CAAb,aAAa;6BAF3D,kBAAkB;+BAJhB,aAAa;sCAON,YAAY;uCACX,YAAY;8BANrB,kBAAkB;2CADL,YAAY;oCAEnB,4BAA4B"}
+{"version":3,"file":"offerWatcher.d.ts","sourceRoot":"","sources":["offerWatcher.js"],"names":[],"mappings":"AAsGO,iDADK,QAAQ,cAKP,eAAe,QACf,QAAQ,uDAiBpB;AAoCM,6CAJI,OAAO,YACP,QAAQ,QACR,IAAI;aAkDW,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;;;QAgBvD;;WAEG;yCADQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;QAQlC;;;;;WAKG;sCAJQ,MAAM,oBACN,MAAM,CAAC,KAAK,CAAC,oBACb,gBAAgB,qBAChB,iBAAiB;QAkB5B,uDAAuD;8BAA3C,QAAQ,GAAG,qBAAqB;QAoC5C;;;;;;WAMG;yBADQ,KAAK;;IAclB,gDAAgD;oBAArC,eAAe,CAAC,gBAAgB,CAAC;IA8B5C,+CAA+C;mBAApC,eAAe,CAAC,eAAe,CAAC;IAsC3C,iDAAiD;qBAAtC,eAAe,CAAC,iBAAiB,CAAC;GA6BlD;;;;gCAvXkB,CAAC,oBACP,eAAe,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;8BAI7B;IACR,aAAa,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC7C,eAAe,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC7C,cAAc,EAAE,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;CAC5D;+BAiXU,UAAU,CAAC,OAAO,mBAAmB,CAAC;2BACtC,UAAU,CAAC,gBAAgB,CAAC;8BApYV,aAAa;8BAE2B,aAAa;2CAAb,aAAa;6BAH3D,kBAAkB;0BAErB,mBAAmB;+BANd,aAAa;sCAQN,YAAY;uCACX,YAAY;8BAPrB,kBAAkB;2CADL,YAAY;oCAEnB,4BAA4B"}

package/src/offerWatcher.js

@@ -1,6 +1,9 @@
 import { E, passStyleOf } from '@endo/far';
 
-import { isUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
+import {
+  isAbandonedError,
+  isUpgradeDisconnection,
+} from '@agoric/internal/src/upgrade-api.js';
 import { prepareExoClassKit, watchPromise } from '@agoric/vat-data';
 import { M } from '@agoric/store';
 import {
@@ -19,6 +22,7 @@ import { UNPUBLISHED_RESULT } from './offers.js';
  * @import {PromiseWatcher} from '@agoric/swingset-liveslots';
  * @import {Baggage} from '@agoric/vat-data';
  * @import {Vow, VowTools} from '@agoric/vow';
+ * @import {Zone} from '@agoric/base-zone';
  * @import {PaymentPKeywordRecord, Proposal, UserSeat, ZoeService} from '@agoric/zoe';
  * @import {InvitationMakers} from './types.js';
  * @import {PublicSubscribers} from './types.js';
@@ -38,6 +42,28 @@ import { UNPUBLISHED_RESULT } from './offers.js';
  * }} OutcomeWatchers
  */
 
+/**
+ * Adopted from `@agoric/vow/vat.js`
+ *
+ * @param {unknown} reason
+ * @param {unknown} priorRetryValue
+ */
+const isRetryableReason = (reason, priorRetryValue) => {
+  if (
+    isUpgradeDisconnection(reason) &&
+    (!isUpgradeDisconnection(priorRetryValue) ||
+      reason.incarnationNumber > priorRetryValue.incarnationNumber)
+  ) {
+    return reason;
+  }
+  // For abandoned errors there is no way to differentiate errors from
+  // consecutive upgrades
+  if (isAbandonedError(reason) && !isAbandonedError(priorRetryValue)) {
+    return reason;
+  }
+  return undefined;
+};
+
 /** @param {VowTools} vowTools */
 const makeWatchForOfferResult = ({ watch }) => {
   /**
@@ -130,9 +156,49 @@ const offerWatcherGuard = harden({
 /**
  * @param {Baggage} baggage
  * @param {VowTools} vowTools
+ * @param {Zone} zone
  */
-export const prepareOfferWatcher = (baggage, vowTools) => {
+export const prepareOfferWatcher = (baggage, vowTools, zone) => {
   const watchForOfferResult = makeWatchForOfferResult(vowTools);
+
+  const extraProps = zone.weakMapStore('offerWatcherExtraProps');
+  /**
+   * Implement retry logic for offer watchers. This uses the stateful
+   * `isRetryableReason` to avoid infinite promise rejection loops upon remote
+   * vat upgrade.
+   *
+   * @param {{}} facet
+   * @param {unknown} reason
+   * @returns {reason is UpgradeDisconnection} roughly
+   */
+  const needsRetry = (facet, reason) => {
+    const exists = extraProps.has(facet);
+    const extra = exists ? extraProps.get(facet) : harden({});
+
+    const key = `priorRetry`;
+    const priorRetryable = extra[key];
+    const retryable = isRetryableReason(reason, priorRetryable);
+    if (retryable) {
+      // Insert / update the new state.
+      extraProps[exists ? 'set' : 'init'](
+        facet,
+        harden({
+          ...extra,
+          [key]: retryable,
+        }),
+      );
+    } else if (exists) {
+      // Delete/shrink existing state to clean up unnecessary state.
+      const { [key]: _omit, ...rest } = extra;
+      if (Object.keys(rest).length === 0) {
+        extraProps.delete(facet);
+      } else {
+        extraProps.set(facet, harden(rest));
+      }
+    }
+    return !!retryable;
+  };
+
   return prepareExoClassKit(
     baggage,
     'OfferWatcher',
@@ -264,7 +330,7 @@ export const prepareOfferWatcher = (baggage, vowTools) => {
          */
         onRejected(reason, seat) {
           const { facets } = this;
-          if (isUpgradeDisconnection(reason)) {
+          if (needsRetry(facets.paymentWatcher, reason)) {
             void watchForPayout(facets, seat);
           } else {
             facets.helper.handleError(reason);
@@ -300,7 +366,7 @@ export const prepareOfferWatcher = (baggage, vowTools) => {
          */
         onRejected(reason, seat) {
           const { facets } = this;
-          if (isUpgradeDisconnection(reason)) {
+          if (needsRetry(facets.resultWatcher, reason)) {
             void watchForOfferResult(facets, seat);
           } else {
             facets.helper.handleError(reason);
@@ -329,9 +395,12 @@ export const prepareOfferWatcher = (baggage, vowTools) => {
          */
         onRejected(reason, seat) {
           const { facets } = this;
-          if (isUpgradeDisconnection(reason)) {
+          if (needsRetry(facets.numWantsWatcher, reason)) {
             void watchForNumWants(facets, seat);
+          } else {
+            facets.helper.handleError(reason);
           }
+          throw reason;
         },
       },
     },

package/src/smartWallet.js

@@ -333,7 +333,7 @@ export const prepareSmartWallet = (baggage, shared, setTestJig) => {
 
   const vowTools = prepareVowTools(zone.subZone('vow'));
 
-  const makeOfferWatcher = prepareOfferWatcher(baggage, vowTools);
+  const makeOfferWatcher = prepareOfferWatcher(baggage, vowTools, zone);
   const watchOfferOutcomes = makeWatchOfferOutcomes(vowTools);
 
   const updateShape = {