@agoric/ertp 0.16.3-dev-727e4af.0 → 0.16.3-dev-96c9ff5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/ertp",
-  "version": "0.16.3-dev-727e4af.0+727e4af",
+  "version": "0.16.3-dev-96c9ff5.0+96c9ff5",
   "description": "Electronic Rights Transfer Protocol (ERTP). A smart contract framework for exchanging electronic rights",
   "type": "module",
   "main": "src/index.js",
@@ -39,21 +39,21 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-727e4af.0+727e4af",
-    "@agoric/notifier": "0.6.3-dev-727e4af.0+727e4af",
-    "@agoric/store": "0.9.3-dev-727e4af.0+727e4af",
-    "@agoric/vat-data": "0.5.3-dev-727e4af.0+727e4af",
-    "@agoric/zone": "0.2.3-dev-727e4af.0+727e4af",
-    "@endo/eventual-send": "^1.2.1",
-    "@endo/far": "^1.1.1",
-    "@endo/marshal": "^1.4.1",
-    "@endo/nat": "^5.0.6",
-    "@endo/patterns": "^1.3.1",
-    "@endo/promise-kit": "^1.1.1"
+    "@agoric/assert": "0.6.1-dev-96c9ff5.0+96c9ff5",
+    "@agoric/notifier": "0.6.3-dev-96c9ff5.0+96c9ff5",
+    "@agoric/store": "0.9.3-dev-96c9ff5.0+96c9ff5",
+    "@agoric/vat-data": "0.5.3-dev-96c9ff5.0+96c9ff5",
+    "@agoric/zone": "0.2.3-dev-96c9ff5.0+96c9ff5",
+    "@endo/eventual-send": "^1.2.2",
+    "@endo/far": "^1.1.2",
+    "@endo/marshal": "^1.5.0",
+    "@endo/nat": "^5.0.7",
+    "@endo/patterns": "^1.4.0",
+    "@endo/promise-kit": "^1.1.2"
   },
   "devDependencies": {
-    "@agoric/swingset-vat": "0.32.3-dev-727e4af.0+727e4af",
-    "@endo/bundle-source": "^3.2.2",
+    "@agoric/swingset-vat": "0.32.3-dev-96c9ff5.0+96c9ff5",
+    "@endo/bundle-source": "^3.2.3",
     "@fast-check/ava": "^1.1.5",
     "ava": "^5.3.0",
     "tsd": "^0.30.7"
@@ -86,7 +86,7 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 90.62
+    "atLeast": 91.21
   },
-  "gitHead": "727e4af514a8e92f400dd1671a788c5d3cbe1b8a"
+  "gitHead": "96c9ff577fe14cebeb5a38543ba7f8598ffcd0c7"
 }

package/src/amountMath.d.ts

@@ -1,22 +1,21 @@
-export function assertValueGetHelpers<V extends AmountValue>(value: V): MathHelpers<V>;
-import type { AmountValue } from './types.js';
+export function assertValueGetHelpers<V>(value: V): MathHelpers<V>;
 import type { MathHelpers } from './types.js';
 export namespace AmountMath {
-    export function make<K extends AssetKind>(brand: Brand<K>, allegedValue: AssetValueForKind<K>): Amount<K>;
-    export function coerce<K extends AssetKind>(brand: Brand<K>, allegedAmount: Amount<K>): Amount<K>;
-    export function getValue<K extends AssetKind>(brand: Brand<K>, amount: Amount<K>): AssetValueForKind<K>;
+    export function make<B extends Brand, V extends bigint | CopySet | SetValue | CopyBag>(brand: B, allegedValue: V): B extends Brand<"nat"> ? NatAmount : V extends bigint ? NatAmount : V extends CopySet ? CopySetAmount<V["payload"][0]> : V extends CopyBag ? CopyBagAmount<V["payload"][0][0]> : V extends SetValue ? SetAmount<V[0]> : never;
+    export function coerce<A extends Amount>(brand: Brand, allegedAmount: A): A;
+    export function getValue<A extends Amount>(brand: Brand, amount: A): A["value"];
     export let makeEmpty: {
-        (brand: Brand): Amount<"nat">;
-        <K extends AssetKind>(brand: Brand, assetKind: K): Amount<K>;
+        (brand: Brand): NatAmount;
+        <K extends AssetKind>(brand: Brand<K>, assetKind: K): Amount<K>;
     };
-    export function makeEmptyFromAmount<K extends AssetKind>(amount: Amount<K>): Amount<K>;
+    export function makeEmptyFromAmount<A extends Amount>(amount: A): A;
     export function isEmpty(amount: Amount, brand?: Brand | undefined): boolean;
     export { isGTE };
-    export function isEqual<K extends AssetKind>(leftAmount: Amount<K>, rightAmount: Amount<K>, brand?: Brand<K> | undefined): boolean;
-    export function add<K extends AssetKind>(leftAmount: Amount<K>, rightAmount: Amount<K>, brand?: Brand<K> | undefined): Amount<K>;
-    export function subtract<K extends AssetKind>(leftAmount: Amount<K>, rightAmount: Amount<K>, brand?: Brand<K> | undefined): Amount<K>;
-    export function min<K extends AssetKind>(x: Amount<K>, y: Amount<K>, brand?: Brand<K> | undefined): Amount<K>;
-    export function max<K extends AssetKind>(x: Amount<K>, y: Amount<K>, brand?: Brand<K> | undefined): Amount<K>;
+    export function isEqual<A extends Amount>(leftAmount: A, rightAmount: A, brand?: Brand | undefined): boolean;
+    export function add<A extends Amount>(leftAmount: A, rightAmount: A, brand?: Brand | undefined): A;
+    export function subtract<L extends Amount, R extends Amount>(leftAmount: L, rightAmount: R, brand?: Brand | undefined): L extends R ? L : never;
+    export function min<A extends Amount>(x: A, y: A, brand?: Brand | undefined): A;
+    export function max<A extends Amount>(x: A, y: A, brand?: Brand | undefined): A;
 }
 /**
  * Constants for the kinds of assets we support.
@@ -36,11 +35,17 @@ export const AssetKind: {
 };
 import type { AssetKind } from './types.js';
 /** @param {Amount} amount */
-export function getAssetKind(amount: Amount): AssetKindForValue<V>;
+export function getAssetKind(amount: Amount): "copySet" | "set" | "nat" | "copyBag";
 /** @param {AssetKind} allegedAK */
 export function assertAssetKind(allegedAK: AssetKind): void;
 import type { Brand } from './types.js';
-import type { AssetValueForKind } from './types.js';
+import type { CopySet } from '@endo/patterns';
+import type { SetValue } from './types.js';
+import type { CopyBag } from '@endo/patterns';
+import type { NatAmount } from './types.js';
+import type { CopySetAmount } from './types.js';
+import type { CopyBagAmount } from './types.js';
+import type { SetAmount } from './types.js';
 import type { Amount } from './types.js';
 /**
  * Returns true if the leftAmount is greater than or equal to the rightAmount.
@@ -56,6 +61,5 @@ import type { Amount } from './types.js';
  * @returns {boolean}
  */
 declare function isGTE<K extends AssetKind>(leftAmount: Amount<K>, rightAmount: Amount<K>, brand?: Brand<K> | undefined): boolean;
-import type { AssetKindForValue } from './types.js';
 export {};
 //# sourceMappingURL=amountMath.d.ts.map

package/src/amountMath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"amountMath.d.ts","sourceRoot":"","sources":["amountMath.js"],"names":[],"mappings":"AAuHO,sCAFkB,CAAC,6BAAD,CAAC,AADd,kBAK6B;iCAjHmE,YAAY;iCAAZ,YAAY;;IAyMhH,qBAJuB,CAAC,oFAS7B;IAUO,uBAHU,CAAC,0EAWlB;IASS,yBAHQ,CAAC,8EAGgD;;;SAOf,CAAC,6CAAD,CAAC;;IAiBhC,oCAHH,CAAC,kDAUlB;IAQQ,4EAOR;;IAYQ,wBAJS,CAAC,0GAOlB;IAcI,oBAJa,CAAC,4GAQlB;IAcS,yBAJQ,CAAC,4GAQlB;IAUI,oBAJa,CAAC,yFAUyB;IAUvC,oBAJa,CAAC,yFAUyB;;AAtW9C;;;;;;;;;GASG;AACH,wBAPU;IACT,GAAO,EAAE,KAAK,CAAC;IACf,GAAO,EAAE,KAAK,CAAC;IACf,QAAY,EAAE,SAAS,CAAC;IACxB,QAAY,EAAE,SAAS,CAAC;CACrB,CAOD;+BAnByG,YAAY;AA8WxH,6BAA6B;AAC7B,mEAKC;AA9VD,mCAAmC;AACnC,2CADY,SAAS,QAIpB;2BA1B2G,YAAY;uCAAZ,YAAY;4BAAZ,YAAY;AAqKxH;;;;;;;;;;;;GAYG;AACH,uBAJkB,CAAC,kGAEN,OAAO,CAKnB;uCArL2G,YAAY"}
+{"version":3,"file":"amountMath.d.ts","sourceRoot":"","sources":["amountMath.js"],"names":[],"mappings":"AAmHO,sCAFkB,CAAC,SAAD,CAAC,AADd,kBAK6B;iCA3G0I,YAAY;;IAiNvL,qBAdK,CAAC,gBACD,CAAC,uDADD,CAAC,gBACD,CAAC,iOAmBX;IAUO,uBAHG,CAAC,8CAAD,CAAC,KAYX;IASS,yBAHC,CAAC,uCAAD,CAAC,cAGuD;;;SAOZ,CAAC,gDAAD,CAAC;;IAkBnC,oCAHV,CAAC,yBAAD,CAAC,KASX;IAQQ,4EAOR;;IAYQ,wBAJE,CAAC,6BAAD,CAAC,AADA,eACD,CAAC,sCAOX;IAcI,oBAJM,CAAC,6BAAD,CAAC,AADA,eACD,CAAC,gCASX;IAeS,yBALC,CAAC,iBACD,CAAC,6BADD,CAAC,eACD,CAAC,sDASX;IAUI,oBAJM,CAAC,oBAAD,CAAC,AADA,KACD,CAAC,gCAUgC;IAUvC,oBAJM,CAAC,oBAAD,CAAC,AADA,KACD,CAAC,gCAUgC;;AAlX9C;;;;;;;;;GASG;AACH,wBAPU;IACT,GAAO,EAAE,KAAK,CAAC;IACf,GAAO,EAAE,KAAK,CAAC;IACf,QAAY,EAAE,SAAS,CAAC;IACxB,QAAY,EAAE,SAAS,CAAC;CACrB,CAOD;+BApBgL,YAAY;AA2X/L,6BAA6B;AAC7B,oFAIC;AAzWD,mCAAmC;AACnC,2CADY,SAAS,QAIpB;2BA3BkL,YAAY;6BAD5J,gBAAgB;8BACgI,YAAY;6BAD5J,gBAAgB;+BACgI,YAAY;mCAAZ,YAAY;mCAAZ,YAAY;+BAAZ,YAAY;4BAAZ,YAAY;AA+J/L;;;;;;;;;;;;GAYG;AACH,uBAJkB,CAAC,kGAEN,OAAO,CAKnB"}

package/src/amountMath.js

@@ -6,7 +6,10 @@ import { setMathHelpers } from './mathHelpers/setMathHelpers.js';
 import { copySetMathHelpers } from './mathHelpers/copySetMathHelpers.js';
 import { copyBagMathHelpers } from './mathHelpers/copyBagMathHelpers.js';
 
-/** @import {Amount, AssetKind, AmountValue, AssetKindForValue, AssetValueForKind, Brand, MathHelpers} from './types.js' */
+/**
+ * @import {CopyBag, CopySet} from '@endo/patterns';
+ * @import {Amount, AssetKind, AmountValue, AssetKindForValue, AssetValueForKind, Brand, CopyBagAmount, CopySetAmount, MathHelpers, NatAmount, NatValue, SetAmount, SetValue} from './types.js';
+ */
 
 const { quote: q, Fail } = assert;
 
@@ -76,26 +79,19 @@ const helpers = {
   copyBag: copyBagMathHelpers,
 };
 
-/**
- * @template {AmountValue} V
- * @type {(value: V) => AssetKindForValue<V>}
- */
+/** @type {(value: unknown) => 'nat' | 'set' | 'copySet' | 'copyBag'} } */
 const assertValueGetAssetKind = value => {
   const passStyle = passStyleOf(value);
   if (passStyle === 'bigint') {
-    // @ts-expect-error cast
     return 'nat';
   }
   if (passStyle === 'copyArray') {
-    // @ts-expect-error cast
     return 'set';
   }
   if (matches(value, M.set())) {
-    // @ts-expect-error cast
     return 'copySet';
   }
   if (matches(value, M.bag())) {
-    // @ts-expect-error cast
     return 'copyBag';
   }
   // TODO This isn't quite the right error message, in case valuePassStyle
@@ -113,7 +109,7 @@ const assertValueGetAssetKind = value => {
  *
  * Made available only for testing, but it is harmless for other uses.
  *
- * @template {AmountValue} V
+ * @template V
  * @param {V} value
  * @returns {MathHelpers<V>}
  */
@@ -198,29 +194,44 @@ const isGTE = (leftAmount, rightAmount, brand = undefined) => {
  * the abstract right to participate in a particular exchange.
  */
 const AmountMath = {
+  // TODO use overloading to handle when Brand has an AssetKind and when it doesn't.
+  // a AmountForValue utility could help DRY those cases.
   /**
    * Make an amount from a value by adding the brand.
    *
-   * @template {AssetKind} K
-   * @param {Brand<K>} brand
-   * @param {AssetValueForKind<K>} allegedValue
-   * @returns {Amount<K>}
+   * Does not verify that the Brand's AssetKind matches the value's.
+   *
+   * @template {Brand} B
+   * @template {NatValue | CopySet | CopyBag | SetValue} V
+   * @param {B} brand
+   * @param {V} allegedValue
+   * @returns {B extends Brand<'nat'>
+   *     ? NatAmount
+   *     : V extends NatValue
+   *       ? NatAmount
+   *       : V extends CopySet
+   *         ? CopySetAmount<V['payload'][0]>
+   *         : V extends CopyBag
+   *           ? CopyBagAmount<V['payload'][0][0]>
+   *           : V extends SetValue
+   *             ? SetAmount<V[0]>
+   *             : never}
    */
-  // allegedValue has a conditional expression for type widening, to prevent V being bound to a a literal like 1n
   make: (brand, allegedValue) => {
     assertRemotable(brand, 'brand');
     const h = assertValueGetHelpers(allegedValue);
     const value = h.doCoerce(allegedValue);
+    // @ts-expect-error cast
     return harden({ brand, value });
   },
   /**
    * Make sure this amount is valid enough, and return a corresponding valid
    * amount if so.
    *
-   * @template {AssetKind} K
-   * @param {Brand<K>} brand
-   * @param {Amount<K>} allegedAmount
-   * @returns {Amount<K>}
+   * @template {Amount} A
+   * @param {Brand} brand
+   * @param {A} allegedAmount
+   * @returns {A}
    */
   coerce: (brand, allegedAmount) => {
     assertRemotable(brand, 'brand');
@@ -229,15 +240,16 @@ const AmountMath = {
     brand === allegedBrand ||
       Fail`The brand in the allegedAmount ${allegedAmount} in 'coerce' didn't match the specified brand ${brand}.`;
     // Will throw on inappropriate value
+    // @ts-expect-error cast
     return AmountMath.make(brand, allegedValue);
   },
   /**
    * Extract and return the value.
    *
-   * @template {AssetKind} K
-   * @param {Brand<K>} brand
-   * @param {Amount<K>} amount
-   * @returns {AssetValueForKind<K>}
+   * @template {Amount} A
+   * @param {Brand} brand
+   * @param {A} amount
+   * @returns {A['value']}
    */
   getValue: (brand, amount) => AmountMath.coerce(brand, amount).value,
   /**
@@ -246,29 +258,29 @@ const AmountMath = {
    *
    * @type {{
    *   (brand: Brand): Amount<'nat'>;
-   *   <K extends AssetKind>(brand: Brand, assetKind: K): Amount<K>;
+   *   <K extends AssetKind>(brand: Brand<K>, assetKind: K): Amount<K>;
    * }}
    */
   makeEmpty: (brand, assetKind = /** @type {const} */ ('nat')) => {
     assertRemotable(brand, 'brand');
     assertAssetKind(assetKind);
     const value = helpers[assetKind].doMakeEmpty();
+    // @ts-expect-error XXX narrowing from function overload
     return harden({ brand, value });
   },
   /**
    * Return the amount representing an empty amount, using another amount as the
    * template for the brand and assetKind.
    *
-   * @template {AssetKind} K
-   * @param {Amount<K>} amount
-   * @returns {Amount<K>}
+   * @template {Amount} A
+   * @param {A} amount
+   * @returns {A}
    */
   makeEmptyFromAmount: amount => {
     assertRecord(amount, 'amount');
     const { brand, value } = amount;
-    // @ts-expect-error cast
     const assetKind = assertValueGetAssetKind(value);
-    // @ts-expect-error cast (ignore b/c erroring in CI but not my IDE)
+    // @ts-expect-error different subtype
     return AmountMath.makeEmpty(brand, assetKind);
   },
   /**
@@ -291,10 +303,10 @@ const AmountMath = {
    * Returns true if the leftAmount equals the rightAmount. We assume that if
    * isGTE is true in both directions, isEqual is also true
    *
-   * @template {AssetKind} K
-   * @param {Amount<K>} leftAmount
-   * @param {Amount<K>} rightAmount
-   * @param {Brand<K>} [brand]
+   * @template {Amount} A
+   * @param {A} leftAmount
+   * @param {A} rightAmount
+   * @param {Brand} [brand]
    * @returns {boolean}
    */
   isEqual: (leftAmount, rightAmount, brand = undefined) => {
@@ -308,15 +320,16 @@ const AmountMath = {
    * amount, it usually means including all of the elements from both left and
    * right.
    *
-   * @template {AssetKind} K
-   * @param {Amount<K>} leftAmount
-   * @param {Amount<K>} rightAmount
-   * @param {Brand<K>} [brand]
-   * @returns {Amount<K>}
+   * @template {Amount} A
+   * @param {A} leftAmount
+   * @param {A} rightAmount
+   * @param {Brand} [brand]
+   * @returns {A}
    */
   add: (leftAmount, rightAmount, brand = undefined) => {
     const h = checkLRAndGetHelpers(leftAmount, rightAmount, brand);
     const value = h.doAdd(...coerceLR(h, leftAmount, rightAmount));
+    // @ts-expect-error different subtype
     return harden({ brand: leftAmount.brand, value });
   },
   /**
@@ -326,25 +339,27 @@ const AmountMath = {
    * error. Because the left amount must include the right amount, this is NOT
    * equivalent to set subtraction.
    *
-   * @template {AssetKind} K
-   * @param {Amount<K>} leftAmount
-   * @param {Amount<K>} rightAmount
-   * @param {Brand<K>} [brand]
-   * @returns {Amount<K>}
+   * @template {Amount} L
+   * @template {Amount} R
+   * @param {L} leftAmount
+   * @param {R} rightAmount
+   * @param {Brand} [brand]
+   * @returns {L extends R ? L : never}
    */
   subtract: (leftAmount, rightAmount, brand = undefined) => {
     const h = checkLRAndGetHelpers(leftAmount, rightAmount, brand);
     const value = h.doSubtract(...coerceLR(h, leftAmount, rightAmount));
+    // @ts-expect-error different subtype
     return harden({ brand: leftAmount.brand, value });
   },
   /**
    * Returns the min value between x and y using isGTE
    *
-   * @template {AssetKind} K
-   * @param {Amount<K>} x
-   * @param {Amount<K>} y
-   * @param {Brand<K>} [brand]
-   * @returns {Amount<K>}
+   * @template {Amount} A
+   * @param {A} x
+   * @param {A} y
+   * @param {Brand} [brand]
+   * @returns {A}
    */
   min: (x, y, brand = undefined) =>
     // eslint-disable-next-line no-nested-ternary
@@ -356,11 +371,11 @@ const AmountMath = {
   /**
    * Returns the max value between x and y using isGTE
    *
-   * @template {AssetKind} K
-   * @param {Amount<K>} x
-   * @param {Amount<K>} y
-   * @param {Brand<K>} [brand]
-   * @returns {Amount<K>}
+   * @template {Amount} A
+   * @param {A} x
+   * @param {A} y
+   * @param {Brand} [brand]
+   * @returns {A}
    */
   max: (x, y, brand = undefined) =>
     // eslint-disable-next-line no-nested-ternary
@@ -376,7 +391,6 @@ harden(AmountMath);
 const getAssetKind = amount => {
   assertRecord(amount, 'amount');
   const { value } = amount;
-  // @ts-expect-error cast (ignore b/c erroring in CI but not my IDE)
   return assertValueGetAssetKind(value);
 };
 harden(getAssetKind);

package/src/issuerKit.d.ts

@@ -11,7 +11,7 @@ export function prepareIssuerKit<K extends import("./types.js").AssetKind>(issue
 export function makeIssuerKit<K extends import("./types.js").AssetKind = "nat">(name: string, assetKind?: K | undefined, displayInfo?: AdditionalDisplayInfo | undefined, optShutdownWithFailure?: ShutdownWithFailure | undefined, { elementShape, recoverySetsOption }?: Partial<{
     elementShape: Pattern;
     recoverySetsOption: RecoverySetsOption;
-}> | undefined): IssuerKit<K>;
+}> | undefined): IssuerKit<K, any>;
 export type IssuerRecord<K extends import("./types.js").AssetKind> = {
     name: string;
     assetKind: K;

package/src/issuerKit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"issuerKit.d.ts","sourceRoot":"","sources":["issuerKit.js"],"names":[],"mappings":"AA4GO,iCAFgB,CAAC,wDAVb,OAAO,kBAAkB,EAAE,OAAO,+HAyC5C;AAQM,mCAFI,OAAO,kBAAkB,EAAE,OAAO,WAEgB;AAoDtD,qCAFgB,CAAC,wDAZb,OAAO,kBAAkB,EAAE,OAAO,QAClC,MAAM;kBAtBE,OAAO;;8BA4DzB;AAiCM,iCAFgB,CAAC,wDAZb,OAAO,kBAAkB,EAAE,OAAO,QAClC,MAAM;kBAhFE,OAAO;;8BAkIzB;AAqCM,8BAFgB,CAAC,uDAXb,MAAM;kBA1JE,OAAO;;8BAsLvB;yBAtUW,CAAC;UADD,MAAM;eACN,CAAC;;kBAED,OAAO;;;;;;;;;;;;;;;;;mBA8IF,OAAO;;;yCAtJa,sBAAsB;wCAD0B,YAAY;+BAAZ,YAAY;2CAAZ,YAAY"}
+{"version":3,"file":"issuerKit.d.ts","sourceRoot":"","sources":["issuerKit.js"],"names":[],"mappings":"AA4GO,iCAFgB,CAAC,wDAVb,OAAO,kBAAkB,EAAE,OAAO,+HAyC5C;AAQM,mCAFI,OAAO,kBAAkB,EAAE,OAAO,WAEgB;AAoDtD,qCAFgB,CAAC,wDAZb,OAAO,kBAAkB,EAAE,OAAO,QAClC,MAAM;kBAtBE,OAAO;;8BA4DzB;AAiCM,iCAFgB,CAAC,wDAZb,OAAO,kBAAkB,EAAE,OAAO,QAClC,MAAM;kBAhFE,OAAO;;8BAkIzB;AAqCM,8BAFgB,CAAC,uDAXb,MAAM;kBA1JE,OAAO;;mCAsLvB;yBAtUW,CAAC;UADD,MAAM;eACN,CAAC;;kBAED,OAAO;;;;;;;;;;;;;;;;;mBA8IF,OAAO;;;yCAtJa,sBAAsB;wCAD0B,YAAY;+BAAZ,YAAY;2CAAZ,YAAY"}

package/src/issuerKit.js

@@ -325,7 +325,7 @@ harden(prepareIssuerKit);
  *   anything else is corrupted by that corrupted state. See
  *   https://github.com/Agoric/agoric-sdk/issues/3434
  * @param {IssuerOptionsRecord} [options]
- * @returns {IssuerKit<K>}
+ * @returns {IssuerKit<K, any>}
  */
 export const makeIssuerKit = (
   name,

package/src/legacy-payment-helpers.d.ts

@@ -1,10 +1,10 @@
-export function claim<K extends AssetKind>(recoveryPurse: ERef<Purse<K>>, srcPaymentP: ERef<Payment<K>>, optAmountShape?: Pattern): Promise<Payment<K>>;
+export function claim<P extends Payment>(recoveryPurse: ERef<Purse>, srcPaymentP: ERef<P>, optAmountShape?: Pattern): Promise<P>;
 export function combine<K extends AssetKind>(recoveryPurse: ERef<Purse<K>>, srcPaymentsPs: ERef<Payment<K>>[], optTotalAmount?: Pattern): Promise<Payment<K>>;
 export function split<K extends AssetKind>(recoveryPurse: ERef<Purse<K>>, srcPaymentP: ERef<Payment<K>>, paymentAmountA: Amount<K>): Promise<Payment<K>[]>;
 export function splitMany<K extends AssetKind>(recoveryPurse: ERef<Purse<K>>, srcPaymentP: ERef<Payment<K>>, amounts: Amount<K>[]): Promise<Payment[]>;
-import type { AssetKind } from './types.js';
+import type { Payment } from './types.js';
 import type { Purse } from './types.js';
 import type { ERef } from '@endo/far';
-import type { Payment } from './types.js';
+import type { AssetKind } from './types.js';
 import type { Amount } from './types.js';
 //# sourceMappingURL=legacy-payment-helpers.d.ts.map

package/src/legacy-payment-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"legacy-payment-helpers.d.ts","sourceRoot":"","sources":["legacy-payment-helpers.js"],"names":[],"mappings":"AAkCO,sBAFsB,CAAC,mGADnB,OAAO,uBAYjB;AAiBM,wBAFsB,CAAC,uGADnB,OAAO,uBA2BjB;AAgBM,sBAFsB,CAAC,oIAY7B;AAgBM,0BAHW,CAAC,4HAqBlB;+BAxI0F,YAAY;2BAAZ,YAAY;0BADhF,WAAW;6BACyD,YAAY;4BAAZ,YAAY"}
+{"version":3,"file":"legacy-payment-helpers.d.ts","sourceRoot":"","sources":["legacy-payment-helpers.js"],"names":[],"mappings":"AAkCO,sBAFc,CAAC,qFADX,OAAO,GACL,OAAO,CAAC,CAAC,CAAC,CAYtB;AAiBM,wBAFsB,CAAC,uGADnB,OAAO,uBA2BjB;AAgBM,sBAFsB,CAAC,oIAY7B;AAgBM,0BAHW,CAAC,4HAqBlB;6BAzI0F,YAAY;2BAAZ,YAAY;0BADhF,WAAW;+BACyD,YAAY;4BAAZ,YAAY"}

package/src/legacy-payment-helpers.js

@@ -26,11 +26,11 @@ const { Fail } = assert;
  */
 
 /**
- * @template {AssetKind} K
- * @param {ERef<Purse<K>>} recoveryPurse
- * @param {ERef<Payment<K>>} srcPaymentP
+ * @template {Payment} P
+ * @param {ERef<Purse>} recoveryPurse
+ * @param {ERef<P>} srcPaymentP
  * @param {Pattern} [optAmountShape]
- * @returns {Promise<Payment<K>>}
+ * @returns {Promise<P>}
  */
 export const claim = async (
   recoveryPurse,
@@ -38,6 +38,7 @@ export const claim = async (
   optAmountShape = undefined,
 ) => {
   const srcPayment = await srcPaymentP;
+  // @ts-expect-error XXX could be instantiated with a different subtype
   return E.when(E(recoveryPurse).deposit(srcPayment, optAmountShape), amount =>
     E(recoveryPurse).withdraw(amount),
   );

package/src/mathHelpers/copyBagMathHelpers.d.ts

@@ -1,4 +1,4 @@
 /** @type {MathHelpers<import('@endo/patterns').CopyBag>} */
-export const copyBagMathHelpers: MathHelpers<import("@endo/patterns").CopyBag<any>>;
+export const copyBagMathHelpers: MathHelpers<import("@endo/patterns").CopyBag<import("@endo/patterns").Key>>;
 import type { MathHelpers } from '../types.js';
 //# sourceMappingURL=copyBagMathHelpers.d.ts.map

package/src/mathHelpers/copyBagMathHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"copyBagMathHelpers.d.ts","sourceRoot":"","sources":["copyBagMathHelpers.js"],"names":[],"mappings":"AAkBA,4DAA4D;AAC5D,oFAWG;iCAjB4B,aAAa"}
+{"version":3,"file":"copyBagMathHelpers.d.ts","sourceRoot":"","sources":["copyBagMathHelpers.js"],"names":[],"mappings":"AAkBA,4DAA4D;AAC5D,6GAWG;iCAjB4B,aAAa"}

package/src/paymentLedger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paymentLedger.d.ts","sourceRoot":"","sources":["paymentLedger.js"],"names":[],"mappings":"AAqFO,qCAFoB,CAAC,gCAPjB,OAAO,cAAc,EAAE,IAAI,QAC3B,MAAM,aAMU,CAAC,AALhB,6CAED,OAAO,qHA6UjB;+BA9YwH,YAAY;iCAAZ,YAAY;wCAAZ,YAAY;yCAC/F,sBAAsB;mCAD6D,YAAY"}
+{"version":3,"file":"paymentLedger.d.ts","sourceRoot":"","sources":["paymentLedger.js"],"names":[],"mappings":"AAsFO,qCAFoB,CAAC,gCAPjB,OAAO,cAAc,EAAE,IAAI,QAC3B,MAAM,aAMU,CAAC,AALhB,6CAED,OAAO,qHA4TjB;+BA9XwH,YAAY;iCAAZ,YAAY;wCAAZ,YAAY;yCAC/F,sBAAsB;mCAD6D,YAAY"}

package/src/paymentLedger.js

@@ -15,6 +15,7 @@ import { BrandI, makeIssuerInterfaces } from './typeGuards.js';
 /**
  * @import {Amount, AssetKind, DisplayInfo, PaymentLedger, Payment, Brand, RecoverySetsOption, Purse, Issuer, Mint} from './types.js'
  * @import {ShutdownWithFailure} from '@agoric/swingset-vat'
+ * @import {Key} from '@endo/patterns';
  */
 
 const { details: X, quote: q, Fail } = assert;
@@ -93,11 +94,7 @@ export const preparePaymentLedger = (
   optShutdownWithFailure = undefined,
 ) => {
   /** @type {Brand<K>} */
-  // Should be
-  // at-ts-expect-error XXX callWhen
-  // but ran into the usual disagreement between local lint and CI
-
-  // @ts-expect-error
+  // @ts-expect-error XXX callWhen
   const brand = issuerZone.exo(`${name} brand`, BrandI, {
     isMyIssuer(allegedIssuer) {
       // BrandI delays calling this method until `allegedIssuer` is a Remotable
@@ -299,7 +296,7 @@ export const preparePaymentLedger = (
   };
 
   /** @type {() => Purse<K>} */
-  // @ts-expect-error type parameter confusion
+  // @ts-expect-error XXX amount kinds
   const makeEmptyPurse = preparePurseKind(
     issuerZone,
     name,
@@ -315,11 +312,7 @@ export const preparePaymentLedger = (
   );
 
   /** @type {Issuer<K>} */
-  // Should be
-  // at-ts-expect-error cast due to callWhen discrepancy
-  // but ran into the usual disagreement between local lint and CI
-
-  // @ts-expect-error
+  // @ts-expect-error XXX callWhen
   const issuer = issuerZone.exo(`${name} issuer`, IssuerI, {
     getBrand() {
       return brand;
@@ -374,11 +367,6 @@ export const preparePaymentLedger = (
    * `makeIssuerKit` drops it on the floor, it can still be recovered in an
    * emergency upgrade.
    */
-  // Should be
-  // at-ts-expect-error checked cast
-  // but ran into the usual disagreement between local lint and IDE lint.
-  // Don't know yet about lint under CI.
-
   const mintRecoveryPurse = /** @type {Purse<K>} */ (
     issuerZone.makeOnce('mintRecoveryPurse', () => makeEmptyPurse())
   );
@@ -389,10 +377,6 @@ export const preparePaymentLedger = (
       return issuer;
     },
     mintPayment(newAmount) {
-      // Should be
-      // at-ts-expect-error checked cast
-      // but ran into the usual disagreement between local lint and CI
-
       newAmount = coerce(newAmount);
       mustMatch(newAmount, amountShape, 'minted amount');
       // `rawPayment` is not associated with any recovery set, and

package/src/purse.d.ts

@@ -7,18 +7,17 @@ export function preparePurseKind(issuerZone: import("@agoric/zone").Zone, name:
 }, recoverySetsState: RecoverySetsOption, paymentRecoverySets: globalThis.WeakMapStore<Payment, globalThis.SetStore<Payment>>): () => import("@endo/exo").Guarded<{
     deposit(srcPayment: any, optAmountShape?: undefined): any;
     withdraw(amount: any): any;
-    getCurrentAmount(): Amount<AssetKind>;
+    getCurrentAmount(): import("./types.js").NatAmount | import("./types.js").CopySetAmount<import("@endo/patterns").Key> | import("./types.js").SetAmount<import("@endo/patterns").Key> | import("./types.js").CopyBagAmount<import("@endo/patterns").Key>;
     getCurrentAmountNotifier(): import("@agoric/notifier").Notifier<any>;
     getAllegedBrand(): Brand;
     getDepositFacet(): import("@endo/exo").Guarded<{
         receive(...args: any[]): any;
     }>;
-    getRecoverySet(): import("@endo/patterns").CopySet<Payment>;
-    recoverAll(): Amount<AssetKind>;
+    getRecoverySet(): import("@endo/patterns").CopySet<any>;
+    recoverAll(): import("./types.js").NatAmount | import("./types.js").CopySetAmount<import("@endo/patterns").Key> | import("./types.js").SetAmount<import("@endo/patterns").Key> | import("./types.js").CopyBagAmount<import("@endo/patterns").Key>;
 }>;
 import type { AssetKind } from './types.js';
 import type { Brand } from './types.js';
 import type { RecoverySetsOption } from './types.js';
 import type { Payment } from './types.js';
-import type { Amount } from './types.js';
 //# sourceMappingURL=purse.d.ts.map

package/src/purse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"purse.d.ts","sourceRoot":"","sources":["purse.js"],"names":[],"mappings":"AA4BO,6CAfI,OAAO,cAAc,EAAE,IAAI,QAC3B,MAAM,iDAGN;IACV,KAAS,EAAE,OAAO,gBAAgB,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IACxD,YAAgB,EAAE,OAAO,gBAAgB,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;CAC5D,gBACO;IACV,eAAmB,EAAE,GAAG,CAAC;IACzB,gBAAoB,EAAE,GAAG,CAAC;CACvB;;;;;;;;;;;GA8JH;+BAjLwG,YAAY;2BAAZ,YAAY;wCAAZ,YAAY;6BAAZ,YAAY;4BAAZ,YAAY"}
+{"version":3,"file":"purse.d.ts","sourceRoot":"","sources":["purse.js"],"names":[],"mappings":"AA4BO,6CAfI,OAAO,cAAc,EAAE,IAAI,QAC3B,MAAM,iDAGN;IACV,KAAS,EAAE,OAAO,gBAAgB,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IACxD,YAAgB,EAAE,OAAO,gBAAgB,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;CAC5D,gBACO;IACV,eAAmB,EAAE,GAAG,CAAC;IACzB,gBAAoB,EAAE,GAAG,CAAC;CACvB;;;;;;;;;;;GA8JH;+BAjLwG,YAAY;2BAAZ,YAAY;wCAAZ,YAAY;6BAAZ,YAAY"}