@agoric/inter-protocol 0.13.2-dev-65d3f14.0 → 0.13.2-pismo-dev-12e97f1.0

package/src/vaultFactory/vault.js

@@ -1,3 +1,4 @@
+// @ts-check
 import '@agoric/zoe/exported.js';
 
 import {
@@ -5,7 +6,6 @@ import {
   makeRatioFromAmounts,
   ceilMultiplyBy,
   floorMultiplyBy,
-  atomicTransfer,
 } from '@agoric/zoe/src/contractSupport/index.js';
 import { AmountMath } from '@agoric/ertp';
 import {
@@ -23,7 +23,7 @@ import {
   stageDelta,
 } from '../contractSupport.js';
 
-const { quote: q, Fail } = assert;
+const { details: X, quote: q } = assert;
 
 const trace = makeTracer('IV', false);
 
@@ -198,10 +198,12 @@ const checkRestart = (newCollateralPre, maxDebtPre, newCollateral, newDebt) => {
     );
     // `floorMultiply` because the debt ceiling should be tight
     const maxDebtAfter = floorMultiplyBy(newCollateral, debtPerCollateral);
-    AmountMath.isGTE(maxDebtAfter, newDebt) ||
-      Fail`The requested debt ${q(
+    assert(
+      AmountMath.isGTE(maxDebtAfter, newDebt),
+      X`The requested debt ${q(
         newDebt,
-      )} is more than the collateralization ratio allows: ${q(maxDebtAfter)}`;
+      )} is more than the collateralization ratio allows: ${q(maxDebtAfter)}`,
+    );
     // The `collateralAfter` can still cover the `newDebt`, so don't restart.
     return false;
   }
@@ -229,7 +231,9 @@ const helperBehavior = {
     const { phase } = state;
     const validNewPhases = validTransitions[phase];
     validNewPhases.includes(newPhase) ||
-      Fail`Vault cannot transition from ${q(phase)} to ${q(newPhase)}`;
+      assert.fail(
+        X`Vault cannot transition from ${q(phase)} to ${q(newPhase)}`,
+      );
     state.phase = newPhase;
   },
 
@@ -242,7 +246,9 @@ const helperBehavior = {
     const { phase } = state;
     phase === Phase.ACTIVE ||
       phase === Phase.LIQUIDATED ||
-      Fail`to be closed a vault must be active or liquidated, not ${phase}`;
+      assert.fail(
+        X`to be closed a vault must be active or liquidated, not ${phase}`,
+      );
   },
   // #endregion
 
@@ -251,7 +257,7 @@ const helperBehavior = {
    * but not for interest accrual.
    *
    * @param {MethodContext} context
-   * @param {Amount<'nat'>} newDebt - principal and all accrued interest
+   * @param {Amount} newDebt - principal and all accrued interest
    */
   updateDebtSnapshot: ({ state }, newDebt) => {
     // update local state
@@ -299,7 +305,7 @@ const helperBehavior = {
   assertVaultHoldsNoMinted: ({ state, facets }) => {
     const { vaultSeat } = state;
     AmountMath.isEmpty(facets.helper.getMintedAllocated(vaultSeat)) ||
-      Fail`Vault should be empty of Minted`;
+      assert.fail(X`Vault should be empty of Minted`);
   },
 
   /**
@@ -314,10 +320,12 @@ const helperBehavior = {
     proposedRunDebt,
   ) => {
     const maxRun = await state.manager.maxDebtFor(collateralAmount);
-    AmountMath.isGTE(maxRun, proposedRunDebt, facets.helper.debtBrand()) ||
-      Fail`Requested ${q(proposedRunDebt)} exceeds max ${q(maxRun)} for ${q(
+    assert(
+      AmountMath.isGTE(maxRun, proposedRunDebt, facets.helper.debtBrand()),
+      X`Requested ${q(proposedRunDebt)} exceeds max ${q(maxRun)} for ${q(
         collateralAmount,
-      )} collateral`;
+      )} collateral`,
+    );
   },
 
   /**
@@ -396,18 +404,20 @@ const helperBehavior = {
       // you must pay off the entire remainder but if you offer too much, we won't
       // take more than you owe
       AmountMath.isGTE(given, debt) ||
-        Fail`Offer ${given} is not sufficient to pay off debt ${debt}`;
+        assert.fail(
+          X`Offer ${given} is not sufficient to pay off debt ${debt}`,
+        );
 
       // Return any overpayment
-      atomicTransfer(zcf, vaultSeat, seat, vaultSeat.getCurrentAllocation());
-
+      seat.incrementBy(vaultSeat.decrementBy(vaultSeat.getCurrentAllocation()));
+      zcf.reallocate(seat, vaultSeat);
       state.manager.burnAndRecord(debt, seat);
     } else if (phase === Phase.LIQUIDATED) {
       // Simply reallocate vault assets to the offer seat.
       // Don't take anything from the offer, even if vault is underwater.
       // TODO verify that returning Minted here doesn't mess up debt limits
-
-      atomicTransfer(zcf, vaultSeat, seat, vaultSeat.getCurrentAllocation());
+      seat.incrementBy(vaultSeat.decrementBy(vaultSeat.getCurrentAllocation()));
+      zcf.reallocate(seat, vaultSeat);
     } else {
       throw new Error('only active and liquidated vaults can be closed');
     }
@@ -439,9 +449,9 @@ const helperBehavior = {
    * so the simple math works.
    *
    * @param {MethodContext} context
-   * @param {Amount<'nat'>} currentDebt
-   * @param {Amount<'nat'>} giveAmount
-   * @param {Amount<'nat'>} wantAmount
+   * @param {Amount} currentDebt
+   * @param {Amount} giveAmount
+   * @param {Amount} wantAmount
    */
   loanFee: ({ state }, currentDebt, giveAmount, wantAmount) => {
     const fee = ceilMultiplyBy(
@@ -482,7 +492,7 @@ const helperBehavior = {
     // max debt supported by current Collateral as modified by proposal
     const maxDebtPre = await state.manager.maxDebtFor(newCollateralPre);
     updaterPre === ephemera.outerUpdater ||
-      Fail`Transfer during vault adjustment`;
+      assert.fail(X`Transfer during vault adjustment`);
     helper.assertActive();
 
     // After the `await`, we retrieve the vault's allocations again,
@@ -589,9 +599,11 @@ const selfBehavior = {
 
     const normalizedDebtPre = self.getNormalizedDebt();
     const actualDebtPre = self.getCurrentDebt();
-    (AmountMath.isEmpty(normalizedDebtPre) &&
-      AmountMath.isEmpty(actualDebtPre)) ||
-      Fail`vault must be empty initially`;
+    assert(
+      AmountMath.isEmpty(normalizedDebtPre) &&
+        AmountMath.isEmpty(actualDebtPre),
+      X`vault must be empty initially`,
+    );
 
     const collateralPre = self.getCollateralAmount();
     trace('initVaultKit start: collateral', state.idInManager, {
@@ -612,8 +624,10 @@ const selfBehavior = {
       toMint,
     } = helper.loanFee(actualDebtPre, helper.emptyDebt(), wantMinted);
     !AmountMath.isEmpty(fee) ||
-      Fail`loan requested (${wantMinted}) is too small; cannot accrue interest`;
-    AmountMath.isEqual(newDebtPre, toMint) || Fail`fee mismatch for vault`;
+      assert.fail(
+        X`loan requested (${wantMinted}) is too small; cannot accrue interest`,
+      );
+    assert(AmountMath.isEqual(newDebtPre, toMint), X`fee mismatch for vault`);
     trace(
       'initVault',
       state.idInManager,

package/src/vaultFactory/vaultDirector.js

@@ -1,7 +1,9 @@
+// @ts-check
+
 import '@agoric/zoe/exported.js';
 import '@agoric/zoe/src/contracts/exported.js';
 
-import '@agoric/governance/exported.js';
+import '@agoric/governance/src/exported.js';
 import { E } from '@endo/eventual-send';
 
 import { fit, keyEQ, M, makeScalarMap } from '@agoric/store';
@@ -32,7 +34,7 @@ import {
 } from './params.js';
 import { makeVaultManager } from './vaultManager.js';
 
-const { details: X, quote: q, Fail } = assert;
+const { details: X, quote: q } = assert;
 
 /** @typedef {{
  * debtMint: ZCFMint<'nat'>,
@@ -216,15 +218,17 @@ const makeVaultInvitation = ({ state }) => {
     } = seat.getProposal();
     const { brand: brandIn } = collateralAmount;
     collateralTypes.has(brandIn) ||
-      Fail`Not a supported collateral type ${brandIn}`;
+      assert.fail(X`Not a supported collateral type ${brandIn}`);
 
-    AmountMath.isGTE(
-      requestedAmount,
-      ephemera.directorParamManager.getMinInitialDebt(),
-    ) ||
-      Fail`The request must be for at least ${
+    assert(
+      AmountMath.isGTE(
+        requestedAmount,
+        ephemera.directorParamManager.getMinInitialDebt(),
+      ),
+      X`The request must be for at least ${
         ephemera.directorParamManager.getMinInitialDebt().value
-      }. ${requestedAmount.value} is too small`;
+      }. ${requestedAmount.value} is too small`,
+    );
 
     /** @type {VaultManager} */
     const mgr = collateralTypes.get(brandIn);
@@ -295,7 +299,7 @@ const machineBehavior = {
   // TODO move this under governance #3924
   /**
    * @param {MethodContext} context
-   * @param {Issuer<'nat'>} collateralIssuer
+   * @param {Issuer} collateralIssuer
    * @param {Keyword} collateralKeyword
    * @param {VaultManagerParamValues} initialParamValues
    */
@@ -321,7 +325,9 @@ const machineBehavior = {
     const collateralBrand = zcf.getBrandForIssuer(collateralIssuer);
     // We create only one vault per collateralType.
     !collateralTypes.has(collateralBrand) ||
-      Fail`Collateral brand ${q(collateralBrand)} has already been added`;
+      assert.fail(
+        X`Collateral brand ${q(collateralBrand)} has already been added`,
+      );
 
     const managerStorageNode =
       storageNode &&
@@ -390,9 +396,6 @@ const machineBehavior = {
     const factoryPowers = Far('vault factory powers', {
       getGovernedParams: () => ({
         ...vaultParamManager.readonly(),
-        /** @type {() => Amount<'nat'>} */
-        // @ts-expect-error cast
-        getDebtLimit: vaultParamManager.readonly().getDebtLimit,
         getChargingPeriod: () => loanTimingParams[CHARGING_PERIOD_KEY].value,
         getRecordingPeriod: () => loanTimingParams[RECORDING_PERIOD_KEY].value,
       }),
@@ -485,7 +488,7 @@ const publicBehavior = {
   getCollateralManager: ({ state }, brandIn) => {
     const { collateralTypes } = state;
     collateralTypes.has(brandIn) ||
-      Fail`Not a supported collateral type ${brandIn}`;
+      assert.fail(X`Not a supported collateral type ${brandIn}`);
     /** @type {VaultManager} */
     return collateralTypes.get(brandIn).getPublicFacet();
   },

package/src/vaultFactory/vaultFactory.js

@@ -1,4 +1,6 @@
-import '@agoric/governance/exported.js';
+// @ts-check
+
+import '@agoric/governance/src/exported.js';
 import '@agoric/zoe/exported.js';
 import '@agoric/zoe/src/contracts/exported.js';
 
@@ -19,7 +21,6 @@ import '@agoric/zoe/src/contracts/exported.js';
 
 import { assertElectorateMatches } from '@agoric/governance';
 import { makeStoredPublisherKit } from '@agoric/notifier';
-import { assertAllDefined } from '@agoric/internal';
 import {
   makeVaultDirectorParamManager,
   LIQUIDATION_INSTALL_KEY,
@@ -27,6 +28,7 @@ import {
   MIN_INITIAL_DEBT_KEY,
 } from './params.js';
 import { makeVaultDirector } from './vaultDirector.js';
+import { assertKeysDefined } from '../contractSupport.js';
 
 /**
  * @typedef {ZCF<GovernanceTerms<import('./params').VaultDirectorParams> & {
@@ -52,20 +54,15 @@ import { makeVaultDirector } from './vaultDirector.js';
  * }} privateArgs
  */
 export const start = async (zcf, privateArgs) => {
-  const {
-    feeMintAccess,
-    initialPoserInvitation,
-    initialShortfallInvitation,
-    marshaller,
-    storageNode,
-  } = privateArgs;
-  assertAllDefined({
-    feeMintAccess,
-    initialPoserInvitation,
-    initialShortfallInvitation,
-    marshaller,
-    storageNode,
-  });
+  assertKeysDefined(privateArgs, [
+    'feeMintAccess',
+    'initialPoserInvitation',
+    'initialShortfallInvitation',
+    'storageNode',
+    'marshaller',
+  ]);
+  const { feeMintAccess, initialPoserInvitation, initialShortfallInvitation } =
+    privateArgs;
   const debtMint = await zcf.registerFeeMint('Minted', feeMintAccess);
   zcf.setTestJig(() => ({
     mintedIssuerRecord: debtMint.getIssuerRecord(),
@@ -78,7 +75,11 @@ export const start = async (zcf, privateArgs) => {
   } = zcf.getTerms().governedParams;
   /** a powerful object; can modify the invitation */
   const vaultDirectorParamManager = await makeVaultDirectorParamManager(
-    makeStoredPublisherKit(storageNode, marshaller, 'governance'),
+    makeStoredPublisherKit(
+      privateArgs.storageNode,
+      privateArgs.marshaller,
+      'governance',
+    ),
     zcf.getZoeService(),
     initialPoserInvitation,
     liqInstall,
@@ -96,8 +97,8 @@ export const start = async (zcf, privateArgs) => {
     zcf,
     vaultDirectorParamManager,
     debtMint,
-    storageNode,
-    marshaller,
+    privateArgs.storageNode,
+    privateArgs.marshaller,
   );
 
   return harden({

package/src/vaultFactory/vaultHolder.js

@@ -1,13 +1,14 @@
 /**
  * @file Use-object for the owner of a vault
  */
+// @ts-check
 import '@agoric/zoe/exported.js';
 
 import { makeStoredPublishKit } from '@agoric/notifier';
 import { defineDurableKindMulti, makeKindHandle } from '@agoric/vat-data';
 import { makeEphemeraProvider } from '../contractSupport.js';
 
-const { Fail } = assert;
+const { details: X } = assert;
 
 // XXX durable key to an ephemeral object
 // UNTIL https://github.com/Agoric/agoric-sdk/issues/4567
@@ -64,9 +65,7 @@ const helper = {
    */
   owned: ({ state }) => {
     const { vault } = state;
-    if (!vault) {
-      throw Fail`Using vault holder after transfer`;
-    }
+    assert(vault, X`Using vault holder after transfer`);
     return vault;
   },
   /** @param {MethodContext} context */

package/src/vaultFactory/vaultKit.js

@@ -1,3 +1,4 @@
+// @ts-check
 import '@agoric/zoe/exported.js';
 import { Far } from '@endo/marshal';
 import { makeVaultHolder } from './vaultHolder.js';

package/src/vaultFactory/vaultManager.js

@@ -1,4 +1,5 @@
 /* eslint-disable consistent-return */
+// @ts-check
 /**
  * @file Vault Manager object manages vault-based debts for a collateral type.
  *
@@ -31,7 +32,6 @@ import {
   getAmountOut,
   makeRatio,
   makeRatioFromAmounts,
-  atomicTransfer,
 } from '@agoric/zoe/src/contractSupport/index.js';
 import { E } from '@endo/eventual-send';
 import { unitAmount } from '@agoric/zoe/src/contractSupport/priceQuote.js';
@@ -164,7 +164,7 @@ const provideEphemera = makeEphemeraProvider(() => ({
  *
  * @param {import('./vaultFactory.js').VaultFactoryZCF} zcf
  * @param {ZCFMint<'nat'>} debtMint
- * @param {Brand<'nat'>} collateralBrand
+ * @param {Brand} collateralBrand
  * @param {ERef<PriceAuthority>} priceAuthority
  * @param {import('./vaultDirector.js').FactoryPowersFacet} factoryPowers
  * @param {ERef<TimerService>} timerService
@@ -538,9 +538,12 @@ const helperBehavior = {
           // it. We could hold it until it crosses some threshold, then sell it
           // to the AMM, or we could transfer it to the reserve. At least it's
           // visible in the accounting.
-          atomicTransfer(zcf, vaultSeat, state.retainedCollateralSeat, {
-            Collateral: collateralPost,
-          });
+          vaultSeat.decrementBy(
+            state.retainedCollateralSeat.incrementBy({
+              Collateral: collateralPost,
+            }),
+          );
+          zcf.reallocate(vaultSeat, state.retainedCollateralSeat);
         }
 
         // Reduce totalCollateral by collateralPre, since all the collateral was
@@ -624,8 +627,8 @@ const managerBehavior = {
    * was type {MintAndReallocate}
    *
    * @param {MethodContext} context
-   * @param {Amount<'nat'>} toMint
-   * @param {Amount<'nat'>} fee
+   * @param {Amount} toMint
+   * @param {Amount} fee
    * @param {ZCFSeat} seat
    * @param {...ZCFSeat} otherSeats
    * @returns {void}

package/src/vpool-xyk-amm/addLiquidity.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 import {
   assertProposalShape,
   calcSecondaryRequired,
@@ -7,7 +9,7 @@ import { AmountMath } from '@agoric/ertp';
 
 import '@agoric/zoe/exported.js';
 
-const { Fail, quote: q } = assert;
+const { details: X, quote: q } = assert;
 
 const { add, multiply } = natSafeMath;
 /**
@@ -29,7 +31,7 @@ const makeMakeAddLiquidityInvitation = (zcf, getPool) => {
     const liquidityIssuer = pool.getLiquidityIssuer();
     const liquidityBrand = zcf.getBrandForIssuer(liquidityIssuer);
     seat.getProposal().want.Liquidity.brand === liquidityBrand ||
-      Fail`liquidity brand must be ${q(liquidityBrand)}`;
+      assert.fail(X`liquidity brand must be ${q(liquidityBrand)}`);
 
     return pool.addLiquidity(seat);
   };
@@ -131,7 +133,6 @@ const makeMakeAddLiquidityAtRateInvitation = (
     });
 
     const giveAlloc = seat.getProposal().give;
-    /** @type {Amount<'nat'>} */
     const secondaryAmount = giveAlloc.Secondary;
     const secondaryBrand = secondaryAmount.brand;
     const centralBrand = giveAlloc.Central.brand;

package/src/vpool-xyk-amm/addPool.js

@@ -1,13 +1,12 @@
+// @ts-check
+
 import { E } from '@endo/eventual-send';
 import { AmountMath, AssetKind } from '@agoric/ertp';
-import {
-  assertProposalShape,
-  atomicTransfer,
-} from '@agoric/zoe/src/contractSupport/index.js';
+import { assertProposalShape } from '@agoric/zoe/src/contractSupport/index.js';
 
 import { definePoolKind } from './pool.js';
 
-const { quote: q, Fail } = assert;
+const { details: X, quote: q } = assert;
 
 const DISPLAY_INFO = harden({ decimalPlaces: 6 });
 
@@ -17,7 +16,7 @@ const DISPLAY_INFO = harden({ decimalPlaces: 6 });
  * @param {ZCF} zcf
  * @param {(Brand) => boolean} isInSecondaries
  * @param {import('@agoric/store/src/stores/store-utils.js').AtomicProvider<Brand, ZCFMint>} brandToLiquidityMintProvider
- * @param {() => (secondaryBrand: Brand<'nat'>) => Promise<void>} getAddIssuerToReserve
+ * @param {() => (secondaryBrand: Brand) => Promise<void>} getAddIssuerToReserve
  */
 export const makeAddIssuer = (
   zcf,
@@ -40,12 +39,12 @@ export const makeAddIssuer = (
     ]);
     // AWAIT ///////////////
     secondaryAssetKind === AssetKind.NAT ||
-      Fail`${q(keyword)} asset not fungible (must use NAT math)`;
+      assert.fail(X`${q(keyword)} asset not fungible (must use NAT math)`);
 
     /** @type {(brand: Brand) => Promise<ZCFMint>} */
     const makeLiquidityMint = brand => {
       !isInSecondaries(brand) ||
-        Fail`issuer ${secondaryIssuer} already has a pool`;
+        assert.fail(X`issuer ${secondaryIssuer} already has a pool`);
 
       const liquidityKeyword = `${keyword}Liquidity`;
       zcf.assertUniqueKeyword(liquidityKeyword);
@@ -57,19 +56,19 @@ export const makeAddIssuer = (
         ]),
         ([issuer, mint]) => {
           console.log(
-            `Saved issuer ${secondaryIssuer} to keyword ${keyword} and got back ${issuer}`,
+            X`Saved issuer ${secondaryIssuer} to keyword ${keyword} and got back ${issuer}`,
           );
           return mint;
         },
       ).catch(e => {
         console.error(
-          `Failure Saving issuer ${secondaryIssuer}. Not added to Reserve`,
+          X`Failure Saving issuer ${secondaryIssuer}. Not added to Reserve`,
         );
         throw e;
       });
     };
 
-    /** @type {(brand: Brand<'nat'>) => Promise<void>} */
+    /** @type {(brand: Brand) => Promise<void>} */
     const finish = brand => {
       // defer lookup until necessary. more aligned with governed
       // param we expect this to be eventually.
@@ -134,8 +133,6 @@ export const makeAddPoolInvitation = (
         .get(secondaryBrand)
         .getIssuerRecord();
 
-    /** @type {Amount<'nat'>} */
-    // @ts-expect-error cast governance types
     const minPoolLiquidity = ammPowers.params.getMinInitialPoolLiquidity();
 
     if (proposalWant.Liquidity) {
@@ -150,12 +147,17 @@ export const makeAddPoolInvitation = (
         centralAboveMinimum,
       );
       AmountMath.isGTE(funderLiquidityAmount, wantLiquidityAmount) ||
-        Fail`Requested too many liquidity tokens (${wantLiquidityAmount}, max: ${funderLiquidityAmount}`;
+        assert.fail(
+          X`Requested too many liquidity tokens (${wantLiquidityAmount}, max: ${funderLiquidityAmount}`,
+        );
     }
     AmountMath.isGTE(centralAmount, minPoolLiquidity) ||
-      Fail`The minimum initial liquidity is ${minPoolLiquidity}, rejecting ${centralAmount}`;
+      assert.fail(
+        X`The minimum initial liquidity is ${minPoolLiquidity}, rejecting ${centralAmount}`,
+      );
     const minLiqAmount = AmountMath.make(
       liquidityBrand,
+      // @ts-expect-error known nat
       minPoolLiquidity.value,
     );
 
@@ -176,15 +178,10 @@ export const makeAddPoolInvitation = (
     // transfer minPoolLiquidity in tokens from the funder to the reserve.
     helper.addLiquidityInternal(seat, secondaryAmount, centralAmount);
 
+    seat.decrementBy({ Liquidity: minLiqAmount });
     const { zcfSeat: reserveLiquidityTokenSeat } = zcf.makeEmptySeatKit();
-    atomicTransfer(
-      zcf,
-      seat,
-      reserveLiquidityTokenSeat,
-      { Liquidity: minLiqAmount },
-      { [liquidityKeyword]: minLiqAmount },
-    );
-
+    reserveLiquidityTokenSeat.incrementBy({ [liquidityKeyword]: minLiqAmount });
+    zcf.reallocate(reserveLiquidityTokenSeat, seat);
     seat.exit();
     pool.updateState();
 

package/src/vpool-xyk-amm/constantProduct/calcFees.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 import { AmountMath } from '@agoric/ertp';
 import {
   ceilMultiplyBy,
@@ -9,7 +11,7 @@ import './internal-types.js';
 
 import { BASIS_POINTS } from './defaults.js';
 
-const { Fail } = assert;
+const { details: X } = assert;
 
 /**
  * Make a ratio given a nat representing basis points and a brand.
@@ -33,14 +35,16 @@ const amountGT = (left, right) =>
  * Apply the feeRatio to the amount that has a matching brand. This used to
  * calculate fees in the single pool case.
  *
- * @param {{ amountIn: Amount<'nat'>, amountOut: Amount<'nat'>}} amounts - a record with two
+ * @param {{ amountIn: Amount, amountOut: Amount}} amounts - a record with two
  *   amounts in different brands.
  * @param {Ratio} feeRatio
- * @returns {Amount<'nat'>}
+ * @returns {Amount}
  */
 const calcFee = ({ amountIn, amountOut }, feeRatio) => {
   feeRatio.numerator.brand === feeRatio.denominator.brand ||
-    Fail`feeRatio numerator and denominator must use the same brand ${feeRatio}`;
+    assert.fail(
+      X`feeRatio numerator and denominator must use the same brand ${feeRatio}`,
+    );
 
   let sameBrandAmount;
   if (amountIn.brand === feeRatio.numerator.brand) {
@@ -48,7 +52,9 @@ const calcFee = ({ amountIn, amountOut }, feeRatio) => {
   } else if (amountOut.brand === feeRatio.numerator.brand) {
     sameBrandAmount = amountOut;
   } else {
-    throw Fail`feeRatio's brand (${feeRatio.numerator.brand}) must match one of the amounts [${amountIn}, ${amountOut}].`;
+    assert.fail(
+      X`feeRatio's brand (${feeRatio.numerator.brand}) must match one of the amounts [${amountIn}, ${amountOut}].`,
+    );
   }
 
   // Always round fees up
@@ -56,7 +62,7 @@ const calcFee = ({ amountIn, amountOut }, feeRatio) => {
 
   // Fee cannot exceed the amount on which it is levied
   AmountMath.isGTE(sameBrandAmount, fee) ||
-    Fail`The feeRatio can't be greater than 1 ${feeRatio}`;
+    assert.fail(X`The feeRatio can't be greater than 1 ${feeRatio}`);
 
   return fee;
 };

package/src/vpool-xyk-amm/constantProduct/calcSwapPrices.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 import { Far } from '@endo/marshal';
 
 import { swap } from './swap.js';