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

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

@@ -1,14 +1,18 @@
+// @ts-check
+
 import { AmountMath } from '@agoric/ertp';
 
 import { natSafeMath } from '@agoric/zoe/src/contractSupport/index.js';
 import { makeRatioFromAmounts } from '@agoric/zoe/src/contractSupport/ratio.js';
 import { getXY } from './getXY.js';
 
-const { Fail } = assert;
+const { details: X } = assert;
 
 const assertSingleBrand = ratio => {
   ratio.numerator.brand === ratio.denominator.brand ||
-    Fail`Ratio was expected to have same brand in numerator ${ratio.numerator.brand} and denominator ${ratio.denominator.brand}`;
+    assert.fail(
+      X`Ratio was expected to have same brand in numerator ${ratio.numerator.brand} and denominator ${ratio.denominator.brand}`,
+    );
 };
 
 /**
@@ -16,9 +20,9 @@ const assertSingleBrand = ratio => {
  * in favor of the amount brand. This is necessary because the ratio is produced
  * by dividing assets of the opposite brand.
  *
- * @param {Amount<'nat'>} amount
+ * @param {Amount} amount
  * @param {Ratio} ratio
- * @returns {Amount<'nat'>}
+ * @returns {Amount}
  */
 const floorMultiplyKeepBrand = (amount, ratio) => {
   assertSingleBrand(ratio);
@@ -34,9 +38,9 @@ const floorMultiplyKeepBrand = (amount, ratio) => {
  * in favor of the amount brand. This is necessary because the ratio is produced
  * by dividing assets of the opposite brand.
  *
- * @param {Amount<'nat'>} amount
+ * @param {Amount} amount
  * @param {Ratio} ratio
- * @returns {Amount<'nat'>}
+ * @returns {Amount}
  */
 const ceilMultiplyKeepBrand = (amount, ratio) => {
   assertSingleBrand(ratio);
@@ -57,10 +61,10 @@ const ceilMultiplyKeepBrand = (amount, ratio) => {
  * deltaY = (deltaXOverX/(1 + deltaXOverX))*y
  * Equivalently: (deltaX / (deltaX + x)) * y
  *
- * @param {Amount<'nat'>} x - the amount of Brand X in pool
- * @param {Amount<'nat'>} y - the amount of Brand Y the pool
- * @param {Amount<'nat'>} deltaX - the amount of Brand X to be added
- * @returns {Amount<'nat'>} deltaY - the amount of Brand Y to be taken out
+ * @param {Amount} x - the amount of Brand X in pool
+ * @param {Amount} y - the amount of Brand Y the pool
+ * @param {Amount} deltaX - the amount of Brand X to be added
+ * @returns {Amount} deltaY - the amount of Brand Y to be taken out
  */
 export const calcDeltaYSellingX = (x, y, deltaX) => {
   const deltaXPlusX = AmountMath.add(deltaX, x);
@@ -79,10 +83,10 @@ export const calcDeltaYSellingX = (x, y, deltaX) => {
  * deltaX = (deltaYOverY/(1 - deltaYOverY))*x
  * Equivalently: (deltaY / (Y - deltaY )) * x
  *
- * @param {Amount<'nat'>} x - the amount of Brand X in the pool
- * @param {Amount<'nat'>} y - the amount of Brand Y in the pool
- * @param {Amount<'nat'>} deltaY - the amount of Brand Y to be taken out
- * @returns {Amount<'nat'>} deltaX - the amount of Brand X to be added
+ * @param {Amount} x - the amount of Brand X in the pool
+ * @param {Amount} y - the amount of Brand Y in the pool
+ * @param {Amount} deltaY - the amount of Brand Y to be taken out
+ * @returns {Amount} deltaX - the amount of Brand X to be added
  */
 export const calcDeltaXSellingX = (x, y, deltaY) => {
   const yMinusDeltaY = AmountMath.subtract(y, deltaY);
@@ -104,7 +108,9 @@ const swapInReduced = ({ x, y, deltaX: offeredAmountIn }) => {
   const amountOut = calcDeltaYSellingX(x, y, offeredAmountIn);
   const reducedAmountIn = calcDeltaXSellingX(x, y, amountOut);
   AmountMath.isGTE(offeredAmountIn, reducedAmountIn) ||
-    Fail`The trade would have required ${reducedAmountIn} more than was offered ${offeredAmountIn}`;
+    assert.fail(
+      X`The trade would have required ${reducedAmountIn} more than was offered ${offeredAmountIn}`,
+    );
 
   return harden({
     amountIn: reducedAmountIn,
@@ -124,7 +130,9 @@ const swapOutImproved = ({ x, y, deltaY: wantedAmountOut }) => {
   const amountIn = calcDeltaXSellingX(x, y, wantedAmountOut);
   const improvedAmountOut = calcDeltaYSellingX(x, y, amountIn);
   AmountMath.isGTE(improvedAmountOut, wantedAmountOut) ||
-    Fail`The trade would have returned ${improvedAmountOut} less than was wanted ${wantedAmountOut}`;
+    assert.fail(
+      X`The trade would have returned ${improvedAmountOut} less than was wanted ${wantedAmountOut}`,
+    );
 
   return harden({
     amountIn,

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

@@ -1,3 +1,5 @@
+// @ts-check
+
 export const BASIS_POINTS = 10000n;
 export const DEFAULT_POOL_FEE = 24n; // 0.0024 or .24%
 export const DEFAULT_PROTOCOL_FEE = 6n; // .0006 or .06%

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

@@ -1,7 +1,9 @@
+// @ts-check
+
 // This does not support secondary to secondary. That has to happen at
 // a higher abstraction
 
-const { Fail } = assert;
+const { details: X } = assert;
 /**
  * The caller provides poolAllocation, which has balances for both Central and
  * Secondary, and at least one of amountGiven and amountWanted. getXY treats
@@ -21,7 +23,9 @@ export const getXY = ({ amountGiven, poolAllocation, amountWanted }) => {
   const centralBrand = poolAllocation.Central.brand;
   amountGiven ||
     amountWanted ||
-    Fail`At least one of ${amountGiven} and ${amountWanted} must be specified`;
+    assert.fail(
+      X`At least one of ${amountGiven} and ${amountWanted} must be specified`,
+    );
 
   const deltas = {
     deltaX: amountGiven,

package/src/vpool-xyk-amm/constantProduct/internal-types.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 /**
  * @typedef {object} ImprovedNoFeeSwapResult
  * @property {Amount<'nat'>} amountIn
@@ -41,9 +43,9 @@
 
 /**
  * @callback CalculateFees
- * @param {Amount<'nat'>} amountGiven
+ * @param {Amount} amountGiven
  * @param {PoolAllocation} poolAllocation
- * @param {Amount<'nat'>} amountWanted
+ * @param {Amount} amountWanted
  * @param {Ratio} protocolFeeRatio
  * @param {Ratio} poolFeeRatio
  * @param {NoFeeSwapFn} swapFn
@@ -52,9 +54,9 @@
 
 /**
  * @callback InternalSwap
- * @param {Amount<'nat'>} amountGiven
+ * @param {Amount} amountGiven
  * @param {PoolAllocation} poolAllocation
- * @param {Amount<'nat'>} amountWanted
+ * @param {Amount} amountWanted
  * @param {Ratio} protocolFeeRatio
  * @param {Ratio} poolFeeRatio
  * @param {NoFeeSwapFn} swapFn
@@ -89,18 +91,18 @@
 
 /**
  * @typedef {object} GetXYResultDeltaX
- * @property {Amount<'nat'>} x
- * @property {Amount<'nat'>} y
- * @property {Amount<'nat'>} deltaX
- * @property {Amount<'nat'>|undefined} deltaY
+ * @property {Amount} x
+ * @property {Amount} y
+ * @property {Amount} deltaX
+ * @property {Amount|undefined} deltaY
  */
 
 /**
  * @typedef {object} GetXYResultDeltaY
- * @property {Amount<'nat'>} x
- * @property {Amount<'nat'>} y
- * @property {Amount<'nat'>} deltaY
- * @property {Amount<'nat'>|undefined} deltaX
+ * @property {Amount} x
+ * @property {Amount} y
+ * @property {Amount} deltaY
+ * @property {Amount|undefined} deltaX
  */
 
 /**

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

@@ -1,4 +1,6 @@
-import { Fail } from '@agoric/assert';
+// @ts-check
+
+import { assert, details as X } from '@agoric/assert';
 import { AmountMath } from '@agoric/ertp';
 
 import { natSafeMath } from '@agoric/zoe/src/contractSupport/index.js';
@@ -28,12 +30,14 @@ export const checkKInvariantSellingX = (x, y, deltaX, deltaY) => {
  * @param {Amount} deltaY - the amount of Brand Y to be taken out
  */
 export const assertKInvariantSellingX = (x, y, deltaX, deltaY) => {
-  checkKInvariantSellingX(x, y, deltaX, deltaY) ||
-    Fail`the constant product invariant was violated, with x=${x}, y=${y}, deltaX=${deltaX}, deltaY=${deltaY}, oldK=${natSafeMath.multiply(
+  assert(
+    checkKInvariantSellingX(x, y, deltaX, deltaY),
+    X`the constant product invariant was violated, with x=${x}, y=${y}, deltaX=${deltaX}, deltaY=${deltaY}, oldK=${natSafeMath.multiply(
       x.value,
       y.value,
     )}, newK=${natSafeMath.multiply(
       AmountMath.add(x, deltaX).value,
       AmountMath.subtract(y, deltaY).value,
-    )}`;
+    )}`,
+  );
 };

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

@@ -1,7 +1,9 @@
+// @ts-check
+
 import { AmountMath } from '@agoric/ertp';
 import { calculateFees, amountGT } from './calcFees.js';
 
-const { Fail } = assert;
+const { details: X } = assert;
 
 /**
  * The fee might not be in the same brand as the amount. If they are the same,
@@ -10,9 +12,9 @@ const { Fail } = assert;
  * We return empty if the fee is larger because an empty amount indicates that
  * the trader didn't place a limit on the inputAmount.
  *
- * @param {Amount<'nat'>} amount
- * @param {Amount<'nat'>} fee
- * @returns {Amount<'nat'>}
+ * @param {Amount} amount
+ * @param {Amount} fee
+ * @returns {Amount}
  */
 const subtractRelevantFees = (amount, fee) => {
   if (amount.brand === fee.brand) {
@@ -29,9 +31,9 @@ const subtractRelevantFees = (amount, fee) => {
  * PoolFee and ProtocolFee each identify their brand. If either (or both) match
  * the brand of the Amount, subtract it/them from the amount.
  *
- * @param {Amount<'nat'>} amount
+ * @param {Amount} amount
  * @param {FeePair} fee
- * @returns {Amount<'nat'>}
+ * @returns {Amount}
  */
 const subtractFees = (amount, { poolFee, protocolFee }) => {
   return subtractRelevantFees(
@@ -44,9 +46,9 @@ const subtractFees = (amount, { poolFee, protocolFee }) => {
  * The fee might not be in the same brand as the amount. If they are the same,
  * add the fee to the amount. Otherwise return the unadjusted amount.
  *
- * @param {Amount<'nat'>} amount
- * @param {Amount<'nat'>} fee
- * @returns {Amount<'nat'>}
+ * @param {Amount} amount
+ * @param {Amount} fee
+ * @returns {Amount}
  */
 const addRelevantFees = (amount, fee) => {
   if (amount.brand === fee.brand) {
@@ -59,9 +61,9 @@ const addRelevantFees = (amount, fee) => {
  * PoolFee and ProtocolFee each identify their brand. If either (or both) match
  * the brand of the Amount, add it/them to the amount.
  *
- * @param {Amount<'nat'>} amount
+ * @param {Amount} amount
  * @param {FeePair} fee
- * @returns {Amount<'nat'>}
+ * @returns {Amount}
  */
 const addFees = (amount, { poolFee, protocolFee }) => {
   return addRelevantFees(addRelevantFees(amount, protocolFee), poolFee);
@@ -75,10 +77,10 @@ const addFees = (amount, { poolFee, protocolFee }) => {
  *
  * The first parameter specifies whether we're incrementing or decrementing from the pool
  *
- * @param {(amountLeft: Amount<any>, amountRight: Amount<any>, brand?: Brand) => Amount<any>} addOrSub
+ * @param {(amountLeft: Amount, amountRight: Amount, brand?: Brand) => Amount} addOrSub
  * @param {PoolAllocation} poolAllocation
- * @param {Amount<'nat'>} amount
- * @returns {Amount<'nat'>}
+ * @param {Amount} amount
+ * @returns {Amount}
  */
 const addOrSubtractFromPool = (addOrSub, poolAllocation, amount) => {
   if (poolAllocation.Central.brand === amount.brand) {
@@ -94,7 +96,7 @@ const isGreaterThanZero = amount => {
 
 const assertGreaterThanZero = (amount, name) => {
   (amount && isGreaterThanZero(amount)) ||
-    Fail`${name} must be greater than 0: ${amount}`;
+    assert.fail(X`${name} must be greater than 0: ${amount}`);
 };
 
 const isWantedAvailable = (poolAllocation, amountWanted) => {
@@ -111,8 +113,8 @@ const isWantedAvailable = (poolAllocation, amountWanted) => {
  * requested, the proceeds would be empty, etc.) Return a result that says no
  * trade will take place and the pool balances won't change.
  *
- * @param {Amount<'nat'>} amountGiven
- * @param {Amount<'nat'>} amountWanted
+ * @param {Amount} amountGiven
+ * @param {Amount} amountWanted
  * @param {PoolAllocation} poolAllocation
  * @param {Ratio} poolFee
  */

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

@@ -1,3 +1,5 @@
+// @ts-check
+
 /**
  * @callback Maximum
  * @param {Amount} left

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

@@ -1,9 +1,6 @@
+// @ts-check
+
 import { AmountMath } from '@agoric/ertp';
-import {
-  atomicRearrange,
-  fromOnly,
-  toOnly,
-} from '@agoric/zoe/src/contractSupport/index.js';
 import { Far } from '@endo/marshal';
 import { makeFeeRatio } from './constantProduct/calcFees.js';
 import {
@@ -11,7 +8,7 @@ import {
   pricesForStatedOutput,
 } from './constantProduct/calcSwapPrices.js';
 
-const { Fail } = assert;
+const { details: X } = assert;
 
 // Price calculations and swap using a pair of pools. Both pools map between RUN
 // and some collateral. We arrange the trades so collateralInPool will have
@@ -54,26 +51,23 @@ export const makeDoublePool = (
   const centralBrand = inCentral.brand;
   const emptyCentralAmount = AmountMath.makeEmpty(centralBrand);
   centralBrand === outCentral.brand ||
-    Fail`The central brands on the two pools must match: ${centralBrand}, ${outCentral.brand}`;
+    assert.fail(
+      X`The central brands on the two pools must match: ${centralBrand}, ${outCentral.brand}`,
+    );
 
   const allocateGainsAndLosses = (seat, prices) => {
     const inPoolSeat = collateralInPool.getPoolSeat();
     const outPoolSeat = collateralOutPool.getPoolSeat();
 
-    atomicRearrange(
-      zcf,
-      harden([
-        fromOnly(seat, { In: prices.swapperGives }),
-        fromOnly(inPoolSeat, { Central: prices.inPoolDecrement }),
-        fromOnly(outPoolSeat, { Secondary: prices.outPoolDecrement }),
-
-        toOnly(seat, { Out: prices.swapperGets }),
-        toOnly(inPoolSeat, { Secondary: prices.inPoolIncrement }),
-        toOnly(outPoolSeat, { Central: prices.outPoolIncrement }),
-        toOnly(feeSeat, { Fee: prices.protocolFee }),
-      ]),
-    );
+    seat.decrementBy(harden({ In: prices.swapperGives }));
+    inPoolSeat.decrementBy(harden({ Central: prices.inPoolDecrement }));
+    outPoolSeat.decrementBy(harden({ Secondary: prices.outPoolDecrement }));
+    seat.incrementBy(harden({ Out: prices.swapperGets }));
+    inPoolSeat.incrementBy(harden({ Secondary: prices.inPoolIncrement }));
+    outPoolSeat.incrementBy(harden({ Central: prices.outPoolIncrement }));
+    feeSeat.incrementBy(harden({ Fee: prices.protocolFee }));
 
+    zcf.reallocate(outPoolSeat, inPoolSeat, feeSeat, seat);
     seat.exit();
     collateralInPool.updateState();
     collateralOutPool.updateState();

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

@@ -1,3 +1,5 @@
+// @ts-check
+
 import { natSafeMath } from '@agoric/zoe/src/contractSupport/index.js';
 import { AmountMath } from '@agoric/ertp';
 import { BASIS_POINTS } from './constantProduct/defaults.js';

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

@@ -1,3 +1,5 @@
+// @ts-check
+
 import '@agoric/zoe/exported.js';
 
 import { AssetKind, makeIssuerKit } from '@agoric/ertp';
@@ -34,7 +36,7 @@ import { publicPrices } from './pool.js';
 import { makeMakeRemoveLiquidityInvitation } from './removeLiquidity.js';
 import { makeMakeSwapInvitation } from './swap.js';
 
-import '@agoric/governance/exported.js';
+import '@agoric/governance/src/exported.js';
 
 const { quote: q, details: X } = assert;
 
@@ -56,7 +58,7 @@ const trace = makeTracer('XykAmm', false);
  * secondaryBrandToLiquidityMint: WeakMapStore<Brand,ZCFMint<'nat'>>,
  * centralBrand: Brand,
  * timer: TimerService,
- * quoteIssuerKit: IssuerKit<'set'>,
+ * quoteIssuerKit: IssuerKit,
  * params: import('@agoric/governance/src/contractGovernance/typedParamManager').Getters<import('./params.js').AmmParams>,
  * protocolSeat: ZCFSeat,
  * }>} AmmPowers
@@ -244,7 +246,7 @@ const start = async (zcf, privateArgs, baggage) => {
     : undefined;
 
   /**
-   * @param {Brand<'nat'>} secondaryBrand
+   * @param {Brand} secondaryBrand
    * @param {ZCFSeat} reserveLiquidityTokenSeat
    * @param {Keyword} liquidityKeyword
    * @returns {Promise<void>} up to caller whether to await or handle rejections

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

@@ -1,3 +1,5 @@
+// @ts-check
+
 import { CONTRACT_ELECTORATE, ParamTypes } from '@agoric/governance';
 
 export const POOL_FEE_KEY = 'PoolFee';

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

@@ -1,3 +1,5 @@
+// @ts-check
+
 import '@agoric/zoe/exported.js';
 
 import { AmountMath, isNatValue } from '@agoric/ertp';
@@ -7,7 +9,6 @@ import {
   calcLiqValueToMint,
   calcSecondaryRequired,
   calcValueToRemove,
-  atomicRearrange,
 } from '@agoric/zoe/src/contractSupport/index.js';
 
 import { E } from '@endo/eventual-send';
@@ -85,7 +86,7 @@ export const definePoolKind = (baggage, ammPowers, storageNode, marshaller) => {
   /**
    * @param {ZCFMint<'nat'>} liquidityZcfMint
    * @param {ZCFSeat} poolSeat
-   * @param {Brand<'nat'>} secondaryBrand
+   * @param {Brand} secondaryBrand
    * @returns {ImmutableState & MutableState}
    */
   const poolInit = (liquidityZcfMint, poolSeat, secondaryBrand) => {
@@ -253,21 +254,18 @@ export const definePoolKind = (baggage, ammPowers, storageNode, marshaller) => {
         ),
       );
 
-      atomicRearrange(
-        ammPowers.zcf,
-        harden([
-          [userSeat, poolSeat, { Liquidity: liquidityIn }],
-          [
-            poolSeat,
-            userSeat,
-            {
-              Central: centralTokenAmountOut,
-              Secondary: tokenKeywordAmountOut,
-            },
-          ],
-        ]),
+      poolSeat.incrementBy(
+        userSeat.decrementBy(harden({ Liquidity: liquidityIn })),
       );
-
+      userSeat.incrementBy(
+        poolSeat.decrementBy(
+          harden({
+            Central: centralTokenAmountOut,
+            Secondary: tokenKeywordAmountOut,
+          }),
+        ),
+      );
+      ammPowers.zcf.reallocate(userSeat, poolSeat);
       state.liqTokenSupply -= liquidityValueIn;
 
       userSeat.exit();

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

@@ -1,3 +1,5 @@
+// @ts-check
+
 import { AmountMath } from '@agoric/ertp';
 import {
   makeNotifierFromSubscriber,
@@ -17,7 +19,7 @@ import { makeOnewayPriceAuthorityKit } from '@agoric/zoe/src/contractSupport/ind
  * @param {Brand} actualBrandOut
  * @param {TimerService} timer
  * @param {Subscriber<import('./pool').NotificationState>} subscriber
- * @param {IssuerKit<'set'>} quoteIssuerKit
+ * @param {IssuerKit} quoteIssuerKit
  * @returns {PriceAuthority}
  */
 export const makePriceAuthority = (

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

@@ -1,3 +1,5 @@
+// @ts-check
+
 import { assertProposalShape } from '@agoric/zoe/src/contractSupport/index.js';
 
 import '@agoric/zoe/exported.js';

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

@@ -1,8 +1,5 @@
-import {
-  atomicRearrange,
-  fromOnly,
-  toOnly,
-} from '@agoric/zoe/src/contractSupport/index.js';
+// @ts-check
+
 import { makeFeeRatio } from './constantProduct/calcFees.js';
 import {
   pricesForStatedInput,
@@ -22,32 +19,20 @@ export const makeSinglePool = ammPowers => ({
     const { pool } = context.facets;
     const { poolSeat } = context.state;
     const { zcf, protocolSeat } = ammPowers;
-    const inBrand = prices.swapperGives.brand;
-
-    /** @type {import('@agoric/zoe/src/contractSupport/atomicTransfer.js').TransferPart[]} */
-    const xfer = harden(
-      inBrand === getSecondaryBrand(pool)
-        ? [
-            fromOnly(poolSeat, { Central: prices.yDecrement }),
-            toOnly(poolSeat, { Secondary: prices.xIncrement }),
-          ]
-        : [
-            fromOnly(poolSeat, { Secondary: prices.yDecrement }),
-            toOnly(poolSeat, { Central: prices.xIncrement }),
-          ],
-    );
-
-    atomicRearrange(
-      zcf,
-      harden([
-        fromOnly(seat, { In: prices.swapperGives }),
+    seat.decrementBy(harden({ In: prices.swapperGives }));
+    seat.incrementBy(harden({ Out: prices.swapperGets }));
+    protocolSeat.incrementBy(harden({ Fee: prices.protocolFee }));
 
-        toOnly(seat, { Out: prices.swapperGets }),
-        toOnly(protocolSeat, { Fee: prices.protocolFee }),
+    const inBrand = prices.swapperGives.brand;
+    if (inBrand === getSecondaryBrand(pool)) {
+      poolSeat.decrementBy(harden({ Central: prices.yDecrement }));
+      poolSeat.incrementBy(harden({ Secondary: prices.xIncrement }));
+    } else {
+      poolSeat.decrementBy(harden({ Secondary: prices.yDecrement }));
+      poolSeat.incrementBy(harden({ Central: prices.xIncrement }));
+    }
 
-        ...xfer,
-      ]),
-    );
+    zcf.reallocate(poolSeat, seat, protocolSeat);
     seat.exit();
     pool.updateState();
     return `Swap successfully completed.`;

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

@@ -1,3 +1,4 @@
+// @ts-check
 import { assertProposalShape } from '@agoric/zoe/src/contractSupport/index.js';
 
 import '@agoric/zoe/exported.js';

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

@@ -1,3 +1,5 @@
+// @ts-check
+
 /**
  * @typedef {object} VPoolPriceQuote
  * @property {Amount<'nat'>} amountIn
@@ -69,12 +71,12 @@
 /**
  * @typedef {object} XYKPool
  * @property {() => bigint} getLiquiditySupply
- * @property {() => Issuer<'nat'>} getLiquidityIssuer
+ * @property {() => Issuer} getLiquidityIssuer
  * @property {(seat: ZCFSeat) => string} addLiquidity
  * @property {(seat: ZCFSeat) => string} removeLiquidity
  * @property {() => ZCFSeat} getPoolSeat
- * @property {() => Amount<'nat'>} getSecondaryAmount
- * @property {() => Amount<'nat'>} getCentralAmount
+ * @property {() => Amount} getSecondaryAmount
+ * @property {() => Amount} getCentralAmount
  * @property {() => Subscriber<Record<string, Amount>>} getSubscriber
  * @property {() => void} updateState
  * @property {() => PriceAuthority} getToCentralPriceAuthority
@@ -100,7 +102,7 @@
  * @typedef {object} XYKAMMPublicFacet
  * @property {() => Promise<Invitation>} addPoolInvitation
  * add a new liquidity pool
- * @property {(secondaryIssuer: ERef<Issuer>, keyword: Keyword) => Promise<Issuer<'nat'>>} addIssuer
+ * @property {(secondaryIssuer: ERef<Issuer>, keyword: Keyword) => Promise<Issuer>} addIssuer
  * @property {() => Promise<Invitation>} makeSwapInvitation synonym for
  * makeSwapInInvitation
  * @property {() => Promise<Invitation>} makeSwapInInvitation make an invitation
@@ -116,24 +118,24 @@
  * ratio of collateral to Central.
  * @property {() => Promise<Invitation>} makeRemoveLiquidityInvitation make an
  * invitation that allows one to remove liquidity from the pool.
- * @property {(brand: Brand<'nat'>) => Issuer<'nat'>} getLiquidityIssuer
- * @property {(brand: Brand<'nat'>) => bigint} getLiquiditySupply get the current value of
+ * @property {(brand: Brand) => Issuer} getLiquidityIssuer
+ * @property {(brand: Brand) => bigint} getLiquiditySupply get the current value of
  * liquidity in the pool for brand held by investors.
- * @property {(brand: Brand<'nat'>) => Issuer<'nat'>} getSecondaryIssuer
+ * @property {(brand: Brand) => Issuer} getSecondaryIssuer
  * @property {(amountIn: Amount, amountOut: Amount) => VPoolPriceQuote} getInputPrice
  * calculate the amount of brandOut that will be returned if the amountIn is
  * offered using makeSwapInInvitation at the current price.
  * @property {(amountOut: Amount, amountIn: Amount) => VPoolPriceQuote} getOutputPrice
  * calculate the amount of brandIn that is required in order to get amountOut
  * using makeSwapOutInvitation at the current price
- * @property {(brand: Brand) => Record<string, Amount<'nat'>>} getPoolAllocation get an
+ * @property {(brand: Brand) => Record<string, Amount>} getPoolAllocation get an
  * AmountKeywordRecord showing the current balances in the pool for brand.
- * @property {() => Issuer<'nat'>} getQuoteIssuer - get the Issuer that attests to
+ * @property {() => Issuer} getQuoteIssuer - get the Issuer that attests to
  * the prices in the priceQuotes issued by the PriceAuthorities
  * @property {(brand: Brand) => {toCentral: PriceAuthority, fromCentral: PriceAuthority}} getPriceAuthorities
  * get a pair of PriceAuthorities { toCentral, fromCentral } for requesting
  * Prices and notifications about changing prices.
- * @property {() => Brand<'nat'>[]} getAllPoolBrands
+ * @property {() => Brand[]} getAllPoolBrands
  * @property {() => Allocation} getProtocolPoolBalance
  * @property {() => StoredSubscription<MetricsNotification>} getMetrics
  * @property {(brand: Brand) => StoredSubscription<PoolMetricsNotification>} getPoolMetrics