@drift-labs/sdk 2.10.0-beta.1 → 2.10.0-beta.2

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.10.0-beta.1",
+  "version": "2.10.0-beta.2",
   "name": "drift",
   "instructions": [
     {

package/src/index.ts

@@ -21,6 +21,7 @@ export * from './accounts/pollingUserStatsAccountSubscriber';
 export * from './accounts/types';
 export * from './addresses/pda';
 export * from './adminClient';
+export * from './testClient';
 export * from './user';
 export * from './userConfig';
 export * from './userStats';

package/src/math/amm.ts

@@ -67,6 +67,8 @@ export function calculateOptimalPegAndBudget(
 
 	const totalFeeLB = amm.totalExchangeFee.div(new BN(2));
 	const budget = BN.max(ZERO, amm.totalFeeMinusDistributions.sub(totalFeeLB));
+
+	let checkLowerBound = true;
 	if (budget.lt(prePegCost)) {
 		const halfMaxPriceSpread = new BN(amm.maxSpread)
 			.div(new BN(2))
@@ -94,11 +96,17 @@ export function calculateOptimalPegAndBudget(
 			);
 
 			newBudget = calculateRepegCost(amm, newOptimalPeg);
+			checkLowerBound = false;
+
 			return [newTargetPrice, newOptimalPeg, newBudget, false];
+		} else if (
+			amm.totalFeeMinusDistributions.lt(amm.totalExchangeFee.div(new BN(2)))
+		) {
+			checkLowerBound = false;
 		}
 	}
 
-	return [targetPrice, newPeg, budget, true];
+	return [targetPrice, newPeg, budget, checkLowerBound];
 }
 
 export function calculateNewAmm(
@@ -108,12 +116,12 @@ export function calculateNewAmm(
 	let pKNumer = new BN(1);
 	let pKDenom = new BN(1);
 
-	const [targetPrice, _newPeg, budget, checkLowerBound] =
+	const [targetPrice, _newPeg, budget, _checkLowerBound] =
 		calculateOptimalPegAndBudget(amm, oraclePriceData);
 	let prePegCost = calculateRepegCost(amm, _newPeg);
 	let newPeg = _newPeg;
 
-	if (prePegCost.gt(budget) && checkLowerBound) {
+	if (prePegCost.gte(budget) && prePegCost.gt(ZERO)) {
 		[pKNumer, pKDenom] = [new BN(999), new BN(1000)];
 		const deficitMadeup = calculateAdjustKCost(amm, pKNumer, pKDenom);
 		assert(deficitMadeup.lte(new BN(0)));
@@ -136,7 +144,6 @@ export function calculateNewAmm(
 			);
 
 		newAmm.terminalQuoteAssetReserve = newQuoteAssetReserve;
-
 		newPeg = calculateBudgetedPeg(newAmm, prePegCost, targetPrice);
 		prePegCost = calculateRepegCost(newAmm, newPeg);
 	}
@@ -148,7 +155,7 @@ export function calculateUpdatedAMM(
 	amm: AMM,
 	oraclePriceData: OraclePriceData
 ): AMM {
-	if (amm.curveUpdateIntensity == 0) {
+	if (amm.curveUpdateIntensity == 0 || oraclePriceData === undefined) {
 		return amm;
 	}
 	const newAmm = Object.assign({}, amm);
@@ -181,7 +188,6 @@ export function calculateUpdatedAMM(
 		newAmm.totalFeeMinusDistributions.sub(prepegCost);
 	newAmm.netRevenueSinceLastFunding =
 		newAmm.netRevenueSinceLastFunding.sub(prepegCost);
-
 	return newAmm;
 }
 
@@ -605,13 +611,22 @@ export function calculateSpreadBN(
 			DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT
 		)
 	) {
-		const revenueRetreatAmount = Math.min(
-			maxTargetSpread / 10,
-			Math.floor(
-				(baseSpread * netRevenueSinceLastFunding.abs().toNumber()) /
-					DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT.abs().toNumber()
+		const maxRetreat = maxTargetSpread / 10;
+		let revenueRetreatAmount = maxRetreat;
+		if (
+			netRevenueSinceLastFunding.gte(
+				DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT.mul(new BN(1000))
 			)
-		);
+		) {
+			revenueRetreatAmount = Math.min(
+				maxRetreat,
+				Math.floor(
+					(baseSpread * netRevenueSinceLastFunding.abs().toNumber()) /
+						DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT.abs().toNumber()
+				)
+			);
+		}
+
 		const halfRevenueRetreatAmount = Math.floor(revenueRetreatAmount / 2);
 
 		spreadTerms.revenueRetreatAmount = revenueRetreatAmount;

package/src/math/oracles.ts

@@ -94,8 +94,9 @@ export function calculateLiveOracleTwap(
 	oraclePriceData: OraclePriceData,
 	now: BN
 ): BN {
-	const sinceLastUpdate = now.sub(
-		amm.historicalOracleData.lastOraclePriceTwapTs
+	const sinceLastUpdate = BN.max(
+		ONE,
+		now.sub(amm.historicalOracleData.lastOraclePriceTwapTs)
 	);
 	const sinceStart = BN.max(ZERO, amm.fundingPeriod.sub(sinceLastUpdate));
 
@@ -124,8 +125,9 @@ export function calculateLiveOracleStd(
 	oraclePriceData: OraclePriceData,
 	now: BN
 ): BN {
-	const sinceLastUpdate = now.sub(
-		amm.historicalOracleData.lastOraclePriceTwapTs
+	const sinceLastUpdate = BN.max(
+		ONE,
+		now.sub(amm.historicalOracleData.lastOraclePriceTwapTs)
 	);
 	const sinceStart = BN.max(ZERO, amm.fundingPeriod.sub(sinceLastUpdate));
 

package/src/math/repeg.ts

@@ -8,6 +8,8 @@ import {
 	PRICE_DIV_PEG,
 	QUOTE_PRECISION,
 	ZERO,
+	ONE,
+	PERCENTAGE_PRECISION,
 } from '../constants/numericConstants';
 import { AMM } from '../types';
 /**
@@ -34,19 +36,51 @@ export function calculateAdjustKCost(
 	const p = numerator.mul(PRICE_PRECISION).div(denomenator);
 
 	const cost = quoteScale
+		.mul(PERCENTAGE_PRECISION)
+		.mul(PERCENTAGE_PRECISION)
 		.div(x.add(d))
 		.sub(
 			quoteScale
 				.mul(p)
+				.mul(PERCENTAGE_PRECISION)
+				.mul(PERCENTAGE_PRECISION)
 				.div(PRICE_PRECISION)
 				.div(x.mul(p).div(PRICE_PRECISION).add(d))
 		)
+		.div(PERCENTAGE_PRECISION)
+		.div(PERCENTAGE_PRECISION)
 		.div(AMM_TO_QUOTE_PRECISION_RATIO)
 		.div(PEG_PRECISION);
 
 	return cost.mul(new BN(-1));
 }
 
+// /**
+//  * Helper function calculating adjust k cost
+//  * @param amm
+//  * @param numerator
+//  * @param denomenator
+//  * @returns cost : Precision QUOTE_ASSET_PRECISION
+//  */
+// export function calculateAdjustKCost2(
+// 	amm: AMM,
+// 	numerator: BN,
+// 	denomenator: BN
+// ): BN {
+// 	// const k = market.amm.sqrtK.mul(market.amm.sqrtK);
+// 	const directionToClose = amm.baseAssetAmountWithAmm.gt(ZERO)
+// 		? PositionDirection.SHORT
+// 		: PositionDirection.LONG;
+
+// 	const [newQuoteAssetReserve, _newBaseAssetReserve] =
+// 		calculateAmmReservesAfterSwap(
+// 			amm,
+// 			'base',
+// 			amm.baseAssetAmountWithAmm.abs(),
+// 			getSwapDirection('base', directionToClose)
+// 		);
+// }
+
 /**
  * Helper function calculating adjust pegMultiplier (repeg) cost
  *
@@ -143,44 +177,38 @@ export function calculateBudgetedK(amm: AMM, cost: BN): [BN, BN] {
 	return [numerator, denominator];
 }
 
-export function calculateBudgetedPeg(amm: AMM, cost: BN, targetPrice: BN): BN {
-	// wolframalpha.com
-	// (1/(x+d) - p/(x*p+d))*y*d*Q = C solve for p
-	// p = (d(y*d*Q - C(x+d))) / (C*x(x+d) + y*y*d*Q)
+export function calculateBudgetedPeg(
+	amm: AMM,
+	budget: BN,
+	targetPrice: BN
+): BN {
+	let perPegCost = amm.quoteAssetReserve
+		.sub(amm.terminalQuoteAssetReserve)
+		.div(AMM_RESERVE_PRECISION.div(PRICE_PRECISION));
+
+	if (perPegCost.gt(ZERO)) {
+		perPegCost = perPegCost.add(ONE);
+	} else if (perPegCost.lt(ZERO)) {
+		perPegCost = perPegCost.sub(ONE);
+	}
 
-	// todo: assumes k = x * y
-	// otherwise use: (y(1-p) + (kp^2/(x*p+d)) - k/(x+d)) * Q = C solve for p
 	const targetPeg = targetPrice
 		.mul(amm.baseAssetReserve)
 		.div(amm.quoteAssetReserve)
 		.div(PRICE_DIV_PEG);
 
-	const k = amm.sqrtK.mul(amm.sqrtK);
-	const x = amm.baseAssetReserve;
-	const y = amm.quoteAssetReserve;
-
-	const d = amm.baseAssetAmountWithAmm;
-	const Q = amm.pegMultiplier;
-
-	const C = cost.mul(new BN(-1));
-
-	const deltaQuoteAssetReserves = y.sub(k.div(x.add(d)));
-	const pegChangeDirection = targetPeg.sub(Q);
+	const pegChangeDirection = targetPeg.sub(amm.pegMultiplier);
 
 	const useTargetPeg =
-		(deltaQuoteAssetReserves.lt(ZERO) && pegChangeDirection.gt(ZERO)) ||
-		(deltaQuoteAssetReserves.gt(ZERO) && pegChangeDirection.lt(ZERO));
+		(perPegCost.lt(ZERO) && pegChangeDirection.gt(ZERO)) ||
+		(perPegCost.gt(ZERO) && pegChangeDirection.lt(ZERO));
 
-	if (deltaQuoteAssetReserves.eq(ZERO) || useTargetPeg) {
+	if (perPegCost.eq(ZERO) || useTargetPeg) {
 		return targetPeg;
 	}
 
-	const deltaPegMultiplier = C.mul(PRICE_PRECISION).div(
-		deltaQuoteAssetReserves.div(AMM_TO_QUOTE_PRECISION_RATIO)
-	);
-	const newPeg = Q.sub(
-		deltaPegMultiplier.mul(PEG_PRECISION).div(PRICE_PRECISION)
-	);
+	const budgetDeltaPeg = budget.mul(PEG_PRECISION).div(perPegCost);
+	const newPeg = BN.max(ONE, amm.pegMultiplier.add(budgetDeltaPeg));
 
 	return newPeg;
 }

package/src/testClient.ts

@@ -0,0 +1,40 @@
+import { AdminClient } from './adminClient';
+import { ConfirmOptions, Signer, Transaction } from '@solana/web3.js';
+import { TxSigAndSlot } from './tx/types';
+import { PollingDriftClientAccountSubscriber } from './accounts/pollingDriftClientAccountSubscriber';
+import { DriftClientConfig } from './driftClientConfig';
+
+export class TestClient extends AdminClient {
+	public constructor(config: DriftClientConfig) {
+		if (config.accountSubscription.type !== 'polling') {
+			throw new Error('Test client must be polling');
+		}
+		super(config);
+	}
+
+	async sendTransaction(
+		tx: Transaction,
+		additionalSigners?: Array<Signer>,
+		opts?: ConfirmOptions,
+		preSigned?: boolean
+	): Promise<TxSigAndSlot> {
+		const { txSig, slot } = await super.sendTransaction(
+			tx,
+			additionalSigners,
+			opts,
+			preSigned
+		);
+
+		let lastFetchedSlot = (
+			this.accountSubscriber as PollingDriftClientAccountSubscriber
+		).accountLoader.mostRecentSlot;
+		while (lastFetchedSlot < slot) {
+			await this.fetchAccounts();
+			lastFetchedSlot = (
+				this.accountSubscriber as PollingDriftClientAccountSubscriber
+			).accountLoader.mostRecentSlot;
+		}
+
+		return { txSig, slot };
+	}
+}

package/src/user.ts

@@ -124,6 +124,11 @@ export class User {
 		return this.accountSubscriber.getUserAccountAndSlot().data;
 	}
 
+	public async forceGetUserAccount(): Promise<UserAccount> {
+		await this.fetchAccounts();
+		return this.accountSubscriber.getUserAccountAndSlot().data;
+	}
+
 	public getUserAccountAndSlot(): DataAndSlot<UserAccount> | undefined {
 		return this.accountSubscriber.getUserAccountAndSlot();
 	}