@agoric/smart-wallet 0.6.0 → 0.6.1-upgrade-23-dev-bd79330.0.bd79330

package/package.json

@@ -1,42 +1,40 @@
 {
   "name": "@agoric/smart-wallet",
-  "version": "0.6.0",
+  "version": "0.6.1-upgrade-23-dev-bd79330.0.bd79330",
   "description": "Wallet contract",
   "type": "module",
   "main": "src/index.js",
   "scripts": {
-    "build": "yarn build:bundles",
-    "build:bundles": "node ./scripts/build-bundles.js",
-    "prepack": "yarn run -T tsc --build tsconfig.build.json",
-    "postpack": "git clean -f '*.d.*ts*' '*.tsbuildinfo'",
+    "prepack": "yarn run -T prepack-package",
+    "postpack": "yarn run -T postpack-package",
     "test": "ava",
     "test:c8": "c8 --all $C8_OPTIONS ava",
     "test:xs": "exit 0",
     "lint": "yarn run -T run-s --continue-on-error 'lint:*'",
     "lint-fix": "yarn lint:eslint --fix",
     "lint:types": "yarn run -T tsc",
-    "lint:eslint": "yarn run -T eslint ."
+    "lint:eslint": "node ../../scripts/eslint-repo.mjs ."
   },
   "devDependencies": {
-    "@agoric/casting": "0.5.0",
-    "@agoric/cosmic-proto": "0.5.0",
-    "@agoric/swingset-vat": "0.33.0",
+    "@agoric/casting": "0.5.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/cosmic-proto": "0.5.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/swingset-vat": "0.33.1-upgrade-23-dev-bd79330.0.bd79330",
     "@endo/bundle-source": "^4.1.2",
     "@endo/captp": "^4.4.8",
     "@endo/init": "^1.1.12",
-    "ava": "^5.3.0",
+    "ava": "^6.4.1",
     "import-meta-resolve": "^4.1.0"
   },
   "dependencies": {
-    "@agoric/ertp": "0.17.0",
-    "@agoric/internal": "0.4.0",
-    "@agoric/notifier": "0.7.0",
-    "@agoric/store": "0.10.0",
-    "@agoric/vat-data": "0.6.0",
-    "@agoric/vats": "0.16.0",
-    "@agoric/vow": "0.2.0",
-    "@agoric/zoe": "0.27.0",
-    "@agoric/zone": "0.3.0",
+    "@agoric/ertp": "0.17.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/internal": "0.4.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/notifier": "0.7.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/store": "0.10.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/vat-data": "0.6.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/vats": "0.16.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/vow": "0.2.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/zoe": "0.27.1-upgrade-23-dev-bd79330.0.bd79330",
+    "@agoric/zone": "0.3.1-upgrade-23-dev-bd79330.0.bd79330",
     "@endo/errors": "^1.2.13",
     "@endo/eventual-send": "^1.3.4",
     "@endo/far": "^1.1.14",
@@ -46,7 +44,9 @@
     "@endo/promise-kit": "^1.1.13"
   },
   "files": [
-    "src/"
+    "src/",
+    "tools/",
+    "source-spec-registry.*"
   ],
   "keywords": [],
   "repository": {
@@ -72,10 +72,10 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 94.51
+    "atLeast": 93.84
   },
   "engines": {
     "node": "^20.9 || ^22.11"
   },
-  "gitHead": "0922d0447ab8fae9d2d87415964403330b5ca313"
+  "gitHead": "bd79330f78dae2faf9cc3d8b10063567700da07b"
 }

package/source-spec-registry.d.ts

@@ -0,0 +1,13 @@
+export namespace smartWalletSourceSpecRegistry {
+    namespace walletFactory {
+        let bundleName: string;
+        let packagePath: string;
+        let sourceSpec: string;
+    }
+}
+export function getSmartWalletSourceSpec(name: keyof typeof smartWalletSourceSpecRegistry): {
+    bundleName: string;
+    packagePath: string;
+    sourceSpec: string;
+};
+//# sourceMappingURL=source-spec-registry.d.ts.map

package/source-spec-registry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-spec-registry.d.ts","sourceRoot":"","sources":["source-spec-registry.js"],"names":[],"mappings":";;;;;;;AAeO,+CADK,MAAM,OAAO,6BAA6B;;;;EAEjB"}

package/source-spec-registry.js

@@ -0,0 +1,17 @@
+import { fileURLToPath } from 'node:url';
+
+/** @param {string} packagePath */
+const resolveSourceSpec = packagePath =>
+  fileURLToPath(import.meta.resolve(packagePath));
+
+export const smartWalletSourceSpecRegistry = {
+  walletFactory: {
+    bundleName: 'walletFactory',
+    packagePath: '@agoric/smart-wallet/src/walletFactory.js',
+    sourceSpec: resolveSourceSpec('@agoric/smart-wallet/src/walletFactory.js'),
+  },
+};
+
+/** @param {keyof typeof smartWalletSourceSpecRegistry} name */
+export const getSmartWalletSourceSpec = name =>
+  smartWalletSourceSpecRegistry[name];

package/src/index.js

@@ -1,6 +1,2 @@
-/// <reference types="@agoric/internal/exported" />
-/// <reference types="@agoric/ertp/exported" />
-/// <reference types="@agoric/zoe/exported" />
-
 // eslint-disable-next-line import/export
 export * from './types-index.js'; // no named exports

package/src/invitations.d.ts

@@ -1,4 +1,4 @@
-export function makeInvitationsHelper(zoe: ERef<ZoeService>, agoricNames: ERef<import("@agoric/vats").NameHub>, invitationBrand: Brand<"set">, invitationsPurse: Purse<"set", import("@agoric/zoe").InvitationDetails>, getInvitationContinuation: (fromOfferId: string) => import("./types.js").InvitationMakers): (spec: InvitationSpec) => ERef<Invitation>;
+export function makeInvitationsHelper(zoe: ERef<ZoeService>, agoricNames: ERef<NameHub>, invitationBrand: Brand<"set">, invitationsPurse: Purse<"set", InvitationDetails>, getInvitationContinuation: (fromOfferId: string) => InvitationMakers): (spec: InvitationSpec) => ERef<Invitation>;
 /**
  * Specify how to produce an invitation. See each type in the union for details.
  */
@@ -20,7 +20,7 @@ export type AgoricContractInvitationSpec = {
  */
 export type ContractInvitationSpec = {
     source: "contract";
-    instance: Instance;
+    instance: Instance<any>;
     publicInvitationMaker: string;
     invitationArgs?: any[];
 };
@@ -32,7 +32,7 @@ export type ContractInvitationSpec = {
  */
 export type PurseInvitationSpec = {
     source: "purse";
-    instance: Instance;
+    instance: Instance<any>;
     description: string;
 };
 /**
@@ -41,9 +41,19 @@ export type PurseInvitationSpec = {
  */
 export type ContinuingInvitationSpec = {
     source: "continuing";
-    previousOffer: import("./offers.js").OfferId;
+    previousOffer: OfferId;
     invitationMakerName: string;
     invitationArgs?: any[];
 };
-export type InvitationsPurseQuery = Pick<import("@agoric/zoe").InvitationDetails, "description" | "instance">;
+export type InvitationsPurseQuery = Pick<InvitationDetails, "description" | "instance">;
+import type { ZoeService } from '@agoric/zoe';
+import type { ERef } from '@agoric/vow';
+import type { NameHub } from '@agoric/vats';
+import type { Brand } from '@agoric/ertp';
+import type { InvitationDetails } from '@agoric/zoe';
+import type { Purse } from '@agoric/ertp';
+import type { InvitationMakers } from './types.js';
+import type { Invitation } from '@agoric/zoe';
+import type { Instance } from '@agoric/zoe/src/zoeService/utils.js';
+import type { OfferId } from './offers.js';
 //# sourceMappingURL=invitations.d.ts.map

package/src/invitations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invitations.d.ts","sourceRoot":"","sources":["invitations.js"],"names":[],"mappings":"AA0EO,2CANI,IAAI,CAAC,UAAU,CAAC,eAChB,IAAI,CAAC,OAAO,cAAc,EAAE,OAAO,CAAC,mBACpC,KAAK,CAAC,KAAK,CAAC,oBACZ,KAAK,CAAC,KAAK,EAAE,OAAO,aAAa,EAAE,iBAAiB,CAAC,6BACrD,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,YAAY,EAAE,gBAAgB,UAoFrD,cAAc,KAAK,IAAI,CAAC,UAAU,CAAC,CAgBtD;;;;6BAjKY,4BAA4B,GAClC,sBAAsB,GACtB,mBAAmB,GACnB,wBAAwB;;;;;;;;2CAKlB;IACR,MAAM,EAAE,gBAAgB,CAAC;IACzB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;CACtD;;;;qCAQS;IACR,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;CACxB;;;;;;;kCAGS;IACR,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;;;;;uCAOS;IACR,MAAM,EAAE,YAAY,CAAC;IACrB,aAAa,EAAE,OAAO,aAAa,EAAE,OAAO,CAAC;IAC7C,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;CACxB;oCAMS,IAAI,CAChB,OAAW,aAAa,EAAE,iBAAiB,EAC3C,aAAiB,GAAG,UAAU,CAC3B"}
+{"version":3,"file":"invitations.d.ts","sourceRoot":"","sources":["invitations.js"],"names":[],"mappings":"AAkFO,2CANI,KAAK,UAAU,CAAC,eAChB,KAAK,OAAO,CAAC,mBACb,MAAM,KAAK,CAAC,oBACZ,MAAM,KAAK,EAAE,iBAAiB,CAAC,6BAC/B,CAAC,WAAW,EAAE,MAAM,KAAK,gBAAgB,UAoFhC,cAAc,KAAK,KAAK,UAAU,CAAC,CAgBtD;;;;6BA9JY,4BAA4B,GAClC,sBAAsB,GACtB,mBAAmB,GACnB,wBAAwB;;;;;;;;2CAKlB;IACR,MAAM,EAAE,gBAAgB,CAAC;IACzB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;CACtD;;;;qCAQS;IACR,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,SAAS,GAAG,CAAC,CAAC;IACxB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;CACxB;;;;;;;kCAGS;IACR,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,SAAS,GAAG,CAAC,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;CACrB;;;;;uCAOS;IACR,MAAM,EAAE,YAAY,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;IACvB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,GAAG,EAAE,CAAC;CACxB;oCAMS,IAAI,CAAC,iBAAiB,EAAE,aAAa,GAAG,UAAU,CAAC;gCA/DJ,aAAa;0BAIlD,aAAa;6BAHV,cAAc;2BAIhB,cAAc;uCALsB,aAAa;2BAMjD,cAAc;sCAJH,YAAY;gCAFa,aAAa;8BAG9C,qCAAqC;6BAJtC,aAAa"}

package/src/invitations.js

@@ -5,6 +5,17 @@ import { Fail } from '@endo/errors';
 import { E } from '@endo/far';
 import { shape } from './typeGuards.js';
 
+/**
+ * @import {OfferId} from './offers.js';
+ * @import {Invitation, InvitationDetails, ZoeService} from '@agoric/zoe';
+ * @import {NameHub} from '@agoric/vats';
+ * @import {InvitationMakers} from './types.js';
+ * @import {Instance} from '@agoric/zoe/src/zoeService/utils.js';
+ * @import {ERef} from '@agoric/vow';
+ * @import {Brand} from '@agoric/ertp';
+ * @import {Purse} from '@agoric/ertp';
+ */
+
 // A safety limit
 const MAX_PIPE_LENGTH = 2;
 
@@ -31,7 +42,7 @@ const MAX_PIPE_LENGTH = 2;
  *
  * @typedef {{
  *   source: 'contract';
- *   instance: Instance;
+ *   instance: Instance<any>;
  *   publicInvitationMaker: string;
  *   invitationArgs?: any[];
  * }} ContractInvitationSpec
@@ -39,7 +50,7 @@ const MAX_PIPE_LENGTH = 2;
  *
  * @typedef {{
  *   source: 'purse';
- *   instance: Instance;
+ *   instance: Instance<any>;
  *   description: string;
  * }} PurseInvitationSpec
  *   the invitation is already in your Zoe "invitation" purse so we need to query
@@ -50,7 +61,7 @@ const MAX_PIPE_LENGTH = 2;
  *
  * @typedef {{
  *   source: 'continuing';
- *   previousOffer: import('./offers.js').OfferId;
+ *   previousOffer: OfferId;
  *   invitationMakerName: string;
  *   invitationArgs?: any[];
  * }} ContinuingInvitationSpec
@@ -59,18 +70,15 @@ const MAX_PIPE_LENGTH = 2;
  */
 
 /**
- * @typedef {Pick<
- *   import('@agoric/zoe').InvitationDetails,
- *   'description' | 'instance'
- * >} InvitationsPurseQuery
+ * @typedef {Pick<InvitationDetails, 'description' | 'instance'>} InvitationsPurseQuery
  */
 
 /**
  * @param {ERef<ZoeService>} zoe
- * @param {ERef<import('@agoric/vats').NameHub>} agoricNames
+ * @param {ERef<NameHub>} agoricNames
  * @param {Brand<'set'>} invitationBrand
- * @param {Purse<'set', import('@agoric/zoe').InvitationDetails>} invitationsPurse
- * @param {(fromOfferId: string) => import('./types.js').InvitationMakers} getInvitationContinuation
+ * @param {Purse<'set', InvitationDetails>} invitationsPurse
+ * @param {(fromOfferId: string) => InvitationMakers} getInvitationContinuation
  */
 export const makeInvitationsHelper = (
   zoe,

package/src/marshal-contexts.d.ts

@@ -3,14 +3,14 @@ export function makeExportContext(): {
     fromCapData: import("@endo/marshal").FromCapData<string>;
     serialize: import("@endo/marshal").ToCapData<string>;
     unserialize: import("@endo/marshal").FromCapData<string>;
-    savePurseActions: (val: globalThis.Purse) => void;
-    savePaymentActions: (val: globalThis.Payment) => void;
+    savePurseActions: (val: Purse) => void;
+    savePaymentActions: (val: Payment) => void;
     /**
      * @param {number} id
      * @param {Purse} purse
      */
     initPurseId: (id: number, purse: Purse) => void;
-    purseEntries: (keyPatt?: Pattern, valuePatt?: Pattern) => Iterable<[number, globalThis.Purse]>;
+    purseEntries: (keyPatt?: import("@endo/patterns").Pattern, valuePatt?: import("@endo/patterns").Pattern) => Iterable<[number, Purse]>;
     /**
      * @param {BoardId} id
      * @param {RemotableObject} val
@@ -84,6 +84,8 @@ export type IdTable<Slot extends Key, Val extends PassableCap> = {
 };
 export type ExportContext = ReturnType<typeof makeExportContext>;
 export type ImportContext = ReturnType<typeof makeImportContext>;
+import type { Purse } from '@agoric/ertp';
+import type { Payment } from '@agoric/ertp';
 import type { BoardId } from '@agoric/vats/src/lib-board.js';
 import type { RemotableObject } from '@endo/marshal';
 import type { PassableCap } from '@endo/marshal';

package/src/marshal-contexts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marshal-contexts.d.ts","sourceRoot":"","sources":["marshal-contexts.js"],"names":[],"mappings":"AAwHO;;;;;;;IAoFH;;;OAGG;sBAFQ,MAAM,SACN,KAAK;;IAMhB;;;OAGG;sBAFQ,OAAO,OACP,eAAe;IAK1B;;;OAGG;wBAFQ,OAAO,OACP,eAAe;EAW7B;AAcM,iDAFI,CAAC,KAAK,EAAE,MAAM,KAAK,WAAW;IA8FrC;;;OAGG;sBAFQ,OAAO,OACP,WAAW;IAKtB;;;OAGG;wBAFQ,OAAO,OACP,WAAW;;;;;;;;;;;;;;;;;;;;;;;EAYzB;AA4BM,2CAHI,MAAM,OACN,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,IAAI,OAapC;;;;uBAlXgD,CAAC,SAApC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAE,IACnC,GAAG,MAAM,GAAG,MAAM,CAAC,IAAI,MAAM,EAAE;;;;qBAGtB,CAAC,SAAV,MAAQ,IACR,GAAG,CAAC,IAAI,MAAM,EAAE;;;;;sBA0CoB,CAAC,SAApC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAE,IACnC,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO;;;;;qBAGvB,GAAG,GAAG,IAAI,GAAG,KAAK;;;;oBAKZ,IAAI,SAAV,GAAK,EACS,GAAG,SAAjB,WAAa,IACb;IACR,MAAM,EAAE,SAAS,IAAI,EAAE,GAAG,CAAC,CAAC;IAC5B,KAAK,EAAE,SAAS,GAAG,EAAE,IAAI,CAAC,CAAC;CAC5B;4BAgJU,UAAU,CAAC,OAAO,iBAAiB,CAAC;4BA+HpC,UAAU,CAAC,OAAO,iBAAiB,CAAC;6BA5VxB,+BAA+B;qCAHV,eAAe;iCAAf,eAAe;yBACxC,gBAAgB;8BACX,4BAA4B"}
+{"version":3,"file":"marshal-contexts.d.ts","sourceRoot":"","sources":["marshal-contexts.js"],"names":[],"mappings":"AA0HO;;;;;;;IAoFH;;;OAGG;sBAFQ,MAAM,SACN,KAAK;;IAMhB;;;OAGG;sBAFQ,OAAO,OACP,eAAe;IAK1B;;;OAGG;wBAFQ,OAAO,OACP,eAAe;EAW7B;AAcM,iDAFI,CAAC,KAAK,EAAE,MAAM,KAAK,WAAW;IA8FrC;;;OAGG;sBAFQ,OAAO,OACP,WAAW;IAKtB;;;OAGG;wBAFQ,OAAO,OACP,WAAW;;;;;;;;;;;;;;;;;;;;;;;EAYzB;AA4BM,2CAHI,MAAM,OACN,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,IAAI,OAapC;;;;uBAlXgD,CAAC,SAApC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAE,IACnC,GAAG,MAAM,GAAG,MAAM,CAAC,IAAI,MAAM,EAAE;;;;qBAGtB,CAAC,SAAV,MAAQ,IACR,GAAG,CAAC,IAAI,MAAM,EAAE;;;;;sBA0CoB,CAAC,SAApC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAE,IACnC,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO;;;;;qBAGvB,GAAG,GAAG,IAAI,GAAG,KAAK;;;;oBAKZ,IAAI,SAAV,GAAK,EACS,GAAG,SAAjB,WAAa,IACb;IACR,MAAM,EAAE,SAAS,IAAI,EAAE,GAAG,CAAC,CAAC;IAC5B,KAAK,EAAE,SAAS,GAAG,EAAE,IAAI,CAAC,CAAC;CAC5B;4BAgJU,UAAU,CAAC,OAAO,iBAAiB,CAAC;4BA+HpC,UAAU,CAAC,OAAO,iBAAiB,CAAC;2BA7V1B,cAAc;6BACZ,cAAc;6BAFd,+BAA+B;qCAHV,eAAe;iCAAf,eAAe;yBACxC,gBAAgB;8BACX,4BAA4B"}

package/src/marshal-contexts.js

@@ -11,6 +11,8 @@ import { DEFAULT_PREFIX } from '@agoric/vats/src/lib-board.js';
  * @import {Key} from '@endo/patterns';
  * @import {MapStore} from '@agoric/swingset-liveslots';
  * @import {BoardId} from '@agoric/vats/src/lib-board.js';
+ * @import {Purse} from '@agoric/ertp';
+ * @import {Payment} from '@agoric/ertp';
  */
 
 /**
@@ -186,10 +188,10 @@ export const makeExportContext = () => {
 
   /**
    * @template {PassableCap} V
-   * @param {string & keyof typeof walletObjects} kind
+   * @param {string & keyof typeof walletObjects} _kind
    * @param {IdTable<number, V>} table
    */
-  const makeSaver = (kind, table) => {
+  const makeSaver = (_kind, table) => {
     let nonce = 0;
     /** @param {V} val */
     const saver = val => {
@@ -374,7 +376,7 @@ export const makeImportContext = (makePresence = defaultMakePresence) => {
 const makePresence = (iface, handler) => {
   let obj;
 
-  void new HandledPromise((resolve, reject, resolveWithPresence) => {
+  void new HandledPromise((_resolve, _reject, resolveWithPresence) => {
     obj = resolveWithPresence(handler);
   });
   assert(obj);

package/src/offerWatcher.d.ts

@@ -1,5 +1,5 @@
-export function makeWatchOfferOutcomes(vowTools: VowTools): (watchers: OutcomeWatchers, seat: UserSeat) => Promise<any[]>;
-export function prepareOfferWatcher(baggage: Baggage, vowTools: VowTools): (walletHelper: any, deposit: {
+export function makeWatchOfferOutcomes(vowTools: VowTools): (watchers: OutcomeWatchers, seat: UserSeat) => Promise<(void | 0 | 1 | PaymentPKeywordRecord)[]>;
+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: {
@@ -10,10 +10,10 @@ export function prepareOfferWatcher(baggage: Baggage, vowTools: VowTools): (wall
         /**
          * @param {string} offerId
          * @param {Amount<'set'>} invitationAmount
-         * @param {import('./types.js').InvitationMakers} invitationMakers
-         * @param {import('./types.js').PublicSubscribers} publicSubscribers
+         * @param {InvitationMakers} invitationMakers
+         * @param {PublicSubscribers} publicSubscribers
          */
-        onNewContinuingOffer(offerId: string, invitationAmount: Amount<"set">, invitationMakers: import("./types.js").InvitationMakers, publicSubscribers: import("./types.js").PublicSubscribers): void;
+        onNewContinuingOffer(offerId: string, invitationAmount: Amount<"set">, invitationMakers: InvitationMakers, publicSubscribers: PublicSubscribers): void;
         /** @param {Passable | ContinuingOfferResult} result */
         publishResult(result: Passable | ContinuingOfferResult): void;
         /**
@@ -45,10 +45,15 @@ export type MakeOfferWatcher = ReturnType<typeof prepareOfferWatcher>;
 export type OfferWatcher = ReturnType<MakeOfferWatcher>;
 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 { Payment } from '@agoric/ertp';
+import type { Amount } from '@agoric/ertp';
 import type { OfferSpec } from './offers.js';
+import type { InvitationMakers } from './types.js';
+import type { PublicSubscribers } from './types.js';
 import type { Passable } from '@endo/pass-style';
 import type { ContinuingOfferResult } from './types.js';
 import type { PromiseWatcher } from '@agoric/swingset-liveslots';
-import type { PaymentPKeywordRecord } from '@agoric/zoe';
 //# sourceMappingURL=offerWatcher.d.ts.map

package/src/offerWatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"offerWatcher.d.ts","sourceRoot":"","sources":["offerWatcher.js"],"names":[],"mappings":"AAyEO,iDADK,QAAQ,cAKP,eAAe,QACf,QAAQ,oBAiBpB;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,OAAO,YAAY,EAAE,gBAAgB,qBACrC,OAAO,YAAY,EAAE,iBAAiB;QAkBjD,uDAAuD;8BAA3C,QAAQ,GAAG,qBAAqB;QAoC5C;;;;;;WAMG;yBADQ,KAAK;;IAclB,gDAAgD;oBAArC,eAAe,CAAC,gBAAgB,CAAC;IA+B5C,+CAA+C;mBAApC,eAAe,CAAC,eAAe,CAAC;IAuC3C,iDAAiD;qBAAtC,eAAe,CAAC,iBAAiB,CAAC;GA2BlD;;;;gCAzTkB,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;+BAmTU,UAAU,CAAC,OAAO,mBAAmB,CAAC;2BACtC,UAAU,CAAC,gBAAgB,CAAC;8BAlUV,aAAa;8BAC2B,aAAa;6BAF3D,kBAAkB;+BAJhB,aAAa;8BAEd,kBAAkB;2CADL,YAAY;oCAEnB,4BAA4B;2CAGW,aAAa"}
+{"version":3,"file":"offerWatcher.d.ts","sourceRoot":"","sources":["offerWatcher.js"],"names":[],"mappings":"AAwGO,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,OAAO,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;8BAtYV,aAAa;8BAE2B,aAAa;2CAAb,aAAa;6BAH3D,kBAAkB;0BAErB,mBAAmB;6BAKhB,cAAc;4BACf,cAAc;+BAZX,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,7 +22,13 @@ 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';
+ * @import {UpgradeDisconnection} from '@agoric/internal/src/upgrade-api.js';
+ * @import {Payment} from '@agoric/ertp';
+ * @import {Amount} from '@agoric/ertp';
  */
 
 /**
@@ -35,6 +44,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 }) => {
   /**
@@ -127,9 +158,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',
@@ -165,8 +236,8 @@ export const prepareOfferWatcher = (baggage, vowTools) => {
         /**
          * @param {string} offerId
          * @param {Amount<'set'>} invitationAmount
-         * @param {import('./types.js').InvitationMakers} invitationMakers
-         * @param {import('./types.js').PublicSubscribers} publicSubscribers
+         * @param {InvitationMakers} invitationMakers
+         * @param {PublicSubscribers} publicSubscribers
          */
         onNewContinuingOffer(
           offerId,
@@ -256,13 +327,12 @@ export const prepareOfferWatcher = (baggage, vowTools) => {
          * If promise disconnected, watch again. Or if there's an Error, handle
          * it.
          *
-         * @param {Error
-         *   | import('@agoric/internal/src/upgrade-api.js').UpgradeDisconnection} reason
+         * @param {Error | UpgradeDisconnection} reason
          * @param {UserSeat} seat
          */
         onRejected(reason, seat) {
           const { facets } = this;
-          if (isUpgradeDisconnection(reason)) {
+          if (needsRetry(facets.paymentWatcher, reason)) {
             void watchForPayout(facets, seat);
           } else {
             facets.helper.handleError(reason);
@@ -293,13 +363,12 @@ export const prepareOfferWatcher = (baggage, vowTools) => {
          * If promise disconnected, watch again. Or if there's an Error, handle
          * it.
          *
-         * @param {Error
-         *   | import('@agoric/internal/src/upgrade-api.js').UpgradeDisconnection} reason
+         * @param {Error | UpgradeDisconnection} reason
          * @param {UserSeat} seat
          */
         onRejected(reason, seat) {
           const { facets } = this;
-          if (isUpgradeDisconnection(reason)) {
+          if (needsRetry(facets.resultWatcher, reason)) {
             void watchForOfferResult(facets, seat);
           } else {
             facets.helper.handleError(reason);
@@ -323,15 +392,17 @@ export const prepareOfferWatcher = (baggage, vowTools) => {
          * and getPayouts() settle the same (they await the same promise and
          * then synchronously return a local value).
          *
-         * @param {Error
-         *   | import('@agoric/internal/src/upgrade-api.js').UpgradeDisconnection} reason
+         * @param {Error | UpgradeDisconnection} reason
          * @param {UserSeat} seat
          */
         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/offers.d.ts

@@ -1,6 +1,7 @@
 /**
- * @import {Proposal} from '@agoric/zoe';
+ * @import {AmountKeywordRecord, Proposal} from '@agoric/zoe';
  * @import {Passable} from '@endo/pass-style';
+ * @import {InvitationSpec} from './invitations.js';
  */
 /**
  * @typedef {number | string} OfferId
@@ -24,7 +25,7 @@
 /**
  * @typedef {{
  *   id: OfferId;
- *   invitationSpec: import('./invitations.js').InvitationSpec;
+ *   invitationSpec: InvitationSpec;
  *   proposal: Proposal;
  *   offerArgs?: any;
  *   saveResult?: ResultPlan;
@@ -62,7 +63,7 @@ export type InvokeEntryMessage = {
  */
 export type OfferSpec = {
     id: OfferId;
-    invitationSpec: import("./invitations.js").InvitationSpec;
+    invitationSpec: InvitationSpec;
     proposal: Proposal;
     offerArgs?: any;
     saveResult?: ResultPlan;
@@ -77,5 +78,7 @@ export type OfferStatus = OfferSpec & {
     payouts?: AmountKeywordRecord;
 };
 import type { Passable } from '@endo/pass-style';
+import type { InvitationSpec } from './invitations.js';
 import type { Proposal } from '@agoric/zoe';
+import type { AmountKeywordRecord } from '@agoric/zoe';
 //# sourceMappingURL=offers.d.ts.map

package/src/offers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"offers.d.ts","sourceRoot":"","sources":["offers.js"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;GAEG;AAEH;;;;;;GAMG;AAEH;;;;;;;;GAQG;AAEH;;;;;;;;;;;GAWG;AAEH,kEAAkE;AAClE,iCAAkC,aAAa,CAAC;sBAnCnC,MAAM,GAAG,MAAM;;;;;UAKd,MAAM;;;;;;;;iCAOP;IACR,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACtB;;;;;;wBAIS;IACR,EAAE,EAAE,OAAO,CAAC;IACZ,cAAc,EAAE,OAAO,kBAAkB,EAAE,cAAc,CAAC;IAC1D,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;0BAUS,SAAS,GAAG;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,CAAC,EACH,OAAO,GACP,OAAO,kBAAkB,GACzB;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,OAAO,CAAC,EAAE,mBAAmB,CAAC;CAC/B;8BAlDuB,kBAAkB;8BADlB,aAAa"}
+{"version":3,"file":"offers.d.ts","sourceRoot":"","sources":["offers.js"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AAEH;;;;;;GAMG;AAEH;;;;;;;;GAQG;AAEH;;;;;;;;;;;GAWG;AAEH,kEAAkE;AAClE,iCAAkC,aAAa,CAAC;sBAnCnC,MAAM,GAAG,MAAM;;;;;UAKd,MAAM;;;;;;;;iCAOP;IACR,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACtB;;;;;;wBAIS;IACR,EAAE,EAAE,OAAO,CAAC;IACZ,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;0BAUS,SAAS,GAAG;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,CAAC,EACH,OAAO,GACP,OAAO,kBAAkB,GACzB;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,OAAO,CAAC,EAAE,mBAAmB,CAAC;CAC/B;8BAnDuB,kBAAkB;oCACZ,kBAAkB;8BAFH,aAAa;yCAAb,aAAa"}

package/src/offers.js

@@ -1,6 +1,7 @@
 /**
- * @import {Proposal} from '@agoric/zoe';
+ * @import {AmountKeywordRecord, Proposal} from '@agoric/zoe';
  * @import {Passable} from '@endo/pass-style';
+ * @import {InvitationSpec} from './invitations.js';
  */
 
 /**
@@ -28,7 +29,7 @@
 /**
  * @typedef {{
  *   id: OfferId;
- *   invitationSpec: import('./invitations.js').InvitationSpec;
+ *   invitationSpec: InvitationSpec;
  *   proposal: Proposal;
  *   offerArgs?: any;
  *   saveResult?: ResultPlan;

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

@@ -1,9 +1,14 @@
 // @ts-check
-/// <reference types="@agoric/vats/src/core/types-ambient" />
 
 import { E } from '@endo/far';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 
+/**
+ * @import {BootstrapPowers} from '@agoric/vats/src/core/types.js';
+ * @import {ChainBootstrapSpace} from '@agoric/vats/src/core/types.js';
+ * @import {VatSourceRef} from '@agoric/vats/src/core/types.js';
+ */
+
 /**
  * @param {BootstrapPowers & ChainBootstrapSpace} powers
  * @param {object} options

package/src/proposals/upgrade-walletFactory-proposal.js

@@ -4,6 +4,14 @@ import { E } from '@endo/far';
 import { makeMarshal } from '@endo/marshal';
 import { allValues } from '@agoric/internal';
 
+/**
+ * @import {NameHub} from '@agoric/vats';
+ * @import {BootstrapManifest} from '@agoric/vats/src/core/lib-boot.js';
+ * @import {ERef} from '@agoric/vow';
+ * @import {BootstrapPowers} from '@agoric/vats/src/core/types.js';
+ * @import {VatSourceRef} from '@agoric/vats/src/core/types.js';
+ */
+
 console.warn('upgrade-walletFactory-proposal.js module evaluating');
 
 // vstorage paths under published.*
@@ -88,7 +96,7 @@ export const publishAgoricBrandsDisplayInfo = async ({
     await E(node).setValue(JSON.stringify(aux));
   };
 
-  /** @type {ERef<import('@agoric/vats').NameHub>} */
+  /** @type {ERef<NameHub>} */
   const brandHub = E(agoricNames).lookup('brand');
   const brands = await E(brandHub).values();
   // tolerate failure; in particular, for the timer brand
@@ -96,7 +104,7 @@ export const publishAgoricBrandsDisplayInfo = async ({
 };
 harden(publishAgoricBrandsDisplayInfo);
 
-/** @type {import('@agoric/vats/src/core/lib-boot').BootstrapManifest} */
+/** @type {BootstrapManifest} */
 const manifest = {
   [upgradeWalletFactory.name]: {
     // include rationale for closely-held, high authority capabilities