@agoric/zoe 0.26.3-upgrade-16-dev-0df76a7.0 → 0.26.3-upgrade-17-dev-e67cd91.0

package/src/contractSupport/ratio.js

@@ -1,5 +1,5 @@
 /// <reference path="./types-ambient.js" />
-import { q, Fail } from '@agoric/assert';
+import { q, Fail } from '@endo/errors';
 import { AmountMath } from '@agoric/ertp';
 import { assertRecord } from '@endo/marshal';
 import { isNat } from '@endo/nat';
@@ -158,17 +158,26 @@ const divideHelper = (amount, ratio, divideOp) => {
   );
 };
 
-/** @type {ScaleAmount} */
+/**
+ * Divide the amount by the ratio, truncating the remainder.
+ * @type {ScaleAmount}
+ */
 export const floorDivideBy = (amount, ratio) => {
   return divideHelper(amount, ratio, floorDivide);
 };
 
-/** @type {ScaleAmount} */
+/**
+ * Divide the amount by the ratio, rounding up the remainder.
+ * @type {ScaleAmount}
+ */
 export const ceilDivideBy = (amount, ratio) => {
   return divideHelper(amount, ratio, ceilDivide);
 };
 
-/** @type {ScaleAmount} */
+/**
+ * Divide the amount by the ratio, rounding to nearest with ties to even (aka Banker's Rounding) as in IEEE 754 default rounding.
+ * @type {ScaleAmount}
+ */
 export const divideBy = (amount, ratio) => {
   return divideHelper(amount, ratio, bankersDivide);
 };
@@ -334,7 +343,8 @@ export const ratiosSame = (left, right) => {
 };
 
 /**
- * Make an equivalant ratio with a new denominator
+ * Make a new ratio with a smaller denominator that approximates the ratio. If
+ * the proposed denominator is larger than the current one, return the original.
  *
  * @param {Ratio} ratio
  * @param {bigint} newDen
@@ -343,6 +353,10 @@ export const ratiosSame = (left, right) => {
 export const quantize = (ratio, newDen) => {
   const oldDen = ratio.denominator.value;
   const oldNum = ratio.numerator.value;
+  if (newDen > oldDen) {
+    return ratio;
+  }
+
   const newNum =
     newDen === oldDen ? oldNum : bankersDivide(oldNum * newDen, oldDen);
   return makeRatio(

package/src/contractSupport/recorder.d.ts

@@ -1,4 +1,4 @@
-export function prepareRecorder(baggage: import("@agoric/vat-data").Baggage, marshaller: ERef<Marshaller>): (publisher: globalThis.Publisher<unknown>, storageNode: import("@endo/eventual-send").DataOnly<globalThis.StorageNode> & import("@endo/eventual-send").RemotableBrand<import("@endo/eventual-send").DataOnly<globalThis.StorageNode>, globalThis.StorageNode>, valueShape?: TypedMatcher<unknown> | undefined) => import("@endo/exo").Guarded<{
+export function prepareRecorder(baggage: import("@agoric/vat-data").Baggage, marshaller: ERef<Marshaller>): (publisher: globalThis.Publisher<unknown>, storageNode: import("@endo/eventual-send").DataOnly<globalThis.StorageNode> & import("@endo/eventual-send").RemotableBrand<import("@endo/eventual-send").DataOnly<globalThis.StorageNode>, globalThis.StorageNode>, valueShape?: TypedPattern<any> | undefined) => import("@endo/exo").Guarded<{
     getStorageNode(): import("@endo/eventual-send").DataOnly<globalThis.StorageNode> & import("@endo/eventual-send").RemotableBrand<import("@endo/eventual-send").DataOnly<globalThis.StorageNode>, globalThis.StorageNode>;
     /**
      * Memoizes the remote call to the storage node
@@ -24,12 +24,12 @@ export function prepareRecorder(baggage: import("@agoric/vat-data").Baggage, mar
 export function defineRecorderKit({ makeRecorder, makeDurablePublishKit }: {
     makeRecorder: MakeRecorder;
     makeDurablePublishKit: ReturnType<typeof prepareDurablePublishKit>;
-}): <T>(storageNode: StorageNode | Awaited<import("@endo/far").FarRef<StorageNode>>, valueShape?: TypedMatcher<T> | undefined) => RecorderKit<T>;
+}): <T>(storageNode: StorageNode | Awaited<import("@endo/far").FarRef<StorageNode>>, valueShape?: TypedPattern<T> | undefined) => RecorderKit<T>;
 export function defineERecorderKit({ makeRecorder, makeDurablePublishKit }: {
     makeRecorder: MakeRecorder;
     makeDurablePublishKit: ReturnType<typeof prepareDurablePublishKit>;
-}): <T>(storageNodeP: ERef<StorageNode>, valueShape?: TypedMatcher<T> | undefined) => EventualRecorderKit<T>;
-export function prepareRecorderKit(baggage: import("@agoric/vat-data").Baggage, marshaller: ERef<Marshaller>): <T>(storageNode: StorageNode | Awaited<import("@endo/far").FarRef<StorageNode>>, valueShape?: TypedMatcher<T> | undefined) => RecorderKit<T>;
+}): <T>(storageNodeP: ERef<StorageNode>, valueShape?: TypedPattern<T> | undefined) => EventualRecorderKit<T>;
+export function prepareRecorderKit(baggage: import("@agoric/vat-data").Baggage, marshaller: ERef<Marshaller>): <T>(storageNode: StorageNode | Awaited<import("@endo/far").FarRef<StorageNode>>, valueShape?: TypedPattern<T> | undefined) => RecorderKit<T>;
 export function prepareRecorderKitMakers(baggage: import("@agoric/vat-data").Baggage, marshaller: ERef<Marshaller>): {
     makeDurablePublishKit: (options?: {
         valueDurability?: "mandatory" | undefined;
@@ -44,7 +44,7 @@ export function prepareRecorderKitMakers(baggage: import("@agoric/vat-data").Bag
             getUpdateSince(updateCount: any): any;
         };
     }>;
-    makeRecorder: (publisher: globalThis.Publisher<unknown>, storageNode: import("@endo/eventual-send").DataOnly<globalThis.StorageNode> & import("@endo/eventual-send").RemotableBrand<import("@endo/eventual-send").DataOnly<globalThis.StorageNode>, globalThis.StorageNode>, valueShape?: TypedMatcher<unknown> | undefined) => import("@endo/exo").Guarded<{
+    makeRecorder: (publisher: globalThis.Publisher<unknown>, storageNode: import("@endo/eventual-send").DataOnly<globalThis.StorageNode> & import("@endo/eventual-send").RemotableBrand<import("@endo/eventual-send").DataOnly<globalThis.StorageNode>, globalThis.StorageNode>, valueShape?: TypedPattern<any> | undefined) => import("@endo/exo").Guarded<{
         getStorageNode(): import("@endo/eventual-send").DataOnly<globalThis.StorageNode> & import("@endo/eventual-send").RemotableBrand<import("@endo/eventual-send").DataOnly<globalThis.StorageNode>, globalThis.StorageNode>;
         /**
          * Memoizes the remote call to the storage node
@@ -67,8 +67,8 @@ export function prepareRecorderKitMakers(baggage: import("@agoric/vat-data").Bag
          */
         writeFinal(value: any): Promise<void>;
     }>;
-    makeRecorderKit: <T>(storageNode: StorageNode | Awaited<import("@endo/far").FarRef<StorageNode>>, valueShape?: TypedMatcher<T> | undefined) => RecorderKit<T>;
-    makeERecorderKit: <T>(storageNodeP: ERef<StorageNode>, valueShape?: TypedMatcher<T> | undefined) => EventualRecorderKit<T>;
+    makeRecorderKit: <T>(storageNode: StorageNode | Awaited<import("@endo/far").FarRef<StorageNode>>, valueShape?: TypedPattern<T> | undefined) => RecorderKit<T>;
+    makeERecorderKit: <T>(storageNodeP: ERef<StorageNode>, valueShape?: TypedPattern<T> | undefined) => EventualRecorderKit<T>;
 };
 export function prepareMockRecorderKitMakers(): {
     storageNode: globalThis.StorageNode & {
@@ -87,7 +87,7 @@ export function prepareMockRecorderKitMakers(): {
             getUpdateSince(updateCount: any): any;
         };
     }>;
-    makeRecorder: (publisher: globalThis.Publisher<unknown>, storageNode: import("@endo/eventual-send").DataOnly<globalThis.StorageNode> & import("@endo/eventual-send").RemotableBrand<import("@endo/eventual-send").DataOnly<globalThis.StorageNode>, globalThis.StorageNode>, valueShape?: TypedMatcher<unknown> | undefined) => import("@endo/exo").Guarded<{
+    makeRecorder: (publisher: globalThis.Publisher<unknown>, storageNode: import("@endo/eventual-send").DataOnly<globalThis.StorageNode> & import("@endo/eventual-send").RemotableBrand<import("@endo/eventual-send").DataOnly<globalThis.StorageNode>, globalThis.StorageNode>, valueShape?: TypedPattern<any> | undefined) => import("@endo/exo").Guarded<{
         getStorageNode(): import("@endo/eventual-send").DataOnly<globalThis.StorageNode> & import("@endo/eventual-send").RemotableBrand<import("@endo/eventual-send").DataOnly<globalThis.StorageNode>, globalThis.StorageNode>;
         /**
          * Memoizes the remote call to the storage node
@@ -110,8 +110,8 @@ export function prepareMockRecorderKitMakers(): {
          */
         writeFinal(value: any): Promise<void>;
     }>;
-    makeRecorderKit: <T>(storageNode: StorageNode | Awaited<import("@endo/far").FarRef<StorageNode>>, valueShape?: TypedMatcher<T> | undefined) => RecorderKit<T>;
-    makeERecorderKit: <T>(storageNodeP: ERef<StorageNode>, valueShape?: TypedMatcher<T> | undefined) => EventualRecorderKit<T>;
+    makeRecorderKit: <T>(storageNode: StorageNode | Awaited<import("@endo/far").FarRef<StorageNode>>, valueShape?: TypedPattern<T> | undefined) => RecorderKit<T>;
+    makeERecorderKit: <T>(storageNodeP: ERef<StorageNode>, valueShape?: TypedPattern<T> | undefined) => EventualRecorderKit<T>;
 };
 export type Recorder<T> = {
     getStorageNode(): Awaited<import("@endo/far").FarRef<StorageNode>>;
@@ -128,16 +128,6 @@ export type EventualRecorderKit<T> = Pick<PublishKit<T>, "subscriber"> & {
 export type MakeRecorder = ReturnType<typeof prepareRecorder>;
 export type MakeRecorderKit = ReturnType<typeof defineRecorderKit>;
 export type MakeERecorderKit = ReturnType<typeof defineERecorderKit>;
-/**
- * Stop-gap until https://github.com/Agoric/agoric-sdk/issues/6160
- * explictly specify the type that the Pattern will verify through a match.
- *
- * This is a Pattern but since that's `any`, including in the typedef turns the
- * whole thing to `any`.
- */
-export type TypedMatcher<T> = import("@endo/patterns").Matcher & {
-    validatedType?: T;
-};
-export type MatchedType<TM extends TypedMatcher<any>> = TM extends TypedMatcher<infer T> ? T : never;
+import type { TypedPattern } from '@agoric/internal';
 import { prepareDurablePublishKit } from '@agoric/notifier';
 //# sourceMappingURL=recorder.d.ts.map

package/src/contractSupport/recorder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recorder.d.ts","sourceRoot":"","sources":["recorder.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"recorder.d.ts","sourceRoot":"","sources":["recorder.js"],"names":[],"mappings":"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"}

package/src/contractSupport/recorder.js

@@ -1,4 +1,4 @@
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 import { StorageNodeShape } from '@agoric/internal';
 import { prepareDurablePublishKit } from '@agoric/notifier';
 import {
@@ -9,6 +9,10 @@ import { mustMatch } from '@agoric/store';
 import { M, makeScalarBigMapStore, prepareExoClass } from '@agoric/vat-data';
 import { E } from '@endo/eventual-send';
 
+/**
+ * @import {TypedPattern} from '@agoric/internal';
+ */
+
 /**
  * Recorders support publishing data to vstorage.
  *
@@ -56,12 +60,12 @@ export const prepareRecorder = (baggage, marshaller) => {
      * @template T
      * @param {PublishKit<T>['publisher']} publisher
      * @param {Awaited<import('@endo/far').FarRef<StorageNode>>} storageNode
-     * @param {TypedMatcher<T>} [valueShape]
+     * @param {TypedPattern<any>} [valueShape]
      */
     (
       publisher,
       storageNode,
-      valueShape = /** @type {TypedMatcher<any>} */ (M.any()),
+      valueShape = /** @type {TypedPattern<any>} */ (M.any()),
     ) => {
       return {
         closed: false,
@@ -145,7 +149,7 @@ export const defineRecorderKit = ({ makeRecorder, makeDurablePublishKit }) => {
   /**
    * @template T
    * @param {StorageNode | Awaited<import('@endo/far').FarRef<StorageNode>>} storageNode
-   * @param {TypedMatcher<T>} [valueShape]
+   * @param {TypedPattern<T>} [valueShape]
    * @returns {RecorderKit<T>}
    */
   const makeRecorderKit = (storageNode, valueShape) => {
@@ -174,7 +178,7 @@ export const defineERecorderKit = ({ makeRecorder, makeDurablePublishKit }) => {
   /**
    * @template T
    * @param {ERef<StorageNode>} storageNodeP
-   * @param {TypedMatcher<T>} [valueShape]
+   * @param {TypedPattern<T>} [valueShape]
    * @returns {EventualRecorderKit<T>}
    */
   const makeERecorderKit = (storageNodeP, valueShape) => {
@@ -258,19 +262,3 @@ export const prepareMockRecorderKitMakers = () => {
     storageNode: makeFakeStorage('mock recorder storage'),
   };
 };
-
-/**
- * Stop-gap until https://github.com/Agoric/agoric-sdk/issues/6160
- * explictly specify the type that the Pattern will verify through a match.
- *
- * This is a Pattern but since that's `any`, including in the typedef turns the
- * whole thing to `any`.
- *
- * @template T
- * @typedef {import('@endo/patterns').Matcher & { validatedType?: T }} TypedMatcher
- */
-
-/**
- * @template {TypedMatcher<any>} TM
- * @typedef {TM extends TypedMatcher<infer T> ? T : never} MatchedType
- */

package/src/contractSupport/stateMachine.js

@@ -1,4 +1,4 @@
-import { assert } from '@agoric/assert';
+import { assert } from '@endo/errors';
 
 /* allowedTransitions is an array of arrays which gets turned into a
  * map. The map maps string states to an array of potential next

package/src/contractSupport/topics.d.ts

@@ -8,6 +8,18 @@ export const PublicTopicShape: import("@endo/patterns").Matcher;
  *   storagePath: ERef<string>,
  * }} PublicTopic
  */
+/**
+ * A {PublicTopic} in which the `storagePath` is always a resolved string and the `subscriber is remote.
+ *
+ * Useful when working with Vows and async-flow.
+ *
+ * @template {object} T topic value
+ * @typedef {{
+ *   description?: string,
+ *   subscriber: Remote<Subscriber<T>>,
+ *   storagePath: string,
+ * }} ResolvedPublicTopic
+ */
 export const TopicsRecordShape: import("@endo/patterns").Matcher;
 export function makeRecorderTopic<T>(description: string, recorderKit: import("./recorder.js").RecorderKit<T> | import("./recorder.js").EventualRecorderKit<T>): PublicTopic<T>;
 export type PublicTopic<T extends unknown> = {
@@ -15,8 +27,22 @@ export type PublicTopic<T extends unknown> = {
     subscriber: Subscriber<T>;
     storagePath: ERef<string>;
 };
+/**
+ * A {PublicTopic} in which the `storagePath` is always a resolved string and the `subscriber is remote.
+ *
+ * Useful when working with Vows and async-flow.
+ */
+export type ResolvedPublicTopic<T extends unknown> = {
+    description?: string;
+    subscriber: Remote<Subscriber<T>>;
+    storagePath: string;
+};
 export type TopicsRecord = {
     [topicName: string]: PublicTopic<unknown>;
 };
+export type ResolvedTopicsRecord = {
+    [topicName: string]: ResolvedPublicTopic<unknown>;
+};
 import { SubscriberShape } from '@agoric/notifier';
+import type { Remote } from '@agoric/internal';
 //# sourceMappingURL=topics.d.ts.map

package/src/contractSupport/topics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"topics.d.ts","sourceRoot":"","sources":["topics.js"],"names":[],"mappings":";AAMA,gEAME;AAEF;;;;;;;GAOG;AAEH,iEAA0E;AAcnE,kCALM,CAAC,eACH,MAAM,eACN,OAAO,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO,eAAe,EAAE,mBAAmB,CAAC,CAAC,CAAC,GACrF,WAAW,CAAC,CAAC,CAAC,CAU1B;wBA9BqB,CAAC,oBACV;IACZ,WAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAc,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAC9B,WAAe,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;CAC3B;2BAMS;IACZ,CAAK,SAAS,EAAE,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;CAC3C;gCA5B4B,kBAAkB"}
+{"version":3,"file":"topics.d.ts","sourceRoot":"","sources":["topics.js"],"names":[],"mappings":";AAUA,gEAME;AAEF;;;;;;;GAOG;AAEH;;;;;;;;;;;GAWG;AAEH,iEAA0E;AAoBnE,kCALM,CAAC,eACH,MAAM,eACN,OAAO,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,OAAO,eAAe,EAAE,mBAAmB,CAAC,CAAC,CAAC,GACrF,WAAW,CAAC,CAAC,CAAC,CAU1B;wBAjDqB,CAAC,oBACV;IACZ,WAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAc,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAC9B,WAAe,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;CAC3B;;;;;;gCAQkB,CAAC,oBACV;IACZ,WAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAc,EAAE,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,WAAe,EAAE,MAAM,CAAC;CACrB;2BAMS;IACZ,CAAK,SAAS,EAAE,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;CAC3C;mCAIS;IACZ,CAAK,SAAS,EAAE,MAAM,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;CACnD;gCAnD4B,kBAAkB;4BAKzB,kBAAkB"}

package/src/contractSupport/topics.js

@@ -2,12 +2,16 @@ import { SubscriberShape } from '@agoric/notifier';
 import { M } from '@agoric/store';
 import { E } from '@endo/far';
 
+/**
+ * @import {Remote} from '@agoric/internal';
+ */
+
 export { SubscriberShape };
 
 export const PublicTopicShape = M.splitRecord(
   {
     subscriber: SubscriberShape,
-    storagePath: M.promise(/* string */),
+    storagePath: M.or(M.promise(/* string */), M.string()),
   },
   { description: M.string() },
 );
@@ -21,6 +25,19 @@ export const PublicTopicShape = M.splitRecord(
  * }} PublicTopic
  */
 
+/**
+ * A {PublicTopic} in which the `storagePath` is always a resolved string and the `subscriber is remote.
+ *
+ * Useful when working with Vows and async-flow.
+ *
+ * @template {object} T topic value
+ * @typedef {{
+ *   description?: string,
+ *   subscriber: Remote<Subscriber<T>>,
+ *   storagePath: string,
+ * }} ResolvedPublicTopic
+ */
+
 export const TopicsRecordShape = M.recordOf(M.string(), PublicTopicShape);
 
 /**
@@ -29,6 +46,12 @@ export const TopicsRecordShape = M.recordOf(M.string(), PublicTopicShape);
  * }} TopicsRecord
  */
 
+/**
+ * @typedef {{
+ *   [topicName: string]: ResolvedPublicTopic<unknown>,
+ * }} ResolvedTopicsRecord
+ */
+
 /**
  * @template T
  * @param {string} description

package/src/contractSupport/zoeHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zoeHelpers.d.ts","sourceRoot":"","sources":["zoeHelpers.js"],"names":[],"mappings":"AASA,iIAAkI;AAM3H,oEAON;AAuBM,+BALI,GAAG,QACH,cAAc,UACd,mBAAmB,GACjB,CAAC,GAAC,CAAC,CAOf;AAED,mBAAmB;AACnB,mBADW,IAAI,CAkBb;AAEF,wBAAwB;AACxB,wBADW,SAAS,CAqBlB;AAiBK,uCAHI,OAAO,iBACP,OAAO,QAIgD;AAsB3D,0CAHI,OAAO,YACP,cAAc,QA+BxB;AAGM,+DAGN;AAED,6EAA8E;AAavE,mCANI,GAAG,iBACH,OAAO,WACP,mBAAmB,YACnB,qBAAqB,GACnB,OAAO,CAAC,MAAM,CAAC,CA8B3B;AAYM,sCALI,GAAG,QACH,OAAO,WACP,mBAAmB,GACjB,OAAO,CAAC,qBAAqB,CAAC,CAQ1C;AAWM,oCAJI,GAAG,wBACH,mBAAmB,4EAgB7B;AAED,0BAA0B;AAC1B,0BADW,WAAW,CAYpB;AAiDK,wBAHe,IAAI,kBACJ,MAAM,uBA/BjB,GAAG,cAGH,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,kBAG9B,oBAAoB,GAAG,SAAS,YAKhC,QAAQ,YAGR,OAAO,+DAUL,OAAO,CAAC;IAAC,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAA;CAAC,CAAC,CA+D1G;;iBAzVa,MAAM,cAAc;0BACpB,MAAM,UAAU"}
+{"version":3,"file":"zoeHelpers.d.ts","sourceRoot":"","sources":["zoeHelpers.js"],"names":[],"mappings":"AASA,iIAAkI;AAI3H,oEAON;AAuBM,+BALI,GAAG,QACH,cAAc,UACd,mBAAmB,GACjB,CAAC,GAAC,CAAC,CAOf;AAED,mBAAmB;AACnB,mBADW,IAAI,CAkBb;AAEF,wBAAwB;AACxB,wBADW,SAAS,CAqBlB;AAiBK,uCAHI,OAAO,iBACP,OAAO,QAIgD;AAsB3D,0CAHI,OAAO,YACP,cAAc,QA8BxB;AAGM,+DAGN;AAED,6EAA8E;AAavE,mCANI,GAAG,iBACH,OAAO,WACP,mBAAmB,YACnB,qBAAqB,GACnB,OAAO,CAAC,MAAM,CAAC,CA8B3B;AAYM,sCALI,GAAG,QACH,OAAO,WACP,mBAAmB,GACjB,OAAO,CAAC,qBAAqB,CAAC,CAQ1C;AAWM,oCAJI,GAAG,wBACH,mBAAmB,4EAgB7B;AAED,0BAA0B;AAC1B,0BADW,WAAW,CAYpB;AAiDK,wBAHe,IAAI,kBACJ,MAAM,uBA/BjB,GAAG,cAGH,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,kBAG9B,oBAAoB,GAAG,SAAS,YAKhC,QAAQ,YAGR,OAAO,+DAUL,OAAO,CAAC;IAAC,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAA;CAAC,CAAC,CA+D1G;;iBAxVa,MAAM,cAAc;0BACpB,MAAM,UAAU"}

package/src/contractSupport/zoeHelpers.js

@@ -1,7 +1,7 @@
-/* eslint @typescript-eslint/no-floating-promises: "warn" */
-import { mustMatch, keyEQ } from '@agoric/store';
+import { Fail } from '@endo/errors';
 import { E } from '@endo/eventual-send';
 import { makePromiseKit } from '@endo/promise-kit';
+import { mustMatch, keyEQ } from '@agoric/store';
 import { AssetKind } from '@agoric/ertp';
 import { fromUniqueEntries } from '@agoric/internal';
 import { satisfiesWant } from '../contractFacet/offerSafety.js';
@@ -9,8 +9,6 @@ import { atomicTransfer, fromOnly, toOnly } from './atomicTransfer.js';
 
 export const defaultAcceptanceMsg = `The offer has been accepted. Once the contract has been completed, please check your payout`;
 
-const { Fail } = assert;
-
 const getKeysSorted = obj => harden(Reflect.ownKeys(obj || {}).sort());
 
 export const assertIssuerKeywords = (zcf, expected) => {
@@ -137,11 +135,10 @@ export const assertProposalShape = (seat, expected) => {
   !Array.isArray(expected) || Fail`Expected must be an non-array object`;
   const assertValuesNull = e => {
     if (e !== undefined) {
-      Object.values(e).forEach(
-        value =>
-          value === null ||
-          Fail`The value of the expected record must be null but was ${value}`,
-      );
+      for (const value of Object.values(e)) {
+        value === null ||
+          Fail`The value of the expected record must be null but was ${value}`;
+      }
     }
   };
 

package/src/contracts/auction/assertBidSeat.js

@@ -1,4 +1,4 @@
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 import { AmountMath } from '@agoric/ertp';
 
 export const assertBidSeat = (zcf, sellSeat, bidSeat) => {

package/src/contracts/auction/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.js"],"names":[],"mappings":"AAqBA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,2BANW,GAAG,CAAC;IACd,aAAe,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;IACrD,iBAAmB,CAAC,EAAE,8BAA0B,CAAC;IACjD,WAAa,EAAE,MAAM,CAAC;CACnB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyHJ;AAjJD,wCAAkC;AAClC,0CAAoC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.js"],"names":[],"mappings":"AAmBA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,2BANW,GAAG,CAAC;IACd,aAAe,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;IACrD,iBAAmB,CAAC,EAAE,8BAA0B,CAAC;IACjD,WAAa,EAAE,MAAM,CAAC;CACnB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyHJ;AAjJD,wCAAkC;AAClC,0CAAoC"}

package/src/contracts/auction/index.js

@@ -1,4 +1,4 @@
-/* eslint @typescript-eslint/no-floating-promises: "warn" */
+import { Fail } from '@endo/errors';
 import { E } from '@endo/eventual-send';
 import { mustMatch } from '@endo/patterns';
 import { Far } from '@endo/marshal';
@@ -14,8 +14,6 @@ import * as secondPriceLogic from './secondPriceLogic.js';
 import * as firstPriceLogic from './firstPriceLogic.js';
 import { assertBidSeat } from './assertBidSeat.js';
 
-const { Fail } = assert;
-
 const FIRST_PRICE = 'first-price';
 const SECOND_PRICE = 'second-price';
 

package/src/contracts/auction/secondPriceLogic.js

@@ -20,7 +20,7 @@ export const calcWinnerAndClose = (zcf, sellSeat, bidSeats) => {
   let highestBidSeat = bidSeats[0];
   let activeBidsCount = 0n;
 
-  bidSeats.forEach(bidSeat => {
+  for (const bidSeat of bidSeats) {
     if (!bidSeat.hasExited()) {
       activeBidsCount += 1n;
       const bid = bidSeat.getAmountAllocated('Bid', bidBrand);
@@ -35,7 +35,7 @@ export const calcWinnerAndClose = (zcf, sellSeat, bidSeats) => {
         secondHighestBid = bid;
       }
     }
-  });
+  }
 
   if (activeBidsCount === 0n) {
     throw sellSeat.fail(Error(`Could not close auction. No bids were active`));
@@ -59,10 +59,10 @@ export const calcWinnerAndClose = (zcf, sellSeat, bidSeats) => {
   );
 
   sellSeat.exit();
-  bidSeats.forEach(bidSeat => {
+  for (const bidSeat of bidSeats) {
     if (!bidSeat.hasExited()) {
       bidSeat.exit();
     }
-  });
+  }
   zcf.shutdown('Auction closed.');
 };

package/src/contracts/autoswap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"autoswap.d.ts","sourceRoot":"","sources":["autoswap.js"],"names":[],"mappings":"AAeA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,2BAFW,GAAG;;GAsVb"}
+{"version":3,"file":"autoswap.d.ts","sourceRoot":"","sources":["autoswap.js"],"names":[],"mappings":"AAeA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,2BAFW,GAAG;;GAwVb"}

package/src/contracts/autoswap.js

@@ -1,5 +1,5 @@
+import { assert } from '@endo/errors';
 import { Far } from '@endo/marshal';
-import { assert } from '@agoric/assert';
 import { AmountMath, isNatValue } from '@agoric/ertp';
 
 // Eventually will be importable from '@agoric/zoe-contract-support'
@@ -64,7 +64,9 @@ const start = async zcf => {
   // In order to get all the brands, we must call zcf.getTerms() after
   // we create the liquidityIssuer
   const { brands } = zcf.getTerms();
-  Object.values(brands).forEach(brand => assertNatAssetKind(zcf, brand));
+  for (const brand of Object.values(brands)) {
+    assertNatAssetKind(zcf, brand);
+  }
   /** @type {Map<Brand,Keyword>} */
   const brandToKeyword = new Map(
     Object.entries(brands).map(([keyword, brand]) => [brand, keyword]),

package/src/contracts/callSpread/calculateShares.js

@@ -1,7 +1,7 @@
 /// <reference path="./types-ambient.js" />
 
+import { assert } from '@endo/errors';
 import { AmountMath, isNatValue } from '@agoric/ertp';
-import { assert } from '@agoric/assert';
 import { makeRatio, oneMinus } from '../../contractSupport/index.js';
 import { make100Percent, make0Percent } from './percent.js';
 

package/src/contracts/callSpread/payoffHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"payoffHandler.d.ts","sourceRoot":"","sources":["payoffHandler.js"],"names":[],"mappings":"AAaA;;;;;;;;GAQG;AACH,uCALW,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,mBACxB,MAAM,CAAC,YAAY,EAAC,aAAa,CAAC,OAAO,CAAC,CAAC,kBAC3C,OAAO,GACL,aAAa,CAgEzB"}
+{"version":3,"file":"payoffHandler.d.ts","sourceRoot":"","sources":["payoffHandler.js"],"names":[],"mappings":"AAYA;;;;;;;;GAQG;AACH,uCALW,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,mBACxB,MAAM,CAAC,YAAY,EAAC,aAAa,CAAC,OAAO,CAAC,CAAC,kBAC3C,OAAO,GACL,aAAa,CAgEzB"}

package/src/contracts/callSpread/payoffHandler.js

@@ -1,4 +1,3 @@
-/* eslint @typescript-eslint/no-floating-promises: "warn" */
 /// <reference path="./types-ambient.js" />
 
 import { E } from '@endo/eventual-send';

package/src/contracts/callSpread/pricedCallSpread.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pricedCallSpread.d.ts","sourceRoot":"","sources":["pricedCallSpread.js"],"names":[],"mappings":"AA0BA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,2BATW,GAAG,CAAC;IACd,YAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,YAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,gBAAkB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAClC,cAAgB,EAAE,cAAc,CAAC;IACjC,UAAY,EAAE,MAAM,CAAC;IACrB,gBAAkB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CAC/B,CAAC;;;;;;;;;;;;EA0GJ;oCA7J4F,4BAA4B"}
+{"version":3,"file":"pricedCallSpread.d.ts","sourceRoot":"","sources":["pricedCallSpread.js"],"names":[],"mappings":"AAwBA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,2BATW,GAAG,CAAC;IACd,YAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,YAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,gBAAkB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAClC,cAAgB,EAAE,cAAc,CAAC;IACjC,UAAY,EAAE,MAAM,CAAC;IACrB,gBAAkB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CAC/B,CAAC;;;;;;;;;;;;EA0GJ;oCA3J4F,4BAA4B"}

package/src/contracts/callSpread/pricedCallSpread.js

@@ -1,6 +1,6 @@
-/* eslint @typescript-eslint/no-floating-promises: "warn" */
 /// <reference path="./types-ambient.js" />
 
+import { Fail } from '@endo/errors';
 import { makePromiseKit } from '@endo/promise-kit';
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
@@ -19,8 +19,6 @@ import { Position } from './position.js';
  * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
  */
 
-const { Fail } = assert;
-
 const PERCENT_BASE = 100n;
 const BASIS_POINTS = 10000n;
 

package/src/contracts/coveredCall-durable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"coveredCall-durable.d.ts","sourceRoot":"","sources":["coveredCall-durable.js"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;GAcG;AACH,2BAJW,GAAG,gBACH,OAAO,mBACP,OAAO,kBAAkB,EAAE,OAAO;;;;GA6E5C"}
+{"version":3,"file":"coveredCall-durable.d.ts","sourceRoot":"","sources":["coveredCall-durable.js"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;GAcG;AACH,2BAJW,GAAG,gBACH,OAAO,mBACP,OAAO,kBAAkB,EAAE,OAAO;;;;GA6E5C"}

package/src/contracts/coveredCall-durable.js

@@ -1,10 +1,9 @@
+import { Fail } from '@endo/errors';
 import { mustMatch, M } from '@agoric/store';
 import { prepareExo, prepareExoClass } from '@agoric/vat-data';
 import { swapExact } from '../contractSupport/index.js';
 import { isAfterDeadlineExitRule, OfferHandlerI } from '../typeGuards.js';
 
-const { Fail } = assert;
-
 const sellSeatExpiredMsg = 'The covered call option is expired.';
 
 /**

package/src/contracts/coveredCall.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"coveredCall.d.ts","sourceRoot":"","sources":["coveredCall.js"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2DG;AACH,2BAFW,GAAG;;EA6Cb"}
+{"version":3,"file":"coveredCall.d.ts","sourceRoot":"","sources":["coveredCall.js"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2DG;AACH,2BAFW,GAAG;;EA6Cb"}

package/src/contracts/coveredCall.js

@@ -1,10 +1,9 @@
+import { Fail, q } from '@endo/errors';
 import { M, mustMatch } from '@agoric/store';
 // Eventually will be importable from '@agoric/zoe-contract-support'
 import { swapExact } from '../contractSupport/index.js';
 import { isAfterDeadlineExitRule } from '../typeGuards.js';
 
-const { Fail, quote: q } = assert;
-
 /**
  * A call option is the right (but not the obligation) to buy digital
  * assets at a pre-determined price, called the strike price. This

package/src/contracts/loan/borrow.js

@@ -1,4 +1,4 @@
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
 import { makePromiseKit } from '@endo/promise-kit';

package/src/contracts/loan/close.js

@@ -1,6 +1,6 @@
 /// <reference path="./types-ambient.js" />
 
-import { Fail } from '@agoric/assert';
+import { Fail } from '@endo/errors';
 import { AmountMath } from '@agoric/ertp';
 
 import { assertProposalShape } from '../../contractSupport/index.js';

package/src/contracts/loan/scheduleLiquidation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduleLiquidation.d.ts","sourceRoot":"","sources":["scheduleLiquidation.js"],"names":[],"mappings":"AAWA,kCAAkC;AAClC,kCADW,mBAAmB,CAsD5B"}
+{"version":3,"file":"scheduleLiquidation.d.ts","sourceRoot":"","sources":["scheduleLiquidation.js"],"names":[],"mappings":"AAUA,kCAAkC;AAClC,kCADW,mBAAmB,CAsD5B"}

package/src/contracts/loan/scheduleLiquidation.js

@@ -1,4 +1,3 @@
-/* eslint @typescript-eslint/no-floating-promises: "warn" */
 import { E } from '@endo/eventual-send';
 import { AmountMath } from '@agoric/ertp';
 

package/src/contracts/loan/updateDebt.js

@@ -1,6 +1,6 @@
+import { annotateError, X } from '@endo/errors';
 import { Far } from '@endo/marshal';
 import { makeNotifierKit, observeNotifier } from '@agoric/notifier';
-import { assert, details as X } from '@agoric/assert';
 import { AmountMath } from '@agoric/ertp';
 import { TimeMath } from '@agoric/time';
 
@@ -70,7 +70,7 @@ export const makeDebtCalculator = debtCalculatorConfig => {
       }
     },
     fail: reason => {
-      assert.note(
+      annotateError(
         reason,
         X`Period problem: ${originalDebt}, started: ${basetime}, debt: ${debt}`,
       );
@@ -79,7 +79,7 @@ export const makeDebtCalculator = debtCalculatorConfig => {
   });
 
   observeNotifier(periodNotifier, periodObserver).catch(reason => {
-    assert.note(
+    annotateError(
       reason,
       X`Unable to updateDebt originally: ${originalDebt}, started: ${basetime}, debt: ${debt}`,
     );

package/src/contracts/mintAndSellNFT.js

@@ -1,8 +1,8 @@
+import { assert } from '@endo/errors';
 import { makeIssuerKit, AssetKind, AmountMath } from '@agoric/ertp';
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
 
-import { assert } from '@agoric/assert';
 import { notForProductionUse } from '@agoric/internal/src/magic-cookie-test-only.js';
 
 /**

package/src/contracts/oracle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oracle.d.ts","sourceRoot":"","sources":["oracle.js"],"names":[],"mappings":"6BA6Gc,WAAW,OAAO,KAAK,CAAC;0BACxB,OAAO,KAAK;AAtG1B;;GAEG;AAEH;;;;GAIG;AACH,2BAFW,GAAG;;;;;;;QAkDV,iCAAiC;qBAArB,WAAW;QAgBvB,iCAAiC;mCAArB,WAAW;;QAhBvB,iCAAiC;qBAArB,WAAW;QAgBvB,iCAAiC;mCAArB,WAAW;;GAwB1B;gCAhG4B,wBAAwB"}
+{"version":3,"file":"oracle.d.ts","sourceRoot":"","sources":["oracle.js"],"names":[],"mappings":"6BA4Gc,WAAW,OAAO,KAAK,CAAC;0BACxB,OAAO,KAAK;AAtG1B;;GAEG;AAEH;;;;GAIG;AACH,2BAFW,GAAG;;;;;;;QAkDV,iCAAiC;qBAArB,WAAW;QAgBvB,iCAAiC;mCAArB,WAAW;;QAhBvB,iCAAiC;qBAArB,WAAW;QAgBvB,iCAAiC;mCAArB,WAAW;;GAwB1B;gCAhG4B,wBAAwB"}

package/src/contracts/oracle.js

@@ -1,5 +1,4 @@
-/* eslint @typescript-eslint/no-floating-promises: "warn" */
-import { assert, Fail } from '@agoric/assert';
+import { assert, Fail } from '@endo/errors';
 import { Far } from '@endo/marshal';
 import { AmountMath } from '@agoric/ertp';
 

package/src/contracts/otcDesk.js

@@ -1,5 +1,5 @@
+import { assert } from '@endo/errors';
 import { E } from '@endo/eventual-send';
-import { assert } from '@agoric/assert';
 import { Far } from '@endo/marshal';
 import {
   offerTo,

package/src/contracts/priceAggregator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"priceAggregator.d.ts","sourceRoot":"","sources":["priceAggregator.js"],"names":[],"mappings":"6BAqCc,MAAM,GAAG,MAAM,GAAG,MAAM;oCAEzB,QAAQ,CAAC,cAAc,GAAG;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC;oBAGlD,cAAc,GAAG,KAAK;sCAmlBtB,WAAW,OAAO,KAAK,CAAC;AA9kBtC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,2BAbW,GAAG,CAAC;IACd,KAAO,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;IAC7C,aAAe,EAAE,MAAM,CAAC;IACxB,OAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACxB,QAAU,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACzB,YAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CAC3B,CAAC,eACM;IACV,UAAY,EAAE,UAAU,CAAC;IACzB,SAAW,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAClD,WAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;CAC9B;;QAgXA;;;;;;;;;WASG;;mBAY4B,WAAW,CAAC,KAAK,CAAC;8BAAoB;gBAAC,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;aAAC;;;;;QA0CtI,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;yGADU,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;;QA/ExC;;;;;;;;;WASG;;mBAY4B,WAAW,CAAC,KAAK,CAAC;8BAAoB;gBAAC,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;aAAC;;;;;QA0CtI,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;yGADU,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;;;;;QAmHxC,sBAAsB;;;;;QAAtB,sBAAsB;;;GAOzB;gCAxlB4B,wBAAwB;sCACwB,4BAA4B"}
+{"version":3,"file":"priceAggregator.d.ts","sourceRoot":"","sources":["priceAggregator.js"],"names":[],"mappings":"6BAoCc,MAAM,GAAG,MAAM,GAAG,MAAM;oCAEzB,QAAQ,CAAC,cAAc,GAAG;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC;oBAGlD,cAAc,GAAG,KAAK;sCAmlBtB,WAAW,OAAO,KAAK,CAAC;AA9kBtC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,2BAbW,GAAG,CAAC;IACd,KAAO,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;IAC7C,aAAe,EAAE,MAAM,CAAC;IACxB,OAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACxB,QAAU,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACzB,YAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CAC3B,CAAC,eACM;IACV,UAAY,EAAE,UAAU,CAAC;IACzB,SAAW,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAClD,WAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;CAC9B;;QAgXA;;;;;;;;;WASG;;mBAY4B,WAAW,CAAC,KAAK,CAAC;8BAAoB;gBAAC,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;aAAC;;;;;QA0CtI,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;yGADU,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;;QA/ExC;;;;;;;;;WASG;;mBAY4B,WAAW,CAAC,KAAK,CAAC;8BAAoB;gBAAC,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;aAAC;;;;;QA0CtI,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;yGADU,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;;;;;QAmHxC,sBAAsB;;;;;QAAtB,sBAAsB;;;GAOzB;gCAxlB4B,wBAAwB;sCACwB,4BAA4B"}