@agoric/inter-protocol 0.13.4-pismo-dev-0d5327f.0 → 0.14.0

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

@@ -1,61 +0,0 @@
-// @ts-check
-
-import { CONTRACT_ELECTORATE, ParamTypes } from '@agoric/governance';
-
-export const POOL_FEE_KEY = 'PoolFee';
-export const PROTOCOL_FEE_KEY = 'ProtocolFee';
-export const MIN_INITIAL_POOL_LIQUIDITY_KEY = 'MinInitialPoolLiquidity';
-
-const DEFAULT_POOL_FEE_BP = 24n;
-const DEFAULT_PROTOCOL_FEE_BP = 6n;
-
-/**
- * @param {Invitation} electorateInvitation - invitation for the question poser
- * @param {bigint} protocolFeeBP
- * @param {bigint} poolFeeBP
- * @param {Amount<'nat'>} minInitialLiquidity
- */
-const makeAmmParams = (
-  electorateInvitation,
-  protocolFeeBP,
-  poolFeeBP,
-  minInitialLiquidity,
-) => {
-  return harden({
-    [POOL_FEE_KEY]: { type: ParamTypes.NAT, value: poolFeeBP },
-    [PROTOCOL_FEE_KEY]: { type: ParamTypes.NAT, value: protocolFeeBP },
-    [MIN_INITIAL_POOL_LIQUIDITY_KEY]: {
-      type: ParamTypes.AMOUNT,
-      value: minInitialLiquidity,
-    },
-    [CONTRACT_ELECTORATE]: {
-      type: ParamTypes.INVITATION,
-      value: electorateInvitation,
-    },
-  });
-};
-
-/** @typedef {import('@agoric/governance/src/contractGovernance/typedParamManager').ParamTypesMapFromRecord<ReturnType<typeof makeAmmParams>>} AmmParams */
-
-const makeAmmTerms = (
-  timer,
-  poserInvitationAmount,
-  minInitialLiquidity,
-  protocolFeeBP = DEFAULT_PROTOCOL_FEE_BP,
-  poolFeeBP = DEFAULT_POOL_FEE_BP,
-) => ({
-  timer,
-  poolFeeBP,
-  protocolFeeBP,
-  governedParams: makeAmmParams(
-    poserInvitationAmount,
-    protocolFeeBP,
-    poolFeeBP,
-    minInitialLiquidity,
-  ),
-});
-
-harden(makeAmmTerms);
-harden(makeAmmParams);
-
-export { makeAmmTerms, makeAmmParams };

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

@@ -1,396 +0,0 @@
-// @ts-check
-
-import '@agoric/zoe/exported.js';
-
-import { AmountMath, isNatValue } from '@agoric/ertp';
-import { makeStoredPublishKit } from '@agoric/notifier';
-import { vivifyKindMulti } from '@agoric/vat-data';
-import {
-  calcLiqValueToMint,
-  calcSecondaryRequired,
-  calcValueToRemove,
-} from '@agoric/zoe/src/contractSupport/index.js';
-
-import { E } from '@endo/eventual-send';
-import { makeMetricsPublisherKit } from '../contractSupport.js';
-import { makePriceAuthority } from './priceAuthority.js';
-import { makeSinglePool } from './singlePool.js';
-
-// Pools represent a single pool of liquidity. Price calculations and trading
-// happen in a wrapper class that knows whether the proposed trade involves a
-// single pool or multiple hops.
-
-export const publicPrices = prices => {
-  return { amountIn: prices.swapperGives, amountOut: prices.swapperGets };
-};
-
-/** @typedef {{ liquidityIssuerRecord: IssuerRecord<'nat'> }} InitPublication */
-
-/** @typedef {{ central: Amount, secondary: Amount }} NotificationState */
-
-/**
- * @typedef {Readonly<{
- * poolSeat: ZCFSeat,
- * secondaryBrand: Brand<'nat'>,
- * liquidityZcfMint: ZCFMint,
- * }>} ImmutableState
- */
-
-/** @typedef {{liqTokenSupply: bigint}} MutableState */
-
-/**
- * @typedef {{
- *   addLiquidityInternal: AddLiquidityInternal,
- *   addLiquidityActual: AddLiquidityActual,
- *   updateMetrics: () => void,
- * }} HelperFacet
- */
-
-/**
- * @typedef {{
- *   state: ImmutableState & MutableState,
- *   facets: {
- *     helper: HelperFacet,
- *     pool: XYKPool,
- *     singlePool: VirtualPool,
- *   },
- * }} MethodContext
- *
- * @typedef {object} PoolMetricsNotification
- * @property {Amount} centralAmount
- * @property {Amount} secondaryAmount
- * @property {Amount} liquidityTokens - outstanding tokens
- */
-
-/** @typedef {import('@agoric/vat-data').Baggage} Baggage */
-/** @typedef {import('./multipoolMarketMaker.js').AmmPowers} AmmPowers */
-
-/**
- * @param {Baggage} baggage
- * @param {AmmPowers} ammPowers
- * @param {ERef<StorageNode>} storageNode
- * @param {ERef<Marshaller>} marshaller
- */
-export const definePoolKind = (baggage, ammPowers, storageNode, marshaller) => {
-  /** @type {StoredPublishKit<NotificationState>} */
-  const { subscriber, publisher } = makeStoredPublishKit(
-    storageNode,
-    marshaller,
-  );
-  /** @type {import('../contractSupport.js').MetricsPublisherKit<PoolMetricsNotification>} */
-  const { metricsPublication, metricsSubscription } = makeMetricsPublisherKit(
-    storageNode,
-    marshaller,
-  );
-
-  /**
-   * @param {ZCFMint<'nat'>} liquidityZcfMint
-   * @param {ZCFSeat} poolSeat
-   * @param {Brand} secondaryBrand
-   * @returns {ImmutableState & MutableState}
-   */
-  const poolInit = (liquidityZcfMint, poolSeat, secondaryBrand) => {
-    /** @type {StoredPublishKit<InitPublication>} */
-    const { publisher: initPublisher } = makeStoredPublishKit(
-      E(storageNode).makeChildNode('init'),
-      marshaller,
-    );
-    initPublisher.finish({
-      liquidityIssuerRecord: liquidityZcfMint.getIssuerRecord(),
-    });
-
-    return {
-      liqTokenSupply: 0n,
-      poolSeat,
-      secondaryBrand,
-      liquidityZcfMint,
-    };
-  };
-
-  /** @param {MethodContext} context */
-  const makePriceGetters = context => {
-    const getPAInputPrice = (amountIn, brandOut) => {
-      return publicPrices(
-        context.facets.singlePool.getPriceForInput(
-          amountIn,
-          AmountMath.makeEmpty(brandOut),
-        ),
-      );
-    };
-    const getPAOutputPrice = (brandIn, amountout) =>
-      publicPrices(
-        context.facets.singlePool.getPriceForOutput(
-          AmountMath.makeEmpty(brandIn),
-          amountout,
-        ),
-      );
-    return { getPAInputPrice, getPAOutputPrice };
-  };
-
-  let toCentralPriceAuthority;
-  const provideToCentralPriceAuthority = context => {
-    if (!toCentralPriceAuthority) {
-      const { getPAInputPrice, getPAOutputPrice } = makePriceGetters(context);
-      const { secondaryBrand } = context.state;
-      const { quoteIssuerKit } = ammPowers;
-      toCentralPriceAuthority = makePriceAuthority(
-        getPAInputPrice,
-        getPAOutputPrice,
-        secondaryBrand,
-        ammPowers.centralBrand,
-        ammPowers.timer,
-        subscriber,
-        quoteIssuerKit,
-      );
-    }
-    return toCentralPriceAuthority;
-  };
-
-  let fromCentralPriceAuthority;
-  const provideFromCentralPriceAuthority = context => {
-    if (!fromCentralPriceAuthority) {
-      const { getPAInputPrice, getPAOutputPrice } = makePriceGetters(context);
-      const { secondaryBrand } = context.state;
-      const quoteIssuerKit = ammPowers.quoteIssuerKit;
-      fromCentralPriceAuthority = makePriceAuthority(
-        getPAInputPrice,
-        getPAOutputPrice,
-        ammPowers.centralBrand,
-        secondaryBrand,
-        ammPowers.timer,
-        subscriber,
-        quoteIssuerKit,
-      );
-    }
-    return fromCentralPriceAuthority;
-  };
-
-  const poolBehavior = {
-    getLiquiditySupply: ({ state: { liqTokenSupply } }) => liqTokenSupply,
-    getLiquidityIssuer: ({ state: { liquidityZcfMint } }) =>
-      liquidityZcfMint.getIssuerRecord().issuer,
-    getPoolSeat: ({ state: { poolSeat } }) => poolSeat,
-    getCentralAmount: ({ state: { poolSeat } }) =>
-      poolSeat.getAmountAllocated('Central', ammPowers.centralBrand),
-    getSecondaryAmount: ({ state }) =>
-      state.poolSeat.getAmountAllocated('Secondary', state.secondaryBrand),
-
-    /**
-     * @param {MethodContext} context
-     * @param {ZCFSeat} zcfSeat
-     * @returns {string}
-     */
-    addLiquidity: ({ state, facets }, zcfSeat) => {
-      const { helper, pool } = facets;
-      const centralIn = zcfSeat.getStagedAllocation().Central;
-      assert(isNatValue(centralIn.value), 'User Central');
-      const secondaryIn = zcfSeat.getStagedAllocation().Secondary;
-      assert(isNatValue(secondaryIn.value), 'User Secondary');
-
-      if (state.liqTokenSupply === 0n) {
-        return helper.addLiquidityActual(pool, zcfSeat, secondaryIn, centralIn);
-      }
-
-      const centralPoolAmount = pool.getCentralAmount();
-      const secondaryPoolAmount = pool.getSecondaryAmount();
-      assert(isNatValue(centralPoolAmount.value), 'Pool Central');
-      assert(isNatValue(secondaryPoolAmount.value), 'Pool Secondary');
-
-      // To calculate liquidity, we'll need to calculate alpha from the primary
-      // token's value before, and the value that will be added to the pool
-      const secondaryRequired = AmountMath.make(
-        state.secondaryBrand,
-        calcSecondaryRequired(
-          centralIn.value,
-          centralPoolAmount.value,
-          secondaryPoolAmount.value,
-          secondaryIn.value,
-        ),
-      );
-
-      // Central was specified precisely so offer must provide enough secondary.
-      assert(
-        AmountMath.isGTE(secondaryIn, secondaryRequired),
-        'insufficient Secondary deposited',
-      );
-
-      return helper.addLiquidityActual(
-        pool,
-        zcfSeat,
-        secondaryRequired,
-        centralPoolAmount,
-      );
-    },
-    removeLiquidity: ({ state, facets }, userSeat) => {
-      const { liquidityZcfMint, poolSeat, secondaryBrand } = state;
-      const liquidityBrand = liquidityZcfMint.getIssuerRecord().brand;
-      const liquidityIn = userSeat.getAmountAllocated(
-        'Liquidity',
-        liquidityBrand,
-      );
-      if (AmountMath.isEmpty(liquidityIn)) {
-        // prevent divide-by-zero. If the caller has tokens, the pool is not empty
-        userSeat.exit();
-        return 'request to remove zero liquidity';
-      }
-
-      const liquidityValueIn = liquidityIn.value;
-      assert(isNatValue(liquidityValueIn), 'User Liquidity');
-      const centralTokenAmountOut = AmountMath.make(
-        ammPowers.centralBrand,
-        calcValueToRemove(
-          state.liqTokenSupply,
-          facets.pool.getCentralAmount().value,
-          liquidityValueIn,
-        ),
-      );
-
-      const tokenKeywordAmountOut = AmountMath.make(
-        secondaryBrand,
-        calcValueToRemove(
-          state.liqTokenSupply,
-          facets.pool.getSecondaryAmount().value,
-          liquidityValueIn,
-        ),
-      );
-
-      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();
-      facets.pool.updateState();
-      return 'Liquidity successfully removed.';
-    },
-    getSubscriber: () => subscriber,
-    /**
-     * Update metrics and primary state
-     *
-     * @param {MethodContext} context
-     */
-    updateState: ({ facets: { pool, helper } }) => {
-      helper.updateMetrics();
-      publisher.publish({
-        central: pool.getCentralAmount(),
-        secondary: pool.getSecondaryAmount(),
-      });
-    },
-
-    /** @deprecated priceAuthorities will not be provided by the AMM */
-    getToCentralPriceAuthority: provideToCentralPriceAuthority,
-    /** @deprecated priceAuthorities will not be provided by the AMM */
-    getFromCentralPriceAuthority: provideFromCentralPriceAuthority,
-
-    /** @param {MethodContext} context */
-    getVPool: ({ facets }) => facets.singlePool,
-    getMetrics: () => metricsSubscription,
-  };
-
-  /** @param {MethodContext} context */
-  const finish = context => {
-    context.facets.helper.updateMetrics();
-  };
-
-  const helperBehavior = {
-    /** @type {import('@agoric/vat-data/src/types').PlusContext<MethodContext, AddLiquidityInternal>} */
-    addLiquidityInternal: (
-      { state },
-      zcfSeat,
-      secondaryAmount,
-      poolCentralAmount,
-      feeSeat,
-    ) => {
-      const { poolSeat, liquidityZcfMint } = state;
-      // addLiquidity can't be called until the pool has been created. We verify
-      // that the asset is NAT before creating a pool.
-
-      const liquidityValueOut = calcLiqValueToMint(
-        state.liqTokenSupply,
-        // @ts-expect-error value could be not Nat
-        zcfSeat.getStagedAllocation().Central.value,
-        poolCentralAmount.value,
-      );
-
-      const liquidityAmountOut = AmountMath.make(
-        liquidityZcfMint.getIssuerRecord().brand,
-        liquidityValueOut,
-      );
-      liquidityZcfMint.mintGains(
-        harden({ Liquidity: liquidityAmountOut }),
-        poolSeat,
-      );
-      state.liqTokenSupply += liquidityValueOut;
-
-      poolSeat.incrementBy(
-        zcfSeat.decrementBy(
-          harden({
-            Central: zcfSeat.getStagedAllocation().Central,
-            Secondary: secondaryAmount,
-          }),
-        ),
-      );
-
-      zcfSeat.incrementBy(
-        poolSeat.decrementBy(harden({ Liquidity: liquidityAmountOut })),
-      );
-      if (feeSeat) {
-        ammPowers.zcf.reallocate(poolSeat, zcfSeat, feeSeat);
-      } else {
-        ammPowers.zcf.reallocate(poolSeat, zcfSeat);
-      }
-    },
-    /** @type {import('@agoric/vat-data/src/types').PlusContext<MethodContext, AddLiquidityActual>} */
-    addLiquidityActual: (
-      { facets },
-      pool,
-      zcfSeat,
-      secondaryAmount,
-      poolCentralAmount,
-      feeSeat,
-    ) => {
-      const { helper } = facets;
-
-      helper.addLiquidityInternal(
-        zcfSeat,
-        secondaryAmount,
-        poolCentralAmount,
-        feeSeat,
-      );
-      zcfSeat.exit();
-      facets.pool.updateState();
-      return 'Added liquidity.';
-    },
-    /** @param {MethodContext} context */
-    updateMetrics: context => {
-      const { state, facets } = context;
-      const payload = harden({
-        centralAmount: facets.pool.getCentralAmount(),
-        secondaryAmount: facets.pool.getSecondaryAmount(),
-        liquidityTokens: AmountMath.make(
-          state.liquidityZcfMint.getIssuerRecord().brand,
-          state.liqTokenSupply,
-        ),
-      });
-
-      metricsPublication.updateState(payload);
-    },
-  };
-
-  const facets = harden({
-    helper: helperBehavior,
-    pool: poolBehavior,
-    singlePool: makeSinglePool(ammPowers),
-  });
-
-  return vivifyKindMulti(baggage, 'pool', poolInit, facets, { finish });
-};

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

@@ -1,94 +0,0 @@
-// @ts-check
-
-import { AmountMath } from '@agoric/ertp';
-import {
-  makeNotifierFromSubscriber,
-  observeIteration,
-  subscribeLatest,
-} from '@agoric/notifier';
-import { E } from '@endo/eventual-send';
-import { Far } from '@endo/marshal';
-
-import { makeOnewayPriceAuthorityKit } from '@agoric/zoe/src/contractSupport/index.js';
-
-/**
- *
- * @param {*} getOutputForGivenInput
- * @param {*} getInputForWantedOutput
- * @param {Brand} actualBrandIn
- * @param {Brand} actualBrandOut
- * @param {TimerService} timer
- * @param {Subscriber<import('./pool').NotificationState>} subscriber
- * @param {IssuerKit} quoteIssuerKit
- * @returns {PriceAuthority}
- */
-export const makePriceAuthority = (
-  getOutputForGivenInput,
-  getInputForWantedOutput,
-  actualBrandIn,
-  actualBrandOut,
-  timer,
-  subscriber,
-  quoteIssuerKit,
-) => {
-  const { brand, issuer: quoteIssuer } = quoteIssuerKit;
-
-  /** @param {PriceQuoteValue} quote */
-  const authenticateQuote = quote => {
-    const quoteAmount = AmountMath.make(brand, harden(quote));
-    const quotePayment = quoteIssuerKit.mint.mintPayment(quoteAmount);
-    return harden({ quoteAmount, quotePayment });
-  };
-
-  // called by createQuote for each trigger to compare price to trigger level
-  const calcAmountOut = amountIn =>
-    getOutputForGivenInput(amountIn, actualBrandOut).amountOut;
-  const calcAmountIn = amountOut =>
-    getInputForWantedOutput(actualBrandIn, amountOut).amountIn;
-
-  /**
-   * @param {PriceQuery} priceQuery
-   * @returns {ERef<PriceQuote>=}
-   */
-  function createQuote(priceQuery) {
-    const quote = priceQuery(calcAmountOut, calcAmountIn);
-    if (!quote) {
-      return undefined;
-    }
-
-    const { amountIn, amountOut } = quote;
-    return E(timer)
-      .getCurrentTimestamp()
-      .then(now =>
-        authenticateQuote([{ amountIn, amountOut, timer, timestamp: now }]),
-      );
-  }
-
-  const priceAuthorityOptions = harden({
-    timer,
-    createQuote,
-    actualBrandIn,
-    actualBrandOut,
-    quoteIssuer,
-    notifier: makeNotifierFromSubscriber(subscriber),
-  });
-
-  const {
-    priceAuthority,
-    adminFacet: { fireTriggers },
-  } = makeOnewayPriceAuthorityKit(priceAuthorityOptions);
-
-  // An observer on a notifier that gets updated when the pool's balances
-  // change via swap or liquidity operations. It checks the comparison predicate
-  // for each active trigger. Due to `subscribeLatest` below it may drop
-  // intermediate values.
-  const priceObserver = Far('priceObserver', {
-    updateState: () => {
-      void fireTriggers(createQuote);
-    },
-  });
-
-  void observeIteration(subscribeLatest(subscriber), priceObserver);
-
-  return priceAuthority;
-};

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

@@ -1,31 +0,0 @@
-// @ts-check
-
-import { assertProposalShape } from '@agoric/zoe/src/contractSupport/index.js';
-
-import '@agoric/zoe/exported.js';
-
-/**
- * @param {ZCF} zcf
- * @param {(brand: Brand) => XYKPool} getPool
- */
-export const makeMakeRemoveLiquidityInvitation = (zcf, getPool) => {
-  const removeLiquidity = seat => {
-    assertProposalShape(seat, {
-      want: {
-        Central: null,
-        Secondary: null,
-      },
-      give: {
-        Liquidity: null,
-      },
-    });
-    // Get the brand of the secondary token so we can identify the liquidity pool.
-    const secondaryBrand = seat.getProposal().want.Secondary.brand;
-    const pool = getPool(secondaryBrand);
-    return pool.removeLiquidity(seat);
-  };
-
-  const makeRemoveLiquidityInvitation = () =>
-    zcf.makeInvitation(removeLiquidity, 'autoswap remove liquidity');
-  return makeRemoveLiquidityInvitation;
-};

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

@@ -1,73 +0,0 @@
-// @ts-check
-
-import { makeFeeRatio } from './constantProduct/calcFees.js';
-import {
-  pricesForStatedInput,
-  pricesForStatedOutput,
-} from './constantProduct/calcSwapPrices.js';
-
-const getSecondaryBrand = pool => pool.getSecondaryAmount().brand;
-const getCentralBrand = pool => pool.getCentralAmount().brand;
-
-const getPools = pool => ({
-  Central: pool.getCentralAmount(),
-  Secondary: pool.getSecondaryAmount(),
-});
-
-export const makeSinglePool = ammPowers => ({
-  allocateGainsAndLosses: (context, seat, prices) => {
-    const { pool } = context.facets;
-    const { poolSeat } = context.state;
-    const { zcf, protocolSeat } = ammPowers;
-    seat.decrementBy(harden({ In: prices.swapperGives }));
-    seat.incrementBy(harden({ Out: prices.swapperGets }));
-    protocolSeat.incrementBy(harden({ 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 }));
-    }
-
-    zcf.reallocate(poolSeat, seat, protocolSeat);
-    seat.exit();
-    pool.updateState();
-    return `Swap successfully completed.`;
-  },
-
-  /**
-   * @param {import('./pool').MethodContext} context
-   * @param {Amount} amountIn
-   * @param {Amount} amountOut
-   */
-  getPriceForInput: ({ facets }, amountIn, amountOut) => {
-    const { params } = ammPowers;
-    return pricesForStatedInput(
-      amountIn,
-      getPools(facets.pool),
-      amountOut,
-      makeFeeRatio(params.getProtocolFee(), getCentralBrand(facets.pool)),
-      makeFeeRatio(params.getPoolFee(), amountOut.brand),
-    );
-  },
-
-  /**
-   * @param {import('./pool').MethodContext} context
-   * @param {Amount} amountIn
-   * @param {Amount} amountOut
-   */
-  getPriceForOutput: ({ facets }, amountIn, amountOut) => {
-    const { params } = ammPowers;
-    return pricesForStatedOutput(
-      amountIn,
-      getPools(facets.pool),
-      amountOut,
-      makeFeeRatio(params.getProtocolFee(), getCentralBrand(facets.pool)),
-      makeFeeRatio(params.getPoolFee(), amountIn.brand),
-    );
-  },
-});
-harden(makeSinglePool);