@velocity-exchange/sdk 0.0.3 → 0.1.0

package/src/index.ts

@@ -26,10 +26,7 @@ export { WebSocketAccountSubscriberV2 } from './accounts/webSocketAccountSubscri
 export { WebSocketProgramAccountSubscriber } from './accounts/webSocketProgramAccountSubscriber';
 export { WebSocketProgramUserAccountSubscriber } from './accounts/websocketProgramUserAccountSubscriber';
 export { WebSocketProgramAccountsSubscriberV2 } from './accounts/webSocketProgramAccountsSubscriberV2';
-export {
-	WebSocketVelocityClientAccountSubscriberV2,
-	WebSocketDriftClientAccountSubscriberV2,
-} from './accounts/webSocketVelocityClientAccountSubscriberV2';
+export { WebSocketVelocityClientAccountSubscriberV2 } from './accounts/webSocketVelocityClientAccountSubscriberV2';
 export * from './accounts/bulkAccountLoader';
 export * from './accounts/bulkUserSubscription';
 export * from './accounts/bulkUserStatsSubscription';

package/src/margin/README.md

@@ -4,8 +4,8 @@ This document describes the single-source-of-truth margin engine in the SDK that
 
 ### Alignment with on-chain
 
-- The SDK snapshot shape mirrors `programs/drift/src/state/margin_calculation.rs` field-for-field.
-- The inputs and ordering mirror `calculate_margin_requirement_and_total_collateral_and_liability_info` in `programs/drift/src/math/margin.rs`.
+- The SDK snapshot shape mirrors `programs/velocity/src/state/margin_calculation.rs` field-for-field.
+- The inputs and ordering mirror `calculate_margin_requirement_and_total_collateral_and_liability_info` in `programs/velocity/src/math/margin.rs`.
 - Isolated positions are represented as `isolatedMarginCalculations` keyed by perp `marketIndex`, matching program logic.
 
 ### Core SDK types (shape parity)

package/src/math/amm.ts

@@ -17,6 +17,7 @@ import {
 } from '../constants/numericConstants';
 import {
 	AMM,
+	MarketStats,
 	PositionDirection,
 	SwapDirection,
 	PerpMarketAccount,
@@ -52,6 +53,7 @@ export function calculatePegFromTargetPrice(
 
 export function calculateOptimalPegAndBudget(
 	amm: AMM,
+	totalExchangeFee: BN,
 	mmOraclePriceData: MMOraclePriceData
 ): [BN, BN, BN, boolean] {
 	const reservePriceBefore = calculatePrice(
@@ -67,7 +69,7 @@ export function calculateOptimalPegAndBudget(
 	);
 	const prePegCost = calculateRepegCost(amm, newPeg);
 
-	const totalFeeLB = amm.totalExchangeFee.div(new BN(2));
+	const totalFeeLB = totalExchangeFee.div(new BN(2));
 	const budget = BN.max(ZERO, amm.totalFeeMinusDistributions.sub(totalFeeLB));
 
 	let checkLowerBound = true;
@@ -102,7 +104,7 @@ export function calculateOptimalPegAndBudget(
 
 			return [newTargetPrice, newOptimalPeg, newBudget, false];
 		} else if (
-			amm.totalFeeMinusDistributions.lt(amm.totalExchangeFee.div(new BN(2)))
+			amm.totalFeeMinusDistributions.lt(totalExchangeFee.div(new BN(2)))
 		) {
 			checkLowerBound = false;
 		}
@@ -113,13 +115,14 @@ export function calculateOptimalPegAndBudget(
 
 export function calculateNewAmm(
 	amm: AMM,
+	totalExchangeFee: BN,
 	mmOraclePriceData: MMOraclePriceData
 ): [BN, BN, BN, BN] {
 	let pKNumer = new BN(1);
 	let pKDenom = new BN(1);
 
 	const [targetPrice, _newPeg, budget, _checkLowerBound] =
-		calculateOptimalPegAndBudget(amm, mmOraclePriceData);
+		calculateOptimalPegAndBudget(amm, totalExchangeFee, mmOraclePriceData);
 	let prePegCost = calculateRepegCost(amm, _newPeg);
 	let newPeg = _newPeg;
 
@@ -155,6 +158,7 @@ export function calculateNewAmm(
 
 export function calculateUpdatedAMM(
 	amm: AMM,
+	totalExchangeFee: BN,
 	mmOraclePriceData: MMOraclePriceData
 ): AMM {
 	if (amm.curveUpdateIntensity == 0 || mmOraclePriceData === undefined) {
@@ -163,6 +167,7 @@ export function calculateUpdatedAMM(
 	const newAmm = Object.assign({}, amm);
 	const [prepegCost, pKNumer, pKDenom, newPeg] = calculateNewAmm(
 		amm,
+		totalExchangeFee,
 		mmOraclePriceData
 	);
 
@@ -195,13 +200,16 @@ export function calculateUpdatedAMM(
 
 export function calculateUpdatedAMMSpreadReserves(
 	amm: AMM,
+	marketStats: MarketStats,
+	totalExchangeFee: BN,
 	direction: PositionDirection,
 	mmOraclePriceData: MMOraclePriceData,
 	latestSlot?: BN
 ): { baseAssetReserve: BN; quoteAssetReserve: BN; sqrtK: BN; newPeg: BN } {
-	const newAmm = calculateUpdatedAMM(amm, mmOraclePriceData);
+	const newAmm = calculateUpdatedAMM(amm, totalExchangeFee, mmOraclePriceData);
 	const [shortReserves, longReserves] = calculateSpreadReserves(
 		newAmm,
+		marketStats,
 		mmOraclePriceData,
 		undefined,
 		latestSlot
@@ -223,19 +231,22 @@ export function calculateUpdatedAMMSpreadReserves(
 
 export function calculateBidAskPrice(
 	amm: AMM,
+	marketStats: MarketStats,
+	totalExchangeFee: BN,
 	mmOraclePriceData: MMOraclePriceData,
 	withUpdate = true,
 	latestSlot?: BN
 ): [BN, BN] {
 	let newAmm: AMM;
 	if (withUpdate) {
-		newAmm = calculateUpdatedAMM(amm, mmOraclePriceData);
+		newAmm = calculateUpdatedAMM(amm, totalExchangeFee, mmOraclePriceData);
 	} else {
 		newAmm = amm;
 	}
 
 	const [bidReserves, askReserves] = calculateSpreadReserves(
 		newAmm,
+		marketStats,
 		mmOraclePriceData,
 		undefined,
 		latestSlot
@@ -844,6 +855,7 @@ export function calculateSpreadBN(
 
 export function calculateSpread(
 	amm: AMM,
+	marketStats: MarketStats,
 	oraclePriceData: OraclePriceData,
 	now?: BN,
 	reservePrice?: BN
@@ -867,9 +879,13 @@ export function calculateSpread(
 		.div(reservePrice);
 
 	now = now || new BN(new Date().getTime() / 1000); //todo
-	const liveOracleStd = calculateLiveOracleStd(amm, oraclePriceData, now);
+	const liveOracleStd = calculateLiveOracleStd(
+		marketStats,
+		oraclePriceData,
+		now
+	);
 	const confIntervalPct = getNewOracleConfPct(
-		amm,
+		marketStats,
 		oraclePriceData,
 		reservePrice,
 		now
@@ -890,11 +906,11 @@ export function calculateSpread(
 		amm.baseAssetReserve,
 		amm.minBaseAssetReserve,
 		amm.maxBaseAssetReserve,
-		amm.markStd,
+		marketStats.markStd,
 		liveOracleStd,
-		amm.longIntensityVolume,
-		amm.shortIntensityVolume,
-		amm.volume24H,
+		marketStats.longIntensityVolume,
+		marketStats.shortIntensityVolume,
+		marketStats.volume24H,
 		amm.ammInventorySpreadAdjustment
 	);
 	let longSpread = spreads[0];
@@ -925,6 +941,7 @@ export function calculateSpread(
 
 export function calculateSpreadReserves(
 	amm: AMM,
+	marketStats: MarketStats,
 	mmOraclePriceData: MMOraclePriceData,
 	now?: BN,
 	latestSlot?: BN
@@ -1022,25 +1039,27 @@ export function calculateSpreadReserves(
 
 		referencePriceOffset = calculateReferencePriceOffset(
 			reservePrice,
-			amm.last24HAvgFundingRate,
+			marketStats.last24HAvgFundingRate,
 			liquidityFractionAfterDeadband,
-			amm.historicalOracleData.lastOraclePriceTwap5Min,
-			amm.lastMarkPriceTwap5Min,
-			amm.historicalOracleData.lastOraclePriceTwap,
-			amm.lastMarkPriceTwap,
+			marketStats.historicalOracleData.lastOraclePriceTwap5Min,
+			marketStats.lastMarkPriceTwap5Min,
+			marketStats.historicalOracleData.lastOraclePriceTwap,
+			marketStats.lastMarkPriceTwap,
 			maxOffset
 		).toNumber();
 	}
 
 	let [longSpread, shortSpread] = calculateSpread(
 		amm,
+		marketStats,
 		mmOraclePriceData,
 		now,
 		reservePrice
 	);
 
+	const lastReferencePriceOffset = marketStats.lastReferencePriceOffset;
 	const doReferencePricOffsetSmooth =
-		Math.sign(referencePriceOffset) !== Math.sign(amm.referencePriceOffset) &&
+		Math.sign(referencePriceOffset) !== Math.sign(lastReferencePriceOffset) &&
 		amm.curveUpdateIntensity > 100;
 
 	if (doReferencePricOffsetSmooth) {
@@ -1048,17 +1067,17 @@ export function calculateSpreadReserves(
 			latestSlot != null
 				? BN.max(latestSlot.sub(amm.lastUpdateSlot), ZERO).toNumber()
 				: 0;
-		const fullOffsetDelta = referencePriceOffset - amm.referencePriceOffset;
+		const fullOffsetDelta = referencePriceOffset - lastReferencePriceOffset;
 		const raw = Math.trunc(
 			Math.min(Math.abs(fullOffsetDelta), slotsPassed * 1000) / 10
 		);
 		const maxAllowed =
-			Math.abs(amm.referencePriceOffset) || Math.abs(referencePriceOffset);
+			Math.abs(lastReferencePriceOffset) || Math.abs(referencePriceOffset);
 
 		const magnitude = Math.min(Math.max(raw, 10), maxAllowed);
 		const referencePriceDelta = Math.sign(fullOffsetDelta) * magnitude;
 
-		referencePriceOffset = amm.referencePriceOffset + referencePriceDelta;
+		referencePriceOffset = lastReferencePriceOffset + referencePriceDelta;
 
 		if (referencePriceDelta < 0) {
 			longSpread += Math.abs(referencePriceDelta);
@@ -1159,6 +1178,7 @@ export function calculateTerminalPrice(market: PerpMarketAccount) {
 
 export function calculateMaxBaseAssetAmountToTrade(
 	amm: AMM,
+	marketStats: MarketStats,
 	limit_price: BN,
 	direction: PositionDirection,
 	mmOraclePriceData?: MMOraclePriceData,
@@ -1175,6 +1195,7 @@ export function calculateMaxBaseAssetAmountToTrade(
 	const newBaseAssetReserve = squareRootBN(newBaseAssetReserveSquared);
 	const [shortSpreadReserves, longSpreadReserves] = calculateSpreadReserves(
 		amm,
+		marketStats,
 		mmOraclePriceData,
 		now
 	);
@@ -1221,6 +1242,7 @@ export function calculateQuoteAssetAmountSwapped(
 
 export function calculateMaxBaseAssetAmountFillable(
 	amm: AMM,
+	orderStepSize: BN,
 	orderDirection: PositionDirection
 ): BN {
 	const maxFillSize = amm.baseAssetReserve.div(
@@ -1241,6 +1263,6 @@ export function calculateMaxBaseAssetAmountFillable(
 
 	return standardizeBaseAssetAmount(
 		BN.min(maxFillSize, maxBaseAssetAmountOnSide),
-		amm.orderStepSize
+		orderStepSize
 	);
 }

package/src/math/auction.ts

@@ -95,7 +95,7 @@ export function getAuctionPrice(
 	) {
 		return getAuctionPriceForFixedAuction(order, slot);
 	} else if (isVariant(order.orderType, 'limit')) {
-		if (order.oraclePriceOffset != null && order.oraclePriceOffset !== 0) {
+		if (order.oraclePriceOffset != null && !order.oraclePriceOffset.eq(ZERO)) {
 			return getAuctionPriceForOracleOffsetAuction(order, slot, oraclePrice);
 		} else {
 			return getAuctionPriceForFixedAuction(order, slot);
@@ -207,7 +207,7 @@ export function deriveOracleAuctionParams({
 		min: BN;
 		max: BN;
 	};
-}): { auctionStartPrice: BN; auctionEndPrice: BN; oraclePriceOffset: number } {
+}): { auctionStartPrice: BN; auctionEndPrice: BN; oraclePriceOffset: BN } {
 	let oraclePriceOffset;
 
 	if (limitPrice.eq(ZERO) || oraclePrice.eq(ZERO)) {
@@ -222,13 +222,6 @@ export function deriveOracleAuctionParams({
 			: auctionEndPrice.sub(oraclePrice).sub(ONE);
 	}
 
-	let oraclePriceOffsetNum;
-	try {
-		oraclePriceOffsetNum = oraclePriceOffset.toNumber();
-	} catch (e) {
-		oraclePriceOffsetNum = 0;
-	}
-
 	if (auctionPriceCaps) {
 		auctionStartPrice = BN.min(
 			BN.max(auctionStartPrice, auctionPriceCaps.min),
@@ -243,7 +236,7 @@ export function deriveOracleAuctionParams({
 	return {
 		auctionStartPrice: auctionStartPrice.sub(oraclePrice),
 		auctionEndPrice: auctionEndPrice.sub(oraclePrice),
-		oraclePriceOffset: oraclePriceOffsetNum,
+		oraclePriceOffset: oraclePriceOffset,
 	};
 }
 
@@ -261,11 +254,11 @@ export function getTriggerAuctionStartPrice(params: {
 	const { perpMarket, direction, oraclePrice, limitPrice } = params;
 
 	const twapMismatch =
-		perpMarket.amm.historicalOracleData.lastOraclePriceTwapTs
-			.sub(perpMarket.amm.lastMarkPriceTwapTs)
+		perpMarket.marketStats.historicalOracleData.lastOraclePriceTwapTs
+			.sub(perpMarket.marketStats.lastMarkPriceTwapTs)
 			.abs()
 			.gte(new BN(60)) ||
-		perpMarket.amm.volume24H.lte(new BN(100_000).mul(QUOTE_PRECISION));
+		perpMarket.marketStats.volume24H.lte(new BN(100_000).mul(QUOTE_PRECISION));
 
 	let baselineStartOffset: BN;
 
@@ -273,27 +266,31 @@ export function getTriggerAuctionStartPrice(params: {
 		const contractTierNumber = getPerpMarketTierNumber(perpMarket);
 		const priceDivisor = contractTierNumber <= 1 ? 500 : 100;
 		baselineStartOffset = isVariant(direction, 'long')
-			? perpMarket.amm.lastBidPriceTwap.divn(priceDivisor)
-			: perpMarket.amm.lastAskPriceTwap.divn(priceDivisor).neg();
+			? perpMarket.marketStats.lastBidPriceTwap.divn(priceDivisor)
+			: perpMarket.marketStats.lastAskPriceTwap.divn(priceDivisor).neg();
 	} else {
 		const markTwapSlow = isVariant(direction, 'long')
-			? perpMarket.amm.lastBidPriceTwap
-			: perpMarket.amm.lastAskPriceTwap;
+			? perpMarket.marketStats.lastBidPriceTwap
+			: perpMarket.marketStats.lastAskPriceTwap;
 
-		const markTwapFast = perpMarket.amm.lastMarkPriceTwap5Min;
+		const markTwapFast = perpMarket.marketStats.lastMarkPriceTwap5Min;
 		const oracleTwapSlow =
-			perpMarket.amm.historicalOracleData.lastOraclePriceTwap;
+			perpMarket.marketStats.historicalOracleData.lastOraclePriceTwap;
 		const oracleTwapFast =
-			perpMarket.amm.historicalOracleData.lastOraclePriceTwap5Min;
+			perpMarket.marketStats.historicalOracleData.lastOraclePriceTwap5Min;
 
 		const offsetSlow = markTwapSlow.sub(oracleTwapSlow);
 		const offsetFast = markTwapFast.sub(oracleTwapFast);
 
-		const fracOfLongSpreadInPrice = new BN(perpMarket.amm.longSpread)
+		// long_spread/short_spread were removed from AMM in the decoupling refactor.
+		// Fall back to half base_spread as the per-side spread approximation; the
+		// AMM no longer caches an exact per-side spread without oracle context.
+		const halfBaseSpread = new BN(Math.floor(perpMarket.amm.baseSpread / 2));
+		const fracOfLongSpreadInPrice = halfBaseSpread
 			.mul(markTwapSlow)
 			.div(PRICE_PRECISION.muln(10)); // divide by 10x for safety
 
-		const fracOfShortSpreadInPrice = new BN(perpMarket.amm.shortSpread)
+		const fracOfShortSpreadInPrice = halfBaseSpread
 			.mul(markTwapSlow)
 			.div(PRICE_PRECISION.muln(10)); // divide by 10x for safety
 

package/src/math/builder.ts

@@ -1,4 +1,48 @@
-import { RevenueShareOrder } from '../types';
+import { PublicKey } from '@solana/web3.js';
+import {
+	OrderParams,
+	ReferrerStatus,
+	RevenueShareEscrowAccount,
+	RevenueShareOrder,
+	UserStatsAccount,
+} from '../types';
+
+/**
+ * True when the user's RevenueShareEscrow was initialized with a referrer.
+ * Fills for such users must include the escrow account or the program rejects
+ * them with UnableToLoadRevenueShareAccount.
+ */
+export function isBuilderReferral(
+	userStats: Pick<UserStatsAccount, 'referrerStatus'>
+): boolean {
+	return (userStats.referrerStatus & ReferrerStatus.BuilderReferral) !== 0;
+}
+
+/**
+ * True when the escrow was initialized with a referrer. Referral rewards
+ * accrue into such escrows on fills, so fills of the escrow owner's orders
+ * must include the escrow account (see `isBuilderReferral`).
+ */
+export function escrowHasReferrer(
+	escrow: Pick<RevenueShareEscrowAccount, 'referrer'>
+): boolean {
+	return !escrow.referrer.equals(PublicKey.default);
+}
+
+/**
+ * True when the order params carry a builder code (`builderIdx` +
+ * `builderFeeTenthBps`).
+ */
+export function hasBuilderParams(
+	orderParams: Pick<OrderParams, 'builderIdx' | 'builderFeeTenthBps'>
+): boolean {
+	return (
+		orderParams.builderIdx !== null &&
+		orderParams.builderIdx !== undefined &&
+		orderParams.builderFeeTenthBps !== null &&
+		orderParams.builderFeeTenthBps !== undefined
+	);
+}
 
 const FLAG_IS_OPEN = 0x01;
 export function isBuilderOrderOpen(order: RevenueShareOrder): boolean {

package/src/math/funding.ts

@@ -28,8 +28,8 @@ function calculateLiveMarkTwap(
 ): BN {
 	now = now || new BN((Date.now() / 1000).toFixed(0));
 
-	const lastMarkTwapWithMantissa = market.amm.lastMarkPriceTwap;
-	const lastMarkPriceTwapTs = market.amm.lastMarkPriceTwapTs;
+	const lastMarkTwapWithMantissa = market.marketStats.lastMarkPriceTwap;
+	const lastMarkPriceTwapTs = market.marketStats.lastMarkPriceTwapTs;
 
 	const timeSinceLastMarkChange = now.sub(lastMarkPriceTwapTs);
 	const markTwapTimeSinceLastUpdate = BN.max(
@@ -38,7 +38,12 @@ function calculateLiveMarkTwap(
 	);
 
 	if (!markPrice) {
-		const [bid, ask] = calculateBidAskPrice(market.amm, mmOraclePriceData);
+		const [bid, ask] = calculateBidAskPrice(
+			market.amm,
+			market.marketStats,
+			market.totalExchangeFee,
+			mmOraclePriceData
+		);
 		markPrice = bid.add(ask).div(new BN(2));
 	}
 
@@ -60,25 +65,28 @@ function shrinkStaleTwaps(
 	let newMarkTwap = markTwapWithMantissa;
 	let newOracleTwap = oracleTwapWithMantissa;
 	if (
-		market.amm.lastMarkPriceTwapTs.gt(
-			market.amm.historicalOracleData.lastOraclePriceTwapTs
+		market.marketStats.lastMarkPriceTwapTs.gt(
+			market.marketStats.historicalOracleData.lastOraclePriceTwapTs
 		)
 	) {
 		// shrink oracle based on invalid intervals
 		const oracleInvalidDuration = BN.max(
 			ZERO,
-			market.amm.lastMarkPriceTwapTs.sub(
-				market.amm.historicalOracleData.lastOraclePriceTwapTs
+			market.marketStats.lastMarkPriceTwapTs.sub(
+				market.marketStats.historicalOracleData.lastOraclePriceTwapTs
 			)
 		);
 		const timeSinceLastOracleTwapUpdate = now.sub(
-			market.amm.historicalOracleData.lastOraclePriceTwapTs
+			market.marketStats.historicalOracleData.lastOraclePriceTwapTs
 		);
 		const oracleTwapTimeSinceLastUpdate = BN.max(
 			ONE,
 			BN.min(
-				market.amm.fundingPeriod,
-				BN.max(ONE, market.amm.fundingPeriod.sub(timeSinceLastOracleTwapUpdate))
+				market.marketStats.fundingPeriod,
+				BN.max(
+					ONE,
+					market.marketStats.fundingPeriod.sub(timeSinceLastOracleTwapUpdate)
+				)
 			)
 		);
 		newOracleTwap = oracleTwapTimeSinceLastUpdate
@@ -86,23 +94,28 @@ function shrinkStaleTwaps(
 			.add(oracleInvalidDuration.mul(markTwapWithMantissa))
 			.div(oracleTwapTimeSinceLastUpdate.add(oracleInvalidDuration));
 	} else if (
-		market.amm.lastMarkPriceTwapTs.lt(
-			market.amm.historicalOracleData.lastOraclePriceTwapTs
+		market.marketStats.lastMarkPriceTwapTs.lt(
+			market.marketStats.historicalOracleData.lastOraclePriceTwapTs
 		)
 	) {
 		// shrink mark to oracle twap over tradless intervals
 		const tradelessDuration = BN.max(
 			ZERO,
-			market.amm.historicalOracleData.lastOraclePriceTwapTs.sub(
-				market.amm.lastMarkPriceTwapTs
+			market.marketStats.historicalOracleData.lastOraclePriceTwapTs.sub(
+				market.marketStats.lastMarkPriceTwapTs
 			)
 		);
-		const timeSinceLastMarkTwapUpdate = now.sub(market.amm.lastMarkPriceTwapTs);
+		const timeSinceLastMarkTwapUpdate = now.sub(
+			market.marketStats.lastMarkPriceTwapTs
+		);
 		const markTwapTimeSinceLastUpdate = BN.max(
 			ONE,
 			BN.min(
-				market.amm.fundingPeriod,
-				BN.max(ONE, market.amm.fundingPeriod.sub(timeSinceLastMarkTwapUpdate))
+				market.marketStats.fundingPeriod,
+				BN.max(
+					ONE,
+					market.marketStats.fundingPeriod.sub(timeSinceLastMarkTwapUpdate)
+				)
 			)
 		);
 		newMarkTwap = markTwapTimeSinceLastUpdate
@@ -141,13 +154,13 @@ export function calculateAllEstimatedFundingRate(
 		mmOraclePriceData,
 		markPrice,
 		now,
-		market.amm.fundingPeriod
+		market.marketStats.fundingPeriod
 	);
 	const liveOracleTwap = calculateLiveOracleTwap(
-		market.amm.historicalOracleData,
+		market.marketStats.historicalOracleData,
 		oraclePriceData,
 		now,
-		market.amm.fundingPeriod
+		market.marketStats.fundingPeriod
 	);
 	const [markTwap, oracleTwap] = shrinkStaleTwaps(
 		market,
@@ -187,10 +200,10 @@ export function calculateAllEstimatedFundingRate(
 
 	const secondsInHour = new BN(3600);
 	const hoursInDay = new BN(24);
-	const timeSinceLastUpdate = now.sub(market.amm.lastFundingRateTs);
+	const timeSinceLastUpdate = now.sub(market.lastFundingRateTs);
 
 	const lowerboundEst = twapSpreadPct
-		.mul(market.amm.fundingPeriod)
+		.mul(market.marketStats.fundingPeriod)
 		.mul(BN.min(secondsInHour, timeSinceLastUpdate))
 		.div(secondsInHour)
 		.div(secondsInHour)
@@ -210,19 +223,15 @@ export function calculateAllEstimatedFundingRate(
 	let cappedAltEst: BN;
 	let largerSide: BN;
 	let smallerSide: BN;
-	if (
-		market.amm.baseAssetAmountLong.gt(market.amm.baseAssetAmountShort.abs())
-	) {
-		largerSide = market.amm.baseAssetAmountLong.abs();
-		smallerSide = market.amm.baseAssetAmountShort.abs();
+	if (market.baseAssetAmountLong.gt(market.baseAssetAmountShort.abs())) {
+		largerSide = market.baseAssetAmountLong.abs();
+		smallerSide = market.baseAssetAmountShort.abs();
 		if (twapSpread.gt(new BN(0))) {
 			return [markTwap, oracleTwap, lowerboundEst, interpEst, interpEst];
 		}
-	} else if (
-		market.amm.baseAssetAmountLong.lt(market.amm.baseAssetAmountShort.abs())
-	) {
-		largerSide = market.amm.baseAssetAmountShort.abs();
-		smallerSide = market.amm.baseAssetAmountLong.abs();
+	} else if (market.baseAssetAmountLong.lt(market.baseAssetAmountShort.abs())) {
+		largerSide = market.baseAssetAmountShort.abs();
+		smallerSide = market.baseAssetAmountLong.abs();
 		if (twapSpread.lt(new BN(0))) {
 			return [markTwap, oracleTwap, lowerboundEst, interpEst, interpEst];
 		}
@@ -370,11 +379,9 @@ export function calculateLongShortFundingRate(
 		now
 	);
 
-	if (market.amm.baseAssetAmountLong.gt(market.amm.baseAssetAmountShort)) {
+	if (market.baseAssetAmountLong.gt(market.baseAssetAmountShort)) {
 		return [cappedAltEst, interpEst];
-	} else if (
-		market.amm.baseAssetAmountLong.lt(market.amm.baseAssetAmountShort)
-	) {
+	} else if (market.baseAssetAmountLong.lt(market.baseAssetAmountShort)) {
 		return [interpEst, cappedAltEst];
 	} else {
 		return [interpEst, interpEst];
@@ -404,13 +411,9 @@ export function calculateLongShortFundingRateAndLiveTwaps(
 			now
 		);
 
-	if (
-		market.amm.baseAssetAmountLong.gt(market.amm.baseAssetAmountShort.abs())
-	) {
+	if (market.baseAssetAmountLong.gt(market.baseAssetAmountShort.abs())) {
 		return [markTwapLive, oracleTwapLive, cappedAltEst, interpEst];
-	} else if (
-		market.amm.baseAssetAmountLong.lt(market.amm.baseAssetAmountShort.abs())
-	) {
+	} else if (market.baseAssetAmountLong.lt(market.baseAssetAmountShort.abs())) {
 		return [markTwapLive, oracleTwapLive, interpEst, cappedAltEst];
 	} else {
 		return [markTwapLive, oracleTwapLive, interpEst, interpEst];
@@ -424,7 +427,7 @@ export function calculateLongShortFundingRateAndLiveTwaps(
  */
 export function calculateFundingPool(market: PerpMarketAccount): BN {
 	// todo
-	const totalFeeLB = market.amm.totalExchangeFee.div(new BN(2));
+	const totalFeeLB = market.totalExchangeFee.div(new BN(2));
 	const feePool = BN.max(
 		ZERO,
 		market.amm.totalFeeMinusDistributions