@drift-labs/sdk 0.1.7 → 0.1.8

package/lib/admin.d.ts

@@ -6,7 +6,7 @@ import { ClearingHouse } from './clearingHouse';
 export declare class Admin extends ClearingHouse {
     static from(connection: Connection, wallet: IWallet, clearingHouseProgramId: PublicKey, opts?: ConfirmOptions): Admin;
     initialize(usdcMint: PublicKey, adminControlsPrices: boolean): Promise<[TransactionSignature, TransactionSignature]>;
-    initializeMarket(marketIndex: BN, priceOracle: PublicKey, baseAmount: BN, quoteAmount: BN, periodicity: BN, pegMultiplier?: BN): Promise<TransactionSignature>;
+    initializeMarket(marketIndex: BN, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN): Promise<TransactionSignature>;
     moveAmmPrice(baseAssetReserve: BN, quoteAssetReserve: BN, marketIndex: BN): Promise<TransactionSignature>;
     updateK(sqrtK: BN, marketIndex: BN): Promise<TransactionSignature>;
     moveAmmToPrice(marketIndex: BN, targetPrice: BN): Promise<TransactionSignature>;

package/lib/admin.js

@@ -122,12 +122,12 @@ class Admin extends clearingHouse_1.ClearingHouse {
             return [initializeTxSig, initializeHistoryTxSig];
         });
     }
-    initializeMarket(marketIndex, priceOracle, baseAmount, quoteAmount, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION) {
+    initializeMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.getMarketsAccount().markets[marketIndex.toNumber()].initialized) {
                 throw Error(`MarketIndex ${marketIndex.toNumber()} already initialized`);
             }
-            const initializeMarketTx = yield this.program.transaction.initializeMarket(marketIndex, baseAmount, quoteAmount, periodicity, pegMultiplier, {
+            const initializeMarketTx = yield this.program.transaction.initializeMarket(marketIndex, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, {
                 accounts: {
                     state: yield this.getStatePublicKey(),
                     admin: this.wallet.publicKey,

package/lib/clearingHouseUser.d.ts

@@ -72,7 +72,7 @@ export declare class ClearingHouseUser {
      * calculates average exit price for closing 100% of position
      * @returns : Precision MARK_PRICE_PRECISION
      */
-    getPositionEstimatedExitPrice(position: UserPosition): BN;
+    getPositionEstimatedExitPrice(position: UserPosition, amountToClose?: BN): BN;
     /**
      * calculates current user leverage across all positions
      * @returns : Precision TEN_THOUSAND

package/lib/clearingHouseUser.js

@@ -60,7 +60,13 @@ class ClearingHouseUser {
      * @returns userPosition
      */
     getUserPosition(marketIndex) {
-        return this.getUserPositionsAccount().positions.find((position) => position.marketIndex.eq(marketIndex));
+        var _a;
+        return ((_a = this.getUserPositionsAccount().positions.find((position) => position.marketIndex.eq(marketIndex))) !== null && _a !== void 0 ? _a : {
+            baseAssetAmount: numericConstants_1.ZERO,
+            lastCumulativeFundingRate: numericConstants_1.ZERO,
+            marketIndex,
+            quoteAssetAmount: numericConstants_1.ZERO,
+        });
     }
     getUserAccountPublicKey() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -158,8 +164,19 @@ class ClearingHouseUser {
      * calculates average exit price for closing 100% of position
      * @returns : Precision MARK_PRICE_PRECISION
      */
-    getPositionEstimatedExitPrice(position) {
+    getPositionEstimatedExitPrice(position, amountToClose) {
         const market = this.clearingHouse.getMarket(position.marketIndex);
+        if (amountToClose) {
+            if (amountToClose.eq(numericConstants_1.ZERO)) {
+                return _1.calculateMarkPrice(market);
+            }
+            position = {
+                baseAssetAmount: amountToClose,
+                lastCumulativeFundingRate: position.lastCumulativeFundingRate,
+                marketIndex: position.marketIndex,
+                quoteAssetAmount: position.quoteAssetAmount,
+            };
+        }
         const baseAssetValue = _1.calculateBaseAssetValue(market, position);
         if (position.baseAssetAmount.eq(numericConstants_1.ZERO)) {
             return numericConstants_1.ZERO;

package/lib/config.js

@@ -5,7 +5,7 @@ exports.configs = {
     devnet: {
         ENV: 'devnet',
         PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-        CLEARING_HOUSE_PROGRAM_ID: 'tCyWBVHtN4iGtZWs2dkefWk38SyN4RGtED14KzUopK9',
+        CLEARING_HOUSE_PROGRAM_ID: 'AsW7LnXB9UA1uec9wi9MctYTgTz7YH9snhxd16GsFaGX',
         USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
     },
     'mainnet-beta': {

package/lib/constants/markets.js

@@ -13,20 +13,20 @@ exports.Markets = [
         devnetPythOracle: 'J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix',
         mainnetPythOracle: 'H6ARHf6YXhGYeQfUzQNGk6rDNnLBQKrenN712K4AQJEG',
     },
-    // {
-    // 	symbol: 'BTC-PERP',
-    // 	baseAssetSymbol: 'BTC',
-    // 	marketIndex: new BN(1),
-    // 	devnetPythOracle: 'HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J',
-    // 	mainnetPythOracle: 'GVXRSBjFk6e6J3NbVPXohDJetcTjaeeuykUpbQF8UoMU',
-    // },
-    // {
-    // 	symbol: 'ETH-PERP',
-    // 	baseAssetSymbol: 'ETH',
-    // 	marketIndex: new BN(2),
-    // 	devnetPythOracle: 'EdVCmQ9FSPcVe5YySXDPCRmc8aDQLKJ9xvYBMZPie1Vw',
-    // 	mainnetPythOracle: 'JBu1AL4obBcCMqKBBxhpWCNUt136ijcuMZLFvTP7iWdB',
-    // },
+    {
+        symbol: 'BTC-PERP',
+        baseAssetSymbol: 'BTC',
+        marketIndex: new bn_js_1.default(1),
+        devnetPythOracle: 'HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J',
+        mainnetPythOracle: 'GVXRSBjFk6e6J3NbVPXohDJetcTjaeeuykUpbQF8UoMU',
+    },
+    {
+        symbol: 'ETH-PERP',
+        baseAssetSymbol: 'ETH',
+        marketIndex: new bn_js_1.default(2),
+        devnetPythOracle: 'EdVCmQ9FSPcVe5YySXDPCRmc8aDQLKJ9xvYBMZPie1Vw',
+        mainnetPythOracle: 'JBu1AL4obBcCMqKBBxhpWCNUt136ijcuMZLFvTP7iWdB',
+    },
     // {
     // 	symbol: 'COPE-PERP',
     // 	baseAssetSymbol: 'COPE',

package/lib/idl/clearing_house.json

@@ -1724,6 +1724,34 @@
         }
     ],
     "types": [
+        {
+            "name": "InitializeUserOptionalAccounts",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "whitelistToken",
+                        "type": "bool"
+                    }
+                ]
+            }
+        },
+        {
+            "name": "ManagePositionOptionalAccounts",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "discountToken",
+                        "type": "bool"
+                    },
+                    {
+                        "name": "referrer",
+                        "type": "bool"
+                    }
+                ]
+            }
+        },
         {
             "name": "CurveRecord",
             "type": {
@@ -1938,34 +1966,6 @@
                 ]
             }
         },
-        {
-            "name": "InitializeUserOptionalAccounts",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "whitelistToken",
-                        "type": "bool"
-                    }
-                ]
-            }
-        },
-        {
-            "name": "ManagePositionOptionalAccounts",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "discountToken",
-                        "type": "bool"
-                    },
-                    {
-                        "name": "referrer",
-                        "type": "bool"
-                    }
-                ]
-            }
-        },
         {
             "name": "LiquidationRecord",
             "type": {

package/lib/math/funding.js

@@ -60,19 +60,42 @@ function calculateAllEstimatedFundingRate(market, pythClient, periodAdjustment =
         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));
-        const feePoolSize = calculateFundingPool(market);
+        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)) {
-            const largerSide = market.baseAssetAmountLong;
-            const smallerSide = market.baseAssetAmountShort;
-            cappedAltEst = feePoolSize.add(smallerSide.mul(interpRateQuote).div(numericConstants_1.AMM_RESERVE_PRECISION))
-                .div(largerSide);
+            largerSide = market.baseAssetAmountLong.abs();
+            smallerSide = market.baseAssetAmountShort.abs();
+            if (twapSpread.gt(new anchor_1.BN(0))) {
+                return [lowerboundEst, interpEst, interpEst];
+            }
         }
         else if (market.baseAssetAmountLong.lt(market.baseAssetAmountShort)) {
-            const largerSide = market.baseAssetAmountShort;
-            const smallerSide = market.baseAssetAmountLong;
-            cappedAltEst = feePoolSize.add(smallerSide.mul(interpRateQuote).div(numericConstants_1.AMM_RESERVE_PRECISION))
-                .div(largerSide);
+            largerSide = market.baseAssetAmountShort.abs();
+            smallerSide = market.baseAssetAmountLong.abs();
+            if (twapSpread.lt(new anchor_1.BN(0))) {
+                return [lowerboundEst, interpEst, interpEst];
+            }
+        }
+        else {
+            return [lowerboundEst, interpEst, interpEst];
+        }
+        if (largerSide.gt(numericConstants_1.ZERO)) {
+            cappedAltEst = smallerSide.mul(twapSpread).div(largerSide);
+            const feePoolTopOff = feePoolSize.mul(numericConstants_1.MARK_PRICE_PRECISION.div(numericConstants_1.QUOTE_PRECISION))
+                .mul(numericConstants_1.AMM_RESERVE_PRECISION).div(largerSide);
+            cappedAltEst = cappedAltEst.add(feePoolTopOff);
+            cappedAltEst = cappedAltEst.mul(numericConstants_1.MARK_PRICE_PRECISION)
+                .mul(new anchor_1.BN(100))
+                .div(oracleTwapWithMantissa)
+                .mul(periodAdjustment).div(hoursInDay);
+            if (cappedAltEst.abs().gt(interpEst.abs())) {
+                cappedAltEst = interpEst;
+            }
         }
         else {
             cappedAltEst = interpEst;
@@ -136,6 +159,7 @@ exports.calculateLongShortFundingRate = calculateLongShortFundingRate;
 function calculateFundingPool(market) {
     const totalFeeLB = market.amm.totalFee.div(new anchor_1.BN(2));
     const feePool = market.amm.totalFeeMinusDistributions.sub(totalFeeLB);
+    // return new BN(QUOTE_PRECISION.mul(new BN(2400)));
     return feePool;
 }
 exports.calculateFundingPool = calculateFundingPool;

package/lib/math/trade.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="bn.js" />
 import { Market, PositionDirection } from '../types';
 import { BN } from '@project-serum/anchor';
+import { AssetType } from './amm';
 export declare type PriceImpactUnit = 'entryPrice' | 'maxPrice' | 'priceDelta' | 'priceDeltaAsNumber' | 'pctAvg' | 'pctMax' | 'quoteAssetAmount' | 'quoteAssetAmountPeg' | 'acquiredBaseAssetAmount' | 'acquiredQuoteAssetAmount';
 /**
  * Calculates avg/max slippage (price impact) for candidate trade
@@ -17,7 +18,7 @@ export declare type PriceImpactUnit = 'entryPrice' | 'maxPrice' | 'priceDelta' |
  *
  * 'newPrice' => the price of the asset after the trade : Precision MARK_PRICE_PRECISION
  */
-export declare function calculateTradeSlippage(direction: PositionDirection, amount: BN, market: Market): [BN, BN, BN, BN];
+export declare function calculateTradeSlippage(direction: PositionDirection, amount: BN, market: Market, inputAssetType?: AssetType): [BN, BN, BN, BN];
 /**
  * Calculates acquired amounts for trade executed
  * @param direction
@@ -27,7 +28,7 @@ export declare function calculateTradeSlippage(direction: PositionDirection, amo
  * 	| 'acquiredBase' =>  positive/negative change in user's base : BN TODO-PRECISION
  * 	| 'acquiredQuote' => positive/negative change in user's quote : BN TODO-PRECISION
  */
-export declare function calculateTradeAcquiredAmounts(direction: PositionDirection, amount: BN, market: Market): [BN, BN];
+export declare function calculateTradeAcquiredAmounts(direction: PositionDirection, amount: BN, market: Market, inputAssetType?: AssetType): [BN, BN];
 /**
  * calculateTargetPriceTrade
  * simple function for finding arbitraging trades

package/lib/math/trade.js

@@ -24,12 +24,12 @@ const MAXPCT = new anchor_1.BN(1000); //percentage units are [0,1000] => [0,1]
  *
  * 'newPrice' => the price of the asset after the trade : Precision MARK_PRICE_PRECISION
  */
-function calculateTradeSlippage(direction, amount, market) {
+function calculateTradeSlippage(direction, amount, market, inputAssetType = 'quote') {
     const oldPrice = market_1.calculateMarkPrice(market);
     if (amount.eq(numericConstants_1.ZERO)) {
         return [numericConstants_1.ZERO, numericConstants_1.ZERO, oldPrice, oldPrice];
     }
-    const [acquiredBase, acquiredQuote] = calculateTradeAcquiredAmounts(direction, amount, market);
+    const [acquiredBase, acquiredQuote] = calculateTradeAcquiredAmounts(direction, amount, market, inputAssetType);
     const entryPrice = amm_1.calculatePrice(acquiredBase, acquiredQuote, market.amm.pegMultiplier).mul(new anchor_1.BN(-1));
     const newPrice = amm_1.calculatePrice(market.amm.baseAssetReserve.sub(acquiredBase), market.amm.quoteAssetReserve.sub(acquiredQuote), market.amm.pegMultiplier);
     if (direction == types_1.PositionDirection.SHORT) {
@@ -60,11 +60,11 @@ exports.calculateTradeSlippage = calculateTradeSlippage;
  * 	| 'acquiredBase' =>  positive/negative change in user's base : BN TODO-PRECISION
  * 	| 'acquiredQuote' => positive/negative change in user's quote : BN TODO-PRECISION
  */
-function calculateTradeAcquiredAmounts(direction, amount, market) {
+function calculateTradeAcquiredAmounts(direction, amount, market, inputAssetType = 'quote') {
     if (amount.eq(numericConstants_1.ZERO)) {
         return [numericConstants_1.ZERO, numericConstants_1.ZERO];
     }
-    const [newQuoteAssetReserve, newBaseAssetReserve] = amm_1.calculateAmmReservesAfterSwap(market.amm, 'quote', amount, amm_1.getSwapDirection('quote', direction));
+    const [newQuoteAssetReserve, newBaseAssetReserve] = amm_1.calculateAmmReservesAfterSwap(market.amm, inputAssetType, amount, amm_1.getSwapDirection(inputAssetType, direction));
     const acquiredBase = market.amm.baseAssetReserve.sub(newBaseAssetReserve);
     const acquiredQuote = market.amm.quoteAssetReserve.sub(newQuoteAssetReserve);
     return [acquiredBase, acquiredQuote];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.1.7",
+	"version": "0.1.8",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/admin.ts

@@ -178,8 +178,8 @@ export class Admin extends ClearingHouse {
 	public async initializeMarket(
 		marketIndex: BN,
 		priceOracle: PublicKey,
-		baseAmount: BN,
-		quoteAmount: BN,
+		baseAssetReserve: BN,
+		quoteAssetReserve: BN,
 		periodicity: BN,
 		pegMultiplier: BN = PEG_PRECISION
 	): Promise<TransactionSignature> {
@@ -189,8 +189,8 @@ export class Admin extends ClearingHouse {
 
 		const initializeMarketTx = await this.program.transaction.initializeMarket(
 			marketIndex,
-			baseAmount,
-			quoteAmount,
+			baseAssetReserve,
+			quoteAssetReserve,
 			periodicity,
 			pegMultiplier,
 			{

package/src/clearingHouseUser.ts

@@ -86,8 +86,15 @@ export class ClearingHouseUser {
 	 * @returns userPosition
 	 */
 	public getUserPosition(marketIndex: BN): UserPosition {
-		return this.getUserPositionsAccount().positions.find((position) =>
-			position.marketIndex.eq(marketIndex)
+		return (
+			this.getUserPositionsAccount().positions.find((position) =>
+				position.marketIndex.eq(marketIndex)
+			) ?? {
+				baseAssetAmount: ZERO,
+				lastCumulativeFundingRate: ZERO,
+				marketIndex,
+				quoteAssetAmount: ZERO,
+			}
 		);
 	}
 
@@ -217,8 +224,21 @@ export class ClearingHouseUser {
 	 * calculates average exit price for closing 100% of position
 	 * @returns : Precision MARK_PRICE_PRECISION
 	 */
-	public getPositionEstimatedExitPrice(position: UserPosition): BN {
+	public getPositionEstimatedExitPrice(position: UserPosition, amountToClose?: BN): BN {
 		const market = this.clearingHouse.getMarket(position.marketIndex);
+
+		if(amountToClose){
+			if(amountToClose.eq(ZERO)){
+				return calculateMarkPrice(market);
+			}
+			position = {
+				baseAssetAmount: amountToClose,
+				lastCumulativeFundingRate: position.lastCumulativeFundingRate,
+				marketIndex: position.marketIndex,
+				quoteAssetAmount: position.quoteAssetAmount,
+			} as UserPosition;
+		}
+
 		const baseAssetValue = calculateBaseAssetValue(market, position);
 		if (position.baseAssetAmount.eq(ZERO)) {
 			return ZERO;

package/src/config.ts

@@ -11,7 +11,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 	devnet: {
 		ENV: 'devnet',
 		PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-		CLEARING_HOUSE_PROGRAM_ID: 'tCyWBVHtN4iGtZWs2dkefWk38SyN4RGtED14KzUopK9',
+		CLEARING_HOUSE_PROGRAM_ID: 'AsW7LnXB9UA1uec9wi9MctYTgTz7YH9snhxd16GsFaGX',
 		USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
 	},
 	'mainnet-beta': {

package/src/constants/markets.ts

@@ -16,20 +16,20 @@ export const Markets: Market[] = [
 		devnetPythOracle: 'J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix',
 		mainnetPythOracle: 'H6ARHf6YXhGYeQfUzQNGk6rDNnLBQKrenN712K4AQJEG',
 	},
-	// {
-	// 	symbol: 'BTC-PERP',
-	// 	baseAssetSymbol: 'BTC',
-	// 	marketIndex: new BN(1),
-	// 	devnetPythOracle: 'HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J',
-	// 	mainnetPythOracle: 'GVXRSBjFk6e6J3NbVPXohDJetcTjaeeuykUpbQF8UoMU',
-	// },
-	// {
-	// 	symbol: 'ETH-PERP',
-	// 	baseAssetSymbol: 'ETH',
-	// 	marketIndex: new BN(2),
-	// 	devnetPythOracle: 'EdVCmQ9FSPcVe5YySXDPCRmc8aDQLKJ9xvYBMZPie1Vw',
-	// 	mainnetPythOracle: 'JBu1AL4obBcCMqKBBxhpWCNUt136ijcuMZLFvTP7iWdB',
-	// },
+	{
+		symbol: 'BTC-PERP',
+		baseAssetSymbol: 'BTC',
+		marketIndex: new BN(1),
+		devnetPythOracle: 'HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J',
+		mainnetPythOracle: 'GVXRSBjFk6e6J3NbVPXohDJetcTjaeeuykUpbQF8UoMU',
+	},
+	{
+		symbol: 'ETH-PERP',
+		baseAssetSymbol: 'ETH',
+		marketIndex: new BN(2),
+		devnetPythOracle: 'EdVCmQ9FSPcVe5YySXDPCRmc8aDQLKJ9xvYBMZPie1Vw',
+		mainnetPythOracle: 'JBu1AL4obBcCMqKBBxhpWCNUt136ijcuMZLFvTP7iWdB',
+	},
 	// {
 	// 	symbol: 'COPE-PERP',
 	// 	baseAssetSymbol: 'COPE',

package/src/idl/clearing_house.json

@@ -1724,6 +1724,34 @@
     }
   ],
   "types": [
+    {
+      "name": "InitializeUserOptionalAccounts",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "whitelistToken",
+            "type": "bool"
+          }
+        ]
+      }
+    },
+    {
+      "name": "ManagePositionOptionalAccounts",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "discountToken",
+            "type": "bool"
+          },
+          {
+            "name": "referrer",
+            "type": "bool"
+          }
+        ]
+      }
+    },
     {
       "name": "CurveRecord",
       "type": {
@@ -1938,34 +1966,6 @@
         ]
       }
     },
-    {
-      "name": "InitializeUserOptionalAccounts",
-      "type": {
-        "kind": "struct",
-        "fields": [
-          {
-            "name": "whitelistToken",
-            "type": "bool"
-          }
-        ]
-      }
-    },
-    {
-      "name": "ManagePositionOptionalAccounts",
-      "type": {
-        "kind": "struct",
-        "fields": [
-          {
-            "name": "discountToken",
-            "type": "bool"
-          },
-          {
-            "name": "referrer",
-            "type": "bool"
-          }
-        ]
-      }
-    },
     {
       "name": "LiquidationRecord",
       "type": {

package/src/math/funding.ts

@@ -1,6 +1,6 @@
 import { BN } from '@project-serum/anchor';
 import {
-	AMM_RESERVE_PRECISION, MARK_PRICE_PRECISION, QUOTE_PRECISION
+	AMM_RESERVE_PRECISION, MARK_PRICE_PRECISION, QUOTE_PRECISION, ZERO
 } from '../constants/numericConstants';
 import { PythClient } from '../pythClient';
 import { Market } from '../types';
@@ -75,26 +75,50 @@ import { calculateMarkPrice } from './market';
 	
 	const interpRateQuote = twapSpreadPct.mul(periodAdjustment).div(hoursInDay)
 	.div(MARK_PRICE_PRECISION.div(QUOTE_PRECISION));
-	const feePoolSize = calculateFundingPool(market);
+	let feePoolSize = calculateFundingPool(market);
+	if(interpRateQuote.lt(new BN(0))){
+		feePoolSize = feePoolSize.mul(new BN(-1));
+	}
 
 	let cappedAltEst: BN;
+	let largerSide: BN;
+	let smallerSide: BN;
 
 	if(market.baseAssetAmountLong.gt(market.baseAssetAmountShort)){
-		const largerSide = market.baseAssetAmountLong;
-		const smallerSide = market.baseAssetAmountShort;
-		cappedAltEst =feePoolSize.add(
-			smallerSide.mul(interpRateQuote).div(AMM_RESERVE_PRECISION))
-		.div(largerSide);
+		largerSide = market.baseAssetAmountLong.abs();
+		smallerSide = market.baseAssetAmountShort.abs();
+		if(twapSpread.gt(new BN(0))){
+			return [lowerboundEst, interpEst, interpEst];
+		}
 	} else if(market.baseAssetAmountLong.lt(market.baseAssetAmountShort)){
-		const largerSide = market.baseAssetAmountShort;
-		const smallerSide = market.baseAssetAmountLong;
-		cappedAltEst = feePoolSize.add(
-			smallerSide.mul(interpRateQuote).div(AMM_RESERVE_PRECISION))
-		.div(largerSide);
+		largerSide = market.baseAssetAmountShort.abs();
+		smallerSide = market.baseAssetAmountLong.abs();
+		if(twapSpread.lt(new BN(0))){
+			return [lowerboundEst, interpEst, interpEst];
+		}
+	} else{
+		return [lowerboundEst, interpEst, interpEst];
+	}
+
+	if(largerSide.gt(ZERO)){
+		cappedAltEst = smallerSide.mul(twapSpread).div(largerSide);
+		const feePoolTopOff = feePoolSize.mul(MARK_PRICE_PRECISION.div(QUOTE_PRECISION))
+		.mul(AMM_RESERVE_PRECISION).div(largerSide);
+		cappedAltEst = cappedAltEst.add(feePoolTopOff);
+	
+		cappedAltEst = cappedAltEst.mul(MARK_PRICE_PRECISION)
+		.mul(new BN(100))
+		.div(oracleTwapWithMantissa)
+		.mul(periodAdjustment).div(hoursInDay);
+	
+		if(cappedAltEst.abs().gt(interpEst.abs())){
+			cappedAltEst = interpEst;
+		}
 	} else{
 		cappedAltEst = interpEst;
 	}
 
+
 	return [lowerboundEst, cappedAltEst, interpEst];
 }
 
@@ -160,5 +184,6 @@ export async function calculateEstimatedFundingRate(
 export function calculateFundingPool(market: Market): BN {
 	const totalFeeLB = market.amm.totalFee.div(new BN(2));
 	const feePool = market.amm.totalFeeMinusDistributions.sub(totalFeeLB);
+	// return new BN(QUOTE_PRECISION.mul(new BN(2400)));
 	return feePool;
 }

package/src/math/trade.ts

@@ -12,6 +12,7 @@ import {
 	calculateAmmReservesAfterSwap,
 	calculatePrice,
 	getSwapDirection,
+	AssetType,
 } from './amm';
 import { squareRootBN } from './utils';
 
@@ -47,7 +48,8 @@ export type PriceImpactUnit =
 export function calculateTradeSlippage(
 	direction: PositionDirection,
 	amount: BN,
-	market: Market
+	market: Market,
+	inputAssetType: AssetType = 'quote',
 ): [BN, BN, BN, BN] {
 	const oldPrice = calculateMarkPrice(market);
 	if (amount.eq(ZERO)) {
@@ -56,7 +58,8 @@ export function calculateTradeSlippage(
 	const [acquiredBase, acquiredQuote] = calculateTradeAcquiredAmounts(
 		direction,
 		amount,
-		market
+		market,
+		inputAssetType
 	);
 
 	const entryPrice = calculatePrice(
@@ -103,7 +106,8 @@ export function calculateTradeSlippage(
 export function calculateTradeAcquiredAmounts(
 	direction: PositionDirection,
 	amount: BN,
-	market: Market
+	market: Market,
+	inputAssetType: AssetType = 'quote',
 ): [BN, BN] {
 	if (amount.eq(ZERO)) {
 		return [ZERO, ZERO];
@@ -112,9 +116,9 @@ export function calculateTradeAcquiredAmounts(
 	const [newQuoteAssetReserve, newBaseAssetReserve] =
 		calculateAmmReservesAfterSwap(
 			market.amm,
-			'quote',
+			inputAssetType,
 			amount,
-			getSwapDirection('quote', direction)
+			getSwapDirection(inputAssetType, direction)
 		);
 
 	const acquiredBase = market.amm.baseAssetReserve.sub(newBaseAssetReserve);