@drift-labs/sdk 0.1.33 → 0.1.34-master.0

package/src/math/amm.ts

@@ -7,6 +7,8 @@ import {
 	AMM_TO_QUOTE_PRECISION_RATIO,
 	QUOTE_PRECISION,
 	AMM_RESERVE_PRECISION,
+	BID_ASK_SPREAD_PRECISION,
+	ONE,
 } from '../constants/numericConstants';
 import { calculateBaseAssetValue } from './position';
 import {
@@ -60,7 +62,10 @@ export type AssetType = 'quote' | 'base';
  * @returns quoteAssetReserve and baseAssetReserve after swap. : Precision AMM_RESERVE_PRECISION
  */
 export function calculateAmmReservesAfterSwap(
-	amm: AMM,
+	amm: Pick<
+		AMM,
+		'pegMultiplier' | 'quoteAssetReserve' | 'sqrtK' | 'baseAssetReserve'
+	>,
 	inputAssetType: AssetType,
 	swapAmount: BN,
 	swapDirection: SwapDirection
@@ -93,6 +98,38 @@ export function calculateAmmReservesAfterSwap(
 	return [newQuoteAssetReserve, newBaseAssetReserve];
 }
 
+export function calculateSpreadReserves(
+	amm: AMM,
+	direction: PositionDirection
+): {
+	baseAssetReserve: BN;
+	quoteAssetReserve: BN;
+} {
+	if (amm.baseSpread === 0) {
+		return {
+			baseAssetReserve: amm.baseAssetReserve,
+			quoteAssetReserve: amm.quoteAssetReserve,
+		};
+	}
+
+	const quoteAsserReserveDelta = amm.quoteAssetReserve.div(
+		BID_ASK_SPREAD_PRECISION.div(new BN(amm.baseSpread / 4))
+	);
+
+	let quoteAssetReserve;
+	if (isVariant(direction, 'long')) {
+		quoteAssetReserve = amm.quoteAssetReserve.add(quoteAsserReserveDelta);
+	} else {
+		quoteAssetReserve = amm.quoteAssetReserve.sub(quoteAsserReserveDelta);
+	}
+
+	const baseAssetReserve = amm.sqrtK.mul(amm.sqrtK).div(quoteAssetReserve);
+	return {
+		baseAssetReserve,
+		quoteAssetReserve,
+	};
+}
+
 /**
  * Helper function calculating constant product curve output. Agnostic to whether input asset is quote or base
  *
@@ -288,7 +325,9 @@ export function calculateTerminalPrice(market: Market) {
 
 export function calculateMaxBaseAssetAmountToTrade(
 	amm: AMM,
-	limit_price: BN
+	limit_price: BN,
+	direction: PositionDirection,
+	useSpread: boolean
 ): [BN, PositionDirection] {
 	const invariant = amm.sqrtK.mul(amm.sqrtK);
 
@@ -300,14 +339,24 @@ export function calculateMaxBaseAssetAmountToTrade(
 
 	const newBaseAssetReserve = squareRootBN(newBaseAssetReserveSquared);
 
-	if (newBaseAssetReserve.gt(amm.baseAssetReserve)) {
+	let baseAssetReserveBefore;
+	if (useSpread) {
+		baseAssetReserveBefore = calculateSpreadReserves(
+			amm,
+			direction
+		).baseAssetReserve;
+	} else {
+		baseAssetReserveBefore = amm.baseAssetReserve;
+	}
+
+	if (newBaseAssetReserve.gt(baseAssetReserveBefore)) {
 		return [
-			newBaseAssetReserve.sub(amm.baseAssetReserve),
+			newBaseAssetReserve.sub(baseAssetReserveBefore),
 			PositionDirection.SHORT,
 		];
-	} else if (newBaseAssetReserve.lt(amm.baseAssetReserve)) {
+	} else if (newBaseAssetReserve.lt(baseAssetReserveBefore)) {
 		return [
-			amm.baseAssetReserve.sub(newBaseAssetReserve),
+			baseAssetReserveBefore.sub(newBaseAssetReserve),
 			PositionDirection.LONG,
 		];
 	} else {
@@ -398,3 +447,19 @@ export function calculateBudgetedPeg(market: Market, cost: BN): BN {
 
 	return newPeg;
 }
+
+export function calculateQuoteAssetAmountSwapped(
+	quoteAssetReserves: BN,
+	pegMultiplier: BN,
+	swapDirection: SwapDirection
+): BN {
+	let quoteAssetAmount = quoteAssetReserves
+		.mul(pegMultiplier)
+		.div(AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO);
+
+	if (isVariant(swapDirection, 'remove')) {
+		quoteAssetAmount = quoteAssetAmount.add(ONE);
+	}
+
+	return quoteAssetAmount;
+}

package/src/math/funding.ts

@@ -43,13 +43,9 @@ export async function calculateAllEstimatedFundingRate(
 	const lastMarkPriceTwapTs = market.amm.lastMarkPriceTwapTs;
 
 	const timeSinceLastMarkChange = now.sub(lastMarkPriceTwapTs);
-	const markTwapTimeSinceLastUpdate = 
-		BN.max(
+	const markTwapTimeSinceLastUpdate = BN.max(
 		secondsInHour,
-		BN.max(
-			ZERO,
-			secondsInHour.sub(timeSinceLastMarkChange)
-		)
+		BN.max(ZERO, secondsInHour.sub(timeSinceLastMarkChange))
 	);
 	const baseAssetPriceWithMantissa = calculateMarkPrice(market);
 
@@ -63,7 +59,10 @@ export async function calculateAllEstimatedFundingRate(
 	const lastOracleTwapWithMantissa = market.amm.lastOraclePriceTwap;
 	const lastOraclePriceTwapTs = market.amm.lastOraclePriceTwapTs;
 
-	const oracleInvalidDuration = BN.max(ZERO, lastMarkPriceTwapTs.sub(lastOraclePriceTwapTs));
+	const oracleInvalidDuration = BN.max(
+		ZERO,
+		lastMarkPriceTwapTs.sub(lastOraclePriceTwapTs)
+	);
 
 	const timeSinceLastOracleTwapUpdate = now.sub(lastOraclePriceTwapTs);
 	const oracleTwapTimeSinceLastUpdate = BN.max(
@@ -87,7 +86,11 @@ export async function calculateAllEstimatedFundingRate(
 			.mul(lastOracleTwapWithMantissa)
 			.add(timeSinceLastMarkChange.mul(oraclePrice))
 			.add(oracleInvalidDuration.mul(lastMarkTwapWithMantissa))
-			.div(timeSinceLastMarkChange.add(oracleTwapTimeSinceLastUpdate).add(oracleInvalidDuration));
+			.div(
+				timeSinceLastMarkChange
+					.add(oracleTwapTimeSinceLastUpdate)
+					.add(oracleInvalidDuration)
+			);
 	}
 
 	const twapSpread = lastMarkTwapWithMantissa.sub(lastOracleTwapWithMantissa);

package/src/math/market.ts

@@ -3,6 +3,7 @@ import { Market, PositionDirection } from '../types';
 import {
 	calculateAmmReservesAfterSwap,
 	calculatePrice,
+	calculateSpreadReserves,
 	getSwapDirection,
 } from './amm';
 import { OraclePriceData } from '../oracles/types';
@@ -21,6 +22,44 @@ export function calculateMarkPrice(market: Market): BN {
 	);
 }
 
+/**
+ * Calculates market bid price
+ *
+ * @param market
+ * @return bidPrice : Precision MARK_PRICE_PRECISION
+ */
+export function calculateBidPrice(market: Market): BN {
+	const { baseAssetReserve, quoteAssetReserve } = calculateSpreadReserves(
+		market.amm,
+		PositionDirection.SHORT
+	);
+
+	return calculatePrice(
+		baseAssetReserve,
+		quoteAssetReserve,
+		market.amm.pegMultiplier
+	);
+}
+
+/**
+ * Calculates market ask price
+ *
+ * @param market
+ * @return bidPrice : Precision MARK_PRICE_PRECISION
+ */
+export function calculateAskPrice(market: Market): BN {
+	const { baseAssetReserve, quoteAssetReserve } = calculateSpreadReserves(
+		market.amm,
+		PositionDirection.LONG
+	);
+
+	return calculatePrice(
+		baseAssetReserve,
+		quoteAssetReserve,
+		market.amm.pegMultiplier
+	);
+}
+
 export function calculateNewMarketAfterTrade(
 	baseAssetAmount: BN,
 	direction: PositionDirection,
@@ -48,5 +87,12 @@ export function calculateMarkOracleSpread(
 	oraclePriceData: OraclePriceData
 ): BN {
 	const markPrice = calculateMarkPrice(market);
-	return markPrice.sub(oraclePriceData.price);
+	return calculateOracleSpread(markPrice, oraclePriceData);
+}
+
+export function calculateOracleSpread(
+	price: BN,
+	oraclePriceData: OraclePriceData
+): BN {
+	return price.sub(oraclePriceData.price);
 }

package/src/math/trade.ts

@@ -1,4 +1,4 @@
-import { isVariant, Market, PositionDirection } from '../types';
+import { Market, PositionDirection } from '../types';
 import { BN } from '@project-serum/anchor';
 import { assert } from '../assert/assert';
 import {
@@ -6,7 +6,6 @@ import {
 	PEG_PRECISION,
 	AMM_TO_QUOTE_PRECISION_RATIO,
 	ZERO,
-	ONE,
 } from '../constants/numericConstants';
 import { calculateMarkPrice } from './market';
 import {
@@ -14,6 +13,7 @@ import {
 	calculatePrice,
 	getSwapDirection,
 	AssetType,
+	calculateSpreadReserves,
 } from './amm';
 import { squareRootBN } from './utils';
 
@@ -101,6 +101,8 @@ export function calculateTradeSlippage(
  * @param direction
  * @param amount
  * @param market
+ * @param inputAssetType
+ * @param useSpread
  * @return
  * 	| 'acquiredBase' =>  positive/negative change in user's base : BN TODO-PRECISION
  * 	| 'acquiredQuote' => positive/negative change in user's quote : BN TODO-PRECISION
@@ -109,27 +111,36 @@ export function calculateTradeAcquiredAmounts(
 	direction: PositionDirection,
 	amount: BN,
 	market: Market,
-	inputAssetType: AssetType = 'quote'
+	inputAssetType: AssetType = 'quote',
+	useSpread = true
 ): [BN, BN] {
 	if (amount.eq(ZERO)) {
 		return [ZERO, ZERO];
 	}
 
 	const swapDirection = getSwapDirection(inputAssetType, direction);
-	const [newQuoteAssetReserve, newBaseAssetReserve] =
-		calculateAmmReservesAfterSwap(
+
+	let amm: Parameters<typeof calculateAmmReservesAfterSwap>[0];
+	if (useSpread && market.amm.baseSpread > 0) {
+		const { baseAssetReserve, quoteAssetReserve } = calculateSpreadReserves(
 			market.amm,
-			inputAssetType,
-			amount,
-			swapDirection
+			direction
 		);
-
-	const acquiredBase = market.amm.baseAssetReserve.sub(newBaseAssetReserve);
-	let acquiredQuote = market.amm.quoteAssetReserve.sub(newQuoteAssetReserve);
-	if (inputAssetType === 'base' && isVariant(swapDirection, 'remove')) {
-		acquiredQuote = acquiredQuote.sub(ONE);
+		amm = {
+			baseAssetReserve,
+			quoteAssetReserve,
+			sqrtK: market.amm.sqrtK,
+			pegMultiplier: market.amm.pegMultiplier,
+		};
+	} else {
+		amm = market.amm;
 	}
 
+	const [newQuoteAssetReserve, newBaseAssetReserve] =
+		calculateAmmReservesAfterSwap(amm, inputAssetType, amount, swapDirection);
+
+	const acquiredBase = amm.baseAssetReserve.sub(newBaseAssetReserve);
+	const acquiredQuote = amm.quoteAssetReserve.sub(newQuoteAssetReserve);
 	return [acquiredBase, acquiredQuote];
 }
 

package/src/orders.ts

@@ -11,6 +11,7 @@ import {
 	BN,
 	calculateAmmReservesAfterSwap,
 	calculateBaseAssetValue,
+	calculateSpreadReserves,
 	ClearingHouseUser,
 	isOrderRiskIncreasingInSameDirection,
 	TEN_THOUSAND,
@@ -211,7 +212,9 @@ export function calculateAmountToTradeForLimit(
 
 	const [maxAmountToTrade, direction] = calculateMaxBaseAssetAmountToTrade(
 		market.amm,
-		limitPrice
+		limitPrice,
+		order.direction,
+		!order.postOnly
 	);
 
 	// Check that directions are the same
@@ -295,24 +298,51 @@ export function calculateBaseAssetAmountUserCanExecute(
 		return ZERO;
 	}
 
-	const baseAssetReservesBefore = market.amm.baseAssetReserve;
+	const swapDirection = isVariant(order.direction, 'long')
+		? SwapDirection.ADD
+		: SwapDirection.REMOVE;
+
+	const useSpread = !order.postOnly;
+	let amm: Parameters<typeof calculateAmmReservesAfterSwap>[0];
+	if (useSpread) {
+		const { baseAssetReserve, quoteAssetReserve } = calculateSpreadReserves(
+			market.amm,
+			order.direction
+		);
+		amm = {
+			baseAssetReserve,
+			quoteAssetReserve,
+			sqrtK: market.amm.sqrtK,
+			pegMultiplier: market.amm.pegMultiplier,
+		};
+	} else {
+		amm = market.amm;
+	}
+
+	const baseAssetReservesBefore = amm.baseAssetReserve;
 	const [_, baseAssetReservesAfter] = calculateAmmReservesAfterSwap(
-		market.amm,
+		amm,
 		'quote',
 		quoteAssetAmount,
-		isVariant(order.direction, 'long')
-			? SwapDirection.ADD
-			: SwapDirection.REMOVE
+		swapDirection
 	);
 
-	let baseAssetAmount = baseAssetReservesBefore.sub(baseAssetReservesAfter).abs();
+	let baseAssetAmount = baseAssetReservesBefore
+		.sub(baseAssetReservesAfter)
+		.abs();
 	if (order.reduceOnly) {
 		const position =
 			user.getUserPosition(order.marketIndex) ||
 			user.getEmptyPosition(order.marketIndex);
-		if (isVariant(order.direction, 'long') && position.baseAssetAmount.gte(ZERO)) {
+		if (
+			isVariant(order.direction, 'long') &&
+			position.baseAssetAmount.gte(ZERO)
+		) {
 			baseAssetAmount = ZERO;
-		} else if (isVariant(order.direction, 'short') && position.baseAssetAmount.lte(ZERO)) {
+		} else if (
+			isVariant(order.direction, 'short') &&
+			position.baseAssetAmount.lte(ZERO)
+		) {
 			baseAssetAmount = ZERO;
 		} else {
 			BN.min(baseAssetAmount, position.baseAssetAmount.abs());

package/src/types.ts

@@ -154,7 +154,7 @@ export type TradeRecord = {
 	markPriceBefore: BN;
 	markPriceAfter: BN;
 	fee: BN;
-	referrerReward: BN;
+	quoteAssetAmountSurplus: BN;
 	refereeDiscount: BN;
 	tokenDiscount: BN;
 	marketIndex: BN;
@@ -309,6 +309,7 @@ export type AMM = {
 	minimumQuoteAssetTradeSize: BN;
 	minimumBaseAssetTradeSize: BN;
 	lastOraclePrice: BN;
+	baseSpread: number;
 };
 
 // # User Account Types

package/src/assert/assert.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assert = void 0;
-function assert(condition, error) {
-    if (!condition) {
-        throw new Error(error || 'Unspecified AssertionError');
-    }
-}
-exports.assert = assert;
-//# sourceMappingURL=assert.js.map

package/src/assert/assert.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"assert.js","sourceRoot":"","sources":["assert.ts"],"names":[],"mappings":";;;AAAA,SAAgB,MAAM,CAAC,SAAkB,EAAE,KAAc;IACxD,IAAI,CAAC,SAAS,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,KAAK,IAAI,4BAA4B,CAAC,CAAC;KACvD;AACF,CAAC;AAJD,wBAIC"}

package/src/math/conversion.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertBaseAssetAmountToNumber = exports.convertToNumber = void 0;
-const numericConstants_1 = require("../constants/numericConstants");
-const convertToNumber = (bigNumber, precision = numericConstants_1.MARK_PRICE_PRECISION) => {
-    if (!bigNumber)
-        return 0;
-    return (bigNumber.div(precision).toNumber() +
-        bigNumber.mod(precision).toNumber() / precision.toNumber());
-};
-exports.convertToNumber = convertToNumber;
-const convertBaseAssetAmountToNumber = (baseAssetAmount) => {
-    return (0, exports.convertToNumber)(baseAssetAmount, numericConstants_1.MARK_PRICE_PRECISION.mul(numericConstants_1.PEG_PRECISION));
-};
-exports.convertBaseAssetAmountToNumber = convertBaseAssetAmountToNumber;
-//# sourceMappingURL=conversion.js.map

package/src/math/conversion.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"conversion.js","sourceRoot":"","sources":["conversion.ts"],"names":[],"mappings":";;;AACA,oEAGuC;AAEhC,MAAM,eAAe,GAAG,CAC9B,SAAa,EACb,YAAgB,uCAAoB,EACnC,EAAE;IACH,IAAI,CAAC,SAAS;QAAE,OAAO,CAAC,CAAC;IACzB,OAAO,CACN,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE;QACnC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAC,QAAQ,EAAE,CAC1D,CAAC;AACH,CAAC,CAAC;AATW,QAAA,eAAe,mBAS1B;AAEK,MAAM,8BAA8B,GAAG,CAAC,eAAmB,EAAE,EAAE;IACrE,OAAO,IAAA,uBAAe,EACrB,eAAe,EACf,uCAAoB,CAAC,GAAG,CAAC,gCAAa,CAAC,CACvC,CAAC;AACH,CAAC,CAAC;AALW,QAAA,8BAA8B,kCAKzC"}

package/src/math/funding.js

@@ -1,223 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateFundingPool = exports.calculateLongShortFundingRateAndLiveTwaps = exports.calculateLongShortFundingRate = exports.calculateEstimatedFundingRate = exports.calculateAllEstimatedFundingRate = void 0;
-const anchor_1 = require("@project-serum/anchor");
-const numericConstants_1 = require("../constants/numericConstants");
-const market_1 = require("./market");
-/**
- *
- * @param market
- * @param oraclePriceData
- * @param periodAdjustment
- * @returns Estimated funding rate. : Precision //TODO-PRECISION
- */
-async function calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustment = new anchor_1.BN(1)) {
-    // periodAdjustment
-    // 	1: hourly
-    //  24: daily
-    //  24 * 365.25: annualized
-    const secondsInHour = new anchor_1.BN(3600);
-    const hoursInDay = new anchor_1.BN(24);
-    if (!market.initialized) {
-        return [numericConstants_1.ZERO, numericConstants_1.ZERO, numericConstants_1.ZERO, numericConstants_1.ZERO, numericConstants_1.ZERO];
-    }
-    const payFreq = new anchor_1.BN(market.amm.fundingPeriod);
-    // todo: sufficiently differs from blockchain timestamp?
-    const now = new anchor_1.BN((Date.now() / 1000).toFixed(0));
-    const timeSinceLastUpdate = now.sub(market.amm.lastFundingRateTs);
-    // calculate real-time mark twap
-    const lastMarkTwapWithMantissa = market.amm.lastMarkPriceTwap;
-    const lastMarkPriceTwapTs = market.amm.lastMarkPriceTwapTs;
-    const timeSinceLastMarkChange = now.sub(lastMarkPriceTwapTs);
-    const markTwapTimeSinceLastUpdate = anchor_1.BN.max(secondsInHour, secondsInHour.sub(timeSinceLastMarkChange));
-    const baseAssetPriceWithMantissa = (0, market_1.calculateMarkPrice)(market);
-    const markTwapWithMantissa = markTwapTimeSinceLastUpdate
-        .mul(lastMarkTwapWithMantissa)
-        .add(timeSinceLastMarkChange.mul(baseAssetPriceWithMantissa))
-        .div(timeSinceLastMarkChange.add(markTwapTimeSinceLastUpdate));
-    // calculate real-time (predicted) oracle twap
-    // note: oracle twap depends on `when the chord is struck` (market is trade)
-    const lastOracleTwapWithMantissa = market.amm.lastOraclePriceTwap;
-    const lastOraclePriceTwapTs = market.amm.lastOraclePriceTwapTs;
-    const timeSinceLastOracleTwapUpdate = now.sub(lastOraclePriceTwapTs);
-    const oracleTwapTimeSinceLastUpdate = anchor_1.BN.max(secondsInHour, secondsInHour.sub(timeSinceLastOracleTwapUpdate));
-    const oraclePrice = oraclePriceData.price;
-    let oracleTwapWithMantissa = lastOracleTwapWithMantissa;
-    const oracleLiveVsTwap = oraclePrice
-        .sub(lastOracleTwapWithMantissa)
-        .abs()
-        .mul(numericConstants_1.MARK_PRICE_PRECISION)
-        .mul(new anchor_1.BN(100))
-        .div(lastOracleTwapWithMantissa);
-    // verify pyth live input is within 10% of last twap for live update
-    if (oracleLiveVsTwap.lte(numericConstants_1.MARK_PRICE_PRECISION.mul(new anchor_1.BN(10)))) {
-        oracleTwapWithMantissa = oracleTwapTimeSinceLastUpdate
-            .mul(lastOracleTwapWithMantissa)
-            .add(timeSinceLastMarkChange.mul(oraclePrice))
-            .div(timeSinceLastOracleTwapUpdate.add(oracleTwapTimeSinceLastUpdate));
-    }
-    const twapSpread = lastMarkTwapWithMantissa.sub(lastOracleTwapWithMantissa);
-    const twapSpreadPct = twapSpread
-        .mul(numericConstants_1.MARK_PRICE_PRECISION)
-        .mul(new anchor_1.BN(100))
-        .div(oracleTwapWithMantissa);
-    const lowerboundEst = twapSpreadPct
-        .mul(payFreq)
-        .mul(anchor_1.BN.min(secondsInHour, timeSinceLastUpdate))
-        .mul(periodAdjustment)
-        .div(secondsInHour)
-        .div(secondsInHour)
-        .div(hoursInDay);
-    const interpEst = twapSpreadPct.mul(periodAdjustment).div(hoursInDay);
-    const interpRateQuote = twapSpreadPct
-        .mul(periodAdjustment)
-        .div(hoursInDay)
-        .div(numericConstants_1.MARK_PRICE_PRECISION.div(numericConstants_1.QUOTE_PRECISION));
-    let feePoolSize = calculateFundingPool(market);
-    if (interpRateQuote.lt(new anchor_1.BN(0))) {
-        feePoolSize = feePoolSize.mul(new anchor_1.BN(-1));
-    }
-    let cappedAltEst;
-    let largerSide;
-    let smallerSide;
-    if (market.baseAssetAmountLong.gt(market.baseAssetAmountShort.abs())) {
-        largerSide = market.baseAssetAmountLong.abs();
-        smallerSide = market.baseAssetAmountShort.abs();
-        if (twapSpread.gt(new anchor_1.BN(0))) {
-            return [
-                markTwapWithMantissa,
-                oracleTwapWithMantissa,
-                lowerboundEst,
-                interpEst,
-                interpEst,
-            ];
-        }
-    }
-    else if (market.baseAssetAmountLong.lt(market.baseAssetAmountShort.abs())) {
-        largerSide = market.baseAssetAmountShort.abs();
-        smallerSide = market.baseAssetAmountLong.abs();
-        if (twapSpread.lt(new anchor_1.BN(0))) {
-            return [
-                markTwapWithMantissa,
-                oracleTwapWithMantissa,
-                lowerboundEst,
-                interpEst,
-                interpEst,
-            ];
-        }
-    }
-    else {
-        return [
-            markTwapWithMantissa,
-            oracleTwapWithMantissa,
-            lowerboundEst,
-            interpEst,
-            interpEst,
-        ];
-    }
-    if (largerSide.gt(numericConstants_1.ZERO)) {
-        // funding smaller flow
-        cappedAltEst = smallerSide.mul(twapSpread).div(hoursInDay);
-        const feePoolTopOff = feePoolSize
-            .mul(numericConstants_1.MARK_PRICE_PRECISION.div(numericConstants_1.QUOTE_PRECISION))
-            .mul(numericConstants_1.AMM_RESERVE_PRECISION);
-        cappedAltEst = cappedAltEst.add(feePoolTopOff).div(largerSide);
-        cappedAltEst = cappedAltEst
-            .mul(numericConstants_1.MARK_PRICE_PRECISION)
-            .mul(new anchor_1.BN(100))
-            .div(oracleTwapWithMantissa)
-            .mul(periodAdjustment);
-        if (cappedAltEst.abs().gte(interpEst.abs())) {
-            cappedAltEst = interpEst;
-        }
-    }
-    else {
-        cappedAltEst = interpEst;
-    }
-    return [
-        markTwapWithMantissa,
-        oracleTwapWithMantissa,
-        lowerboundEst,
-        cappedAltEst,
-        interpEst,
-    ];
-}
-exports.calculateAllEstimatedFundingRate = calculateAllEstimatedFundingRate;
-/**
- *
- * @param market
- * @param oraclePriceData
- * @param periodAdjustment
- * @param estimationMethod
- * @returns Estimated funding rate. : Precision //TODO-PRECISION
- */
-async function calculateEstimatedFundingRate(market, oraclePriceData, periodAdjustment = new anchor_1.BN(1), estimationMethod) {
-    const [_1, _2, lowerboundEst, cappedAltEst, interpEst] = await calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustment);
-    if (estimationMethod == 'lowerbound') {
-        //assuming remaining funding period has no gap
-        return lowerboundEst;
-    }
-    else if (estimationMethod == 'capped') {
-        return cappedAltEst;
-    }
-    else {
-        return interpEst;
-    }
-}
-exports.calculateEstimatedFundingRate = calculateEstimatedFundingRate;
-/**
- *
- * @param market
- * @param oraclePriceData
- * @param periodAdjustment
- * @returns Estimated funding rate. : Precision //TODO-PRECISION
- */
-async function calculateLongShortFundingRate(market, oraclePriceData, periodAdjustment = new anchor_1.BN(1)) {
-    const [_1, _2, _, cappedAltEst, interpEst] = await calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustment);
-    if (market.baseAssetAmountLong.gt(market.baseAssetAmountShort)) {
-        return [cappedAltEst, interpEst];
-    }
-    else if (market.baseAssetAmountLong.lt(market.baseAssetAmountShort)) {
-        return [interpEst, cappedAltEst];
-    }
-    else {
-        return [interpEst, interpEst];
-    }
-}
-exports.calculateLongShortFundingRate = calculateLongShortFundingRate;
-/**
- *
- * @param market
- * @param oraclePriceData
- * @param periodAdjustment
- * @returns Estimated funding rate. : Precision //TODO-PRECISION
- */
-async function calculateLongShortFundingRateAndLiveTwaps(market, oraclePriceData, periodAdjustment = new anchor_1.BN(1)) {
-    const [markTwapLive, oracleTwapLive, _2, cappedAltEst, interpEst] = await calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustment);
-    if (market.baseAssetAmountLong.gt(market.baseAssetAmountShort.abs())) {
-        return [markTwapLive, oracleTwapLive, cappedAltEst, interpEst];
-    }
-    else if (market.baseAssetAmountLong.lt(market.baseAssetAmountShort.abs())) {
-        return [markTwapLive, oracleTwapLive, interpEst, cappedAltEst];
-    }
-    else {
-        return [markTwapLive, oracleTwapLive, interpEst, interpEst];
-    }
-}
-exports.calculateLongShortFundingRateAndLiveTwaps = calculateLongShortFundingRateAndLiveTwaps;
-/**
- *
- * @param market
- * @returns Estimated fee pool size
- */
-function calculateFundingPool(market) {
-    // todo
-    const totalFeeLB = market.amm.totalFee.div(new anchor_1.BN(2));
-    const feePool = anchor_1.BN.max(numericConstants_1.ZERO, market.amm.totalFeeMinusDistributions
-        .sub(totalFeeLB)
-        .mul(new anchor_1.BN(2))
-        .div(new anchor_1.BN(3)));
-    return feePool;
-}
-exports.calculateFundingPool = calculateFundingPool;
-//# sourceMappingURL=funding.js.map

package/src/math/funding.js.map

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