@drift-labs/sdk 0.1.36-master.0 → 0.1.36-master.3

package/lib/math/amm.d.ts

@@ -21,6 +21,7 @@ export declare type AssetType = 'quote' | 'base';
  * @returns quoteAssetReserve and baseAssetReserve after swap. : Precision AMM_RESERVE_PRECISION
  */
 export declare function calculateAmmReservesAfterSwap(amm: Pick<AMM, 'pegMultiplier' | 'quoteAssetReserve' | 'sqrtK' | 'baseAssetReserve'>, inputAssetType: AssetType, swapAmount: BN, swapDirection: SwapDirection): [BN, BN];
+export declare function calculateSpread(amm: AMM, direction: PositionDirection): number;
 export declare function calculateSpreadReserves(amm: AMM, direction: PositionDirection): {
     baseAssetReserve: BN;
     quoteAssetReserve: BN;

package/lib/math/amm.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateQuoteAssetAmountSwapped = exports.calculateBudgetedPeg = exports.calculateBudgetedK = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.calculateRepegCost = exports.calculateAdjustKCost = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateSpreadReserves = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = void 0;
+exports.calculateQuoteAssetAmountSwapped = exports.calculateBudgetedPeg = exports.calculateBudgetedK = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.calculateRepegCost = exports.calculateAdjustKCost = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateSpreadReserves = exports.calculateSpread = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = void 0;
 const anchor_1 = require("@project-serum/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const position_1 = require("./position");
@@ -51,14 +51,27 @@ function calculateAmmReservesAfterSwap(amm, inputAssetType, swapAmount, swapDire
     return [newQuoteAssetReserve, newBaseAssetReserve];
 }
 exports.calculateAmmReservesAfterSwap = calculateAmmReservesAfterSwap;
+function calculateSpread(amm, direction) {
+    let spread;
+    // future logic
+    if ((0, types_1.isVariant)(direction, 'long')) {
+        spread = amm.baseSpread;
+    }
+    else {
+        spread = amm.baseSpread;
+    }
+    return spread;
+}
+exports.calculateSpread = calculateSpread;
 function calculateSpreadReserves(amm, direction) {
-    if (amm.baseSpread === 0) {
+    const spread = calculateSpread(amm, direction);
+    if (spread === 0) {
         return {
             baseAssetReserve: amm.baseAssetReserve,
             quoteAssetReserve: amm.quoteAssetReserve,
         };
     }
-    const quoteAsserReserveDelta = amm.quoteAssetReserve.div(numericConstants_1.BID_ASK_SPREAD_PRECISION.div(new anchor_1.BN(amm.baseSpread / 4)));
+    const quoteAsserReserveDelta = amm.quoteAssetReserve.div(numericConstants_1.BID_ASK_SPREAD_PRECISION.div(new anchor_1.BN(spread / 4)));
     let quoteAssetReserve;
     if ((0, types_1.isVariant)(direction, 'long')) {
         quoteAssetReserve = amm.quoteAssetReserve.add(quoteAsserReserveDelta);

package/lib/math/state.d.ts

@@ -0,0 +1,8 @@
+import { StateAccount } from '../types';
+/**
+ * Get the clearing house percent fee charged on notional of taking trades
+ *
+ * @param state
+ * @returns Precision : basis points (bps)
+ */
+export declare function getExchangeFee(state: StateAccount): number;

package/lib/math/state.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getExchangeFee = void 0;
+/**
+ * Get the clearing house percent fee charged on notional of taking trades
+ *
+ * @param state
+ * @returns Precision : basis points (bps)
+ */
+function getExchangeFee(state) {
+    const exchangeFee = state.feeStructure.feeNumerator.toNumber() /
+        state.feeStructure.feeDenominator.toNumber();
+    return exchangeFee;
+}
+exports.getExchangeFee = getExchangeFee;

package/package.json

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

package/src/accounts/pollingClearingHouseAccountSubscriber.ts

@@ -85,8 +85,14 @@ export class PollingClearingHouseAccountSubscriber
 
 		await this.updateAccountsToPoll();
 		await this.addToAccountLoader();
-		await this.fetch();
-		const subscriptionSucceeded = this.didSubscriptionSucceed();
+
+		let subscriptionSucceeded = false;
+		let retries = 0;
+		while (!subscriptionSucceeded && retries < 5) {
+			await this.fetch();
+			subscriptionSucceeded = this.didSubscriptionSucceed();
+			retries++;
+		}
 
 		if (subscriptionSucceeded) {
 			this.eventEmitter.emit('update');
@@ -237,6 +243,10 @@ export class PollingClearingHouseAccountSubscriber
 					// @ts-ignore
 					this.eventEmitter.emit(accountToPoll.eventType, account);
 					this.eventEmitter.emit('update');
+
+					if (!this.isSubscribed) {
+						this.isSubscribed = this.didSubscriptionSucceed();
+					}
 				}
 			);
 		}

package/src/accounts/pollingOracleSubscriber.ts

@@ -37,11 +37,21 @@ export class PollingOracleSubscriber implements OracleSubscriber {
 		}
 
 		this.addToAccountLoader();
-		await this.fetch();
-		this.eventEmitter.emit('update');
 
-		this.isSubscribed = true;
-		return true;
+		let subscriptionSucceeded = false;
+		let retries = 0;
+		while (!subscriptionSucceeded && retries < 5) {
+			await this.fetch();
+			subscriptionSucceeded = this.didSubscriptionSucceed();
+			retries++;
+		}
+
+		if (subscriptionSucceeded) {
+			this.eventEmitter.emit('update');
+		}
+
+		this.isSubscribed = subscriptionSucceeded;
+		return subscriptionSucceeded;
 	}
 
 	addToAccountLoader(): void {
@@ -100,4 +110,8 @@ export class PollingOracleSubscriber implements OracleSubscriber {
 		this.assertIsSubscribed();
 		return this.oraclePriceData;
 	}
+
+	didSubscriptionSucceed(): boolean {
+		return !!this.oraclePriceData;
+	}
 }

package/src/accounts/pollingTokenAccountSubscriber.ts

@@ -36,11 +36,20 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 		}
 
 		this.addToAccountLoader();
-		await this.fetch();
-		this.eventEmitter.emit('update');
+		let subscriptionSucceeded = false;
+		let retries = 0;
+		while (!subscriptionSucceeded && retries < 5) {
+			await this.fetch();
+			subscriptionSucceeded = this.didSubscriptionSucceed();
+			retries++;
+		}
+
+		if (subscriptionSucceeded) {
+			this.eventEmitter.emit('update');
+		}
 
-		this.isSubscribed = true;
-		return true;
+		this.isSubscribed = subscriptionSucceeded;
+		return subscriptionSucceeded;
 	}
 
 	addToAccountLoader(): void {
@@ -96,4 +105,8 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 		this.assertIsSubscribed();
 		return this.tokenAccount;
 	}
+
+	didSubscriptionSucceed(): boolean {
+		return !!this.tokenAccount;
+	}
 }

package/src/accounts/pollingUserAccountSubscriber.ts

@@ -52,9 +52,14 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 		}
 
 		await this.addToAccountLoader();
-		await this.fetchIfUnloaded();
 
-		const subscriptionSucceeded = this.didSubscriptionSucceed();
+		let subscriptionSucceeded = false;
+		let retries = 0;
+		while (!subscriptionSucceeded && retries < 5) {
+			await this.fetchIfUnloaded();
+			subscriptionSucceeded = this.didSubscriptionSucceed();
+			retries++;
+		}
 
 		if (subscriptionSucceeded) {
 			this.eventEmitter.emit('update');