@agoric/smart-wallet 0.5.4-upgrade-14-dev-c8f9e7b.0 → 0.5.4-upgrade-16-dev-8879538.0

package/package.json

@@ -1,46 +1,45 @@
 {
   "name": "@agoric/smart-wallet",
-  "version": "0.5.4-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
+  "version": "0.5.4-upgrade-16-dev-8879538.0+8879538",
   "description": "Wallet contract",
   "type": "module",
   "scripts": {
     "build": "yarn build:bundles",
     "build:bundles": "node ./scripts/build-bundles.js",
-    "prepack": "tsc --build jsconfig.build.json",
+    "prepack": "tsc --build tsconfig.build.json",
     "postpack": "git clean -f '*.d.ts*'",
     "test": "ava",
     "test:xs": "exit 0",
     "lint": "run-s --continue-on-error lint:*",
     "lint-fix": "yarn lint:eslint --fix",
-    "lint:types": "tsc -p jsconfig.json",
+    "lint:types": "tsc",
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@agoric/cosmic-proto": "0.3.1-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/vats": "^0.15.2-u13.0",
-    "@endo/bundle-source": "2.5.2-upstream-rollup",
-    "@endo/captp": "3.1.1",
-    "@endo/init": "0.5.56",
-    "ava": "^5.2.0",
+    "@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",
+    "@endo/bundle-source": "^3.2.3",
+    "@endo/captp": "^4.2.0",
+    "@endo/init": "^1.1.2",
+    "ava": "^5.3.0",
     "import-meta-resolve": "^2.2.1"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/casting": "0.4.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/deploy-script-support": "0.10.4-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/ertp": "0.16.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/internal": "0.4.0-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/notifier": "0.6.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/store": "0.9.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/swingset-vat": "0.32.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/vat-data": "0.5.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/vats": "0.15.2-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@agoric/zoe": "0.26.3-upgrade-14-dev-c8f9e7b.0+c8f9e7b",
-    "@endo/eventual-send": "0.17.2",
-    "@endo/far": "0.2.18",
-    "@endo/marshal": "0.8.5",
-    "@endo/nat": "4.1.27",
-    "@endo/promise-kit": "0.2.56"
+    "@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",
+    "@endo/eventual-send": "^1.2.2",
+    "@endo/far": "^1.1.2",
+    "@endo/marshal": "^1.5.0",
+    "@endo/nat": "^5.0.7",
+    "@endo/promise-kit": "^1.1.2"
   },
   "files": [
     "src/"
@@ -58,12 +57,18 @@
   "homepage": "https://github.com/Agoric/agoric#readme",
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/*.test.*"
+    ],
+    "require": [
+      "@endo/init/debug.js"
     ],
     "timeout": "2m"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c8f9e7be1645e0be23f47de197409a7d4874add5"
+  "typeCoverage": {
+    "atLeast": 94.35
+  },
+  "gitHead": "8879538cd1d125a08346f02dd5701d0d70c90bb8"
 }

package/src/invitations.d.ts

@@ -1,4 +1,4 @@
-export function makeInvitationsHelper(zoe: ERef<ZoeService>, agoricNames: ERef<NameHub>, invitationBrand: Brand<'set'>, invitationsPurse: Purse<'set'>, getInvitationContinuation: (fromOfferId: string) => import('./types').RemoteInvitationMakers): (spec: InvitationSpec) => ERef<Invitation>;
+export function makeInvitationsHelper(zoe: ERef<ZoeService>, agoricNames: ERef<import("@agoric/vats").NameHub>, invitationBrand: Brand<"set">, invitationsPurse: Purse<"set", InvitationDetails>, getInvitationContinuation: (fromOfferId: string) => import("./types.js").InvitationMakers): (spec: InvitationSpec) => ERef<Invitation>;
 /**
  * Specify how to produce an invitation. See each type in the union for details.
  */
@@ -10,7 +10,7 @@ export type InvitationSpec = AgoricContractInvitationSpec | ContractInvitationSp
  * - the end of the pipe is expected to return an Invitation
  */
 export type AgoricContractInvitationSpec = {
-    source: 'agoricContract';
+    source: "agoricContract";
     instancePath: string[];
     callPipe: Array<[methodName: string, methodArgs?: any[]]>;
 };
@@ -18,7 +18,7 @@ export type AgoricContractInvitationSpec = {
  * source is a contract (in which case this takes an Instance to look up in zoe)
  */
 export type ContractInvitationSpec = {
-    source: 'contract';
+    source: "contract";
     instance: Instance;
     publicInvitationMaker: string;
     invitationArgs?: any[];
@@ -28,7 +28,7 @@ export type ContractInvitationSpec = {
  * - use the find/query invitation by kvs thing
  */
 export type PurseInvitationSpec = {
-    source: 'purse';
+    source: "purse";
     instance: Instance;
     description: string;
 };
@@ -36,10 +36,10 @@ export type PurseInvitationSpec = {
  * continuing invitation in which the offer result from a previous invitation had an `invitationMakers` property
  */
 export type ContinuingInvitationSpec = {
-    source: 'continuing';
-    previousOffer: import('./offers.js').OfferId;
+    source: "continuing";
+    previousOffer: import("./offers.js").OfferId;
     invitationMakerName: string;
     invitationArgs?: any[];
 };
-export type InvitationsPurseQuery = Pick<InvitationDetails, 'description' | 'instance'>;
+export type InvitationsPurseQuery = Pick<InvitationDetails, "description" | "instance">;
 //# 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":"AAkEO,2CANI,KAAK,UAAU,CAAC,eAChB,KAAK,OAAO,CAAC,mBACb,MAAM,KAAK,CAAC,oBACZ,MAAM,KAAK,CAAC,2CACE,MAAM,KAAK,OAAO,SAAS,EAAE,sBAAsB,UAsFxD,cAAc,KAAK,KAAK,UAAU,CAAC,CAgBtD;;;;6BAvJY,4BAA4B,GAAG,sBAAsB,GAAG,mBAAmB,GAAG,wBAAwB;;;;;;;2CAKtG;IACZ,MAAQ,EAAE,gBAAgB,CAAC;IAC3B,YAAc,EAAE,MAAM,EAAE,CAAC;IACzB,QAAU,EAAE,MAAM,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,KAAK,iBAAiB,EAAE,aAAa,GAAG,UAAU,CAAC"}
+{"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"}

package/src/invitations.js

@@ -4,9 +4,6 @@ import { InvitationHandleShape } from '@agoric/zoe/src/typeGuards.js';
 import { E } from '@endo/far';
 import { shape } from './typeGuards.js';
 
-// Ambient types. Needed only for dev but this does a runtime import.
-import '@agoric/zoe/exported.js';
-
 const { Fail } = assert;
 
 // A safety limit
@@ -59,10 +56,10 @@ const MAX_PIPE_LENGTH = 2;
 
 /**
  * @param {ERef<ZoeService>} zoe
- * @param {ERef<NameHub>} agoricNames
+ * @param {ERef<import('@agoric/vats').NameHub>} agoricNames
  * @param {Brand<'set'>} invitationBrand
- * @param {Purse<'set'>} invitationsPurse
- * @param {(fromOfferId: string) => import('./types').RemoteInvitationMakers} getInvitationContinuation
+ * @param {Purse<'set', InvitationDetails>} invitationsPurse
+ * @param {(fromOfferId: string) => import('./types.js').InvitationMakers} getInvitationContinuation
  */
 export const makeInvitationsHelper = (
   zoe,
@@ -103,9 +100,7 @@ export const makeInvitationsHelper = (
       mustMatch(spec, shape.PurseInvitationSpec);
 
       const { instance, description } = spec;
-      // @ts-expect-error TS thinks it's always true. I'm doubtful.
       (instance && description) || Fail`missing instance or description`;
-      /** @type {Amount<'set'>} */
       const purseAmount = await E(invitationsPurse).getCurrentAmount();
       const invitations = AmountMath.getValue(invitationBrand, purseAmount);
 

package/src/marshal-contexts.d.ts

@@ -1,65 +1,65 @@
 export function makeExportContext(): {
-    toCapData: import("@endo/marshal/src/marshal").ToCapData<string>;
-    fromCapData: import("@endo/marshal/src/marshal").FromCapData<string>;
-    serialize: import("@endo/marshal/src/marshal").ToCapData<string>;
-    unserialize: import("@endo/marshal/src/marshal").FromCapData<string>;
-    savePurseActions: (val: Purse<AssetKind>) => void;
-    savePaymentActions: (val: Payment<AssetKind>) => void;
+    toCapData: import("@endo/marshal").ToCapData<string>;
+    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;
     /**
      * @param {number} id
      * @param {Purse} purse
      */
     initPurseId: (id: number, purse: Purse) => void;
-    purseEntries: (keyPatt?: any, valuePatt?: any) => Iterable<[number, Purse<AssetKind>]>;
+    purseEntries: (keyPatt?: globalThis.Pattern, valuePatt?: globalThis.Pattern) => Iterable<[number, globalThis.Purse]>;
     /**
      * @param {BoardId} id
-     * @param {unknown} val
+     * @param {RemotableObject} val
      */
-    initBoardId: (id: BoardId, val: unknown) => void;
+    initBoardId: (id: string, val: RemotableObject) => void;
     /**
      * @param {BoardId} id
-     * @param {unknown} val
+     * @param {RemotableObject} val
      */
-    ensureBoardId: (id: BoardId, val: unknown) => void;
+    ensureBoardId: (id: string, val: RemotableObject) => void;
 };
-export function makeImportContext(makePresence?: ((iface: string) => unknown) | undefined): {
+export function makeImportContext(makePresence?: ((iface: string) => PassableCap) | undefined): {
     /**
      * @param {BoardId} id
-     * @param {unknown} val
+     * @param {PassableCap} val
      */
-    initBoardId: (id: BoardId, val: unknown) => void;
+    initBoardId: (id: string, val: PassableCap) => void;
     /**
      * @param {BoardId} id
-     * @param {unknown} val
+     * @param {PassableCap} val
      */
-    ensureBoardId: (id: BoardId, val: unknown) => void;
+    ensureBoardId: (id: string, val: PassableCap) => void;
     fromMyWallet: {
-        toCapData: import("@endo/marshal/src/marshal").ToCapData<string>;
-        fromCapData: import("@endo/marshal/src/marshal").FromCapData<string>;
-        serialize: import("@endo/marshal/src/marshal").ToCapData<string>;
-        unserialize: import("@endo/marshal/src/marshal").FromCapData<string>;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
-        toCapData: import("@endo/marshal/src/marshal").ToCapData<string>;
-        fromCapData: import("@endo/marshal/src/marshal").FromCapData<string>;
-        serialize: import("@endo/marshal/src/marshal").ToCapData<string>;
-        unserialize: import("@endo/marshal/src/marshal").FromCapData<string>;
+        toCapData: import("@endo/marshal").ToCapData<string>;
+        fromCapData: import("@endo/marshal").FromCapData<string>;
+        serialize: import("@endo/marshal").ToCapData<string>;
+        unserialize: import("@endo/marshal").FromCapData<string>;
+    } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+        toCapData: import("@endo/marshal").ToCapData<string>;
+        fromCapData: import("@endo/marshal").FromCapData<string>;
+        serialize: import("@endo/marshal").ToCapData<string>;
+        unserialize: import("@endo/marshal").FromCapData<string>;
     }>;
     fromBoard: {
-        toCapData: import("@endo/marshal/src/marshal").ToCapData<string>;
-        fromCapData: import("@endo/marshal/src/marshal").FromCapData<string>;
-        serialize: import("@endo/marshal/src/marshal").ToCapData<string>;
-        unserialize: import("@endo/marshal/src/marshal").FromCapData<string>;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
-        toCapData: import("@endo/marshal/src/marshal").ToCapData<string>;
-        fromCapData: import("@endo/marshal/src/marshal").FromCapData<string>;
-        serialize: import("@endo/marshal/src/marshal").ToCapData<string>;
-        unserialize: import("@endo/marshal/src/marshal").FromCapData<string>;
+        toCapData: import("@endo/marshal").ToCapData<string>;
+        fromCapData: import("@endo/marshal").FromCapData<string>;
+        serialize: import("@endo/marshal").ToCapData<string>;
+        unserialize: import("@endo/marshal").FromCapData<string>;
+    } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+        toCapData: import("@endo/marshal").ToCapData<string>;
+        fromCapData: import("@endo/marshal").FromCapData<string>;
+        serialize: import("@endo/marshal").ToCapData<string>;
+        unserialize: import("@endo/marshal").FromCapData<string>;
     }>;
 };
 export function makeLoggingPresence(iface: string, log: (parts: unknown[]) => void): any;
-export type BoardId = import('@agoric/vats/src/lib-board.js').BoardId;
 /**
- * <T>
+ * 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,9 +67,10 @@ export type WalletSlot<T extends Record<string, IdTable<any, any>>> = `${string
  */
 export type KindSlot<K extends string> = `${K}:${Digits}`;
 /**
- * <T>
+ * 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>>> = WalletSlot<T> | BoardId;
+export type MixedSlot<T extends Record<string, IdTable<any, any>>> = string;
 /**
  * - 1 or more digits.
  * NOTE: the typescript definition here is more restrictive than
@@ -79,10 +80,13 @@ export type Digits = `1` | `12` | `123`;
 /**
  * <Value>
  */
-export type IdTable<Slot, Val> = {
+export type IdTable<Slot extends Key, Val extends PassableCap> = {
     bySlot: MapStore<Slot, Val>;
     byVal: MapStore<Val, Slot>;
 };
 export type ExportContext = ReturnType<typeof makeExportContext>;
 export type ImportContext = ReturnType<typeof makeImportContext>;
+import type { RemotableObject } from '@endo/marshal';
+import type { PassableCap } from '@endo/marshal';
+import type { Key } from '@endo/patterns';
 //# sourceMappingURL=marshal-contexts.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"marshal-contexts.d.ts","sourceRoot":"","sources":["marshal-contexts.js"],"names":[],"mappings":"AAmHO;;;;;;;IAqFH;;;OAGG;sBAFQ,MAAM,SACN,KAAK;;IAMhB;;;OAGG;sBAFQ,OAAO,OACP,OAAO;IAKlB;;;OAGG;wBAFQ,OAAO,OACP,OAAO;EAWrB;AAcM,0DAFY,MAAM,KAAK,OAAO;IA8FjC;;;OAGG;sBAFQ,OAAO,OACP,OAAO;IAKlB;;;OAGG;wBAFQ,OAAO,OACP,OAAO;;;;;;;;;;;;;;;;;;;;;;;EAYrB;AAwBM,2CAHI,MAAM,eACE,OAAO,EAAE,KAAK,IAAI,OAapC;sBA9Xa,OAAO,+BAA+B,EAAE,OAAO;;;;sEAiBhD,GAAG,MAAM,GAAG,MAAM,CAAC,IAAI,MAAM,EAAE;;;;yCAI/B,GAAG,CAAC,IAAI,MAAM,EAAE;;;;qEA2ChB,WAAW,CAAC,CAAC,GAAG,OAAO;;;;;;qBAGvB,GAAG,GAAG,IAAI,GAAG,KAAK;;;;iCASlB;IACZ,MAAU,EAAE,SAAS,IAAI,EAAE,GAAG,CAAC,CAAC;IAChC,KAAS,EAAE,SAAS,GAAG,EAAE,IAAI,CAAC,CAAC;CAC5B;4BA8IU,WAAW,wBAAwB,CAAC;4BA+HpC,WAAW,wBAAwB,CAAC"}
+{"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"}

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 }
@@ -23,7 +27,7 @@ const isDefaultBoardId = specimen => {
  * using prefixes.
  *
  * @template {Record<string, IdTable<*,*>>} T
- * @typedef {`${string & keyof T}:${Digits}`} WalletSlot<T>
+ * @typedef {`${string & keyof T}:${Digits}`} WalletSlot
  */
 /**
  * @template {string} K
@@ -70,7 +74,7 @@ const parseWalletSlot = (tables, slot) => {
  * we an mix them without confusion.
  *
  * @template {Record<string, IdTable<*,*>>} T
- * @typedef {WalletSlot<T> | BoardId} MixedSlot<T>
+ * @typedef {WalletSlot<T> | BoardId} MixedSlot
  */
 /**
  * @typedef {`1` | `12` | `123`} Digits - 1 or more digits.
@@ -79,8 +83,8 @@ const parseWalletSlot = (tables, slot) => {
  */
 
 /**
- * @template Slot
- * @template Val
+ * @template {Key} Slot
+ * @template {PassableCap} Val
  *
  * @typedef {{
  *   bySlot: MapStore<Slot, Val>,
@@ -89,9 +93,9 @@ const parseWalletSlot = (tables, slot) => {
  */
 
 /**
- * @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
  */
@@ -126,13 +130,13 @@ 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(),
@@ -161,7 +165,7 @@ export const makeExportContext = () => {
   let unknownNonce = 0;
 
   /**
-   * @param {unknown} val
+   * @param {PassableCap} val
    * @returns {MixedSlot<typeof walletObjects>}
    */
   const valToSlot = val => {
@@ -181,7 +185,7 @@ export const makeExportContext = () => {
   };
 
   /**
-   * @template V
+   * @template {PassableCap} V
    * @param {string & keyof typeof walletObjects} kind
    * @param {IdTable<number, V>} table
    */
@@ -208,14 +212,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)) {
@@ -238,35 +242,35 @@ const defaultMakePresence = iface => {
  * 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 +312,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 +338,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)) {
@@ -365,7 +369,7 @@ export const makeImportContext = (makePresence = defaultMakePresence) => {
  */
 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,41 +1,40 @@
 export function watchOfferOutcomes(watchers: OutcomeWatchers, seat: UserSeat): Promise<[unknown, 0 | 1, PaymentPKeywordRecord]>;
-export function prepareOfferWatcher(baggage: any): (walletHelper?: any, deposit?: any, offerSpec?: any, address?: any, iAmount?: any, seatRef?: any) => {
+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: {
-        updateStatus(offerStatusUpdates: any): void;
-        onNewContinuingOffer(offerId: any, invitationAmount: any, invitationMakers: any, publicSubscribers: any): void;
-        publishResult(result: any): void;
+        /**
+         * @param {Record<string, unknown>} offerStatusUpdates
+         */
+        updateStatus(offerStatusUpdates: Record<string, unknown>): void;
+        /**
+         * @param {string} offerId
+         * @param {Amount<"set">} invitationAmount
+         * @param {import('./types.js').InvitationMakers} invitationMakers
+         * @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;
+        /**
+         * 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'];
+    paymentWatcher: OutcomeWatchers["paymentWatcher"];
     /** @type {OutcomeWatchers['resultWatcher']} */
-    resultWatcher: OutcomeWatchers['resultWatcher'];
+    resultWatcher: OutcomeWatchers["resultWatcher"];
     /** @type {OutcomeWatchers['numWantsWatcher']} */
-    numWantsWatcher: OutcomeWatchers['numWantsWatcher'];
-} & import("@endo/eventual-send").RemotableBrand<{}, {
-    helper: {
-        updateStatus(offerStatusUpdates: any): void;
-        onNewContinuingOffer(offerId: any, invitationAmount: any, invitationMakers: any, publicSubscribers: any): void;
-        publishResult(result: any): void;
-    };
-    /** @type {OutcomeWatchers['paymentWatcher']} */
-    paymentWatcher: OutcomeWatchers['paymentWatcher'];
-    /** @type {OutcomeWatchers['resultWatcher']} */
-    resultWatcher: OutcomeWatchers['resultWatcher'];
-    /** @type {OutcomeWatchers['numWantsWatcher']} */
-    numWantsWatcher: OutcomeWatchers['numWantsWatcher'];
+    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;
+    onFulfilled?: ((value: T, args_0: UserSeat<unknown>) => void) | undefined;
+    onRejected?: ((reason: unknown, args_0: UserSeat<unknown>) => void) | undefined;
 };
 export type OutcomeWatchers = {
     resultWatcher: OfferPromiseWatcher<unknown>;
@@ -43,4 +42,6 @@ export type OutcomeWatchers = {
     paymentWatcher: OfferPromiseWatcher<PaymentPKeywordRecord>;
 };
 export type MakeOfferWatcher = ReturnType<typeof prepareOfferWatcher>;
+export type OfferWatcher = ReturnType<MakeOfferWatcher>;
+import type { OfferSpec } from "./offers.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":"AAyEO,6CAHI,eAAe,QACf,QAAQ,oDAQlB;AA8BM;;;;;;IAwED,gDAAgD;oBAArC,eAAe,CAAC,gBAAgB,CAAC;IAyB5C,+CAA+C;mBAApC,eAAe,CAAC,eAAe,CAAC;IAkB3C,iDAAiD;qBAAtC,eAAe,CAAC,iBAAiB,CAAC;;;;;;;IA3C7C,gDAAgD;oBAArC,eAAe,CAAC,gBAAgB,CAAC;IAyB5C,+CAA+C;mBAApC,eAAe,CAAC,eAAe,CAAC;IAkB3C,iDAAiD;qBAAtC,eAAe,CAAC,iBAAiB,CAAC;GAoBlD;0BArOY,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;+BAsNU,WAAW,0BAA0B,CAAC"}
+{"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"}