@agoric/smart-wallet 0.5.4-upgrade-16-dev-8879538.0 → 0.5.4-upgrade-16-dev-24665a9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/smart-wallet",
-  "version": "0.5.4-upgrade-16-dev-8879538.0+8879538",
+  "version": "0.5.4-upgrade-16-dev-24665a9.0+24665a9",
   "description": "Wallet contract",
   "type": "module",
   "scripts": {
@@ -16,9 +16,9 @@
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-proto": "0.4.1-upgrade-16-dev-8879538.0+8879538",
-    "@agoric/swingset-vat": "0.32.3-upgrade-16-dev-8879538.0+8879538",
-    "@agoric/zone": "0.2.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/cosmic-proto": "0.4.1-upgrade-16-dev-24665a9.0+24665a9",
+    "@agoric/swingset-vat": "0.32.3-upgrade-16-dev-24665a9.0+24665a9",
+    "@agoric/zone": "0.2.3-upgrade-16-dev-24665a9.0+24665a9",
     "@endo/bundle-source": "^3.2.3",
     "@endo/captp": "^4.2.0",
     "@endo/init": "^1.1.2",
@@ -26,15 +26,15 @@
     "import-meta-resolve": "^2.2.1"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-upgrade-16-dev-8879538.0+8879538",
-    "@agoric/casting": "0.4.3-upgrade-16-dev-8879538.0+8879538",
-    "@agoric/ertp": "0.16.3-upgrade-16-dev-8879538.0+8879538",
-    "@agoric/internal": "0.3.3-upgrade-16-dev-8879538.0+8879538",
-    "@agoric/notifier": "0.6.3-upgrade-16-dev-8879538.0+8879538",
-    "@agoric/store": "0.9.3-upgrade-16-dev-8879538.0+8879538",
-    "@agoric/vat-data": "0.5.3-upgrade-16-dev-8879538.0+8879538",
-    "@agoric/vats": "0.15.2-upgrade-16-dev-8879538.0+8879538",
-    "@agoric/zoe": "0.26.3-upgrade-16-dev-8879538.0+8879538",
+    "@agoric/assert": "0.6.1-upgrade-16-dev-24665a9.0+24665a9",
+    "@agoric/casting": "0.4.3-upgrade-16-dev-24665a9.0+24665a9",
+    "@agoric/ertp": "0.16.3-upgrade-16-dev-24665a9.0+24665a9",
+    "@agoric/internal": "0.3.3-upgrade-16-dev-24665a9.0+24665a9",
+    "@agoric/notifier": "0.6.3-upgrade-16-dev-24665a9.0+24665a9",
+    "@agoric/store": "0.9.3-upgrade-16-dev-24665a9.0+24665a9",
+    "@agoric/vat-data": "0.5.3-upgrade-16-dev-24665a9.0+24665a9",
+    "@agoric/vats": "0.15.2-upgrade-16-dev-24665a9.0+24665a9",
+    "@agoric/zoe": "0.26.3-upgrade-16-dev-24665a9.0+24665a9",
     "@endo/eventual-send": "^1.2.2",
     "@endo/far": "^1.1.2",
     "@endo/marshal": "^1.5.0",
@@ -68,7 +68,7 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 94.35
+    "atLeast": 94.36
   },
-  "gitHead": "8879538cd1d125a08346f02dd5701d0d70c90bb8"
+  "gitHead": "24665a97248b854fcb01185d360429301470ed57"
 }

package/src/invitations.d.ts

@@ -5,6 +5,7 @@ export function makeInvitationsHelper(zoe: ERef<ZoeService>, agoricNames: ERef<i
 export type InvitationSpec = AgoricContractInvitationSpec | ContractInvitationSpec | PurseInvitationSpec | ContinuingInvitationSpec;
 /**
  * source of invitation is a chain of calls starting with an agoricName
+ *
  * - the start of the pipe is a lookup of instancePath within agoricNames
  * - each entry in the callPipe executes a call on the preceding result
  * - the end of the pipe is expected to return an Invitation
@@ -12,7 +13,7 @@ export type InvitationSpec = AgoricContractInvitationSpec | ContractInvitationSp
 export type AgoricContractInvitationSpec = {
     source: "agoricContract";
     instancePath: string[];
-    callPipe: Array<[methodName: string, methodArgs?: any[]]>;
+    callPipe: [methodName: string, methodArgs?: any[]][];
 };
 /**
  * source is a contract (in which case this takes an Instance to look up in zoe)
@@ -24,7 +25,9 @@ export type ContractInvitationSpec = {
     invitationArgs?: any[];
 };
 /**
- * the invitation is already in your Zoe "invitation" purse so we need to query it
+ * the invitation is already in your Zoe "invitation" purse so we need to query
+ * it
+ *
  * - use the find/query invitation by kvs thing
  */
 export type PurseInvitationSpec = {
@@ -33,7 +36,8 @@ export type PurseInvitationSpec = {
     description: string;
 };
 /**
- * continuing invitation in which the offer result from a previous invitation had an `invitationMakers` property
+ * continuing invitation in which the offer result from a previous invitation
+ * had an `invitationMakers` property
  */
 export type ContinuingInvitationSpec = {
     source: "continuing";

package/src/invitations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invitations.d.ts","sourceRoot":"","sources":["invitations.js"],"names":[],"mappings":"AA+DO,2CANI,IAAI,CAAC,UAAU,CAAC,eAChB,IAAI,CAAC,OAAO,cAAc,EAAE,OAAO,CAAC,mBACpC,KAAK,CAAC,KAAK,CAAC,oBACZ,KAAK,CAAC,KAAK,EAAE,iBAAiB,CAAC,6BAC/B,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,YAAY,EAAE,gBAAgB,UAoFrD,cAAc,KAAK,IAAI,CAAC,UAAU,CAAC,CAgBtD;;;;6BArJY,4BAA4B,GAAG,sBAAsB,GAAG,mBAAmB,GAAG,wBAAwB;;;;;;;2CAKtG;IACZ,MAAQ,EAAE,gBAAgB,CAAC;IAC3B,YAAc,EAAE,MAAM,EAAE,CAAC;IACzB,QAAU,EAAE,KAAK,CAAC,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;CACzD;;;;qCAMS;IACZ,MAAQ,EAAE,UAAU,CAAC;IACrB,QAAU,EAAE,QAAQ,CAAC;IACrB,qBAAuB,EAAE,MAAM,CAAC;IAChC,cAAgB,CAAC,EAAE,GAAG,EAAE,CAAC;CACtB;;;;;kCAGS;IACZ,MAAQ,EAAE,OAAO,CAAC;IAClB,QAAU,EAAE,QAAQ,CAAC;IACrB,WAAa,EAAE,MAAM,CAAC;CACnB;;;;uCAIS;IACZ,MAAQ,EAAE,YAAY,CAAC;IACvB,aAAe,EAAE,OAAO,aAAa,EAAE,OAAO,CAAC;IAC/C,mBAAqB,EAAE,MAAM,CAAC;IAC9B,cAAgB,CAAC,EAAE,GAAG,EAAE,CAAC;CACtB;oCAKS,IAAI,CAAC,iBAAiB,EAAE,aAAa,GAAG,UAAU,CAAC"}
+{"version":3,"file":"invitations.d.ts","sourceRoot":"","sources":["invitations.js"],"names":[],"mappings":"AAwEO,2CANI,IAAI,CAAC,UAAU,CAAC,eAChB,IAAI,CAAC,OAAO,cAAc,EAAE,OAAO,CAAC,mBACpC,KAAK,CAAC,KAAK,CAAC,oBACZ,KAAK,CAAC,KAAK,EAAE,iBAAiB,CAAC,6BAC/B,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,YAAY,EAAE,gBAAgB,UAoFrD,cAAc,KAAK,IAAI,CAAC,UAAU,CAAC,CAgBtD;;;;6BA9JY,4BAA4B,GAClC,sBAAsB,GACtB,mBAAmB,GACnB,wBAAwB;;;;;;;;2CAKlB;IACZ,MAAU,EAAE,gBAAgB,CAAC;IAC7B,YAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,QAAY,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;CACtD;;;;qCAQS;IACZ,MAAU,EAAE,UAAU,CAAC;IACvB,QAAY,EAAE,QAAQ,CAAC;IACvB,qBAAyB,EAAE,MAAM,CAAC;IAClC,cAAkB,CAAC,EAAE,GAAG,EAAE,CAAC;CACxB;;;;;;;kCAGS;IACZ,MAAU,EAAE,OAAO,CAAC;IACpB,QAAY,EAAE,QAAQ,CAAC;IACvB,WAAe,EAAE,MAAM,CAAC;CACrB;;;;;uCAOS;IACZ,MAAU,EAAE,YAAY,CAAC;IACzB,aAAiB,EAAE,OAAO,aAAa,EAAE,OAAO,CAAC;IACjD,mBAAuB,EAAE,MAAM,CAAC;IAChC,cAAkB,CAAC,EAAE,GAAG,EAAE,CAAC;CACxB;oCAMS,IAAI,CAAC,iBAAiB,EAAE,aAAa,GAAG,UAAU,CAAC"}

package/src/invitations.js

@@ -10,44 +10,53 @@ const { Fail } = assert;
 const MAX_PIPE_LENGTH = 2;
 
 /**
- * @typedef {AgoricContractInvitationSpec | ContractInvitationSpec | PurseInvitationSpec | ContinuingInvitationSpec} InvitationSpec
- * Specify how to produce an invitation. See each type in the union for details.
+ * @typedef {AgoricContractInvitationSpec
+ *   | ContractInvitationSpec
+ *   | PurseInvitationSpec
+ *   | ContinuingInvitationSpec} InvitationSpec
+ *   Specify how to produce an invitation. See each type in the union for details.
  */
 
 /**
  * @typedef {{
- * source: 'agoricContract',
- * instancePath: string[],
- * callPipe: Array<[methodName: string, methodArgs?: any[]]>,
+ *   source: 'agoricContract';
+ *   instancePath: string[];
+ *   callPipe: [methodName: string, methodArgs?: any[]][];
  * }} AgoricContractInvitationSpec
- * source of invitation is a chain of calls starting with an agoricName
+ *   source of invitation is a chain of calls starting with an agoricName
+ *
  *   - the start of the pipe is a lookup of instancePath within agoricNames
  *   - each entry in the callPipe executes a call on the preceding result
  *   - the end of the pipe is expected to return an Invitation
  *
+ *
  * @typedef {{
- * source: 'contract',
- * instance: Instance,
- * publicInvitationMaker: string,
- * invitationArgs?: any[],
+ *   source: 'contract';
+ *   instance: Instance;
+ *   publicInvitationMaker: string;
+ *   invitationArgs?: any[];
  * }} ContractInvitationSpec
- * source is a contract (in which case this takes an Instance to look up in zoe)
+ *   source is a contract (in which case this takes an Instance to look up in zoe)
  *
  * @typedef {{
- * source: 'purse',
- * instance: Instance,
- * description: string,
+ *   source: 'purse';
+ *   instance: Instance;
+ *   description: string;
  * }} PurseInvitationSpec
- * the invitation is already in your Zoe "invitation" purse so we need to query it
+ *   the invitation is already in your Zoe "invitation" purse so we need to query
+ *   it
+ *
  *   - use the find/query invitation by kvs thing
  *
+ *
  * @typedef {{
- * source: 'continuing',
- * previousOffer: import('./offers.js').OfferId,
- * invitationMakerName: string,
- * invitationArgs?: any[],
+ *   source: 'continuing';
+ *   previousOffer: import('./offers.js').OfferId;
+ *   invitationMakerName: string;
+ *   invitationArgs?: any[];
  * }} ContinuingInvitationSpec
- * continuing invitation in which the offer result from a previous invitation had an `invitationMakers` property
+ *   continuing invitation in which the offer result from a previous invitation
+ *   had an `invitationMakers` property
  */
 
 /**

package/src/marshal-contexts.d.ts

@@ -58,8 +58,7 @@ export function makeImportContext(makePresence?: ((iface: string) => PassableCap
 };
 export function makeLoggingPresence(iface: string, log: (parts: unknown[]) => void): any;
 /**
- * When marshaling a purse, payment, etc. we partition the slots
- * using prefixes.
+ * When marshaling a purse, payment, etc. we partition the slots using prefixes.
  */
 export type WalletSlot<T extends Record<string, IdTable<any, any>>> = `${string & keyof T}:${Digits}`;
 /**
@@ -67,14 +66,13 @@ export type WalletSlot<T extends Record<string, IdTable<any, any>>> = `${string
  */
 export type KindSlot<K extends string> = `${K}:${Digits}`;
 /**
- * Since KindSlots always include a colon and BoardIds never do,
- * we an mix them without confusion.
+ * Since KindSlots always include a colon and BoardIds never do, we an mix them
+ * without confusion.
  */
 export type MixedSlot<T extends Record<string, IdTable<any, any>>> = string;
 /**
- * - 1 or more digits.
- * NOTE: the typescript definition here is more restrictive than
- * actual usage.
+ * - 1 or more digits. NOTE: the typescript
+ *   definition here is more restrictive than actual usage.
  */
 export type Digits = `1` | `12` | `123`;
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"marshal-contexts.d.ts","sourceRoot":"","sources":["marshal-contexts.js"],"names":[],"mappings":"AAuHO;;;;;;;IAqFH;;;OAGG;sBAFQ,MAAM,SACN,KAAK;;IAMhB;;;OAGG;;IAIH;;;OAGG;;EAUN;AAcM,0DAFY,MAAM;IA8FrB;;;OAGG;;IAIH;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;;EAWN;AAwBM,2CAHI,MAAM,OACN,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,IAAI,OAapC;;;;;uBA7W8B,CAAC,8CAAnB,GAAG,MAAM,GAAG,MAAM,CAAC,IAAI,MAAM,EAAE;;;;qBAI5B,CAAC,mBAAJ,GAAG,CAAC,IAAI,MAAM,EAAE;;;;;sBA2CL,CAAC;;;;;;qBAGZ,GAAG,GAAG,IAAI,GAAG,KAAK;;;;oBAWL,IAAI,cAAT,GAAG,wBAFX;IACZ,MAAU,EAAE,QAAQ,CACK,IAAI,AADJ,EACL,GAAG,AADO,CAAC,CAAC;IAChC,KAAS,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;CAC5B;4BA8IU,UAAU,CAAC,OAAO,iBAAiB,CAAC;4BA+HpC,UAAU,CAAC,OAAO,iBAAiB,CAAC;qCA/VH,eAAe;iCAAf,eAAe;yBACxC,gBAAgB"}
+{"version":3,"file":"marshal-contexts.d.ts","sourceRoot":"","sources":["marshal-contexts.js"],"names":[],"mappings":"AAuHO;;;;;;;IAoFH;;;OAGG;sBAFQ,MAAM,SACN,KAAK;;IAMhB;;;OAGG;;IAIH;;;OAGG;;EAUN;AAcM,0DAFY,MAAM;IA8FrB;;;OAGG;;IAIH;;;OAGG;;;;;;;;;;;;;;;;;;;;;;;;EAWN;AA4BM,2CAHI,MAAM,OACN,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,IAAI,OAapC;;;;uBAjX8B,CAAC,8CAAnB,GAAG,MAAM,GAAG,MAAM,CAAC,IAAI,MAAM,EAAE;;;;qBAI5B,CAAC,mBAAJ,GAAG,CAAC,IAAI,MAAM,EAAE;;;;;sBA2CL,CAAC;;;;;qBAGZ,GAAG,GAAG,IAAI,GAAG,KAAK;;;;oBASL,IAAI,cAAT,GAAG,wBAFX;IACZ,MAAU,EAAE,QAAQ,CACK,IAAI,AADJ,EACL,GAAG,AADO,CAAC,CAAC;IAChC,KAAS,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;CAC5B;4BAgJU,UAAU,CAAC,OAAO,iBAAiB,CAAC;4BA+HpC,UAAU,CAAC,OAAO,iBAAiB,CAAC;qCA9VH,eAAe;iCAAf,eAAe;yBACxC,gBAAgB"}

package/src/marshal-contexts.js

@@ -23,10 +23,9 @@ const isDefaultBoardId = specimen => {
 };
 
 /**
- * When marshaling a purse, payment, etc. we partition the slots
- * using prefixes.
+ * When marshaling a purse, payment, etc. we partition the slots using prefixes.
  *
- * @template {Record<string, IdTable<*,*>>} T
+ * @template {Record<string, IdTable<any, any>>} T
  * @typedef {`${string & keyof T}:${Digits}`} WalletSlot
  */
 /**
@@ -35,7 +34,7 @@ const isDefaultBoardId = specimen => {
  */
 
 /**
- * @template {Record<string, IdTable<*,*>>} T
+ * @template {Record<string, IdTable<any, any>>} T
  * @param {T} _tables
  * @param {string & keyof T} kind
  * @param {number} id
@@ -47,10 +46,10 @@ const makeWalletSlot = (_tables, kind, id) => {
 };
 
 /**
- * @template {Record<string, IdTable<*,*>>} T
+ * @template {Record<string, IdTable<any, any>>} T
  * @param {T} record
  * @param {(value: string, index: number, obj: string[]) => boolean} predicate
- * @returns {string & keyof T | undefined}
+ * @returns {(string & keyof T) | undefined}
  */
 const findKey = (record, predicate) => {
   const key = Object.keys(record).find(predicate);
@@ -58,10 +57,10 @@ const findKey = (record, predicate) => {
 };
 
 /**
- * @template {Record<string, IdTable<*,*>>} T
+ * @template {Record<string, IdTable<any, any>>} T
  * @param {T} tables
  * @param {string} slot
- * @returns {{ kind: undefined | string & keyof T, id: number }}
+ * @returns {{ kind: undefined | (string & keyof T); id: number }}
  */
 const parseWalletSlot = (tables, slot) => {
   const kind = findKey(tables, k => slot.startsWith(`${k}:`));
@@ -70,25 +69,23 @@ const parseWalletSlot = (tables, slot) => {
 };
 
 /**
- * Since KindSlots always include a colon and BoardIds never do,
- * we an mix them without confusion.
+ * Since KindSlots always include a colon and BoardIds never do, we an mix them
+ * without confusion.
  *
- * @template {Record<string, IdTable<*,*>>} T
+ * @template {Record<string, IdTable<any, any>>} T
  * @typedef {WalletSlot<T> | BoardId} MixedSlot
  */
 /**
- * @typedef {`1` | `12` | `123`} Digits - 1 or more digits.
- * NOTE: the typescript definition here is more restrictive than
- * actual usage.
+ * @typedef {`1` | `12` | `123`} Digits - 1 or more digits. NOTE: the typescript
+ *   definition here is more restrictive than actual usage.
  */
 
 /**
  * @template {Key} Slot
  * @template {PassableCap} Val
- *
  * @typedef {{
- *   bySlot: MapStore<Slot, Val>,
- *   byVal: MapStore<Val, Slot>,
+ *   bySlot: MapStore<Slot, Val>;
+ *   byVal: MapStore<Val, Slot>;
  * }} IdTable<Value>
  */
 
@@ -105,17 +102,20 @@ const initSlotVal = (table, slot, val) => {
 };
 
 /**
- * Make context for exporting wallet data where brands etc. can be recognized by boardId.
- * Export for use outside the smart wallet.
+ * Make context for exporting wallet data where brands etc. can be recognized by
+ * boardId. Export for use outside the smart wallet.
  *
  * When serializing wallet state for, there's a tension between
  *
- *  - keeping purses etc. closely held
- *  - recognizing identity of brands also referenced in the state of contracts such as the AMM
+ * - keeping purses etc. closely held
+ * - recognizing identity of brands also referenced in the state of contracts such
+ *   as the AMM
+ *
+ * `makeMarshal()` is parameterized by the type of slots. Here we use a disjoint
+ * union of
  *
- * `makeMarshal()` is parameterized by the type of slots. Here we use a disjoint union of
- *   - board ids for widely shared objects
- *   - kind:seq ids for closely held objects; for example purse:123
+ * - board ids for widely shared objects
+ * - kind:seq ids for closely held objects; for example purse:123
  */
 export const makeExportContext = () => {
   const walletObjects = {
@@ -143,14 +143,13 @@ export const makeExportContext = () => {
   };
 
   /**
-   * Look up the slot in mappings from published data
-   * else try walletObjects that we have seen.
-   *
-   * @throws if not found (a slotToVal function typically
-   *         conjures a new identity)
+   * Look up the slot in mappings from published data else try walletObjects
+   * that we have seen.
    *
    * @param {MixedSlot<typeof walletObjects>} slot
    * @param {string} _iface
+   * @throws if not found (a slotToVal function typically conjures a new
+   *   identity)
    */
   const slotToVal = (slot, _iface) => {
     if (isDefaultBoardId(slot) && boardObjects.bySlot.has(slot)) {
@@ -239,8 +238,8 @@ const defaultMakePresence = iface => {
 };
 
 /**
- * Make context for marshalling wallet or board data.
- * To be imported into the client, which never exports objects.
+ * Make context for marshalling wallet or board data. To be imported into the
+ * client, which never exports objects.
  *
  * @param {(iface: string) => PassableCap} [makePresence]
  */
@@ -363,8 +362,12 @@ export const makeImportContext = (makePresence = defaultMakePresence) => {
 /**
  * @param {string} iface
  * @param {{
- *   applyMethod: (target: unknown, method: string | symbol, args: unknown[]) => void,
- *   applyFunction: (target: unknown, args: unknown[]) => void,
+ *   applyMethod: (
+ *     target: unknown,
+ *     method: string | symbol,
+ *     args: unknown[],
+ *   ) => void;
+ *   applyFunction: (target: unknown, args: unknown[]) => void;
  * }} handler
  */
 const makePresence = (iface, handler) => {

package/src/offerWatcher.d.ts

@@ -7,17 +7,18 @@ export function prepareOfferWatcher(baggage: import("@agoric/vat-data").Baggage)
         updateStatus(offerStatusUpdates: Record<string, unknown>): void;
         /**
          * @param {string} offerId
-         * @param {Amount<"set">} invitationAmount
+         * @param {Amount<'set'>} invitationAmount
          * @param {import('./types.js').InvitationMakers} invitationMakers
-         * @param {import("./types.js").PublicSubscribers} publicSubscribers
+         * @param {import('./types.js').PublicSubscribers} publicSubscribers
          */
         onNewContinuingOffer(offerId: string, invitationAmount: Amount<"set">, invitationMakers: import("./types.js").InvitationMakers, publicSubscribers: import("./types.js").PublicSubscribers): void;
-        /** @param {unknown} result */
-        publishResult(result: unknown): void;
+        /** @param {Passable | ContinuingOfferResult} result */
+        publishResult(result: Passable | ContinuingOfferResult): void;
         /**
          * Called when the offer result promise rejects. The other two watchers
-         * are waiting for particular values out of Zoe but they settle at the same time
-         * and don't need their own error handling.
+         * are waiting for particular values out of Zoe but they settle at the
+         * same time and don't need their own error handling.
+         *
          * @param {Error} err
          */
         handleError(err: Error): void;
@@ -37,11 +38,13 @@ export type OfferPromiseWatcher<T extends unknown> = {
     onRejected?: ((reason: unknown, args_0: UserSeat<unknown>) => void) | undefined;
 };
 export type OutcomeWatchers = {
-    resultWatcher: OfferPromiseWatcher<unknown>;
+    resultWatcher: OfferPromiseWatcher<Passable>;
     numWantsWatcher: OfferPromiseWatcher<number>;
     paymentWatcher: OfferPromiseWatcher<PaymentPKeywordRecord>;
 };
 export type MakeOfferWatcher = ReturnType<typeof prepareOfferWatcher>;
 export type OfferWatcher = ReturnType<MakeOfferWatcher>;
 import type { OfferSpec } from "./offers.js";
+import type { Passable } from '@endo/pass-style';
+import type { ContinuingOfferResult } from "./types.js";
 //# 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":"AAgEO,6CAHI,eAAe,QACf,QAAQ,oDAQlB;AAkCM,6CAFI,OAAO,kBAAkB,EAAE,OAAO;;QA0BrC;;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,8BAA8B;8BAAlB,OAAO;QAqCnB;;;;;WAKG;yBADQ,KAAK;;IAclB,gDAAgD;oBAArC,eAAe,CAAC,gBAAgB,CAAC;IA6B5C,+CAA+C;mBAApC,eAAe,CAAC,eAAe,CAAC;IAsB3C,iDAAiD;qBAAtC,eAAe,CAAC,iBAAiB,CAAC;GA0BlD;;;;gCAhR2B,CAAC;;;;8BAIhB;IACZ,aAAe,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC9C,eAAiB,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC/C,cAAgB,EAAE,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;CAC1D;+BA2QU,UAAU,CAAC,OAAO,mBAAmB,CAAC;2BACtC,UAAU,CAAC,gBAAgB,CAAC;+BAzRb,aAAa"}
+{"version":3,"file":"offerWatcher.d.ts","sourceRoot":"","sources":["offerWatcher.js"],"names":[],"mappings":"AAoEO,6CAHI,eAAe,QACf,QAAQ,oDAQlB;AAkCM,6CAFI,OAAO,kBAAkB,EAAE,OAAO;;QAyBrC;;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;;QAoCvD;;;;;;WAMG;yBADQ,KAAK;;IAclB,gDAAgD;oBAArC,eAAe,CAAC,gBAAgB,CAAC;IA+B5C,+CAA+C;mBAApC,eAAe,CAAC,eAAe,CAAC;IAwB3C,iDAAiD;qBAAtC,eAAe,CAAC,iBAAiB,CAAC;GA2BlD;;;;gCApR2B,CAAC;;;;;;qBAMP,mBAAmB,CAAC,MAAM,CAAC;oBAC5B,mBAAmB,CAAC,qBAAqB,CAAC;;+BAgRjD,UAAU,CAAC,OAAO,mBAAmB,CAAC;2BACtC,UAAU,CAAC,gBAAgB,CAAC;+BAhSd,aAAa;8BAEd,kBAAkB;2CADL,YAAY"}

package/src/offerWatcher.js

@@ -12,8 +12,12 @@ import { deeplyFulfilledObject, objectMap } from '@agoric/internal';
 
 import { UNPUBLISHED_RESULT } from './offers.js';
 
-/** @import {OfferSpec} from "./offers.js" */
-/** @import {PromiseWatcher} from '@agoric/swingset-liveslots' */
+/**
+ * @import {OfferSpec} from "./offers.js";
+ * @import {ContinuingOfferResult} from "./types.js";
+ * @import {Passable} from '@endo/pass-style';
+ * @import {PromiseWatcher} from '@agoric/swingset-liveslots';
+ */
 
 /**
  * @template {any} T
@@ -22,9 +26,9 @@ import { UNPUBLISHED_RESULT } from './offers.js';
 
 /**
  * @typedef {{
- * resultWatcher: OfferPromiseWatcher<unknown>,
- * numWantsWatcher: OfferPromiseWatcher<number>,
- * paymentWatcher: OfferPromiseWatcher<PaymentPKeywordRecord>,
+ *   resultWatcher: OfferPromiseWatcher<Passable>;
+ *   numWantsWatcher: OfferPromiseWatcher<number>;
+ *   paymentWatcher: OfferPromiseWatcher<PaymentPKeywordRecord>;
  * }} OutcomeWatchers
  */
 
@@ -108,9 +112,8 @@ export const prepareOfferWatcher = baggage => {
     'OfferWatcher',
     offerWatcherGuard,
     /**
-     *
-     * @param {*} walletHelper
-     * @param {*} deposit
+     * @param {any} walletHelper
+     * @param {any} deposit
      * @param {OfferSpec} offerSpec
      * @param {string} address
      * @param {Amount<'set'>} invitationAmount
@@ -137,9 +140,9 @@ export const prepareOfferWatcher = baggage => {
         },
         /**
          * @param {string} offerId
-         * @param {Amount<"set">} invitationAmount
+         * @param {Amount<'set'>} invitationAmount
          * @param {import('./types.js').InvitationMakers} invitationMakers
-         * @param {import("./types.js").PublicSubscribers} publicSubscribers
+         * @param {import('./types.js').PublicSubscribers} publicSubscribers
          */
         onNewContinuingOffer(
           offerId,
@@ -157,7 +160,7 @@ export const prepareOfferWatcher = baggage => {
           );
         },
 
-        /** @param {unknown} result */
+        /** @param {Passable | ContinuingOfferResult} result */
         publishResult(result) {
           const { state, facets } = this;
 
@@ -183,7 +186,6 @@ export const prepareOfferWatcher = baggage => {
                   state.invitationAmount,
                   // @ts-expect-error narrowed by passStyle
                   result.invitationMakers,
-                  // @ts-expect-error narrowed by passStyle
                   result.publicSubscribers,
                 );
               }
@@ -196,8 +198,9 @@ export const prepareOfferWatcher = baggage => {
         },
         /**
          * Called when the offer result promise rejects. The other two watchers
-         * are waiting for particular values out of Zoe but they settle at the same time
-         * and don't need their own error handling.
+         * are waiting for particular values out of Zoe but they settle at the
+         * same time and don't need their own error handling.
+         *
          * @param {Error} err
          */
         handleError(err) {
@@ -226,9 +229,11 @@ export const prepareOfferWatcher = baggage => {
           facets.helper.updateStatus({ payouts: amounts });
         },
         /**
-         * If promise disconnected, watch again. Or if there's an Error, handle it.
+         * 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
+         *   | import('@agoric/internal/src/upgrade-api.js').UpgradeDisconnection} reason
          * @param {UserSeat} seat
          */
         onRejected(reason, seat) {
@@ -248,9 +253,11 @@ export const prepareOfferWatcher = baggage => {
           facets.helper.publishResult(result);
         },
         /**
-         * If promise disconnected, watch again. Or if there's an Error, handle it.
+         * 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
+         *   | import('@agoric/internal/src/upgrade-api.js').UpgradeDisconnection} reason
          * @param {UserSeat} seat
          */
         onRejected(reason, seat) {
@@ -277,7 +284,8 @@ export const prepareOfferWatcher = baggage => {
          * 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
+         *   | import('@agoric/internal/src/upgrade-api.js').UpgradeDisconnection} reason
          * @param {UserSeat} seat
          */
         onRejected(reason, seat) {

package/src/offers.d.ts

@@ -3,10 +3,10 @@
  */
 /**
  * @typedef {{
- *   id: OfferId,
- *   invitationSpec: import('./invitations.js').InvitationSpec,
- *   proposal: Proposal,
- *   offerArgs?: any
+ *   id: OfferId;
+ *   invitationSpec: import('./invitations.js').InvitationSpec;
+ *   proposal: Proposal;
+ *   offerArgs?: any;
  * }} OfferSpec
  */
 /** Value for "result" field when the result can't be published */

package/src/offers.d.ts.map

@@ -1 +1 @@
-{"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,GAAG,CAAA;CAChB;0BAOS,SAAS,GAAG;IACxB,KAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,MAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,kBAAkB,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,GAAG,CAAC;CACjB;0BAOS,SAAS,GAAG;IACxB,KAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,MAAU,CAAC,EAAE,OAAO,GAAG,OAAO,kBAAkB,CAAC;IACjD,OAAW,CAAC,EAAE,mBAAmB,CAAC;CAC/B"}

package/src/offers.js

@@ -4,10 +4,10 @@
 
 /**
  * @typedef {{
- *   id: OfferId,
- *   invitationSpec: import('./invitations.js').InvitationSpec,
- *   proposal: Proposal,
- *   offerArgs?: any
+ *   id: OfferId;
+ *   invitationSpec: import('./invitations.js').InvitationSpec;
+ *   proposal: Proposal;
+ *   offerArgs?: any;
  * }} OfferSpec
  */
 
@@ -16,9 +16,9 @@ export const UNPUBLISHED_RESULT = 'UNPUBLISHED';
 
 /**
  * @typedef {OfferSpec & {
- * error?: string,
- * numWantsSatisfied?: number
- * result?: unknown | typeof UNPUBLISHED_RESULT,
- * payouts?: AmountKeywordRecord,
+ *   error?: string;
+ *   numWantsSatisfied?: number;
+ *   result?: unknown | typeof UNPUBLISHED_RESULT;
+ *   payouts?: AmountKeywordRecord;
  * }} OfferStatus
  */

package/src/proposals/upgrade-walletFactory-proposal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade-walletFactory-proposal.d.ts","sourceRoot":"","sources":["upgrade-walletFactory-proposal.js"],"names":[],"mappings":"AAqBO,yOALK,eAAe;IAGkD,OAAO,EAAzE;QAAE,gBAAgB,EAAE,YAAY,GAAG;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE;kBAkDnE;AAMM,mGAFK,eAAe,iBAwB1B;AAyBM;;;;;;;EAKN"}
+{"version":3,"file":"upgrade-walletFactory-proposal.d.ts","sourceRoot":"","sources":["upgrade-walletFactory-proposal.js"],"names":[],"mappings":"AAoBO,yOAJI,eAAe;IAEmD,OAAO,EAAzE;QAAE,gBAAgB,EAAE,YAAY,GAAG;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE;kBAkDnE;AAMM,mGAFI,eAAe,iBAwBzB;AAyBM;;;;;;;EAKN"}

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

@@ -14,8 +14,7 @@ const BOARD_AUX = 'boardAux';
 const marshalData = makeMarshal(_val => Fail`data only`);
 
 /**
- * @param { BootstrapPowers } powers
- *
+ * @param {BootstrapPowers} powers
  * @param {object} config
  * @param {{ walletFactoryRef: VatSourceRef & { bundleID: string } }} config.options
  */
@@ -71,7 +70,7 @@ export const upgradeWalletFactory = async (
 harden(upgradeWalletFactory);
 
 /**
- * @param { BootstrapPowers } powers
+ * @param {BootstrapPowers} powers
  */
 export const publishAgoricBrandsDisplayInfo = async ({
   consume: { agoricNames, board, chainStorage },
@@ -98,7 +97,7 @@ export const publishAgoricBrandsDisplayInfo = async ({
 };
 harden(publishAgoricBrandsDisplayInfo);
 
-/** @type { import("@agoric/vats/src/core/lib-boot").BootstrapManifest } */
+/** @type {import('@agoric/vats/src/core/lib-boot').BootstrapManifest} */
 const manifest = {
   [upgradeWalletFactory.name]: {
     // include rationale for closely-held, high authority capabilities