@drift-labs/sdk 2.93.0-beta.0 → 2.93.0-beta.10

package/VERSION

@@ -1 +1 @@
-2.93.0-beta.0
+2.93.0-beta.10

package/lib/constants/perpMarkets.js

@@ -707,6 +707,36 @@ exports.MainnetPerpMarkets = [
         oracleSource: __1.OracleSource.PYTH_1K_PULL,
         pythFeedId: '0x5169491cd7e2a44c98353b779d5eb612e4ac32e073f5cc534303d86307c2f1bc',
     },
+    {
+        fullName: 'TRUMP-WIN-2024-BET',
+        category: ['Prediction', 'Election'],
+        symbol: 'TRUMP-WIN-2024-BET',
+        baseAssetSymbol: 'TRUMP-WIN-2024',
+        marketIndex: 36,
+        oracle: new web3_js_1.PublicKey('7YrQUxmxGdbk8pvns9KcL5ojbZSL2eHj62hxRqggtEUR'),
+        launchTs: 1723996800000,
+        oracleSource: __1.OracleSource.Prelaunch,
+    },
+    {
+        fullName: 'KAMALA-POPULAR-VOTE-2024-BET',
+        category: ['Prediction', 'Election'],
+        symbol: 'KAMALA-POPULAR-VOTE-2024-BET',
+        baseAssetSymbol: 'KAMALA-POPULAR-VOTE-2024',
+        marketIndex: 37,
+        oracle: new web3_js_1.PublicKey('AowFw1dCVjS8kngvTCoT3oshiUyL69k7P1uxqXwteWH4'),
+        launchTs: 1723996800000,
+        oracleSource: __1.OracleSource.Prelaunch,
+    },
+    {
+        fullName: 'FED-CUT-50-SEPT-2024-BET',
+        category: ['Prediction', 'Election'],
+        symbol: 'FED-CUT-50-SEPT-2024-BET',
+        baseAssetSymbol: 'FED-CUT-50-SEPT-2024',
+        marketIndex: 38,
+        oracle: new web3_js_1.PublicKey('5QzgqAbEhJ1cPnLX4tSZEXezmW7sz7PPVVg2VanGi8QQ'),
+        launchTs: 1724250126000,
+        oracleSource: __1.OracleSource.Prelaunch,
+    },
 ];
 exports.PerpMarkets = {
     devnet: exports.DevnetPerpMarkets,

package/lib/constants/spotMarkets.js

@@ -87,7 +87,7 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'wBTC',
         marketIndex: 3,
-        oracle: new web3_js_1.PublicKey('486kr3pmFPfTsS4aZgcsQ7kS4i9rjMsYYZup6HQNSTT4'),
+        oracle: new web3_js_1.PublicKey('9Tq8iN5WnMX2PcZGj4iSFEAgHCi8cM6x8LsDUbuzq8uw'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh'),
         precision: new __1.BN(10).pow(numericConstants_1.EIGHT),

package/lib/dlob/DLOB.d.ts

@@ -81,7 +81,7 @@ export declare class DLOB {
     findJitAuctionNodesToFill(marketIndex: number, slot: number, oraclePriceData: OraclePriceData, marketType: MarketType): NodeToFill[];
     getTakingBids(marketIndex: number, marketType: MarketType, slot: number, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
     getTakingAsks(marketIndex: number, marketType: MarketType, slot: number, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
-    private getBestNode;
+    protected getBestNode(generatorList: Array<Generator<DLOBNode>>, oraclePriceData: OraclePriceData, slot: number, compareFcn: (bestDLOBNode: DLOBNode, currentDLOBNode: DLOBNode, slot: number, oraclePriceData: OraclePriceData) => boolean, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
     getRestingLimitAsks(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
     getRestingLimitBids(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
     getAsks(marketIndex: number, fallbackAsk: BN | undefined, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;

package/lib/driftClient.d.ts

@@ -640,6 +640,8 @@ export declare class DriftClient {
     settlePNLIx(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number): Promise<TransactionInstruction>;
     settleMultiplePNLs(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndexes: number[], mode: SettlePnlMode, txParams?: TxParams): Promise<TransactionSignature>;
     settleMultiplePNLsIx(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndexes: number[], mode: SettlePnlMode): Promise<TransactionInstruction>;
+    getSetUserStatusToBeingLiquidatedIx(userAccountPublicKey: PublicKey, userAccount: UserAccount): Promise<TransactionInstruction>;
+    setUserStatusToBeingLiquidated(userAccountPublicKey: PublicKey, userAccount: UserAccount): Promise<TransactionSignature>;
     liquidatePerp(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: number, maxBaseAssetAmount: BN, limitPrice?: BN, txParams?: TxParams, liquidatorSubAccountId?: number): Promise<TransactionSignature>;
     getLiquidatePerpIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: number, maxBaseAssetAmount: BN, limitPrice?: BN, liquidatorSubAccountId?: number): Promise<TransactionInstruction>;
     liquidatePerpWithFill(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: number, makerInfos: MakerInfo[], txParams?: TxParams, liquidatorSubAccountId?: number): Promise<TransactionSignature>;

package/lib/driftClient.js

@@ -3210,6 +3210,23 @@ class DriftClient {
             remainingAccounts: remainingAccounts,
         });
     }
+    async getSetUserStatusToBeingLiquidatedIx(userAccountPublicKey, userAccount) {
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [userAccount],
+        });
+        return await this.program.instruction.setUserStatusToBeingLiquidated({
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user: userAccountPublicKey,
+                authority: this.wallet.publicKey,
+            },
+            remainingAccounts,
+        });
+    }
+    async setUserStatusToBeingLiquidated(userAccountPublicKey, userAccount) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getSetUserStatusToBeingLiquidatedIx(userAccountPublicKey, userAccount)), [], this.opts);
+        return txSig;
+    }
     async liquidatePerp(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount, limitPrice, txParams, liquidatorSubAccountId) {
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getLiquidatePerpIx(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount, limitPrice, liquidatorSubAccountId), txParams), [], this.opts);
         this.perpMarketLastSlotCache.set(marketIndex, slot);

package/lib/idl/drift.json

@@ -1881,6 +1881,22 @@
                 }
             ]
         },
+        {
+            "name": "setUserStatusToBeingLiquidated",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": []
+        },
         {
             "name": "resolvePerpPnlDeficit",
             "accounts": [
@@ -2259,7 +2275,7 @@
                 },
                 {
                     "name": "spotMarket",
-                    "isMut": false,
+                    "isMut": true,
                     "isSigner": false
                 },
                 {
@@ -2295,7 +2311,7 @@
                 },
                 {
                     "name": "spotMarket",
-                    "isMut": false,
+                    "isMut": true,
                     "isSigner": false
                 },
                 {

package/lib/math/amm.js

@@ -449,7 +449,7 @@ function getQuoteAssetReservePredictionMarketBounds(amm, direction) {
         .mul(pegSqrt)
         .div(amm.pegMultiplier);
     if (direction === types_1.PositionDirection.LONG) {
-        quoteAssetReserveLowerBound = this.amm.sqrtK
+        quoteAssetReserveLowerBound = amm.sqrtK
             .muln(22361)
             .mul(pegSqrt)
             .divn(100000)

package/lib/orderSubscriber/OrderSubscriber.d.ts

@@ -28,6 +28,12 @@ export declare class OrderSubscriber {
     subscribe(): Promise<void>;
     fetch(): Promise<void>;
     tryUpdateUserAccount(key: string, dataType: 'raw' | 'decoded' | 'buffer', data: string[] | UserAccount | Buffer, slot: number): void;
+    /**
+     * Creates a new DLOB for the order subscriber to fill. This will allow a
+     * caller to extend the DLOB Subscriber with a custom DLOB type.
+     * @returns New, empty DLOB object.
+     */
+    protected createDLOB(): DLOB;
     getDLOB(slot: number): Promise<DLOB>;
     getSlot(): number;
     unsubscribe(): Promise<void>;

package/lib/orderSubscriber/OrderSubscriber.js

@@ -141,8 +141,16 @@ class OrderSubscriber {
             }
         }
     }
+    /**
+     * Creates a new DLOB for the order subscriber to fill. This will allow a
+     * caller to extend the DLOB Subscriber with a custom DLOB type.
+     * @returns New, empty DLOB object.
+     */
+    createDLOB() {
+        return new DLOB_1.DLOB();
+    }
     async getDLOB(slot) {
-        const dlob = new DLOB_1.DLOB();
+        const dlob = this.createDLOB();
         for (const [key, { userAccount }] of this.usersAccounts.entries()) {
             for (const order of userAccount.orders) {
                 dlob.insertOrder(order, key, slot);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.93.0-beta.0",
+	"version": "2.93.0-beta.10",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -44,7 +44,7 @@
 		"@pythnetwork/pyth-solana-receiver": "^0.7.0",
 		"@solana/spl-token": "0.3.7",
 		"@solana/web3.js": "1.92.3",
-		"@switchboard-xyz/on-demand": "1.2.1",
+		"@switchboard-xyz/on-demand": "1.2.32",
 		"anchor-bankrun": "^0.3.0",
 		"node-cache": "^5.1.2",
 		"rpc-websockets": "7.5.1",

package/src/constants/perpMarkets.ts

@@ -780,6 +780,36 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		pythFeedId:
 			'0x5169491cd7e2a44c98353b779d5eb612e4ac32e073f5cc534303d86307c2f1bc',
 	},
+	{
+		fullName: 'TRUMP-WIN-2024-BET',
+		category: ['Prediction', 'Election'],
+		symbol: 'TRUMP-WIN-2024-BET',
+		baseAssetSymbol: 'TRUMP-WIN-2024',
+		marketIndex: 36,
+		oracle: new PublicKey('7YrQUxmxGdbk8pvns9KcL5ojbZSL2eHj62hxRqggtEUR'),
+		launchTs: 1723996800000,
+		oracleSource: OracleSource.Prelaunch,
+	},
+	{
+		fullName: 'KAMALA-POPULAR-VOTE-2024-BET',
+		category: ['Prediction', 'Election'],
+		symbol: 'KAMALA-POPULAR-VOTE-2024-BET',
+		baseAssetSymbol: 'KAMALA-POPULAR-VOTE-2024',
+		marketIndex: 37,
+		oracle: new PublicKey('AowFw1dCVjS8kngvTCoT3oshiUyL69k7P1uxqXwteWH4'),
+		launchTs: 1723996800000,
+		oracleSource: OracleSource.Prelaunch,
+	},
+	{
+		fullName: 'FED-CUT-50-SEPT-2024-BET',
+		category: ['Prediction', 'Election'],
+		symbol: 'FED-CUT-50-SEPT-2024-BET',
+		baseAssetSymbol: 'FED-CUT-50-SEPT-2024',
+		marketIndex: 38,
+		oracle: new PublicKey('5QzgqAbEhJ1cPnLX4tSZEXezmW7sz7PPVVg2VanGi8QQ'),
+		launchTs: 1724250126000,
+		oracleSource: OracleSource.Prelaunch,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

package/src/constants/spotMarkets.ts

@@ -123,7 +123,7 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'wBTC',
 		marketIndex: 3,
-		oracle: new PublicKey('486kr3pmFPfTsS4aZgcsQ7kS4i9rjMsYYZup6HQNSTT4'),
+		oracle: new PublicKey('9Tq8iN5WnMX2PcZGj4iSFEAgHCi8cM6x8LsDUbuzq8uw'),
 		oracleSource: OracleSource.PYTH_PULL,
 		mint: new PublicKey('3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh'),
 		precision: new BN(10).pow(EIGHT),

package/src/dlob/DLOB.ts

@@ -1104,7 +1104,7 @@ export class DLOB {
 		);
 	}
 
-	private *getBestNode(
+	protected *getBestNode(
 		generatorList: Array<Generator<DLOBNode>>,
 		oraclePriceData: OraclePriceData,
 		slot: number,

package/src/driftClient.ts

@@ -5946,6 +5946,40 @@ export class DriftClient {
 		);
 	}
 
+	public async getSetUserStatusToBeingLiquidatedIx(
+		userAccountPublicKey: PublicKey,
+		userAccount: UserAccount
+	): Promise<TransactionInstruction> {
+		const remainingAccounts = this.getRemainingAccounts({
+			userAccounts: [userAccount],
+		});
+		return await this.program.instruction.setUserStatusToBeingLiquidated({
+			accounts: {
+				state: await this.getStatePublicKey(),
+				user: userAccountPublicKey,
+				authority: this.wallet.publicKey,
+			},
+			remainingAccounts,
+		});
+	}
+
+	public async setUserStatusToBeingLiquidated(
+		userAccountPublicKey: PublicKey,
+		userAccount: UserAccount
+	): Promise<TransactionSignature> {
+		const { txSig } = await this.sendTransaction(
+			await this.buildTransaction(
+				await this.getSetUserStatusToBeingLiquidatedIx(
+					userAccountPublicKey,
+					userAccount
+				)
+			),
+			[],
+			this.opts
+		);
+		return txSig;
+	}
+
 	public async liquidatePerp(
 		userAccountPublicKey: PublicKey,
 		userAccount: UserAccount,

package/src/idl/drift.json

@@ -1881,6 +1881,22 @@
         }
       ]
     },
+    {
+      "name": "setUserStatusToBeingLiquidated",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
     {
       "name": "resolvePerpPnlDeficit",
       "accounts": [
@@ -2259,7 +2275,7 @@
         },
         {
           "name": "spotMarket",
-          "isMut": false,
+          "isMut": true,
           "isSigner": false
         },
         {
@@ -2295,7 +2311,7 @@
         },
         {
           "name": "spotMarket",
-          "isMut": false,
+          "isMut": true,
           "isSigner": false
         },
         {

package/src/math/amm.ts

@@ -866,7 +866,7 @@ export function getQuoteAssetReservePredictionMarketBounds(
 		.div(amm.pegMultiplier);
 
 	if (direction === PositionDirection.LONG) {
-		quoteAssetReserveLowerBound = this.amm.sqrtK
+		quoteAssetReserveLowerBound = amm.sqrtK
 			.muln(22361)
 			.mul(pegSqrt)
 			.divn(100000)

package/src/orderSubscriber/OrderSubscriber.ts

@@ -217,8 +217,17 @@ export class OrderSubscriber {
 		}
 	}
 
+	/**
+	 * Creates a new DLOB for the order subscriber to fill. This will allow a
+	 * caller to extend the DLOB Subscriber with a custom DLOB type.
+	 * @returns New, empty DLOB object.
+	 */
+	protected createDLOB(): DLOB {
+		return new DLOB();
+	}
+
 	public async getDLOB(slot: number): Promise<DLOB> {
-		const dlob = new DLOB();
+		const dlob = this.createDLOB();
 		for (const [key, { userAccount }] of this.usersAccounts.entries()) {
 			for (const order of userAccount.orders) {
 				dlob.insertOrder(order, key, slot);

package/tests/ci/idl.ts

@@ -0,0 +1,53 @@
+import {
+	DriftClient,
+	BulkAccountLoader,
+} from '../../src';
+import { Connection, Keypair } from '@solana/web3.js';
+import { Wallet, Program } from '@coral-xyz/anchor';
+import dotenv from 'dotenv';
+import { assert } from 'chai';
+import driftIDL from '../../src/idl/drift.json';
+
+dotenv.config();
+
+describe('Verify IDL', function () {
+	this.timeout(100_000);
+	const MAINNET_RPC_ENDPOINT = process.env.MAINNET_RPC_ENDPOINT;
+
+	// avoid breaking pre-commit
+	if (MAINNET_RPC_ENDPOINT === undefined) {
+		return;
+	}
+
+	const wallet = new Wallet(Keypair.generate());
+
+	const mainnetConnection = new Connection(MAINNET_RPC_ENDPOINT);
+
+	const mainnetBulkAccountLoader = new BulkAccountLoader(
+		mainnetConnection,
+		'processed',
+		1
+	);
+
+	const mainnetDriftClient = new DriftClient({
+		connection: mainnetConnection,
+		wallet,
+		env: 'mainnet-beta',
+		accountSubscription: {
+			type: 'polling',
+			accountLoader: mainnetBulkAccountLoader,
+		},
+	});
+
+	it('verify idl', async () => {
+		const idl = await Program.fetchIdl(mainnetDriftClient.program.programId, mainnetDriftClient.provider);
+
+		// anchor idl init seems to strip the metadata
+		idl["metadata"] = {"address":"dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"};
+		const encodedMainnetIdl = JSON.stringify(idl);
+
+		const encodedSdkIdl = JSON.stringify(driftIDL);
+
+		assert(encodedSdkIdl === encodedMainnetIdl);
+	});
+});

package/tests/ci/verifyConstants.ts

@@ -20,7 +20,7 @@ describe('Verify Constants', function () {
 	const DEVNET_RPC_ENDPOINT = process.env.DEVNET_RPC_ENDPOINT;
 
 	// avoid breaking pre-commit
-	if (MAINNET_RPC_ENDPOINT === undefined && DEVNET_RPC_ENDPOINT === undefined) {
+	if (MAINNET_RPC_ENDPOINT === undefined || DEVNET_RPC_ENDPOINT === undefined) {
 		return;
 	}
 

package/tests/dlob/helpers.ts

@@ -367,6 +367,7 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 		fuelBoostTaker: 0,
 		fuelBoostMaker: 0,
 		fuelBoostInsurance: 0,
+		tokenProgram: 0,
 	},
 	{
 		status: MarketStatus.ACTIVE,
@@ -457,6 +458,7 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 		fuelBoostTaker: 0,
 		fuelBoostMaker: 0,
 		fuelBoostInsurance: 0,
+		tokenProgram: 0,
 	},
 	{
 		status: MarketStatus.ACTIVE,
@@ -547,6 +549,7 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 		fuelBoostTaker: 0,
 		fuelBoostMaker: 0,
 		fuelBoostInsurance: 0,
+		tokenProgram: 0,
 	},
 ];
 

package/tests/dlob/test.ts

@@ -4931,15 +4931,10 @@ describe('DLOB Spot Tests', () => {
 				`cross found: taker orderId: ${n.node.order?.orderId.toString()}: BAA: ${n.node.order?.baseAssetAmountFilled.toString()}/${n.node.order?.baseAssetAmount.toString()}, maker orderId: ${n.makerNodes[0]?.order?.orderId.toString()}: BAA: ${n.makerNodes[0]?.order?.baseAssetAmountFilled.toString()}/${n.makerNodes[0]?.order?.baseAssetAmount.toString()}`
 			);
 		}
-		expect(nodesToFillAfter.length).to.equal(2);
+		expect(nodesToFillAfter.length).to.equal(1);
 
 		// taker should fill completely with best maker
-		expect(nodesToFillAfter[0].node.order?.orderId).to.equal(4);
-		expect(nodesToFillAfter[0].makerNodes[0]?.order?.orderId).to.equal(3);
-
-		// taker should fill completely with second best maker
-		expect(nodesToFillAfter[1].node.order?.orderId).to.equal(4);
-		expect(nodesToFillAfter[1].makerNodes[0]?.order?.orderId).to.equal(2);
+		expect(nodesToFillAfter[0].makerNodes.length).to.equal(2);
 	});
 
 	it('Test two market orders to fill one limit order', () => {

package/tests/subscriber/openbook.ts

@@ -5,6 +5,10 @@ describe('openbook v2 subscriber', function () {
 	this.timeout(100_000);
 
 	it('works', async function () {
+		if (!process.env.MAINNET_RPC_ENDPOINT) {
+			return;
+		}
+
 		const connection = new Connection(
 			process.env.MAINNET_RPC_ENDPOINT as string
 		);

package/tests/user/test.ts

@@ -82,10 +82,22 @@ async function makeMockUser(
 		};
 	}
 
+	function getOracleDataForPerpMarket(marketIndex) {
+		const oracle = getMockPerpMarket(marketIndex).amm.oracle;
+		return getMockOracle(oracle).data;
+	}
+
+	function getOracleDataForSpotMarket(marketIndex) {
+		const oracle = getMockSpotMarket(marketIndex).oracle;
+		return getMockOracle(oracle).data;
+	}
+
 	mockUser.getUserAccount = getMockUserAccount;
 	mockUser.driftClient.getPerpMarketAccount = getMockPerpMarket;
 	mockUser.driftClient.getSpotMarketAccount = getMockSpotMarket;
 	mockUser.driftClient.getOraclePriceDataAndSlot = getMockOracle;
+	mockUser.driftClient.getOracleDataForPerpMarket = getOracleDataForPerpMarket;
+	mockUser.driftClient.getOracleDataForSpotMarket = getOracleDataForSpotMarket;
 	return mockUser;
 }