@drift-labs/sdk 2.93.0-beta.7 → 2.93.0-beta.9

package/VERSION

@@ -1 +1 @@
-2.93.0-beta.7
+2.93.0-beta.9

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/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.7",
+	"version": "2.93.0-beta.9",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

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/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/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;
 }