@drift-labs/sdk 0.2.0-master.24 → 0.2.0-master.25

package/src/clearingHouseUser.ts

@@ -183,7 +183,9 @@ export class ClearingHouseUser {
 
 	/**
 	 * calculates the market position if the lp position was settled
-	 * @returns : userPosition
+	 * @returns : the settled userPosition
+	 * @returns : the dust base asset amount (ie, < stepsize)
+	 * @returns : pnl from settle
 	 */
 	public getSettledLPPosition(marketIndex: BN): [UserPosition, BN, BN] {
 		const _position = this.getUserPosition(marketIndex);
@@ -224,9 +226,6 @@ export class ClearingHouseUser {
 
 		const reaminderPerLP = remainderBaa.mul(AMM_RESERVE_PRECISION).div(nShares);
 
-		position.baseAssetAmount = position.baseAssetAmount.add(standardizedBaa);
-		position.quoteAssetAmount = position.quoteAssetAmount.add(deltaQaa);
-
 		position.lastNetBaseAssetAmountPerLp =
 			market.amm.marketPositionPerLp.baseAssetAmount.sub(reaminderPerLP);
 
@@ -254,7 +253,7 @@ export class ClearingHouseUser {
 					.mul(deltaBaa.abs())
 					.div(position.baseAssetAmount.abs())
 			);
-			pnl = position.quoteEntryAmount.sub(newQuoteEntry);
+			pnl = position.quoteEntryAmount.sub(newQuoteEntry).add(deltaQaa);
 		} else {
 			newQuoteEntry = deltaQaa.sub(
 				deltaQaa.mul(position.baseAssetAmount.abs()).div(deltaBaa.abs())
@@ -262,6 +261,8 @@ export class ClearingHouseUser {
 			pnl = position.quoteEntryAmount.add(deltaQaa.sub(newQuoteEntry));
 		}
 		position.quoteEntryAmount = newQuoteEntry;
+		position.baseAssetAmount = position.baseAssetAmount.add(standardizedBaa);
+		position.quoteAssetAmount = position.quoteAssetAmount.add(deltaQaa);
 
 		if (position.baseAssetAmount.gt(ZERO)) {
 			position.lastCumulativeFundingRate = market.amm.cumulativeFundingRateLong;

package/src/config.ts

@@ -28,7 +28,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 	devnet: {
 		ENV: 'devnet',
 		PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-		CLEARING_HOUSE_PROGRAM_ID: 'HbUKwqFPjz9r7ZtT416AU8aaecDQMKKiDCTS3AdXnS6c',
+		CLEARING_HOUSE_PROGRAM_ID: '3v1iEjbSSLSSYyt1pmx4UB5rqJGurmz71RibXF7X6UF3',
 		USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
 		MARKETS: DevnetMarkets,
 		BANKS: DevnetBanks,

package/src/events/eventSubscriber.ts

@@ -25,6 +25,8 @@ export class EventSubscriber {
 	private awaitTxResolver = new Map<string, () => void>();
 	private logProvider: LogProvider;
 	public eventEmitter: StrictEventEmitter<EventEmitter, EventSubscriberEvents>;
+	private lastSeenSlot: number;
+	public lastSeenTxSig: string;
 
 	public constructor(
 		private connection: Connection,
@@ -62,19 +64,22 @@ export class EventSubscriber {
 		}
 	}
 
-	public subscribe(): boolean {
-		if (this.logProvider.isSubscribed()) {
-			return true;
-		}
+	public async subscribe(): Promise<boolean> {
+		try {
+			if (this.logProvider.isSubscribed()) {
+				return true;
+			}
 
-		this.fetchPreviousTx().catch((e) => {
+			this.logProvider.subscribe((txSig, slot, logs) => {
+				this.handleTxLogs(txSig, slot, logs);
+			}, true);
+
+			return true;
+		} catch (e) {
 			console.error('Error fetching previous txs in event subscriber');
 			console.error(e);
-		});
-
-		return this.logProvider.subscribe((txSig, slot, logs) => {
-			this.handleTxLogs(txSig, slot, logs);
-		});
+			return false;
+		}
 	}
 
 	private handleTxLogs(
@@ -98,11 +103,14 @@ export class EventSubscriber {
 			this.awaitTxResolver.delete(txSig);
 		}
 
+		if (slot > this.lastSeenSlot) {
+			this.lastSeenTxSig = txSig;
+		}
 		this.txEventCache.add(txSig, wrappedEvents);
 	}
 
-	private async fetchPreviousTx(): Promise<void> {
-		if (!this.options.untilTx) {
+	public async fetchPreviousTx(fetchMax?: boolean): Promise<void> {
+		if (!this.options.untilTx && !fetchMax) {
 			return;
 		}
 

package/src/events/fetchLogs.ts

@@ -1,14 +1,18 @@
+import { Program } from '@project-serum/anchor';
 import {
 	Connection,
 	Finality,
 	PublicKey,
 	TransactionSignature,
 } from '@solana/web3.js';
+import { WrappedEvents } from './types';
 
 type Log = { txSig: TransactionSignature; slot: number; logs: string[] };
 type FetchLogsResponse = {
 	earliestTx: string;
 	mostRecentTx: string;
+	earliestSlot: number;
+	mostRecentSlot: number;
 	transactionLogs: Log[];
 };
 
@@ -17,19 +21,21 @@ export async function fetchLogs(
 	programId: PublicKey,
 	finality: Finality,
 	beforeTx?: TransactionSignature,
-	untilTx?: TransactionSignature
-): Promise<FetchLogsResponse | undefined> {
+	untilTx?: TransactionSignature,
+	limit?: number
+): Promise<FetchLogsResponse> {
 	const signatures = await connection.getSignaturesForAddress(
 		programId,
 		{
 			before: beforeTx,
 			until: untilTx,
+			limit,
 		},
 		finality
 	);
 
 	const sortedSignatures = signatures.sort((a, b) =>
-		a.slot < b.slot ? -1 : 1
+		a.slot === b.slot ? 0 : a.slot < b.slot ? -1 : 1
 	);
 
 	const filteredSignatures = sortedSignatures.filter(
@@ -61,14 +67,15 @@ export async function fetchLogs(
 		)
 	).flat();
 
-	const earliestTx = filteredSignatures[0].signature;
-	const mostRecentTx =
-		filteredSignatures[filteredSignatures.length - 1].signature;
+	const earliest = filteredSignatures[0];
+	const mostRecent = filteredSignatures[filteredSignatures.length - 1];
 
 	return {
 		transactionLogs: transactionLogs,
-		earliestTx: earliestTx,
-		mostRecentTx: mostRecentTx,
+		earliestTx: earliest.signature,
+		mostRecentTx: mostRecent.signature,
+		earliestSlot: earliest.slot,
+		mostRecentSlot: mostRecent.slot,
 	};
 }
 
@@ -78,3 +85,23 @@ function chunk<T>(array: readonly T[], size: number): T[][] {
 		.map((_, index) => index * size)
 		.map((begin) => array.slice(begin, begin + size));
 }
+
+export class LogParser {
+	private program: Program;
+
+	constructor(program: Program) {
+		this.program = program;
+	}
+
+	public parseEventsFromLogs(event: Log): WrappedEvents {
+		const records: WrappedEvents = [];
+		// @ts-ignore
+		this.program._events._eventParser.parseLogs(event.logs, (eventLog) => {
+			eventLog.data.txSig = event.txSig;
+			eventLog.data.slot = event.slot;
+			eventLog.data.eventType = eventLog.name;
+			records.push(eventLog.data);
+		});
+		return records;
+	}
+}

package/src/events/pollingLogProvider.ts

@@ -13,6 +13,7 @@ export class PollingLogProvider implements LogProvider {
 	private intervalId: NodeJS.Timer;
 	private mostRecentSeenTx?: TransactionSignature;
 	private mutex: number;
+	private firstFetch = true;
 
 	public constructor(
 		private connection: Connection,
@@ -23,7 +24,10 @@ export class PollingLogProvider implements LogProvider {
 		this.finality = commitment === 'finalized' ? 'finalized' : 'confirmed';
 	}
 
-	public subscribe(callback: logProviderCallback): boolean {
+	public subscribe(
+		callback: logProviderCallback,
+		skipHistory?: boolean
+	): boolean {
 		if (this.intervalId) {
 			return true;
 		}
@@ -40,9 +44,13 @@ export class PollingLogProvider implements LogProvider {
 					this.programId,
 					this.finality,
 					undefined,
-					this.mostRecentSeenTx
+					this.mostRecentSeenTx,
+					// If skipping history, only fetch one log back, not the maximum amount available
+					skipHistory && this.firstFetch ? 1 : undefined
 				);
 
+				this.firstFetch = false;
+
 				if (response === undefined) {
 					return;
 				}

package/src/events/types.ts

@@ -8,6 +8,7 @@ import {
 	OrderActionRecord,
 	OrderRecord,
 	SettlePnlRecord,
+	LPRecord,
 } from '../index';
 
 export type EventSubscriptionOptions = {
@@ -33,6 +34,7 @@ export const DefaultEventSubscriptionOptions: EventSubscriptionOptions = {
 		'FundingRateRecord',
 		'NewUserRecord',
 		'SettlePnlRecord',
+		'LPRecord',
 	],
 	maxEventsPerType: 4096,
 	orderBy: 'blockchain',
@@ -68,6 +70,7 @@ export type EventMap = {
 	OrderActionRecord: Event<OrderActionRecord>;
 	SettlePnlRecord: Event<SettlePnlRecord>;
 	NewUserRecord: Event<NewUserRecord>;
+	LPRecord: Event<LPRecord>;
 };
 
 export type EventType = keyof EventMap;
@@ -89,7 +92,7 @@ export type logProviderCallback = (
 
 export interface LogProvider {
 	isSubscribed(): boolean;
-	subscribe(callback: logProviderCallback): boolean;
+	subscribe(callback: logProviderCallback, skipHistory?: boolean): boolean;
 	unsubscribe(): Promise<boolean>;
 }
 

package/src/examples/makeTradeExample.ts

@@ -10,6 +10,8 @@ import {
 	PositionDirection,
 	convertToNumber,
 	calculateTradeSlippage,
+	BulkAccountLoader,
+	Markets,
 	MARK_PRICE_PRECISION,
 	QUOTE_PRECISION,
 } from '..';
@@ -27,9 +29,11 @@ export const getTokenAddress = (
 	);
 };
 
+const cluster = 'devnet';
+
 const main = async () => {
 	// Initialize Drift SDK
-	const sdkConfig = initialize({ env: 'devnet' });
+	const sdkConfig = initialize({ env: cluster });
 
 	// Set up the Wallet and Provider
 	const privateKey = process.env.BOT_PRIVATE_KEY; // stored as an array string
@@ -63,10 +67,21 @@ const main = async () => {
 	const clearingHousePublicKey = new PublicKey(
 		sdkConfig.CLEARING_HOUSE_PROGRAM_ID
 	);
+	const bulkAccountLoader = new BulkAccountLoader(
+		connection,
+		'confirmed',
+		1000
+	);
 	const clearingHouse = new ClearingHouse({
 		connection,
 		wallet: provider.wallet,
 		programID: clearingHousePublicKey,
+		marketIndexes: Markets[cluster].map((market) => market.marketIndex),
+		bankIndexes: Banks[cluster].map((bank) => bank.bankIndex),
+		accountSubscription: {
+			type: 'polling',
+			accountLoader: bulkAccountLoader,
+		},
 	});
 	await clearingHouse.subscribe();
 
@@ -74,6 +89,10 @@ const main = async () => {
 	const user = new ClearingHouseUser({
 		clearingHouse,
 		userAccountPublicKey: await clearingHouse.getUserAccountPublicKey(),
+		accountSubscription: {
+			type: 'polling',
+			accountLoader: bulkAccountLoader,
+		},
 	});
 
 	//// Check if clearing house account exists for the current wallet

package/src/idl/clearing_house.json

@@ -26,7 +26,7 @@
           "isSigner": false
         },
         {
-          "name": "insuranceVaultAuthority",
+          "name": "clearingHouseSigner",
           "isMut": false,
           "isSigner": false
         },
@@ -71,18 +71,13 @@
           "isMut": true,
           "isSigner": false
         },
-        {
-          "name": "bankVaultAuthority",
-          "isMut": false,
-          "isSigner": false
-        },
         {
           "name": "insuranceFundVault",
           "isMut": true,
           "isSigner": false
         },
         {
-          "name": "insuranceFundVaultAuthority",
+          "name": "clearingHouseSigner",
           "isMut": false,
           "isSigner": false
         },
@@ -316,8 +311,8 @@
           "isSigner": false
         },
         {
-          "name": "bankVaultAuthority",
-          "isMut": true,
+          "name": "clearingHouseSigner",
+          "isMut": false,
           "isSigner": false
         },
         {
@@ -974,8 +969,8 @@
           "isSigner": false
         },
         {
-          "name": "insuranceFundVaultAuthority",
-          "isMut": true,
+          "name": "clearingHouseSigner",
+          "isMut": false,
           "isSigner": false
         },
         {
@@ -1029,8 +1024,8 @@
           "isSigner": false
         },
         {
-          "name": "insuranceFundVaultAuthority",
-          "isMut": true,
+          "name": "clearingHouseSigner",
+          "isMut": false,
           "isSigner": false
         },
         {
@@ -1100,8 +1095,8 @@
           "isSigner": false
         },
         {
-          "name": "bankVaultAuthority",
-          "isMut": true,
+          "name": "clearingHouseSigner",
+          "isMut": false,
           "isSigner": false
         },
         {
@@ -1146,7 +1141,7 @@
           "isSigner": false
         },
         {
-          "name": "insuranceVaultAuthority",
+          "name": "clearingHouseSigner",
           "isMut": false,
           "isSigner": false
         },
@@ -1192,7 +1187,7 @@
           "isSigner": false
         },
         {
-          "name": "insuranceVaultAuthority",
+          "name": "clearingHouseSigner",
           "isMut": false,
           "isSigner": false
         },
@@ -2414,8 +2409,8 @@
           "isSigner": false
         },
         {
-          "name": "bankVaultAuthority",
-          "isMut": true,
+          "name": "clearingHouseSigner",
+          "isMut": false,
           "isSigner": false
         },
         {
@@ -2565,6 +2560,11 @@
     {
       "name": "removeInsuranceFundStake",
       "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
         {
           "name": "bank",
           "isMut": false,
@@ -2591,8 +2591,8 @@
           "isSigner": false
         },
         {
-          "name": "insuranceFundVaultAuthority",
-          "isMut": true,
+          "name": "clearingHouseSigner",
+          "isMut": false,
           "isSigner": false
         },
         {
@@ -2646,26 +2646,10 @@
             "name": "vault",
             "type": "publicKey"
           },
-          {
-            "name": "vaultAuthority",
-            "type": "publicKey"
-          },
-          {
-            "name": "vaultAuthorityNonce",
-            "type": "u8"
-          },
           {
             "name": "insuranceFundVault",
             "type": "publicKey"
           },
-          {
-            "name": "insuranceFundVaultAuthority",
-            "type": "publicKey"
-          },
-          {
-            "name": "insuranceFundVaultAuthorityNonce",
-            "type": "u8"
-          },
           {
             "name": "revenuePool",
             "type": {
@@ -2976,14 +2960,6 @@
             "name": "insuranceVault",
             "type": "publicKey"
           },
-          {
-            "name": "insuranceVaultAuthority",
-            "type": "publicKey"
-          },
-          {
-            "name": "insuranceVaultNonce",
-            "type": "u8"
-          },
           {
             "name": "marginRatioInitial",
             "type": "u128"
@@ -3072,6 +3048,14 @@
             "name": "liquidationMarginBufferRatio",
             "type": "u8"
           },
+          {
+            "name": "signer",
+            "type": "publicKey"
+          },
+          {
+            "name": "signerNonce",
+            "type": "u8"
+          },
           {
             "name": "padding0",
             "type": "u128"
@@ -3352,6 +3336,10 @@
             "name": "quoteAssetAmount",
             "type": "i128"
           },
+          {
+            "name": "lpShares",
+            "type": "u128"
+          },
           {
             "name": "userPnl",
             "type": "i128"
@@ -4478,6 +4466,23 @@
         ]
       }
     },
+    {
+      "name": "LPAction",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "AddLiquidity"
+          },
+          {
+            "name": "RemoveLiquidity"
+          },
+          {
+            "name": "SettleLiquidity"
+          }
+        ]
+      }
+    },
     {
       "name": "LiquidationType",
       "type": {
@@ -5173,6 +5178,53 @@
         }
       ]
     },
+    {
+      "name": "LPRecord",
+      "fields": [
+        {
+          "name": "ts",
+          "type": "i64",
+          "index": false
+        },
+        {
+          "name": "user",
+          "type": "publicKey",
+          "index": false
+        },
+        {
+          "name": "action",
+          "type": {
+            "defined": "LPAction"
+          },
+          "index": false
+        },
+        {
+          "name": "nShares",
+          "type": "u128",
+          "index": false
+        },
+        {
+          "name": "marketIndex",
+          "type": "u64",
+          "index": false
+        },
+        {
+          "name": "deltaBaseAssetAmount",
+          "type": "i128",
+          "index": false
+        },
+        {
+          "name": "deltaQuoteAssetAmount",
+          "type": "i128",
+          "index": false
+        },
+        {
+          "name": "pnl",
+          "type": "i128",
+          "index": false
+        }
+      ]
+    },
     {
       "name": "LiquidationRecord",
       "fields": [

package/src/index.ts

@@ -30,6 +30,7 @@ export * from './factory/oracleClient';
 export * from './factory/bigNum';
 export * from './events/types';
 export * from './events/eventSubscriber';
+export * from './events/fetchLogs';
 export * from './math/auction';
 export * from './math/conversion';
 export * from './math/funding';

package/src/math/amm.ts

@@ -308,6 +308,51 @@ export function calculateAmmReservesAfterSwap(
 	return [newQuoteAssetReserve, newBaseAssetReserve];
 }
 
+export function calculateMarketOpenBidAsk(
+	baseAssetReserve: BN,
+	minBaseAssetReserve: BN,
+	maxBaseAssetReserve: BN
+): [BN, BN] {
+	// open orders
+	let openAsks;
+	if (maxBaseAssetReserve > baseAssetReserve) {
+		openAsks = maxBaseAssetReserve.sub(baseAssetReserve).mul(new BN(-1));
+	} else {
+		openAsks = ZERO;
+	}
+
+	let openBids;
+	if (minBaseAssetReserve < baseAssetReserve) {
+		openBids = baseAssetReserve.sub(minBaseAssetReserve);
+	} else {
+		openBids = ZERO;
+	}
+	return [openBids, openAsks];
+}
+
+export function calculateInventoryScale(
+	netBaseAssetAmount: BN,
+	baseAssetReserve: BN,
+	minBaseAssetReserve: BN,
+	maxBaseAssetReserve: BN
+): number {
+	// inventory skew
+	const [openBids, openAsks] = calculateMarketOpenBidAsk(
+		baseAssetReserve,
+		minBaseAssetReserve,
+		maxBaseAssetReserve
+	);
+
+	const totalLiquidity = BN.max(openBids.abs().add(openAsks.abs()), new BN(1));
+	const inventoryScale =
+		BN.min(netBaseAssetAmount.abs(), totalLiquidity)
+			.mul(BID_ASK_SPREAD_PRECISION.mul(new BN(5)))
+			.div(totalLiquidity)
+			.toNumber() / BID_ASK_SPREAD_PRECISION.toNumber();
+
+	return inventoryScale;
+}
+
 export function calculateEffectiveLeverage(
 	baseSpread: number,
 	quoteAssetReserve: BN,
@@ -353,7 +398,10 @@ export function calculateSpreadBN(
 	pegMultiplier: BN,
 	netBaseAssetAmount: BN,
 	markPrice: BN,
-	totalFeeMinusDistributions: BN
+	totalFeeMinusDistributions: BN,
+	baseAssetReserve: BN,
+	minBaseAssetReserve: BN,
+	maxBaseAssetReserve: BN
 ): [number, number] {
 	let longSpread = baseSpread / 2;
 	let shortSpread = baseSpread / 2;
@@ -374,6 +422,20 @@ export function calculateSpreadBN(
 
 	const MAX_INVENTORY_SKEW = 5;
 
+	const inventoryScale = calculateInventoryScale(
+		netBaseAssetAmount,
+		baseAssetReserve,
+		minBaseAssetReserve,
+		maxBaseAssetReserve
+	);
+	const inventorySpreadScale = Math.min(MAX_INVENTORY_SKEW, 1 + inventoryScale);
+
+	if (netBaseAssetAmount.gt(ZERO)) {
+		longSpread *= inventorySpreadScale;
+	} else if (netBaseAssetAmount.lt(ZERO)) {
+		shortSpread *= inventorySpreadScale;
+	}
+
 	const effectiveLeverage = calculateEffectiveLeverage(
 		baseSpread,
 		quoteAssetReserve,
@@ -447,7 +509,10 @@ export function calculateSpread(
 		amm.pegMultiplier,
 		amm.netBaseAssetAmount,
 		markPrice,
-		amm.totalFeeMinusDistributions
+		amm.totalFeeMinusDistributions,
+		amm.baseAssetReserve,
+		amm.minBaseAssetReserve,
+		amm.maxBaseAssetReserve
 	);
 
 	let spread: number;