@agoric/zoe 0.26.3-upgrade-14-dev-c8f9e7b.0 → 0.26.3-upgrade-16-fi-dev-8879538.0

package/tools/test-utils.js

@@ -0,0 +1,26 @@
+import { AmountMath } from '@agoric/ertp';
+import { makeRatio } from '../src/contractSupport/ratio.js';
+
+/** @param {Pick<IssuerKit<'nat'>, 'brand' | 'issuer' | 'mint'>} kit */
+export const withAmountUtils = kit => {
+  const decimalPlaces = kit.issuer.getDisplayInfo?.()?.decimalPlaces ?? 6;
+  return {
+    ...kit,
+    /** @param {NatValue} v */
+    make: v => AmountMath.make(kit.brand, v),
+    makeEmpty: () => AmountMath.makeEmpty(kit.brand),
+    /**
+     * @param {NatValue} n
+     * @param {NatValue} [d]
+     */
+    makeRatio: (n, d) => makeRatio(n, kit.brand, d),
+    /** @param {number} n */
+    units: n =>
+      AmountMath.make(kit.brand, BigInt(Math.round(n * 10 ** decimalPlaces))),
+    /** The intact Exo remotable */
+    issuerKit: kit,
+  };
+};
+/** @typedef {ReturnType<typeof withAmountUtils>} AmountUtils */
+
+export { makeFakeStorageKit } from '@agoric/internal/src/storage-test-utils.js';

package/tools/types.d.ts

@@ -2,11 +2,11 @@ export type PriceQuote = {
     /**
      * Amount whose value is a PriceQuoteValue
      */
-    quoteAmount: Amount<'set'>;
+    quoteAmount: Amount<"set", PriceDescription>;
     /**
      * The `quoteAmount` wrapped as a payment
      */
-    quotePayment: ERef<Payment<'set'>>;
+    quotePayment: ERef<Payment<"set", PriceDescription>>;
 };
 /**
  * A single-valued set of PriceDescriptions.  This is the `value` in
@@ -20,19 +20,19 @@ export type PriceDescription = {
     /**
      * The amount supplied to a trade
      */
-    amountIn: Amount<'nat'>;
+    amountIn: Amount<"nat">;
     /**
      * The quoted result of trading `amountIn`
      */
-    amountOut: Amount<'nat'>;
+    amountOut: Amount<"nat">;
     /**
      * The service that gave the `timestamp`
      */
-    timer: import('@agoric/time/src/types').TimerService;
+    timer: import("@endo/pass-style").RemotableObject & import("@agoric/time").TimerService;
     /**
      * A timestamp according to `timer` for the quote
      */
-    timestamp: import('@agoric/time/src/types').TimestampRecord;
+    timestamp: import("@agoric/time").TimestampRecord;
     /**
      * Additional conditions for the quote
      */
@@ -49,7 +49,7 @@ export type PriceAuthorityKit = {
 };
 export type MutableQuote = {
     cancel: (reason?: any) => void;
-    updateLevel: (amountIn: Amount<'nat'>, amountOut: Amount<'nat'>) => void;
+    updateLevel: (amountIn: Amount<"nat">, amountOut: Amount<"nat">) => void;
     getPromise: () => ERef<PriceQuote>;
 };
 /**
@@ -60,38 +60,38 @@ export type PriceAuthority = {
     /**
      * Get the ERTP issuer of PriceQuotes for a given brandIn/brandOut pair
      */
-    getQuoteIssuer: (brandIn: Brand, brandOut: Brand) => ERef<Issuer<'set'>>;
+    getQuoteIssuer: (brandIn: Brand, brandOut: Brand) => ERef<Issuer<"set", PriceDescription>>;
     /**
      * Get the timer used in PriceQuotes for a given brandIn/brandOut pair
      */
-    getTimerService: (brandIn: Brand, brandOut: Brand) => ERef<import('@agoric/time/src/types').TimerService>;
+    getTimerService: (brandIn: Brand, brandOut: Brand) => ERef<import("@agoric/time").TimerService>;
     /**
      * Be notified of the latest PriceQuotes for a given
      * `amountIn`.  The rate at which these are issued may be very different between
      * `priceAuthorities`.
      */
-    makeQuoteNotifier: (amountIn: Amount<'nat'>, brandOut: Brand<'nat'>) => ERef<Notifier<PriceQuote>>;
+    makeQuoteNotifier: (amountIn: Amount<"nat">, brandOut: Brand<"nat">) => ERef<Notifier<PriceQuote>>;
     /**
      * Resolves after `deadline` passes on the
      * priceAuthority's timerService with the price quote of `amountIn` at that time
      */
-    quoteAtTime: (deadline: import('@agoric/time/src/types').Timestamp, amountIn: Amount<'nat'>, brandOut: Brand<'nat'>) => Promise<PriceQuote>;
+    quoteAtTime: (deadline: import("@agoric/time").Timestamp, amountIn: Amount<"nat">, brandOut: Brand<"nat">) => Promise<PriceQuote>;
     /**
      * Get a quote corresponding to the specified amountIn
      */
-    quoteGiven: (amountIn: Amount<'nat'>, brandOut: Brand<'nat'>) => Promise<PriceQuote>;
+    quoteGiven: (amountIn: Amount<"nat">, brandOut: Brand<"nat">) => Promise<PriceQuote>;
     /**
      * Get a quote corresponding to the specified amountOut
      */
-    quoteWanted: (brandIn: Brand<'nat'>, amountOut: Amount<'nat'>) => Promise<PriceQuote>;
+    quoteWanted: (brandIn: Brand<"nat">, amountOut: Amount<"nat">) => Promise<PriceQuote>;
     /**
      * Resolve when a price quote of `amountIn` exceeds `amountOutLimit`
      */
-    quoteWhenGT: (amountIn: Amount<'nat'>, amountOutLimit: Amount<'nat'>) => Promise<PriceQuote>;
+    quoteWhenGT: (amountIn: Amount<"nat">, amountOutLimit: Amount<"nat">) => Promise<PriceQuote>;
     /**
      * Resolve when a price quote of `amountIn` reaches or exceeds `amountOutLimit`
      */
-    quoteWhenGTE: (amountIn: Amount<'nat'>, amountOutLimit: Amount<'nat'>) => Promise<PriceQuote>;
+    quoteWhenGTE: (amountIn: Amount<"nat">, amountOutLimit: Amount<"nat">) => Promise<PriceQuote>;
     /**
      * Resolve when a price quote of `amountIn` reaches or drops below
      * `amountOutLimit`
@@ -120,11 +120,11 @@ export type PriceAuthority = {
      */
     mutableQuoteWhenLT: (amountIn: Amount, amountOutLimit: Amount) => ERef<MutableQuote>;
 };
-export type PriceCalculator = (amount: Amount<'nat'>) => Amount<'nat'>;
+export type PriceCalculator = (amount: Amount<"nat">) => Amount<"nat">;
 export type PriceQuery = (calcAmountIn: PriceCalculator, calcAmountOut: PriceCalculator) => {
-    amountIn: Amount<'nat'>;
-    amountOut: Amount<'nat'>;
-    timestamp?: import('@agoric/time/src/types').TimestampRecord;
+    amountIn: Amount<"nat">;
+    amountOut: Amount<"nat">;
+    timestamp?: import("@agoric/time").TimestampRecord;
 } | undefined;
 /**
  * A description of a single quote
@@ -133,10 +133,10 @@ export type PriceLevel = {
     /**
      * The amount supplied to a trade
      */
-    amountIn: Amount<'nat'>;
+    amountIn: Amount<"nat">;
     /**
      * The quoted result of trading `amountIn`
      */
-    amountOut: Amount<'nat'>;
+    amountOut: Amount<"nat">;
 };
 //# sourceMappingURL=types.d.ts.map

package/tools/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":";;;;iBAKc,OAAO,KAAK,CAAC;;;;kBAEb,KAAK,QAAQ,KAAK,CAAC,CAAC;;;;;;8BAKrB,CAAC,gBAAgB,CAAC;;;;;;;;cAQjB,OAAO,KAAK,CAAC;;;;eAEb,OAAO,KAAK,CAAC;;;;WAEb,OAAO,wBAAwB,EAAE,YAAY;;;;eAE7C,OAAO,wBAAwB,EAAE,eAAe;;;;iBAEhD,GAAG;;4CAMN,UAAU,KACR,KAAK,UAAU,CAAC,GAAG,SAAS;8CAK9B,gBAAgB;;gCAKC,gBAAgB,KAAK,QAAQ,IAAI,CAAC;;;oBAKhD,cAAc;gBACd,mBAAmB;;;sBAKT,GAAG,KAAK,IAAI;4BACX,OAAO,KAAK,CAAC,aAAa,OAAO,KAAK,CAAC,KAAK,IAAI;gBAC3D,MAAM,KAAK,UAAU,CAAC;;;;;;;;;;8BAQZ,KAAK,YAAY,KAAK,KAAK,KAAK,OAAO,KAAK,CAAC,CAAC;;;;+BAG9C,KAAK,YACJ,KAAK,KACtB,KAAK,OAAO,wBAAwB,EAAE,YAAY,CAAC;;;;;;kCAGlC,OAAO,KAAK,CAAC,YACb,MAAM,KAAK,CAAC,KAClB,KAAK,SAAS,UAAU,CAAC,CAAC;;;;;4BAKpB,OAAO,wBAAwB,EAAE,SAAS,YAC1C,OAAO,KAAK,CAAC,YACb,MAAM,KAAK,CAAC,KAC7B,QAAQ,UAAU,CAAC;;;;2BAIF,OAAO,KAAK,CAAC,YACb,MAAM,KAAK,CAAC,KAC7B,QAAQ,UAAU,CAAC;;;;2BAGH,MAAM,KAAK,CAAC,aACV,OAAO,KAAK,CAAC,KAAK,QAAQ,UAAU,CAAC;;;;4BAGtC,OAAO,KAAK,CAAC,kBACP,OAAO,KAAK,CAAC,KACpC,QAAQ,UAAU,CAAC;;;;6BAGF,OAAO,KAAK,CAAC,kBACP,OAAO,KAAK,CAAC,KACpC,QAAQ,UAAU,CAAC;;;;;6BAGF,MAAM,kBACA,MAAM,KAC7B,QAAQ,UAAU,CAAC;;;;4BAIF,MAAM,kBACA,MAAM,KAC7B,QAAQ,UAAU,CAAC;;;;mCAGF,MAAM,kBACA,MAAM,KAC7B,KAAK,YAAY,CAAC;;;;;oCAGD,MAAM,kBACA,MAAM,KAC7B,KAAK,YAAY,CAAC;;;;;oCAID,MAAM,kBACA,MAAM,KAC7B,KAAK,YAAY,CAAC;;;;mCAID,MAAM,kBACA,MAAM,KAC7B,KAAK,YAAY,CAAC;;uCAKJ,OAAO,KAAK,CAAC,KAAK,OAAO,KAAK,CAAC;wCAK1C,eAAe,iBACf,eAAe,KACb;IAAE,QAAQ,EAAE,OAAO,KAAK,CAAC,CAAC;IAAC,SAAS,EAAE,OAAO,KAAK,CAAC,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,wBAAwB,EAAE,eAAe,CAAA;CAAE,GAAG,SAAS;;;;;;;;cAO9H,OAAO,KAAK,CAAC;;;;eAEb,OAAO,KAAK,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":"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"}

package/tools/types.js

@@ -1,11 +1,11 @@
-export {}; 
-// @jessie-check
+// Ensure this is a module.
+export {};
 
 /**
  * @typedef {object} PriceQuote
- * @property {Amount<'set'>} quoteAmount
+ * @property {Amount<'set', PriceDescription>} quoteAmount
  * Amount whose value is a PriceQuoteValue
- * @property {ERef<Payment<'set'>>} quotePayment
+ * @property {ERef<Payment<'set', PriceDescription>>} quotePayment
  * The `quoteAmount` wrapped as a payment
  */
 
@@ -22,9 +22,9 @@ export {};
  * The amount supplied to a trade
  * @property {Amount<'nat'>} amountOut
  * The quoted result of trading `amountIn`
- * @property {import('@agoric/time/src/types').TimerService} timer
+ * @property {import('@endo/pass-style').RemotableObject & import('@agoric/time').TimerService} timer
  * The service that gave the `timestamp`
- * @property {import('@agoric/time/src/types').TimestampRecord} timestamp
+ * @property {import('@agoric/time').TimestampRecord} timestamp
  * A timestamp according to `timer` for the quote
  * @property {any} [conditions]
  * Additional conditions for the quote
@@ -64,12 +64,12 @@ export {};
  * An object that mints PriceQuotes and handles
  * triggers and notifiers for changes in the price
  *
- * @property {(brandIn: Brand, brandOut: Brand) => ERef<Issuer<'set'>>} getQuoteIssuer
+ * @property {(brandIn: Brand, brandOut: Brand) => ERef<Issuer<'set', PriceDescription>>} getQuoteIssuer
  * Get the ERTP issuer of PriceQuotes for a given brandIn/brandOut pair
  *
  * @property {(brandIn: Brand,
  *             brandOut: Brand
- * ) => ERef<import('@agoric/time/src/types').TimerService>} getTimerService
+ * ) => ERef<import('@agoric/time').TimerService>} getTimerService
  * Get the timer used in PriceQuotes for a given brandIn/brandOut pair
  *
  * @property {(amountIn: Amount<'nat'>,
@@ -79,7 +79,7 @@ export {};
  * `amountIn`.  The rate at which these are issued may be very different between
  * `priceAuthorities`.
  *
- * @property {(deadline: import('@agoric/time/src/types').Timestamp,
+ * @property {(deadline: import('@agoric/time').Timestamp,
  *             amountIn: Amount<'nat'>,
  *             brandOut: Brand<'nat'>
  * ) => Promise<PriceQuote>} quoteAtTime
@@ -147,7 +147,7 @@ export {};
  * @callback PriceQuery
  * @param {PriceCalculator} calcAmountIn
  * @param {PriceCalculator} calcAmountOut
- * @returns {{ amountIn: Amount<'nat'>, amountOut: Amount<'nat'>, timestamp?: import('@agoric/time/src/types').TimestampRecord } | undefined}
+ * @returns {{ amountIn: Amount<'nat'>, amountOut: Amount<'nat'>, timestamp?: import('@agoric/time').TimestampRecord } | undefined}
  */
 
 /**