@agoric/zoe 0.26.3-dev-34632ea.0 → 0.26.3-dev-f0367d7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/zoe",
-  "version": "0.26.3-dev-34632ea.0+34632ea",
+  "version": "0.26.3-dev-f0367d7.0+f0367d7",
   "description": "Zoe: the Smart Contract Framework for Offer Enforcement",
   "type": "module",
   "main": "./src/zoeService/zoe.js",
@@ -43,17 +43,17 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-34632ea.0+34632ea",
-    "@agoric/ertp": "0.16.3-dev-34632ea.0+34632ea",
-    "@agoric/internal": "0.3.3-dev-34632ea.0+34632ea",
-    "@agoric/notifier": "0.6.3-dev-34632ea.0+34632ea",
-    "@agoric/store": "0.9.3-dev-34632ea.0+34632ea",
-    "@agoric/swingset-liveslots": "0.10.3-dev-34632ea.0+34632ea",
-    "@agoric/swingset-vat": "0.32.3-dev-34632ea.0+34632ea",
-    "@agoric/time": "0.3.3-dev-34632ea.0+34632ea",
-    "@agoric/vat-data": "0.5.3-dev-34632ea.0+34632ea",
-    "@agoric/vow": "0.1.1-dev-34632ea.0+34632ea",
-    "@agoric/zone": "0.2.3-dev-34632ea.0+34632ea",
+    "@agoric/base-zone": "0.1.1-dev-f0367d7.0+f0367d7",
+    "@agoric/ertp": "0.16.3-dev-f0367d7.0+f0367d7",
+    "@agoric/internal": "0.3.3-dev-f0367d7.0+f0367d7",
+    "@agoric/notifier": "0.6.3-dev-f0367d7.0+f0367d7",
+    "@agoric/store": "0.9.3-dev-f0367d7.0+f0367d7",
+    "@agoric/swingset-liveslots": "0.10.3-dev-f0367d7.0+f0367d7",
+    "@agoric/swingset-vat": "0.32.3-dev-f0367d7.0+f0367d7",
+    "@agoric/time": "0.3.3-dev-f0367d7.0+f0367d7",
+    "@agoric/vat-data": "0.5.3-dev-f0367d7.0+f0367d7",
+    "@agoric/vow": "0.1.1-dev-f0367d7.0+f0367d7",
+    "@agoric/zone": "0.2.3-dev-f0367d7.0+f0367d7",
     "@endo/bundle-source": "^3.5.1",
     "@endo/captp": "^4.4.4",
     "@endo/common": "^1.2.9",
@@ -70,7 +70,7 @@
     "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-dev-34632ea.0+34632ea",
+    "@agoric/kmarshal": "0.1.1-dev-f0367d7.0+f0367d7",
     "@endo/init": "^1.1.8",
     "ava": "^5.3.0",
     "c8": "^10.1.2",
@@ -100,5 +100,5 @@
   "typeCoverage": {
     "atLeast": 85.15
   },
-  "gitHead": "34632ea968d02a9e35edd3f7ca3b6edd59e4ef52"
+  "gitHead": "f0367d7ec66e1b662c39811381d4ff5f525b1fd2"
 }

package/src/contractSupport/bondingCurves.js

@@ -2,7 +2,7 @@
 
 import { Nat } from '@endo/nat';
 import { Fail } from '@endo/errors';
-import { natSafeMath } from './safeMath.js';
+import { natSafeMath } from '@agoric/ertp/src/safeMath.js';
 
 const { subtract, add, multiply, floorDivide } = natSafeMath;
 

package/src/contractSupport/index.d.ts

@@ -1,5 +1,6 @@
-export { natSafeMath } from "./safeMath.js";
+export { natSafeMath } from "@agoric/ertp/src/safeMath.js";
 export { makeStateMachine } from "./stateMachine.js";
+export * from "@agoric/ertp/src/ratio.js";
 export * from "./durability.js";
 export * from "./prepare-ownable.js";
 export * from "./priceAuthority.js";
@@ -10,5 +11,4 @@ export * from "./topics.js";
 export { getInputPrice, getOutputPrice, calcLiqValueToMint, calcValueToRemove, calcSecondaryRequired } from "./bondingCurves.js";
 export { atomicRearrange, atomicTransfer, fromOnly, toOnly } from "./atomicTransfer.js";
 export { defaultAcceptanceMsg, swap, fitProposalShape, assertProposalShape, assertIssuerKeywords, satisfies, assertNatAssetKind, swapExact, depositToSeat, withdrawFromSeat, saveAllIssuers, offerTo } from "./zoeHelpers.js";
-export { makeRatio, makeRatioFromAmounts, floorMultiplyBy, floorDivideBy, ceilMultiplyBy, ceilDivideBy, assertIsRatio, invertRatio, oneMinus, addRatios, multiplyRatios, ratiosSame, quantize, ratioGTE, subtractRatios, ratioToNumber } from "./ratio.js";
 //# sourceMappingURL=index.d.ts.map

package/src/contractSupport/index.js

@@ -8,7 +8,7 @@ export {
   calcSecondaryRequired,
 } from './bondingCurves.js';
 
-export { natSafeMath } from './safeMath.js';
+export { natSafeMath } from '@agoric/ertp/src/safeMath.js';
 
 export { makeStateMachine } from './stateMachine.js';
 
@@ -34,24 +34,7 @@ export {
   offerTo,
 } from './zoeHelpers.js';
 
-export {
-  makeRatio,
-  makeRatioFromAmounts,
-  floorMultiplyBy,
-  floorDivideBy,
-  ceilMultiplyBy,
-  ceilDivideBy,
-  assertIsRatio,
-  invertRatio,
-  oneMinus,
-  addRatios,
-  multiplyRatios,
-  ratiosSame,
-  quantize,
-  ratioGTE,
-  subtractRatios,
-  ratioToNumber,
-} from './ratio.js';
+export * from '@agoric/ertp/src/ratio.js';
 
 export * from './durability.js';
 export * from './prepare-ownable.js';

package/src/contractSupport/priceAuthorityInitial.js

@@ -7,7 +7,7 @@ import { Far } from '@endo/marshal';
 import { makeNotifier } from '@agoric/notifier';
 import { AmountMath } from '@agoric/ertp';
 
-import { multiplyBy } from './ratio.js';
+import { multiplyBy } from '@agoric/ertp/src/ratio.js';
 import { mintQuote } from './priceAuthorityTransform.js';
 
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"priceAggregator.d.ts","sourceRoot":"","sources":["priceAggregator.js"],"names":[],"mappings":"6BAuCc,MAAM,GAAG,MAAM,GAAG,MAAM;oCAEzB,QAAQ,CAAC,cAAc,GAAG;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC;oBAGlD,cAAc,GAAG,KAAK;sCAolBtB,WAAW,OAAO,KAAK,CAAC;AA/kBtC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,2BAbW,IAAI;IACZ,KAAK,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;IAC3C,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACtB,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CAC3B,CAAC,eACM;IACR,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAChD,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;CAC9B;;QA+WA;;;;;;;;;WASG;2CADQ,QAAQ,GAAG,MAAM;mBAaG,WAAW,CAAC,KAAK,CAAC;8BAAoB;gBAAC,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,WAAW,IAAI,CAAC,CAAC,CAAA;aAAC;;;;;QA0CtI,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;sCAHQ,QAAQ,GAAG,MAAM,UACjB,WAAW,KACT,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;;QA/ExC;;;;;;;;;WASG;2CADQ,QAAQ,GAAG,MAAM;mBAaG,WAAW,CAAC,KAAK,CAAC;8BAAoB;gBAAC,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,WAAW,IAAI,CAAC,CAAC,CAAA;aAAC;;;;;QA0CtI,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;sCAHQ,QAAQ,GAAG,MAAM,UACjB,WAAW,KACT,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;;;;;QAqHxC,sBAAsB;;;;;QAAtB,sBAAsB;;;GAOzB;gCA3lB4B,wBAAwB;yBAEV,aAAa;sCADqB,4BAA4B;gCAC9D,aAAa"}
+{"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;sCAolBtB,WAAW,OAAO,KAAK,CAAC;AA/kBtC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,2BAbW,IAAI;IACZ,KAAK,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;IAC3C,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACtB,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CAC3B,CAAC,eACM;IACR,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAChD,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;CAC9B;;QA+WA;;;;;;;;;WASG;2CADQ,QAAQ,GAAG,MAAM;mBAaG,WAAW,CAAC,KAAK,CAAC;8BAAoB;gBAAC,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,WAAW,IAAI,CAAC,CAAC,CAAA;aAAC;;;;;QA0CtI,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;sCAHQ,QAAQ,GAAG,MAAM,UACjB,WAAW,KACT,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;;QA/ExC;;;;;;;;;WASG;2CADQ,QAAQ,GAAG,MAAM;mBAaG,WAAW,CAAC,KAAK,CAAC;8BAAoB;gBAAC,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,WAAW,IAAI,CAAC,CAAC,CAAA;aAAC;;;;;QA0CtI,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;sCAHQ,QAAQ,GAAG,MAAM,UACjB,WAAW,KACT,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;;;;;QAqHxC,sBAAsB;;;;;QAAtB,sBAAsB;;;GAOzB;gCA3lB4B,wBAAwB;yBAEV,aAAa;sCADqB,4BAA4B;gCAC9D,aAAa"}

package/src/contracts/priceAggregator.js

@@ -12,23 +12,21 @@ import { Fail, q } from '@endo/errors';
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
 
-import {
-  calculateMedian,
-  makeOnewayPriceAuthorityKit,
-  makePriceQuoteIssuer,
-} from '../contractSupport/index.js';
 import {
   addRatios,
   assertParsableNumber,
+  calculateMedian,
   ceilDivideBy,
   floorMultiplyBy,
+  makeOnewayPriceAuthorityKit,
+  makePriceQuoteIssuer,
   makeRatio,
   makeRatioFromAmounts,
   multiplyRatios,
   parseRatio,
   ratioGTE,
   ratiosSame,
-} from '../contractSupport/ratio.js';
+} from '../contractSupport/index.js';
 
 /**
  * @import {LegacyMap} from '@agoric/store'

package/tools/test-utils.d.ts

@@ -6,7 +6,7 @@ export function withAmountUtils(kit: Pick<IssuerKit<"nat", any>, "brand" | "issu
      * @param {NatValue} n
      * @param {NatValue} [d]
      */
-    makeRatio: (n: NatValue, d?: NatValue) => Ratio;
+    makeRatio: (n: NatValue, d?: NatValue) => import("@agoric/ertp/src/ratio.js").Ratio;
     /** @param {number} n */
     units: (n: number) => import("@agoric/ertp").NatAmount;
     /** The intact Exo remotable */

package/tools/test-utils.js

@@ -1,5 +1,5 @@
 import { AmountMath } from '@agoric/ertp';
-import { makeRatio } from '../src/contractSupport/ratio.js';
+import { makeRatio } from '../src/contractSupport/index.js';
 
 /**
  * @import {Amount, Brand, DepositFacet, Issuer, IssuerKit, NatValue} from '@agoric/ertp';

package/src/contractSupport/ratio.d.ts

@@ -1,39 +0,0 @@
-export function assertIsRatio(ratio: any): void;
-export function makeRatio(numerator: bigint, numeratorBrand: Brand, denominator?: bigint, denominatorBrand?: Brand): Ratio;
-export function makeRatioFromAmounts(numeratorAmount: Amount, denominatorAmount: Amount): Ratio;
-/** @type {ScaleAmount} */
-export const floorMultiplyBy: ScaleAmount;
-/** @type {ScaleAmount} */
-export const ceilMultiplyBy: ScaleAmount;
-/** @type {ScaleAmount} */
-export const multiplyBy: ScaleAmount;
-/**
- * Divide the amount by the ratio, truncating the remainder.
- * @type {ScaleAmount}
- */
-export const floorDivideBy: ScaleAmount;
-/**
- * Divide the amount by the ratio, rounding up the remainder.
- * @type {ScaleAmount}
- */
-export const ceilDivideBy: 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: ScaleAmount;
-export function invertRatio(ratio: Ratio): Ratio;
-export function addRatios(left: Ratio, right: Ratio): Ratio;
-export function subtractRatios(left: Ratio, right: Ratio): Ratio;
-export function multiplyRatios(left: Ratio, right: Ratio): Ratio;
-export function oneMinus(ratio: Ratio): Ratio;
-export function ratioGTE(left: Ratio, right: Ratio): boolean;
-export function ratiosSame(left: Ratio, right: Ratio): boolean;
-export function quantize(ratio: Ratio, newDen: bigint): Ratio;
-export function parseRatio(numeric: ParsableNumber, numeratorBrand: Brand<"nat">, denominatorBrand?: Brand<"nat">): Ratio;
-export function assertParsableNumber(specimen: unknown): asserts specimen is ParsableNumber;
-export function ratioToNumber(ratio: Ratio): number;
-export type ParsableNumber = bigint | number | string;
-import type { Brand } from '@agoric/ertp';
-import type { Amount } from '@agoric/ertp';
-//# sourceMappingURL=ratio.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"ratio.d.ts","sourceRoot":"","sources":["ratio.js"],"names":[],"mappings":"AA4CO,gDAcN;AASM,qCANI,MAAM,kBACN,KAAK,gBACL,MAAM,qBACN,KAAK,GACH,KAAK,CAejB;AAOM,sDAJI,MAAM,qBACN,MAAM,GACJ,KAAK,CAYjB;AA2BD,0BAA0B;AAC1B,8BADW,WAAW,CAGpB;AAEF,0BAA0B;AAC1B,6BADW,WAAW,CAGpB;AAEF,0BAA0B;AAC1B,yBADW,WAAW,CAGpB;AA2BF;;;GAGG;AACH,4BAFU,WAAW,CAInB;AAEF;;;GAGG;AACH,2BAFU,WAAW,CAInB;AAEF;;;GAGG;AACH,uBAFU,WAAW,CAInB;AAMK,mCAHI,KAAK,GACH,KAAK,CAWjB;AAOM,gCAJI,KAAK,SACL,KAAK,GACH,KAAK,CAwBjB;AAOM,qCAJI,KAAK,SACL,KAAK,GACH,KAAK,CAmBjB;AAOM,qCAJI,KAAK,SACL,KAAK,GACH,KAAK,CA8BjB;AAQM,gCAHI,KAAK,GACH,KAAK,CAcjB;AAOM,+BAJI,KAAK,SACL,KAAK,GACH,OAAO,CAkBnB;AASM,iCAJI,KAAK,SACL,KAAK,GACH,OAAO,CAOnB;AAUM,gCAJI,KAAK,UACL,MAAM,GACJ,KAAK,CAiBjB;AAaM,oCALI,cAAc,kBACd,MAAM,KAAK,CAAC,qBACZ,MAAM,KAAK,CAAC,GACV,KAAK,CAmBjB;AAMM,+CAHI,OAAO,GACL,QAAQ,QAAQ,IAAI,cAAc,CAK9C;AAQM,qCAHI,KAAK,GACH,MAAM,CAMlB;6BAhDa,MAAM,GAAG,MAAM,GAAG,MAAM;2BA7WkB,cAAc;4BAAd,cAAc"}

package/src/contractSupport/ratio.js

@@ -1,423 +0,0 @@
-/// <reference path="./types-ambient.js" />
-import { q, Fail } from '@endo/errors';
-import { AmountMath } from '@agoric/ertp';
-import { assertRecord } from '@endo/marshal';
-import { isNat } from '@endo/nat';
-
-import { natSafeMath } from './safeMath.js';
-
-/**
- * @import {Amount, Brand, Issuer, Payment, Purse} from '@agoric/ertp';
- */
-
-const { multiply, floorDivide, ceilDivide, bankersDivide, add, subtract } =
-  natSafeMath;
-
-// make a Ratio, which represents a fraction. It is a pass-by-copy record.
-//
-// The natural syntax for the most common operations we want to support
-// are Amount * Ratio and Amount / Ratio. Since the operations want to adhere to
-// the ratio rather than the amount, we settled on a calling convention of
-// [ceil|floor]MultiplyBy(Amount, Ratio) and [ceil|floor]DivideBy(Amount, Ratio)
-//
-// The most common kind of Ratio can be applied to Amounts of a particular
-// brand, and produces results of the same brand. This represents a multiplier
-// that is only applicable to that brand. The less common kind of Ratio can be
-// applied to one particular brand of amounts, and produces results of another
-// particular brand. This represents some kind of exchange rate. The
-// brand-checking helps us ensure that normal Ratios aren't applied to amounts
-// of the wrong brand, and that exchange rates are only used in the appropriate
-// direction.
-//
-// Since the ratios are represented by a numerator and a denominator, every
-// multiplication or division operation that produces an amount ends with a
-// division of the underlying bigints, and integer division requires a mode
-// of [rounding to integer](https://en.wikipedia.org/wiki/Rounding#Rounding_to_integer).
-// Because `Ratio` only work with Natural numbers, just three modes suffice:
-//   - floor rounds down
-//   - ceil rounds up
-//   - default (without prefix) minimizes bias by rounding half to even
-
-const PERCENT = 100n;
-
-const ratioPropertyNames = ['numerator', 'denominator'];
-
-export const assertIsRatio = ratio => {
-  assertRecord(ratio, 'ratio');
-  const keys = Object.keys(ratio);
-  keys.length === 2 || Fail`Ratio ${ratio} must be a record with 2 fields.`;
-  for (const name of keys) {
-    ratioPropertyNames.includes(name) ||
-      Fail`Parameter must be a Ratio record, but ${ratio} has ${q(name)}`;
-  }
-  const numeratorValue = ratio.numerator.value;
-  const denominatorValue = ratio.denominator.value;
-  isNat(numeratorValue) ||
-    Fail`The numerator value must be a NatValue, not ${numeratorValue}`;
-  isNat(denominatorValue) ||
-    Fail`The denominator value must be a NatValue, not ${denominatorValue}`;
-};
-
-/**
- * @param {bigint} numerator
- * @param {Brand} numeratorBrand
- * @param {bigint} [denominator] The default denominator is 100
- * @param {Brand} [denominatorBrand] The default is to reuse the numeratorBrand
- * @returns {Ratio}
- */
-export const makeRatio = (
-  numerator,
-  numeratorBrand,
-  denominator = PERCENT,
-  denominatorBrand = numeratorBrand,
-) => {
-  denominator > 0n ||
-    Fail`No infinite ratios! Denominator was 0 ${q(denominatorBrand)}`;
-
-  return harden({
-    numerator: AmountMath.make(numeratorBrand, numerator),
-    denominator: AmountMath.make(denominatorBrand, denominator),
-  });
-};
-
-/**
- * @param {Amount} numeratorAmount
- * @param {Amount} denominatorAmount
- * @returns {Ratio}
- */
-export const makeRatioFromAmounts = (numeratorAmount, denominatorAmount) => {
-  AmountMath.coerce(numeratorAmount.brand, numeratorAmount);
-  AmountMath.coerce(denominatorAmount.brand, denominatorAmount);
-  return makeRatio(
-    // @ts-expect-error value can be any AmountValue but makeRatio() supports only bigint
-    numeratorAmount.value,
-    numeratorAmount.brand,
-    denominatorAmount.value,
-    denominatorAmount.brand,
-  );
-};
-
-/**
- * @param {Amount<'nat'>} amount
- * @param {Ratio} ratio
- * @param {*} divideOp
- * @returns {Amount<'nat'>}
- */
-const multiplyHelper = (amount, ratio, divideOp) => {
-  AmountMath.coerce(amount.brand, amount);
-  assertIsRatio(ratio);
-  amount.brand === ratio.denominator.brand ||
-    Fail`amount's brand ${q(amount.brand)} must match ratio's denominator ${q(
-      ratio.denominator.brand,
-    )}`;
-
-  return /** @type {Amount<'nat'>} */ (
-    AmountMath.make(
-      ratio.numerator.brand,
-      divideOp(
-        multiply(amount.value, ratio.numerator.value),
-        ratio.denominator.value,
-      ),
-    )
-  );
-};
-
-/** @type {ScaleAmount} */
-export const floorMultiplyBy = (amount, ratio) => {
-  return multiplyHelper(amount, ratio, floorDivide);
-};
-
-/** @type {ScaleAmount} */
-export const ceilMultiplyBy = (amount, ratio) => {
-  return multiplyHelper(amount, ratio, ceilDivide);
-};
-
-/** @type {ScaleAmount} */
-export const multiplyBy = (amount, ratio) => {
-  return multiplyHelper(amount, ratio, bankersDivide);
-};
-
-/**
- * @param {Amount<'nat'>} amount
- * @param {Ratio} ratio
- * @param {*} divideOp
- * @returns {Amount<'nat'>}
- */
-const divideHelper = (amount, ratio, divideOp) => {
-  AmountMath.coerce(amount.brand, amount);
-  assertIsRatio(ratio);
-  amount.brand === ratio.numerator.brand ||
-    Fail`amount's brand ${q(amount.brand)} must match ratio's numerator ${q(
-      ratio.numerator.brand,
-    )}`;
-
-  return /** @type {Amount<'nat'>} */ (
-    AmountMath.make(
-      ratio.denominator.brand,
-      divideOp(
-        multiply(amount.value, ratio.denominator.value),
-        ratio.numerator.value,
-      ),
-    )
-  );
-};
-
-/**
- * Divide the amount by the ratio, truncating the remainder.
- * @type {ScaleAmount}
- */
-export const floorDivideBy = (amount, ratio) => {
-  return divideHelper(amount, ratio, floorDivide);
-};
-
-/**
- * Divide the amount by the ratio, rounding up the remainder.
- * @type {ScaleAmount}
- */
-export const ceilDivideBy = (amount, ratio) => {
-  return divideHelper(amount, ratio, ceilDivide);
-};
-
-/**
- * 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);
-};
-
-/**
- * @param {Ratio} ratio
- * @returns {Ratio}
- */
-export const invertRatio = ratio => {
-  assertIsRatio(ratio);
-
-  return makeRatio(
-    /** @type {NatValue} */ (ratio.denominator.value),
-    ratio.denominator.brand,
-    /** @type {NatValue} */ (ratio.numerator.value),
-    ratio.numerator.brand,
-  );
-};
-
-/**
- * @param {Ratio} left
- * @param {Ratio} right
- * @returns {Ratio}
- */
-export const addRatios = (left, right) => {
-  assertIsRatio(right);
-  assertIsRatio(left);
-  left.numerator.brand === right.numerator.brand ||
-    Fail`numerator brands must match: ${q(left)} ${q(right)}`;
-  left.denominator.brand === right.denominator.brand ||
-    Fail`denominator brands must match: ${q(left)} ${q(right)}`;
-
-  // Simplifying the expression:
-  //  (and + bnd) / y d**2
-  //  (a + b) nd / y d**2
-  //  ((a + b) n / y d) * (d / d)
-  //  (a + b) n / yd
-  return makeRatio(
-    add(
-      multiply(left.numerator.value, right.denominator.value), // a nd
-      multiply(left.denominator.value, right.numerator.value), // b nd
-    ), // (a + b) nd
-    left.numerator.brand,
-    multiply(left.denominator.value, right.denominator.value), // y d**2
-    left.denominator.brand,
-  );
-};
-
-/**
- * @param {Ratio} left
- * @param {Ratio} right
- * @returns {Ratio}
- */
-export const subtractRatios = (left, right) => {
-  assertIsRatio(right);
-  assertIsRatio(left);
-  left.numerator.brand === right.numerator.brand ||
-    Fail`numerator brands must match: ${q(left)} ${q(right)}`;
-  left.denominator.brand === right.denominator.brand ||
-    Fail`denominator brands must match: ${q(left)} ${q(right)}`;
-
-  return makeRatio(
-    subtract(
-      multiply(left.numerator.value, right.denominator.value), // a nd
-      multiply(left.denominator.value, right.numerator.value), // b nd
-    ), // (a - b) nd
-    left.numerator.brand,
-    multiply(left.denominator.value, right.denominator.value), // y d**2
-    left.denominator.brand,
-  );
-};
-
-/**
- * @param {Ratio} left
- * @param {Ratio} right
- * @returns {Ratio}
- */
-export const multiplyRatios = (left, right) => {
-  assertIsRatio(right);
-  assertIsRatio(left);
-
-  const getRemainingBrands = () => {
-    // Prefer results that have the same brand as the left operand.
-    if (right.numerator.brand === right.denominator.brand) {
-      return [left.numerator.brand, left.denominator.brand];
-    }
-    if (right.numerator.brand === left.denominator.brand) {
-      return [left.numerator.brand, right.denominator.brand];
-    }
-    if (left.numerator.brand === right.denominator.brand) {
-      return [right.numerator.brand, left.denominator.brand];
-    }
-    if (left.numerator.brand === left.denominator.brand) {
-      return [right.numerator.brand, right.denominator.brand];
-    }
-    throw Fail`at least one brand must cancel out: ${q(left)} ${q(right)}`;
-  };
-
-  const [numeratorBrand, denominatorBrand] = getRemainingBrands();
-  return makeRatio(
-    multiply(left.numerator.value, right.numerator.value),
-    numeratorBrand,
-    multiply(left.denominator.value, right.denominator.value),
-    denominatorBrand,
-  );
-};
-
-/**
- * If ratio is between 0 and 1, subtract from 1.
- *
- * @param {Ratio} ratio
- * @returns {Ratio}
- */
-export const oneMinus = ratio => {
-  assertIsRatio(ratio);
-  ratio.numerator.brand === ratio.denominator.brand ||
-    Fail`oneMinus only supports ratios with a single brand, but ${ratio.numerator.brand} doesn't match ${ratio.denominator.brand}`;
-  ratio.numerator.value <= ratio.denominator.value ||
-    Fail`Parameter must be less than or equal to 1: ${ratio.numerator.value}/${ratio.denominator.value}`;
-  return makeRatio(
-    subtract(ratio.denominator.value, ratio.numerator.value),
-    ratio.numerator.brand,
-    ratio.denominator.value,
-    ratio.numerator.brand,
-  );
-};
-
-/**
- * @param {Ratio} left
- * @param {Ratio} right
- * @returns {boolean}
- */
-export const ratioGTE = (left, right) => {
-  if (left.numerator.brand === right.numerator.brand) {
-    left.denominator.brand === right.denominator.brand ||
-      Fail`numerator brands match, but denominator brands don't: ${q(left)} ${q(
-        right,
-      )}`;
-  } else if (left.numerator.brand === left.denominator.brand) {
-    right.numerator.brand === right.denominator.brand ||
-      Fail`lefthand brands match, but righthand brands don't: ${q(left)} ${q(
-        right,
-      )}`;
-  }
-  return natSafeMath.isGTE(
-    multiply(left.numerator.value, right.denominator.value),
-    multiply(right.numerator.value, left.denominator.value),
-  );
-};
-
-/**
- * True iff the ratios are the same values (equal or equivalant may return false)
- *
- * @param {Ratio} left
- * @param {Ratio} right
- * @returns {boolean}
- */
-export const ratiosSame = (left, right) => {
-  return (
-    AmountMath.isEqual(left.numerator, right.numerator) &&
-    AmountMath.isEqual(left.denominator, right.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
- * @returns {Ratio}
- */
-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(
-    newNum,
-    ratio.numerator.brand,
-    newDen,
-    ratio.denominator.brand,
-  );
-};
-
-const NUMERIC_RE = /^(\d\d*)(?:\.(\d*))?$/;
-/** @typedef {bigint | number | string} ParsableNumber */
-
-/**
- * Create a ratio from a given numeric value.
- *
- * @param {ParsableNumber} numeric
- * @param {Brand<'nat'>} numeratorBrand
- * @param {Brand<'nat'>} [denominatorBrand]
- * @returns {Ratio}
- */
-export const parseRatio = (
-  numeric,
-  numeratorBrand,
-  denominatorBrand = numeratorBrand,
-) => {
-  const match = `${numeric}`.match(NUMERIC_RE);
-  if (!match) {
-    throw Fail`Invalid numeric data: ${numeric}`;
-  }
-
-  const [_, whole, part = ''] = match;
-  return makeRatio(
-    BigInt(`${whole}${part}`),
-    numeratorBrand,
-    10n ** BigInt(part.length),
-    denominatorBrand,
-  );
-};
-
-/**
- * @param {unknown} specimen
- * @returns {asserts specimen is ParsableNumber}
- */
-export const assertParsableNumber = specimen => {
-  const match = `${specimen}`.match(NUMERIC_RE);
-  match || Fail`Invalid numeric data: ${specimen}`;
-};
-
-/**
- * Ratios might be greater or less than one.
- *
- * @param {Ratio} ratio
- * @returns {number}
- */
-export const ratioToNumber = ratio => {
-  const n = Number(ratio.numerator.value);
-  const d = Number(ratio.denominator.value);
-  return n / d;
-};

package/src/contractSupport/safeMath.d.ts

@@ -1,11 +0,0 @@
-export namespace natSafeMath {
-    let add: NatOp;
-    let subtract: NatOp;
-    let multiply: NatOp;
-    let floorDivide: NatOp;
-    let ceilDivide: NatOp;
-    let bankersDivide: NatOp;
-    let isGTE: (x: number | bigint, y: number | bigint) => boolean;
-}
-export type NatOp = (x: number | bigint, y: number | bigint) => NatValue;
-//# sourceMappingURL=safeMath.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"safeMath.d.ts","sourceRoot":"","sources":["safeMath.js"],"names":[],"mappings":";aAYa,KAAK;kBAGL,KAAK;kBAEL,KAAK;qBAEL,KAAK;oBAEL,KAAK;uBAQN,KAAK;eAiBJ,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,KAAK,OAAO;;oBA5ClD,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,KAAK,QAAQ"}