@drift-labs/sdk 2.93.0-beta.8 → 2.94.0-beta.0

package/VERSION

@@ -1 +1 @@
-2.93.0-beta.8
+2.94.0-beta.0

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.92.0",
+    "version": "2.93.0",
     "name": "drift",
     "instructions": [
         {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.93.0-beta.8",
+	"version": "2.94.0-beta.0",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.92.0",
+  "version": "2.93.0",
   "name": "drift",
   "instructions": [
     {

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