@agoric/smart-wallet 0.5.4-u15.0 → 0.5.4-u16.0

package/src/marshal-contexts.js

@@ -6,7 +6,11 @@ import { DEFAULT_PREFIX } from '@agoric/vats/src/lib-board.js';
 
 const { Fail, quote: q } = assert;
 
-/** @typedef {import('@agoric/vats/src/lib-board.js').BoardId} BoardId */
+/**
+ * @import {PassableCap, RemotableObject} from '@endo/marshal';
+ * @import {Key} from '@endo/patterns';
+ * @import {BoardId} from '@agoric/vats/src/lib-board.js';
+ */
 
 /**
  * ID from a board made with { prefix: DEFAULT_PREFIX }
@@ -19,11 +23,10 @@ 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
- * @typedef {`${string & keyof T}:${Digits}`} WalletSlot<T>
+ * @template {Record<string, IdTable<any, any>>} T
+ * @typedef {`${string & keyof T}:${Digits}`} WalletSlot
  */
 /**
  * @template {string} K
@@ -31,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
@@ -43,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);
@@ -54,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}:`));
@@ -66,32 +69,30 @@ 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
- * @typedef {WalletSlot<T> | BoardId} MixedSlot<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 Slot
- * @template Val
- *
+ * @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>
  */
 
 /**
- * @template Slot
- * @template Val
- * @param {IdTable<Slot, Val>} table
+ * @template {Key} Slot
+ * @template {PassableCap} Val
+ * @param {IdTable<Slot, PassableCap>} table
  * @param {Slot} slot
  * @param {Val} val
  */
@@ -101,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
- *   - board ids for widely shared objects
- *   - kind:seq ids for closely held objects; for example purse:123
+ * `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
  */
 export const makeExportContext = () => {
   const walletObjects = {
@@ -126,27 +130,26 @@ export const makeExportContext = () => {
       byVal: makeScalarMapStore(),
     },
     // TODO: offer, contact, dapp
-    /** @type {IdTable<number, unknown>} */
+    /** @type {IdTable<number, PassableCap>} */
     unknown: {
       bySlot: makeScalarMapStore(),
       byVal: makeScalarMapStore(),
     },
   };
-  /** @type {IdTable<BoardId, unknown>} */
+  /** @type {IdTable<BoardId, PassableCap>} */
   const boardObjects = {
     bySlot: makeScalarMapStore(),
     byVal: makeScalarMapStore(),
   };
 
   /**
-   * 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)) {
@@ -161,7 +164,7 @@ export const makeExportContext = () => {
   let unknownNonce = 0;
 
   /**
-   * @param {unknown} val
+   * @param {PassableCap} val
    * @returns {MixedSlot<typeof walletObjects>}
    */
   const valToSlot = val => {
@@ -181,7 +184,7 @@ export const makeExportContext = () => {
   };
 
   /**
-   * @template V
+   * @template {PassableCap} V
    * @param {string & keyof typeof walletObjects} kind
    * @param {IdTable<number, V>} table
    */
@@ -208,14 +211,14 @@ export const makeExportContext = () => {
     purseEntries: walletObjects.purse.bySlot.entries,
     /**
      * @param {BoardId} id
-     * @param {unknown} val
+     * @param {RemotableObject} val
      */
     initBoardId: (id, val) => {
       initSlotVal(boardObjects, id, val);
     },
     /**
      * @param {BoardId} id
-     * @param {unknown} val
+     * @param {RemotableObject} val
      */
     ensureBoardId: (id, val) => {
       if (boardObjects.byVal.has(val)) {
@@ -235,38 +238,38 @@ 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) => unknown} [makePresence]
+ * @param {(iface: string) => PassableCap} [makePresence]
  */
 export const makeImportContext = (makePresence = defaultMakePresence) => {
   const walletObjects = {
-    /** @type {IdTable<number, unknown>} */
+    /** @type {IdTable<number, PassableCap>} */
     purse: {
       bySlot: makeScalarMapStore(),
       byVal: makeScalarMapStore(),
     },
-    /** @type {IdTable<number, unknown>} */
+    /** @type {IdTable<number, PassableCap>} */
     payment: {
       bySlot: makeScalarMapStore(),
       byVal: makeScalarMapStore(),
     },
-    /** @type {IdTable<number, unknown>} */
+    /** @type {IdTable<number, PassableCap>} */
     unknown: {
       bySlot: makeScalarMapStore(),
       byVal: makeScalarMapStore(),
     },
   };
-  /** @type {IdTable<BoardId, unknown>} */
+  /** @type {IdTable<BoardId, PassableCap>} */
   const boardObjects = {
     bySlot: makeScalarMapStore(),
     byVal: makeScalarMapStore(),
   };
 
   /**
-   * @template Slot
-   * @template Val
+   * @template {Key} Slot
+   * @template {PassableCap} Val
    * @param {IdTable<Slot, Val>} table
    * @param {Slot} slot
    * @param {string} iface
@@ -308,7 +311,7 @@ export const makeImportContext = (makePresence = defaultMakePresence) => {
 
   const valToSlot = {
     fromBoard: val => boardObjects.byVal.get(val),
-    /** @param {unknown} val */
+    /** @param {PassableCap} val */
     fromMyWallet: val => {
       const kind = findKey(walletObjects, k => walletObjects[k].byVal.has(val));
       if (kind === undefined) {
@@ -334,14 +337,14 @@ export const makeImportContext = (makePresence = defaultMakePresence) => {
   return harden({
     /**
      * @param {BoardId} id
-     * @param {unknown} val
+     * @param {PassableCap} val
      */
     initBoardId: (id, val) => {
       initSlotVal(boardObjects, id, val);
     },
     /**
      * @param {BoardId} id
-     * @param {unknown} val
+     * @param {PassableCap} val
      */
     ensureBoardId: (id, val) => {
       if (boardObjects.byVal.has(val)) {
@@ -359,13 +362,17 @@ 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) => {
   let obj;
-  // eslint-disable-next-line no-new
+
   void new HandledPromise((resolve, reject, resolveWithPresence) => {
     obj = resolveWithPresence(handler);
   });

package/src/offerWatcher.d.ts

@@ -1,66 +1,48 @@
 export function watchOfferOutcomes(watchers: OutcomeWatchers, seat: UserSeat): Promise<[unknown, 0 | 1, PaymentPKeywordRecord]>;
-export function prepareOfferWatcher(baggage: MapStore<string, unknown>): (walletHelper: any, deposit: any, offerSpec: import("./offers.js").OfferSpec, address: string, invitationAmount: Amount<"set">, seatRef: UserSeat<unknown>) => {
+export function prepareOfferWatcher(baggage: import("@agoric/vat-data").Baggage): (walletHelper: any, deposit: any, offerSpec: OfferSpec, address: string, invitationAmount: import("@agoric/ertp/src/types.js").SetAmount<import("@endo/patterns").Key>, seatRef: UserSeat<unknown>) => import("@endo/exo").GuardedKit<{
     helper: {
         /**
          * @param {Record<string, unknown>} offerStatusUpdates
          */
         updateStatus(offerStatusUpdates: Record<string, unknown>): void;
-        onNewContinuingOffer(offerId: any, invitationAmount: any, invitationMakers: any, publicSubscribers: any): void;
-        publishResult(result: any): 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.
-         * @param {Error} err
-         */
-        handleError(err: Error): void;
-    };
-    /** @type {OutcomeWatchers['paymentWatcher']} */
-    paymentWatcher: OutcomeWatchers['paymentWatcher'];
-    /** @type {OutcomeWatchers['resultWatcher']} */
-    resultWatcher: OutcomeWatchers['resultWatcher'];
-    /** @type {OutcomeWatchers['numWantsWatcher']} */
-    numWantsWatcher: OutcomeWatchers['numWantsWatcher'];
-} & import("@endo/eventual-send").RemotableBrand<{}, {
-    helper: {
-        /**
-         * @param {Record<string, unknown>} offerStatusUpdates
+         * @param {string} offerId
+         * @param {Amount<'set'>} invitationAmount
+         * @param {import('./types.js').InvitationMakers} invitationMakers
+         * @param {import('./types.js').PublicSubscribers} publicSubscribers
          */
-        updateStatus(offerStatusUpdates: Record<string, unknown>): void;
-        onNewContinuingOffer(offerId: any, invitationAmount: any, invitationMakers: any, publicSubscribers: any): void;
-        publishResult(result: any): void;
+        onNewContinuingOffer(offerId: string, invitationAmount: Amount<"set">, invitationMakers: import("./types.js").InvitationMakers, publicSubscribers: import("./types.js").PublicSubscribers): 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;
     };
     /** @type {OutcomeWatchers['paymentWatcher']} */
-    paymentWatcher: OutcomeWatchers['paymentWatcher'];
+    paymentWatcher: OutcomeWatchers["paymentWatcher"];
     /** @type {OutcomeWatchers['resultWatcher']} */
-    resultWatcher: OutcomeWatchers['resultWatcher'];
+    resultWatcher: OutcomeWatchers["resultWatcher"];
     /** @type {OutcomeWatchers['numWantsWatcher']} */
-    numWantsWatcher: 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> = {
-    onFulfilled: (any: any) => any;
-    onRejected: (err: Error, seat: any) => void;
-};
+export type OfferPromiseWatcher<T extends unknown> = PromiseWatcher<T, [UserSeat]>;
 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";
+import type { PromiseWatcher } from '@agoric/swingset-liveslots';
 //# 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,6CAHI,eAAe,QACf,QAAQ,oDAQlB;AAkCM;;QAwBC;;WAEG;yCADQ,OAAO,MAAM,EAAE,OAAO,CAAC;;;QAyDlC;;;;;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;;;QA/H3C;;WAEG;yCADQ,OAAO,MAAM,EAAE,OAAO,CAAC;;;QAyDlC;;;;;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;0BAnRY,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;;;;;+BAKiC,GAAG;sBAAoB,KAAK,QAAQ,GAAG,KAAK,IAAI;;8BAIxE;IACZ,aAAe,EAAE,oBAAoB,OAAO,CAAC,CAAC;IAC9C,eAAiB,EAAE,oBAAoB,MAAM,CAAC,CAAC;IAC/C,cAAgB,EAAE,oBAAoB,qBAAqB,CAAC,CAAC;CAC1D;+BAoQU,WAAW,0BAA0B,CAAC"}
+{"version":3,"file":"offerWatcher.d.ts","sourceRoot":"","sources":["offerWatcher.js"],"names":[],"mappings":"AAoEO,6CAHI,eAAe,QACf,QAAQ,oDAQlB;AAkCM,6CAFI,OAAO,kBAAkB,EAAE,OAAO,iNAyHnC,WAAS;;QAhGX;;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;IAwB3C,iDAAiD;qBAAtC,eAAe,CAAC,iBAAiB,CAAC;GA2BlD;;;;gCArRkB,CAAC,oBACP,eAAe,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;8BAI7B;IACZ,aAAiB,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IACjD,eAAmB,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACjD,cAAkB,EAAE,mBAAmB,CAAC,qBAAqB,CAAC,CAAC;CAC5D;+BA+QU,UAAU,CAAC,OAAO,mBAAmB,CAAC;2BACtC,UAAU,CAAC,gBAAgB,CAAC;+BAhSd,aAAa;8BAEd,kBAAkB;2CADL,YAAY;oCAEnB,4BAA4B"}

package/src/offerWatcher.js

@@ -13,24 +13,22 @@ 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
+ * @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
- * @typedef {{ onFulfilled: (any) => any, onRejected: (err: Error, seat: any) => void }} OfferPromiseWatcher<T, [UserSeat]
+ * @typedef {PromiseWatcher<T, [UserSeat]>} OfferPromiseWatcher<T, [UserSeat]
  */
 
 /**
  * @typedef {{
- * resultWatcher: OfferPromiseWatcher<unknown>,
- * numWantsWatcher: OfferPromiseWatcher<number>,
- * paymentWatcher: OfferPromiseWatcher<PaymentPKeywordRecord>,
+ *   resultWatcher: OfferPromiseWatcher<Passable>;
+ *   numWantsWatcher: OfferPromiseWatcher<number>;
+ *   paymentWatcher: OfferPromiseWatcher<PaymentPKeywordRecord>;
  * }} OutcomeWatchers
  */
 
@@ -40,7 +38,6 @@ import { UNPUBLISHED_RESULT } from './offers.js';
  */
 const watchForOfferResult = ({ resultWatcher }, seat) => {
   const p = E(seat).getOfferResult();
-  // @ts-expect-error missing declarations?
   watchPromise(p, resultWatcher, seat);
   return p;
 };
@@ -51,7 +48,6 @@ const watchForOfferResult = ({ resultWatcher }, seat) => {
  */
 const watchForNumWants = ({ numWantsWatcher }, seat) => {
   const p = E(seat).numWantsSatisfied();
-  // @ts-expect-error missing declarations?
   watchPromise(p, numWantsWatcher, seat);
   return p;
 };
@@ -62,7 +58,6 @@ const watchForNumWants = ({ numWantsWatcher }, seat) => {
  */
 const watchForPayout = ({ paymentWatcher }, seat) => {
   const p = E(seat).getPayouts();
-  // @ts-expect-error missing declarations?
   watchPromise(p, paymentWatcher, seat);
   return p;
 };
@@ -117,10 +112,9 @@ export const prepareOfferWatcher = baggage => {
     'OfferWatcher',
     offerWatcherGuard,
     /**
-     *
-     * @param {*} walletHelper
-     * @param {*} deposit
-     * @param {import('./offers.js').OfferSpec} offerSpec
+     * @param {any} walletHelper
+     * @param {any} deposit
+     * @param {OfferSpec} offerSpec
      * @param {string} address
      * @param {Amount<'set'>} invitationAmount
      * @param {UserSeat} seatRef
@@ -144,6 +138,12 @@ export const prepareOfferWatcher = baggage => {
 
           state.walletHelper.updateStatus(state.status);
         },
+        /**
+         * @param {string} offerId
+         * @param {Amount<'set'>} invitationAmount
+         * @param {import('./types.js').InvitationMakers} invitationMakers
+         * @param {import('./types.js').PublicSubscribers} publicSubscribers
+         */
         onNewContinuingOffer(
           offerId,
           invitationAmount,
@@ -160,6 +160,7 @@ export const prepareOfferWatcher = baggage => {
           );
         },
 
+        /** @param {Passable | ContinuingOfferResult} result */
         publishResult(result) {
           const { state, facets } = this;
 
@@ -176,12 +177,14 @@ export const prepareOfferWatcher = baggage => {
               facets.helper.updateStatus({ result });
               break;
             case 'copyRecord':
+              // @ts-expect-error narrowed by passStyle
               if ('invitationMakers' in result) {
                 // save for continuing invitation offer
 
                 void facets.helper.onNewContinuingOffer(
                   String(state.status.id),
                   state.invitationAmount,
+                  // @ts-expect-error narrowed by passStyle
                   result.invitationMakers,
                   result.publicSubscribers,
                 );
@@ -195,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) {
@@ -225,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').DisconnectionObject} reason
+         * @param {Error
+         *   | import('@agoric/internal/src/upgrade-api.js').UpgradeDisconnection} reason
          * @param {UserSeat} seat
          */
         onRejected(reason, seat) {
@@ -247,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').DisconnectionObject} reason
+         * @param {Error
+         *   | import('@agoric/internal/src/upgrade-api.js').UpgradeDisconnection} reason
          * @param {UserSeat} seat
          */
         onRejected(reason, seat) {
@@ -276,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').DisconnectionObject} reason
+         * @param {Error
+         *   | import('@agoric/internal/src/upgrade-api.js').UpgradeDisconnection} reason
          * @param {UserSeat} seat
          */
         onRejected(reason, seat) {
@@ -292,3 +301,4 @@ export const prepareOfferWatcher = baggage => {
 harden(prepareOfferWatcher);
 
 /** @typedef {ReturnType<typeof prepareOfferWatcher>} MakeOfferWatcher */
+/** @typedef {ReturnType<MakeOfferWatcher>} OfferWatcher */

package/src/offers.d.ts

@@ -3,10 +3,10 @@
  */
 /**
  * @typedef {{
- *   id: OfferId,
- *   invitationSpec: import('./invitations').InvitationSpec,
- *   proposal: Proposal,
- *   offerArgs?: unknown
+ *   id: OfferId;
+ *   invitationSpec: import('./invitations.js').InvitationSpec;
+ *   proposal: Proposal;
+ *   offerArgs?: any;
  * }} OfferSpec
  */
 /** Value for "result" field when the result can't be published */
@@ -14,11 +14,11 @@ export const UNPUBLISHED_RESULT: "UNPUBLISHED";
 export type OfferId = number | string;
 export type OfferSpec = {
     id: OfferId;
-    invitationSpec: import('./invitations').InvitationSpec;
+    invitationSpec: import("./invitations.js").InvitationSpec;
     proposal: Proposal;
-    offerArgs?: unknown;
+    offerArgs?: any;
 };
-export type OfferStatus = import('./offers.js').OfferSpec & {
+export type OfferStatus = OfferSpec & {
     error?: string;
     numWantsSatisfied?: number;
     result?: unknown | typeof UNPUBLISHED_RESULT;

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,eAAe,EAAE,cAAc,CAAC;IAC3D,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,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').InvitationSpec,
- *   proposal: Proposal,
- *   offerArgs?: unknown
+ *   id: OfferId;
+ *   invitationSpec: import('./invitations.js').InvitationSpec;
+ *   proposal: Proposal;
+ *   offerArgs?: any;
  * }} OfferSpec
  */
 
@@ -15,10 +15,10 @@
 export const UNPUBLISHED_RESULT = 'UNPUBLISHED';
 
 /**
- * @typedef {import('./offers.js').OfferSpec & {
- * error?: string,
- * numWantsSatisfied?: number
- * result?: unknown | typeof UNPUBLISHED_RESULT,
- * payouts?: AmountKeywordRecord,
+ * @typedef {OfferSpec & {
+ *   error?: string;
+ *   numWantsSatisfied?: number;
+ *   result?: unknown | typeof UNPUBLISHED_RESULT;
+ *   payouts?: AmountKeywordRecord;
  * }} OfferStatus
  */

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

@@ -1 +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;;kBAqCnC;AAEM;;;;;;;;;;;;;;;;EAYL"}
+{"version":3,"file":"upgrade-wallet-factory2-proposal.d.ts","sourceRoot":"","sources":["upgrade-wallet-factory2-proposal.js"],"names":[],"mappings":"AAWO,qKAJI,eAAe,GAAG,mBAAmB,WAE7C;IAA6C,OAAO,EAA5C;QAAE,SAAS,EAAE,YAAY,CAAA;KAAE;CACrC,iBAmCA;AAEM;;;;;;;;;;;;;;;;EAYL"}

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

@@ -1,4 +1,6 @@
 // @ts-check
+/// <reference types="@agoric/vats/src/core/types-ambient" />
+
 import { E } from '@endo/far';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 
@@ -27,7 +29,6 @@ export const upgradeWalletFactory = async (
     makeStorageNodeChild(chainStorage, WALLET_STORAGE_PATH_SEGMENT),
     provisionPoolStartResult,
   ]);
-  // @ts-expect-error missing type declaration?
   const walletReviver = await E(ppFacets.creatorFacet).getWalletReviver();
 
   const privateArgs = {

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

@@ -1,4 +1,4 @@
-export function upgradeWalletFactory({ consume: { contractKits: kitsP, instancePrivateArgs: argsP }, instance: { consume: { walletFactory: wfInstanceP }, }, }: BootstrapPowers, config: {
+export function upgradeWalletFactory({ consume: { contractKits, governedContractKits, chainStorage, walletBridgeManager: walletBridgeManagerP, }, instance: { consume: { walletFactory: wfInstanceP, provisionPool: ppInstanceP }, }, }: BootstrapPowers, config: {
     options: {
         walletFactoryRef: VatSourceRef & {
             bundleID: string;

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":"AAoBO,gKALK,eAAe;;0BAGI,YAAY,GAAG;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE;;kBA6BjE;AAMM,mGAFK,eAAe,iBAwB1B;AAsBM;;;;;;;EAKN"}
+{"version":3,"file":"upgrade-walletFactory-proposal.d.ts","sourceRoot":"","sources":["upgrade-walletFactory-proposal.js"],"names":[],"mappings":"AAoBO,yOAJI,eAAe,UAEvB;IAA0E,OAAO,EAAzE;QAAE,gBAAgB,EAAE,YAAY,GAAG;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE;CACnE,iBAiDA;AAMM,mGAFI,eAAe,iBAwBzB;AAyBM;;;;;;;EAKN"}