@drift-labs/sdk 2.162.0-beta.2 → 2.163.0-beta.10

package/tests/user/marginCalculations.test.ts

@@ -227,8 +227,8 @@ describe('User margin calculations', () => {
 				DEFAULT_ORACLES
 			);
 
-			assert(mockUser.getFreeCollateral('Initial', false, 0).gt(ZERO));
-			assert(mockUser.getFreeCollateral('Initial', false, 5).eq(ZERO));
+			assert(mockUser.getFreeCollateral('Initial', 0).gt(ZERO));
+			assert(mockUser.getFreeCollateral('Initial', 5).eq(ZERO));
 		});
 	});
 
@@ -312,7 +312,6 @@ describe('User margin calculations', () => {
 				'Maintenance',
 				false,
 				ZERO,
-				false,
 				'Isolated'
 			);
 			assert(liqPrice.gte(ZERO));

package/tests/user/test.ts

@@ -8,6 +8,7 @@ import {
 	SpotMarketAccount,
 	PRICE_PRECISION,
 	OraclePriceData,
+	MMOraclePriceData,
 	BASE_PRECISION,
 	QUOTE_PRECISION,
 	calculatePositionPNL,
@@ -96,12 +97,21 @@ async function makeMockUser(
 		return getMockOracle(oracle).data;
 	}
 
+	function getMMOracleDataForPerpMarket(
+		marketIndex: number
+	): MMOraclePriceData {
+		const oracle = getMockPerpMarket(marketIndex).amm.oracle;
+		return getMockOracle(oracle).data as unknown as MMOraclePriceData;
+	}
+
 	mockUser.getUserAccount = getMockUserAccount;
 	mockUser.driftClient.getPerpMarketAccount = getMockPerpMarket;
 	mockUser.driftClient.getSpotMarketAccount = getMockSpotMarket;
 	mockUser.driftClient.getOraclePriceDataAndSlot = getMockOracle;
 	mockUser.driftClient.getOracleDataForPerpMarket = getOracleDataForPerpMarket;
 	mockUser.driftClient.getOracleDataForSpotMarket = getOracleDataForSpotMarket;
+	mockUser.driftClient.getMMOracleDataForPerpMarket =
+		getMMOracleDataForPerpMarket;
 	return mockUser;
 }
 
@@ -306,10 +316,10 @@ describe('User Tests', () => {
 			'getMaxLeverageForPerp:',
 			mockUser.getMaxLeverageForPerp(0).toString()
 		);
-		assert(mockUser.getMaxLeverageForPerp(0).eq(new BN('50000'))); // 5x
+		assert(mockUser.getMaxLeverageForPerp(0).eq(new BN('37358'))); // ~3.7x
 		assert(
-			mockUser.getMaxLeverageForPerp(0, 'Maintenance').eq(new BN('100000'))
-		); // 10x
+			mockUser.getMaxLeverageForPerp(0, 'Maintenance').eq(new BN('37358'))
+		); // same (marginCategory unused)
 	});
 
 	it('worst case token amount', async () => {
@@ -499,10 +509,7 @@ describe('User Tests', () => {
 		const strictOraclePrice = new StrictOraclePrice(PRICE_PRECISION.muln(25));
 		const tokenAmount = new BN(100).mul(LAMPORTS_PRECISION);
 
-		for (const ratio of [
-			MARGIN_PRECISION.toNumber() * 2,
-			89478485,
-		]) {
+		for (const ratio of [MARGIN_PRECISION.toNumber() * 2, 89478485]) {
 			const assetValue = getSpotAssetValue(
 				tokenAmount,
 				strictOraclePrice,
@@ -551,7 +558,7 @@ describe('User Tests', () => {
 		let mLev = mockUser.getMaxLeverageForPerp(0, 'Maintenance').toNumber();
 		console.log(iLev, mLev);
 		assert(iLev == 5000);
-		assert(mLev == 10000);
+		assert(mLev == 5000);
 
 		myMockUserAccount.maxMarginRatio = MARGIN_PRECISION.div(
 			new BN(2)
@@ -569,7 +576,7 @@ describe('User Tests', () => {
 		console.log(iLev, mLev);
 
 		assert(iLev == 2000);
-		assert(mLev == 10000);
+		assert(mLev == 2000);
 	});
 
 	it('getTotalIsolatedPositionDeposits sums isolated USDC deposits', async () => {
@@ -727,8 +734,7 @@ describe('User Tests', () => {
 		myMockUserAccount.perpPositions[0].marketIndex = 0;
 		myMockUserAccount.perpPositions[0].baseAssetAmount = BASE_PRECISION;
 		myMockUserAccount.perpPositions[0].quoteAssetAmount = QUOTE_PRECISION.neg();
-		myMockUserAccount.perpPositions[0].quoteEntryAmount =
-			QUOTE_PRECISION.neg();
+		myMockUserAccount.perpPositions[0].quoteEntryAmount = QUOTE_PRECISION.neg();
 		myMockUserAccount.perpPositions[0].quoteBreakEvenAmount =
 			QUOTE_PRECISION.neg();
 		myMockUserAccount.perpPositions[0].isolatedPositionScaledBalance = new BN(
@@ -813,10 +819,7 @@ describe('User Tests', () => {
 			[1, 1, 1, 1, 1, 1, 1, 1]
 		);
 
-		const { spotAssetValue } = mockUser.getLeverageComponents(
-			true,
-			'Initial'
-		);
+		const { spotAssetValue } = mockUser.getLeverageComponents(true, 'Initial');
 		// Cross spot asset only: 200 USDC. Isolated collateral is handled separately.
 		assert(spotAssetValue.eq(new BN(200).mul(QUOTE_PRECISION)));
 	});

package/lib/browser/accounts/pollingHighLeverageModeConfigAccountSubscriber.d.ts

@@ -1,29 +0,0 @@
-/// <reference types="node" />
-import { DataAndSlot, HighLeverageModeConfigAccountEvents, HighLeverageModeConfigAccountSubscriber } from './types';
-import { Program } from '@coral-xyz/anchor';
-import StrictEventEmitter from 'strict-event-emitter-types';
-import { EventEmitter } from 'events';
-import { PublicKey } from '@solana/web3.js';
-import { BulkAccountLoader } from './bulkAccountLoader';
-import { HighLeverageModeConfig } from '../types';
-export declare class PollingHighLeverageModeConfigAccountSubscriber implements HighLeverageModeConfigAccountSubscriber {
-    isSubscribed: boolean;
-    program: Program;
-    eventEmitter: StrictEventEmitter<EventEmitter, HighLeverageModeConfigAccountEvents>;
-    highLeverageModeConfigAccountPublicKey: PublicKey;
-    accountLoader: BulkAccountLoader;
-    callbackId?: string;
-    errorCallbackId?: string;
-    highLeverageModeConfigAccountAndSlot?: DataAndSlot<HighLeverageModeConfig>;
-    constructor(program: Program, publicKey: PublicKey, accountLoader: BulkAccountLoader);
-    subscribe(highLeverageModeConfig?: HighLeverageModeConfig): Promise<boolean>;
-    addToAccountLoader(): Promise<void>;
-    fetchIfUnloaded(): Promise<void>;
-    fetch(): Promise<void>;
-    doesAccountExist(): boolean;
-    unsubscribe(): Promise<void>;
-    assertIsSubscribed(): void;
-    getHighLeverageModeConfigAccountAndSlot(): DataAndSlot<HighLeverageModeConfig>;
-    didSubscriptionSucceed(): boolean;
-    updateData(highLeverageModeConfig: HighLeverageModeConfig, slot: number): void;
-}

package/lib/browser/accounts/pollingHighLeverageModeConfigAccountSubscriber.js

@@ -1,111 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PollingHighLeverageModeConfigAccountSubscriber = void 0;
-const types_1 = require("./types");
-const events_1 = require("events");
-class PollingHighLeverageModeConfigAccountSubscriber {
-    constructor(program, publicKey, accountLoader) {
-        this.isSubscribed = false;
-        this.program = program;
-        this.highLeverageModeConfigAccountPublicKey = publicKey;
-        this.accountLoader = accountLoader;
-        this.eventEmitter = new events_1.EventEmitter();
-    }
-    async subscribe(highLeverageModeConfig) {
-        if (this.isSubscribed) {
-            return true;
-        }
-        if (highLeverageModeConfig) {
-            this.highLeverageModeConfigAccountAndSlot = {
-                data: highLeverageModeConfig,
-                slot: undefined,
-            };
-        }
-        await this.addToAccountLoader();
-        await this.fetchIfUnloaded();
-        if (this.doesAccountExist()) {
-            this.eventEmitter.emit('update');
-        }
-        this.isSubscribed = true;
-        return true;
-    }
-    async addToAccountLoader() {
-        if (this.callbackId) {
-            return;
-        }
-        this.callbackId = await this.accountLoader.addAccount(this.highLeverageModeConfigAccountPublicKey, (buffer, slot) => {
-            if (!buffer) {
-                return;
-            }
-            if (this.highLeverageModeConfigAccountAndSlot &&
-                this.highLeverageModeConfigAccountAndSlot.slot > slot) {
-                return;
-            }
-            const account = this.program.account.user.coder.accounts.decode('HighLeverageModeConfig', buffer);
-            this.highLeverageModeConfigAccountAndSlot = { data: account, slot };
-            this.eventEmitter.emit('highLeverageModeConfigAccountUpdate', account);
-            this.eventEmitter.emit('update');
-        });
-        this.errorCallbackId = this.accountLoader.addErrorCallbacks((error) => {
-            this.eventEmitter.emit('error', error);
-        });
-    }
-    async fetchIfUnloaded() {
-        if (this.highLeverageModeConfigAccountAndSlot === undefined) {
-            await this.fetch();
-        }
-    }
-    async fetch() {
-        var _a, _b;
-        try {
-            const dataAndContext = await this.program.account.highLeverageModeConfig.fetchAndContext(this.highLeverageModeConfigAccountPublicKey, this.accountLoader.commitment);
-            if (dataAndContext.context.slot >
-                ((_b = (_a = this.highLeverageModeConfigAccountAndSlot) === null || _a === void 0 ? void 0 : _a.slot) !== null && _b !== void 0 ? _b : 0)) {
-                this.highLeverageModeConfigAccountAndSlot = {
-                    data: dataAndContext.data,
-                    slot: dataAndContext.context.slot,
-                };
-            }
-        }
-        catch (e) {
-            console.log(`PollingHighLeverageModeConfigAccountSubscriber.fetch() HighLeverageModeConfig does not exist: ${e.message}`);
-        }
-    }
-    doesAccountExist() {
-        return this.highLeverageModeConfigAccountAndSlot !== undefined;
-    }
-    async unsubscribe() {
-        if (!this.isSubscribed) {
-            return;
-        }
-        this.accountLoader.removeAccount(this.highLeverageModeConfigAccountPublicKey, this.callbackId);
-        this.callbackId = undefined;
-        this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
-        this.errorCallbackId = undefined;
-        this.isSubscribed = false;
-    }
-    assertIsSubscribed() {
-        if (!this.isSubscribed) {
-            throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
-        }
-    }
-    getHighLeverageModeConfigAccountAndSlot() {
-        this.assertIsSubscribed();
-        return this.highLeverageModeConfigAccountAndSlot;
-    }
-    didSubscriptionSucceed() {
-        return !!this.highLeverageModeConfigAccountAndSlot;
-    }
-    updateData(highLeverageModeConfig, slot) {
-        if (!this.highLeverageModeConfigAccountAndSlot ||
-            this.highLeverageModeConfigAccountAndSlot.slot < slot) {
-            this.highLeverageModeConfigAccountAndSlot = {
-                data: highLeverageModeConfig,
-                slot,
-            };
-            this.eventEmitter.emit('highLeverageModeConfigAccountUpdate', highLeverageModeConfig);
-            this.eventEmitter.emit('update');
-        }
-    }
-}
-exports.PollingHighLeverageModeConfigAccountSubscriber = PollingHighLeverageModeConfigAccountSubscriber;

package/lib/browser/accounts/webSocketHighLeverageModeConfigAccountSubscriber.d.ts

@@ -1,23 +0,0 @@
-/// <reference types="node" />
-import { DataAndSlot, AccountSubscriber, HighLeverageModeConfigAccountEvents, HighLeverageModeConfigAccountSubscriber } from './types';
-import { Program } from '@coral-xyz/anchor';
-import StrictEventEmitter from 'strict-event-emitter-types';
-import { EventEmitter } from 'events';
-import { Commitment, PublicKey } from '@solana/web3.js';
-import { HighLeverageModeConfig } from '../types';
-export declare class WebSocketHighLeverageModeConfigAccountSubscriber implements HighLeverageModeConfigAccountSubscriber {
-    isSubscribed: boolean;
-    resubTimeoutMs?: number;
-    commitment?: Commitment;
-    program: Program;
-    eventEmitter: StrictEventEmitter<EventEmitter, HighLeverageModeConfigAccountEvents>;
-    highLeverageModeConfigAccountPublicKey: PublicKey;
-    highLeverageModeConfigDataAccountSubscriber: AccountSubscriber<HighLeverageModeConfig>;
-    constructor(program: Program, highLeverageModeConfigAccountPublicKey: PublicKey, resubTimeoutMs?: number, commitment?: Commitment);
-    subscribe(highLeverageModeConfigAccount?: HighLeverageModeConfig): Promise<boolean>;
-    fetch(): Promise<void>;
-    unsubscribe(): Promise<void>;
-    assertIsSubscribed(): void;
-    getHighLeverageModeConfigAccountAndSlot(): DataAndSlot<HighLeverageModeConfig>;
-    updateData(highLeverageModeConfig: HighLeverageModeConfig, slot: number): void;
-}

package/lib/browser/accounts/webSocketHighLeverageModeConfigAccountSubscriber.js

@@ -1,69 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebSocketHighLeverageModeConfigAccountSubscriber = void 0;
-const types_1 = require("./types");
-const events_1 = require("events");
-const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
-class WebSocketHighLeverageModeConfigAccountSubscriber {
-    constructor(program, highLeverageModeConfigAccountPublicKey, resubTimeoutMs, commitment) {
-        this.isSubscribed = false;
-        this.program = program;
-        this.highLeverageModeConfigAccountPublicKey =
-            highLeverageModeConfigAccountPublicKey;
-        this.eventEmitter = new events_1.EventEmitter();
-        this.resubTimeoutMs = resubTimeoutMs;
-        this.commitment = commitment;
-    }
-    async subscribe(highLeverageModeConfigAccount) {
-        if (this.isSubscribed) {
-            return true;
-        }
-        this.highLeverageModeConfigDataAccountSubscriber =
-            new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('highLeverageModeConfig', this.program, this.highLeverageModeConfigAccountPublicKey, undefined, {
-                resubTimeoutMs: this.resubTimeoutMs,
-            }, this.commitment);
-        if (highLeverageModeConfigAccount) {
-            this.highLeverageModeConfigDataAccountSubscriber.setData(highLeverageModeConfigAccount);
-        }
-        await this.highLeverageModeConfigDataAccountSubscriber.subscribe((data) => {
-            this.eventEmitter.emit('highLeverageModeConfigAccountUpdate', data);
-            this.eventEmitter.emit('update');
-        });
-        this.eventEmitter.emit('update');
-        this.isSubscribed = true;
-        return true;
-    }
-    async fetch() {
-        await Promise.all([
-            this.highLeverageModeConfigDataAccountSubscriber.fetch(),
-        ]);
-    }
-    async unsubscribe() {
-        if (!this.isSubscribed) {
-            return;
-        }
-        await Promise.all([
-            this.highLeverageModeConfigDataAccountSubscriber.unsubscribe(),
-        ]);
-        this.isSubscribed = false;
-    }
-    assertIsSubscribed() {
-        if (!this.isSubscribed) {
-            throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
-        }
-    }
-    getHighLeverageModeConfigAccountAndSlot() {
-        this.assertIsSubscribed();
-        return this.highLeverageModeConfigDataAccountSubscriber.dataAndSlot;
-    }
-    updateData(highLeverageModeConfig, slot) {
-        var _a;
-        const currentDataSlot = ((_a = this.highLeverageModeConfigDataAccountSubscriber.dataAndSlot) === null || _a === void 0 ? void 0 : _a.slot) || 0;
-        if (currentDataSlot <= slot) {
-            this.highLeverageModeConfigDataAccountSubscriber.setData(highLeverageModeConfig, slot);
-            this.eventEmitter.emit('highLeverageModeConfigAccountUpdate', highLeverageModeConfig);
-            this.eventEmitter.emit('update');
-        }
-    }
-}
-exports.WebSocketHighLeverageModeConfigAccountSubscriber = WebSocketHighLeverageModeConfigAccountSubscriber;