@drift-labs/sdk 2.86.0-beta.15 → 2.86.0-beta.16

package/VERSION

@@ -1 +1 @@
-2.86.0-beta.15
+2.86.0-beta.16

package/lib/constants/spotMarkets.js

@@ -101,7 +101,7 @@ exports.MainnetSpotMarkets = [
         symbol: 'USDT',
         marketIndex: 5,
         oracle: new web3_js_1.PublicKey('3vxLXJqLqF3JG5TCbYycbKWRBbCJQLxQmBGCkyqEEefL'),
-        oracleSource: __1.OracleSource.PYTH_STABLE_COIN,
+        oracleSource: __1.OracleSource.PYTH,
         mint: new web3_js_1.PublicKey('Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB'),
         precision: numericConstants_1.QUOTE_PRECISION,
         precisionExp: numericConstants_1.QUOTE_PRECISION_EXP,
@@ -146,8 +146,8 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'JTO',
         marketIndex: 9,
-        oracle: new web3_js_1.PublicKey('Ffq6ACJ17NAgaxC6ocfMzVXL3K61qxB2xHg6WUawWPfP'),
-        oracleSource: __1.OracleSource.PYTH_PULL,
+        oracle: new web3_js_1.PublicKey('D8UUgr8a3aR3yUeHLu7v8FWK7E8Y5sSU7qrYBXUJXBQ5'),
+        oracleSource: __1.OracleSource.PYTH,
         mint: new web3_js_1.PublicKey('jtojtomepa8beP8AuQc6eXt5FriJwfFMwQx2v2f9mCL'),
         precision: new __1.BN(10).pow(numericConstants_1.NINE),
         precisionExp: numericConstants_1.NINE,
@@ -194,8 +194,8 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'W',
         marketIndex: 13,
-        oracle: new web3_js_1.PublicKey('4HbitGsdcFbtFotmYscikQFAAKJ3nYx4t7sV7fTvsk8U'),
-        oracleSource: __1.OracleSource.PYTH_PULL,
+        oracle: new web3_js_1.PublicKey('H9j8CT1bFiWHaZUPMooEaxMRHdWdJ5T9CzFn41z96JHW'),
+        oracleSource: __1.OracleSource.PYTH,
         mint: new web3_js_1.PublicKey('85VBFQZC9TZkfaptBWjvUw7YbZjy52A6mjtPGjstQAmQ'),
         precision: new __1.BN(10).pow(numericConstants_1.SIX),
         precisionExp: numericConstants_1.SIX,
@@ -206,8 +206,8 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'TNSR',
         marketIndex: 14,
-        oracle: new web3_js_1.PublicKey('13jpjpVyU5hGpjsZ4HzCcmBo85wze4N8Au7U6cC3GMip'),
-        oracleSource: __1.OracleSource.PYTH_PULL,
+        oracle: new web3_js_1.PublicKey('7Cfyymx49ipGsgEsCA2XygAB2DUsan4C6Cyb5c8oR5st'),
+        oracleSource: __1.OracleSource.SWITCHBOARD,
         mint: new web3_js_1.PublicKey('TNSRxcUxoT9xBG3de7PiJyTDYu7kskLqcpddxnEJAS6'),
         precision: new __1.BN(10).pow(numericConstants_1.NINE),
         precisionExp: numericConstants_1.NINE,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.86.0-beta.15",
+	"version": "2.86.0-beta.16",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/constants/spotMarkets.ts

@@ -139,7 +139,7 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		symbol: 'USDT',
 		marketIndex: 5,
 		oracle: new PublicKey('3vxLXJqLqF3JG5TCbYycbKWRBbCJQLxQmBGCkyqEEefL'),
-		oracleSource: OracleSource.PYTH_STABLE_COIN,
+		oracleSource: OracleSource.PYTH,
 		mint: new PublicKey('Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB'),
 		precision: QUOTE_PRECISION,
 		precisionExp: QUOTE_PRECISION_EXP,
@@ -192,8 +192,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'JTO',
 		marketIndex: 9,
-		oracle: new PublicKey('Ffq6ACJ17NAgaxC6ocfMzVXL3K61qxB2xHg6WUawWPfP'),
-		oracleSource: OracleSource.PYTH_PULL,
+		oracle: new PublicKey('D8UUgr8a3aR3yUeHLu7v8FWK7E8Y5sSU7qrYBXUJXBQ5'),
+		oracleSource: OracleSource.PYTH,
 		mint: new PublicKey('jtojtomepa8beP8AuQc6eXt5FriJwfFMwQx2v2f9mCL'),
 		precision: new BN(10).pow(NINE),
 		precisionExp: NINE,
@@ -250,8 +250,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'W',
 		marketIndex: 13,
-		oracle: new PublicKey('4HbitGsdcFbtFotmYscikQFAAKJ3nYx4t7sV7fTvsk8U'),
-		oracleSource: OracleSource.PYTH_PULL,
+		oracle: new PublicKey('H9j8CT1bFiWHaZUPMooEaxMRHdWdJ5T9CzFn41z96JHW'),
+		oracleSource: OracleSource.PYTH,
 		mint: new PublicKey('85VBFQZC9TZkfaptBWjvUw7YbZjy52A6mjtPGjstQAmQ'),
 		precision: new BN(10).pow(SIX),
 		precisionExp: SIX,
@@ -265,8 +265,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'TNSR',
 		marketIndex: 14,
-		oracle: new PublicKey('13jpjpVyU5hGpjsZ4HzCcmBo85wze4N8Au7U6cC3GMip'),
-		oracleSource: OracleSource.PYTH_PULL,
+		oracle: new PublicKey('7Cfyymx49ipGsgEsCA2XygAB2DUsan4C6Cyb5c8oR5st'),
+		oracleSource: OracleSource.SWITCHBOARD,
 		mint: new PublicKey('TNSRxcUxoT9xBG3de7PiJyTDYu7kskLqcpddxnEJAS6'),
 		precision: new BN(10).pow(NINE),
 		precisionExp: NINE,

package/tests/ci/verifyConstants.ts

@@ -0,0 +1,214 @@
+import {
+	DriftClient,
+	DevnetSpotMarkets,
+	MainnetSpotMarkets,
+	DevnetPerpMarkets,
+	MainnetPerpMarkets,
+	BulkAccountLoader,
+	getVariant,
+} from '../../src';
+import { Connection, Keypair } from '@solana/web3.js';
+import { Wallet } from '@coral-xyz/anchor';
+import dotenv from 'dotenv';
+import { assert } from 'chai';
+
+dotenv.config();
+
+describe('Verify Constants', function () {
+	this.timeout(100_000);
+	const MAINNET_RPC_ENDPOINT = process.env.MAINNET_RPC_ENDPOINT;
+    const DEVNET_RPC_ENDPOINT = process.env.DEVNET_RPC_ENDPOINT;
+
+	if (MAINNET_RPC_ENDPOINT === undefined) {
+	    throw new Error("MAINNET_RPC_ENDPOINT not found in .env");
+	}
+
+    if (DEVNET_RPC_ENDPOINT === undefined) {
+	    throw new Error("DEVNET_RPC_ENDPOINT not found in .env");
+	}
+
+	const wallet = new Wallet(Keypair.generate());
+
+    const devnetConnection = new Connection(DEVNET_RPC_ENDPOINT);
+	const mainnetConnection = new Connection(MAINNET_RPC_ENDPOINT);
+
+	const devnetBulkAccountLoader = new BulkAccountLoader(
+		devnetConnection,
+		'processed',
+		1
+	);
+
+	const mainnetBulkAccountLoader = new BulkAccountLoader(
+		mainnetConnection,
+		'processed',
+		1
+	);
+
+	const devnetDriftClient = new DriftClient({
+		connection: devnetConnection,
+		wallet,
+		env: 'devnet',
+		accountSubscription: {
+			type: 'polling',
+			accountLoader: devnetBulkAccountLoader,
+		},
+	});
+
+	const mainnetDriftClient = new DriftClient({
+		connection: mainnetConnection,
+		wallet,
+		env: 'mainnet-beta',
+		accountSubscription: {
+			type: 'polling',
+			accountLoader: mainnetBulkAccountLoader,
+		},
+	});
+
+	before(async () => {
+		await devnetDriftClient.subscribe();
+		await mainnetDriftClient.subscribe();
+	});
+
+	after(async () => {
+		await devnetDriftClient.unsubscribe();
+		await mainnetDriftClient.unsubscribe();
+	});
+
+	it('has all mainnet markets', async () => {
+		const spotMarkets = mainnetDriftClient.getSpotMarketAccounts();
+        spotMarkets.sort((a, b) => a.marketIndex - b.marketIndex);
+
+		for (const market of spotMarkets) {
+			const correspondingConfigMarket = MainnetSpotMarkets.find(
+				(configMarket) => configMarket.marketIndex === market.marketIndex
+			);
+			assert(
+				correspondingConfigMarket !== undefined,
+				`Market ${
+					market.marketIndex
+				} not found in MainnetSpotMarkets. market: ${market.pubkey.toBase58()}`
+			);
+			assert(
+				correspondingConfigMarket.oracle.toBase58() == market.oracle.toBase58(),
+				`Oracle mismatch for mainnet spot market ${
+					market.marketIndex
+				}, market: ${market.pubkey.toBase58()}, constants: ${correspondingConfigMarket.oracle.toBase58()}, chain: ${market.oracle.toBase58()}`
+			);
+			assert(
+				getVariant(correspondingConfigMarket.oracleSource) ===
+					getVariant(market.oracleSource),
+				`Oracle source mismatch for mainnet spot market ${
+					market.marketIndex
+				}, market: ${market.pubkey.toBase58()}, constants: ${getVariant(
+					correspondingConfigMarket.oracleSource
+				)}, chain: ${getVariant(market.oracleSource)}`
+			);
+			assert(
+				correspondingConfigMarket.mint.toBase58() === market.mint.toBase58(),
+				`Mint mismatch for mainnet spot market ${
+					market.marketIndex
+				}, market: ${market.pubkey.toBase58()}, constants: ${correspondingConfigMarket.mint.toBase58()}, chain: ${market.mint.toBase58()}`
+			);
+		}
+
+		const perpMarkets = mainnetDriftClient.getPerpMarketAccounts();
+        perpMarkets.sort((a, b) => a.marketIndex - b.marketIndex);
+
+		for (const market of perpMarkets) {
+			const correspondingConfigMarket = MainnetPerpMarkets.find(
+				(configMarket) => configMarket.marketIndex === market.marketIndex
+			);
+			assert(
+				correspondingConfigMarket !== undefined,
+				`Market ${
+					market.marketIndex
+				} not found in MainnetPerpMarkets, market: ${market.pubkey.toBase58()}`
+			);
+			assert(
+				correspondingConfigMarket.oracle.toBase58() ==
+					market.amm.oracle.toBase58(),
+				`Oracle mismatch for mainnet perp market ${
+					market.marketIndex
+				}, market: ${market.pubkey.toBase58()}, constants: ${correspondingConfigMarket.oracle.toBase58()}, chain: ${market.amm.oracle.toBase58()}`
+			);
+			assert(
+				getVariant(correspondingConfigMarket.oracleSource) ===
+					getVariant(market.amm.oracleSource),
+				`Oracle source mismatch for mainnet perp market ${
+					market.marketIndex
+				}, market: ${market.pubkey.toBase58()}, constants: ${getVariant(
+					correspondingConfigMarket.oracleSource
+				)}, chain: ${getVariant(market.amm.oracleSource)}`
+			);
+		}
+	});
+
+	it('has all devnet markets', async () => {
+		const spotMarkets = devnetDriftClient.getSpotMarketAccounts();
+        spotMarkets.sort((a, b) => a.marketIndex - b.marketIndex);
+
+		for (const market of spotMarkets) {
+			const correspondingConfigMarket = DevnetSpotMarkets.find(
+				(configMarket) => configMarket.marketIndex === market.marketIndex
+			);
+			assert(
+				correspondingConfigMarket !== undefined,
+				`Market ${
+					market.marketIndex
+				} not found in DevnetSpotMarkets, market: ${market.pubkey.toBase58()}`
+			);
+			assert(
+				correspondingConfigMarket.oracle.toBase58() == market.oracle.toBase58(),
+				`Oracle mismatch for devnet spot market ${
+					market.marketIndex
+				}, market: ${market.pubkey.toBase58()}, constants: ${correspondingConfigMarket.oracle.toBase58()}, chain: ${market.oracle.toBase58()}`
+			);
+			assert(
+				getVariant(correspondingConfigMarket.oracleSource) ===
+					getVariant(market.oracleSource),
+				`Oracle source mismatch for devnet spot market ${
+					market.marketIndex
+				}, market: ${market.pubkey.toBase58()}, constants: ${getVariant(
+					correspondingConfigMarket.oracleSource
+				)}, chain: ${getVariant(market.oracleSource)}`
+			);
+			assert(
+				correspondingConfigMarket.mint.toBase58() === market.mint.toBase58(),
+				`Mint mismatch for devnet spot market ${
+					market.marketIndex
+				}, market: ${market.pubkey.toBase58()}, constants: ${correspondingConfigMarket.mint.toBase58()}, chain: ${market.mint.toBase58()}`
+			);
+		}
+
+		const perpMarkets = devnetDriftClient.getPerpMarketAccounts();
+        perpMarkets.sort((a, b) => a.marketIndex - b.marketIndex);
+
+		for (const market of perpMarkets) {
+			const correspondingConfigMarket = DevnetPerpMarkets.find(
+				(configMarket) => configMarket.marketIndex === market.marketIndex
+			);
+			assert(
+				correspondingConfigMarket !== undefined,
+				`Market ${
+					market.marketIndex
+				} not found in DevnetPerpMarkets, market: ${market.pubkey.toBase58()}`
+			);
+			assert(
+				correspondingConfigMarket.oracle.toBase58() ==
+					market.amm.oracle.toBase58(),
+				`Oracle mismatch for devnet perp market ${
+					market.marketIndex
+				}, market: ${market.pubkey.toBase58()}, constants: ${correspondingConfigMarket.oracle.toBase58()}, chain: ${market.amm.oracle.toBase58()}`
+			);
+			assert(
+				getVariant(correspondingConfigMarket.oracleSource) ===
+					getVariant(market.amm.oracleSource),
+				`Oracle source mismatch for devnet perp market ${
+					market.marketIndex
+				}, market: ${market.pubkey.toBase58()}, constants: ${getVariant(
+					correspondingConfigMarket.oracleSource
+				)}, chain: ${getVariant(market.amm.oracleSource)}`
+			);
+		}
+	});
+});