@drift-labs/sdk 2.60.0-beta.3 → 2.60.0-beta.5

package/VERSION

@@ -1 +1 @@
-2.60.0-beta.3
+2.60.0-beta.5

package/lib/constants/spotMarkets.js

@@ -158,7 +158,7 @@ exports.MainnetSpotMarkets = [
         mint: new web3_js_1.PublicKey('JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN'),
         precision: new __1.BN(10).pow(numericConstants_1.SIX),
         precisionExp: numericConstants_1.SIX,
-        serumMarket: new web3_js_1.PublicKey('FbwncFP5bZjdx8J6yfDDTrCmmMkwieuape1enCvwLG33'),
+        phoenixMarket: new web3_js_1.PublicKey('2pspvjWWaf3dNgt3jsgSzFCNvMGPb7t8FrEYvLGjvcCe'),
     },
 ];
 exports.SpotMarkets = {

package/package.json

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

package/src/constants/spotMarkets.ts

@@ -188,7 +188,9 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		mint: new PublicKey('JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN'),
 		precision: new BN(10).pow(SIX),
 		precisionExp: SIX,
-		serumMarket: new PublicKey('FbwncFP5bZjdx8J6yfDDTrCmmMkwieuape1enCvwLG33'),
+		phoenixMarket: new PublicKey(
+			'2pspvjWWaf3dNgt3jsgSzFCNvMGPb7t8FrEYvLGjvcCe'
+		),
 	},
 ];
 

package/examples/phoenix.ts

@@ -1,66 +0,0 @@
-import { Connection, PublicKey } from '@solana/web3.js';
-import {
-	BASE_PRECISION,
-	L2Level,
-	PRICE_PRECISION,
-	PhoenixSubscriber,
-} from '../src';
-import { PROGRAM_ID } from '@ellipsis-labs/phoenix-sdk';
-
-export async function listenToBook(): Promise<void> {
-	const connection = new Connection('https://api.mainnet-beta.solana.com');
-
-	for (const market of [
-		'4DoNfFBfF7UokCC2FQzriy7yHK6DY6NVdYpuekQ5pRgg', // SOL/USDC
-		'Ew3vFDdtdGrknJAVVfraxCA37uNJtimXYPY4QjnfhFHH', // ETH/USDC
-		'2sTMN9A1D1qeZLF95XQgJCUPiKe5DiV52jLfZGqMP46m', // PYTH/USDC
-		'BRLLmdtPGuuFn3BU6orYw4KHaohAEptBToi3dwRUnHQZ', // JTO/USDC
-	]) {
-		const phoenixSubscriber = new PhoenixSubscriber({
-			connection,
-			programId: PROGRAM_ID,
-			marketAddress: new PublicKey(market),
-			accountSubscription: {
-				type: 'websocket',
-			},
-		});
-
-		await phoenixSubscriber.subscribe();
-
-		const bids = phoenixSubscriber.getL2Levels('bids');
-		const asks = phoenixSubscriber.getL2Levels('asks');
-		let bid: L2Level | null = null;
-		for (const b of bids) {
-			bid = b;
-			break;
-		}
-		let ask: L2Level | null = null;
-		for (const a of asks) {
-			ask = a;
-			break;
-		}
-
-		console.log('market', market);
-		console.log(
-			(bid?.size.toNumber() || 0) / BASE_PRECISION.toNumber(),
-			(bid?.price.toNumber() || 0) / PRICE_PRECISION.toNumber(),
-			'@',
-			(ask?.price.toNumber() || (1 << 53) - 1) / PRICE_PRECISION.toNumber(),
-			(ask?.size.toNumber() || 0) / BASE_PRECISION.toNumber()
-		);
-		console.log();
-
-		await phoenixSubscriber.unsubscribe();
-	}
-}
-
-(async function () {
-	try {
-		await listenToBook();
-	} catch (err) {
-		console.log('Error: ', err);
-		process.exit(1);
-	}
-
-	process.exit(0);
-})();

package/lib/examples/loadDlob.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/examples/loadDlob.js

@@ -1,59 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const anchor_1 = require("@coral-xyz/anchor");
-const __1 = require("..");
-const web3_js_1 = require("@solana/web3.js");
-const __2 = require("..");
-const env = 'mainnet-beta';
-const main = async () => {
-    // Initialize Drift SDK
-    const sdkConfig = (0, __2.initialize)({ env });
-    // Set up the Wallet and Provider
-    const privateKey = process.env.BOT_PRIVATE_KEY; // stored as an array string
-    const keypair = web3_js_1.Keypair.fromSecretKey(Uint8Array.from(JSON.parse(privateKey)));
-    const wallet = new __1.Wallet(keypair);
-    // Set up the Connection
-    const rpcAddress = process.env.RPC_ADDRESS; // can use: https://api.devnet.solana.com for devnet; https://api.mainnet-beta.solana.com for mainnet;
-    const connection = new web3_js_1.Connection(rpcAddress);
-    // Set up the Provider
-    const provider = new anchor_1.AnchorProvider(connection, 
-    // @ts-ignore
-    wallet, anchor_1.AnchorProvider.defaultOptions());
-    // Set up the Drift Clearing House
-    const driftPublicKey = new web3_js_1.PublicKey(sdkConfig.DRIFT_PROGRAM_ID);
-    const bulkAccountLoader = new __2.BulkAccountLoader(connection, 'confirmed', 1000);
-    const driftClient = new __2.DriftClient({
-        connection,
-        wallet: provider.wallet,
-        programID: driftPublicKey,
-        ...(0, __2.getMarketsAndOraclesForSubscription)(env),
-        accountSubscription: {
-            type: 'polling',
-            accountLoader: bulkAccountLoader,
-        },
-    });
-    console.log('Subscribing drift client...');
-    await driftClient.subscribe();
-    console.log('Loading user map...');
-    const userMap = new __1.UserMap({
-        driftClient,
-        subscriptionConfig: {
-            type: 'websocket',
-            commitment: 'processed',
-        },
-        skipInitialLoad: false,
-        includeIdle: false,
-    });
-    // fetches all users and subscribes for updates
-    await userMap.subscribe();
-    console.log('Loading dlob from user map...');
-    const slot = await driftClient.connection.getSlot();
-    const dlob = await userMap.getDLOB(slot);
-    console.log('number of orders', dlob.getDLOBOrders().length);
-    dlob.clear();
-    console.log('Unsubscribing users...');
-    await userMap.unsubscribe();
-    console.log('Unsubscribing drift client...');
-    await driftClient.unsubscribe();
-};
-main();

package/lib/examples/makeTradeExample.d.ts

@@ -1,2 +0,0 @@
-import { PublicKey } from '@solana/web3.js';
-export declare const getTokenAddress: (mintAddress: string, userPubKey: string) => Promise<PublicKey>;

package/lib/examples/makeTradeExample.js

@@ -1,83 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTokenAddress = void 0;
-const anchor_1 = require("@coral-xyz/anchor");
-const __1 = require("..");
-const spl_token_1 = require("@solana/spl-token");
-const web3_js_1 = require("@solana/web3.js");
-const __2 = require("..");
-const spotMarkets_1 = require("../constants/spotMarkets");
-const getTokenAddress = (mintAddress, userPubKey) => {
-    return (0, spl_token_1.getAssociatedTokenAddress)(new web3_js_1.PublicKey(mintAddress), new web3_js_1.PublicKey(userPubKey));
-};
-exports.getTokenAddress = getTokenAddress;
-const env = 'devnet';
-const main = async () => {
-    // Initialize Drift SDK
-    const sdkConfig = (0, __2.initialize)({ env });
-    // Set up the Wallet and Provider
-    const privateKey = process.env.BOT_PRIVATE_KEY; // stored as an array string
-    const keypair = web3_js_1.Keypair.fromSecretKey(Uint8Array.from(JSON.parse(privateKey)));
-    const wallet = new __1.Wallet(keypair);
-    // Set up the Connection
-    const rpcAddress = process.env.RPC_ADDRESS; // can use: https://api.devnet.solana.com for devnet; https://api.mainnet-beta.solana.com for mainnet;
-    const connection = new web3_js_1.Connection(rpcAddress);
-    // Set up the Provider
-    const provider = new anchor_1.AnchorProvider(connection, 
-    // @ts-ignore
-    wallet, anchor_1.AnchorProvider.defaultOptions());
-    // Check SOL Balance
-    const lamportsBalance = await connection.getBalance(wallet.publicKey);
-    console.log('SOL balance:', lamportsBalance / 10 ** 9);
-    // Misc. other things to set up
-    const usdcTokenAddress = await (0, exports.getTokenAddress)(sdkConfig.USDC_MINT_ADDRESS, wallet.publicKey.toString());
-    // Set up the Drift Clearing House
-    const driftPublicKey = new web3_js_1.PublicKey(sdkConfig.DRIFT_PROGRAM_ID);
-    const bulkAccountLoader = new __2.BulkAccountLoader(connection, 'confirmed', 1000);
-    const driftClient = new __2.DriftClient({
-        connection,
-        wallet: provider.wallet,
-        programID: driftPublicKey,
-        ...(0, __2.getMarketsAndOraclesForSubscription)(env),
-        accountSubscription: {
-            type: 'polling',
-            accountLoader: bulkAccountLoader,
-        },
-    });
-    await driftClient.subscribe();
-    // Set up user client
-    const user = new __2.User({
-        driftClient: driftClient,
-        userAccountPublicKey: await driftClient.getUserAccountPublicKey(),
-        accountSubscription: {
-            type: 'polling',
-            accountLoader: bulkAccountLoader,
-        },
-    });
-    //// Check if user account exists for the current wallet
-    const userAccountExists = await user.exists();
-    if (!userAccountExists) {
-        //// Create a Clearing House account by Depositing some USDC ($10,000 in this case)
-        const depositAmount = new anchor_1.BN(10000).mul(__2.QUOTE_PRECISION);
-        await driftClient.initializeUserAccountAndDepositCollateral(depositAmount, await (0, exports.getTokenAddress)(usdcTokenAddress.toString(), wallet.publicKey.toString()), spotMarkets_1.SpotMarkets['devnet'][0].marketIndex);
-    }
-    await user.subscribe();
-    // Get current price
-    const solMarketInfo = sdkConfig.PERP_MARKETS.find((market) => market.baseAssetSymbol === 'SOL');
-    const marketIndex = solMarketInfo.marketIndex;
-    const [bid, ask] = (0, __1.calculateBidAskPrice)(driftClient.getPerpMarketAccount(marketIndex).amm, driftClient.getOracleDataForPerpMarket(marketIndex));
-    const formattedBidPrice = (0, __2.convertToNumber)(bid, __2.PRICE_PRECISION);
-    const formattedAskPrice = (0, __2.convertToNumber)(ask, __2.PRICE_PRECISION);
-    console.log(`Current amm bid and ask price are $${formattedBidPrice} and $${formattedAskPrice}`);
-    // Estimate the slippage for a $5000 LONG trade
-    const solMarketAccount = driftClient.getPerpMarketAccount(solMarketInfo.marketIndex);
-    const slippage = (0, __2.convertToNumber)((0, __2.calculateTradeSlippage)(__2.PositionDirection.LONG, new anchor_1.BN(1).mul(__1.BASE_PRECISION), solMarketAccount, 'base', driftClient.getOracleDataForPerpMarket(solMarketInfo.marketIndex))[0], __2.PRICE_PRECISION);
-    console.log(`Slippage for a 1 SOL-PERP would be $${slippage}`);
-    await driftClient.placePerpOrder((0, __1.getMarketOrderParams)({
-        baseAssetAmount: new anchor_1.BN(1).mul(__1.BASE_PRECISION),
-        direction: __2.PositionDirection.LONG,
-        marketIndex: solMarketAccount.marketIndex,
-    }));
-    console.log(`Placed a 1 SOL-PERP LONG order`);
-};
-main();

package/src/examples/loadDlob.ts

@@ -1,86 +0,0 @@
-import { AnchorProvider } from '@coral-xyz/anchor';
-import { UserMap, Wallet } from '..';
-import { Connection, Keypair, PublicKey } from '@solana/web3.js';
-import {
-	DriftClient,
-	initialize,
-	BulkAccountLoader,
-	getMarketsAndOraclesForSubscription,
-} from '..';
-
-const env = 'mainnet-beta';
-
-const main = async () => {
-	// Initialize Drift SDK
-	const sdkConfig = initialize({ env });
-
-	// Set up the Wallet and Provider
-	const privateKey = process.env.BOT_PRIVATE_KEY; // stored as an array string
-	const keypair = Keypair.fromSecretKey(
-		Uint8Array.from(JSON.parse(privateKey))
-	);
-	const wallet = new Wallet(keypair);
-
-	// Set up the Connection
-	const rpcAddress = process.env.RPC_ADDRESS; // can use: https://api.devnet.solana.com for devnet; https://api.mainnet-beta.solana.com for mainnet;
-	const connection = new Connection(rpcAddress);
-
-	// Set up the Provider
-	const provider = new AnchorProvider(
-		connection,
-		// @ts-ignore
-		wallet,
-		AnchorProvider.defaultOptions()
-	);
-
-	// Set up the Drift Clearing House
-	const driftPublicKey = new PublicKey(sdkConfig.DRIFT_PROGRAM_ID);
-	const bulkAccountLoader = new BulkAccountLoader(
-		connection,
-		'confirmed',
-		1000
-	);
-	const driftClient = new DriftClient({
-		connection,
-		wallet: provider.wallet,
-		programID: driftPublicKey,
-		...getMarketsAndOraclesForSubscription(env),
-		accountSubscription: {
-			type: 'polling',
-			accountLoader: bulkAccountLoader,
-		},
-	});
-
-	console.log('Subscribing drift client...');
-	await driftClient.subscribe();
-
-	console.log('Loading user map...');
-	const userMap = new UserMap({
-		driftClient,
-		subscriptionConfig: {
-			type: 'websocket',
-			commitment: 'processed',
-		},
-		skipInitialLoad: false,
-		includeIdle: false,
-	});
-
-	// fetches all users and subscribes for updates
-	await userMap.subscribe();
-
-	console.log('Loading dlob from user map...');
-	const slot = await driftClient.connection.getSlot();
-	const dlob = await userMap.getDLOB(slot);
-
-	console.log('number of orders', dlob.getDLOBOrders().length);
-
-	dlob.clear();
-
-	console.log('Unsubscribing users...');
-	await userMap.unsubscribe();
-
-	console.log('Unsubscribing drift client...');
-	await driftClient.unsubscribe();
-};
-
-main();

package/src/examples/makeTradeExample.ts

@@ -1,162 +0,0 @@
-import { AnchorProvider, BN } from '@coral-xyz/anchor';
-import {
-	BASE_PRECISION,
-	calculateBidAskPrice,
-	getMarketOrderParams,
-	Wallet,
-} from '..';
-import { getAssociatedTokenAddress } from '@solana/spl-token';
-import { Connection, Keypair, PublicKey } from '@solana/web3.js';
-import {
-	DriftClient,
-	User,
-	initialize,
-	PositionDirection,
-	convertToNumber,
-	calculateTradeSlippage,
-	BulkAccountLoader,
-	getMarketsAndOraclesForSubscription,
-	PRICE_PRECISION,
-	QUOTE_PRECISION,
-} from '..';
-import { SpotMarkets } from '../constants/spotMarkets';
-
-export const getTokenAddress = (
-	mintAddress: string,
-	userPubKey: string
-): Promise<PublicKey> => {
-	return getAssociatedTokenAddress(
-		new PublicKey(mintAddress),
-		new PublicKey(userPubKey)
-	);
-};
-
-const env = 'devnet';
-
-const main = async () => {
-	// Initialize Drift SDK
-	const sdkConfig = initialize({ env });
-
-	// Set up the Wallet and Provider
-	const privateKey = process.env.BOT_PRIVATE_KEY; // stored as an array string
-	const keypair = Keypair.fromSecretKey(
-		Uint8Array.from(JSON.parse(privateKey))
-	);
-	const wallet = new Wallet(keypair);
-
-	// Set up the Connection
-	const rpcAddress = process.env.RPC_ADDRESS; // can use: https://api.devnet.solana.com for devnet; https://api.mainnet-beta.solana.com for mainnet;
-	const connection = new Connection(rpcAddress);
-
-	// Set up the Provider
-	const provider = new AnchorProvider(
-		connection,
-		// @ts-ignore
-		wallet,
-		AnchorProvider.defaultOptions()
-	);
-
-	// Check SOL Balance
-	const lamportsBalance = await connection.getBalance(wallet.publicKey);
-	console.log('SOL balance:', lamportsBalance / 10 ** 9);
-
-	// Misc. other things to set up
-	const usdcTokenAddress = await getTokenAddress(
-		sdkConfig.USDC_MINT_ADDRESS,
-		wallet.publicKey.toString()
-	);
-
-	// Set up the Drift Clearing House
-	const driftPublicKey = new PublicKey(sdkConfig.DRIFT_PROGRAM_ID);
-	const bulkAccountLoader = new BulkAccountLoader(
-		connection,
-		'confirmed',
-		1000
-	);
-	const driftClient = new DriftClient({
-		connection,
-		wallet: provider.wallet,
-		programID: driftPublicKey,
-		...getMarketsAndOraclesForSubscription(env),
-		accountSubscription: {
-			type: 'polling',
-			accountLoader: bulkAccountLoader,
-		},
-	});
-	await driftClient.subscribe();
-
-	// Set up user client
-	const user = new User({
-		driftClient: driftClient,
-		userAccountPublicKey: await driftClient.getUserAccountPublicKey(),
-		accountSubscription: {
-			type: 'polling',
-			accountLoader: bulkAccountLoader,
-		},
-	});
-
-	//// Check if user account exists for the current wallet
-	const userAccountExists = await user.exists();
-
-	if (!userAccountExists) {
-		//// Create a Clearing House account by Depositing some USDC ($10,000 in this case)
-		const depositAmount = new BN(10000).mul(QUOTE_PRECISION);
-		await driftClient.initializeUserAccountAndDepositCollateral(
-			depositAmount,
-			await getTokenAddress(
-				usdcTokenAddress.toString(),
-				wallet.publicKey.toString()
-			),
-			SpotMarkets['devnet'][0].marketIndex
-		);
-	}
-
-	await user.subscribe();
-
-	// Get current price
-	const solMarketInfo = sdkConfig.PERP_MARKETS.find(
-		(market) => market.baseAssetSymbol === 'SOL'
-	);
-
-	const marketIndex = solMarketInfo.marketIndex;
-	const [bid, ask] = calculateBidAskPrice(
-		driftClient.getPerpMarketAccount(marketIndex).amm,
-		driftClient.getOracleDataForPerpMarket(marketIndex)
-	);
-
-	const formattedBidPrice = convertToNumber(bid, PRICE_PRECISION);
-	const formattedAskPrice = convertToNumber(ask, PRICE_PRECISION);
-
-	console.log(
-		`Current amm bid and ask price are $${formattedBidPrice} and $${formattedAskPrice}`
-	);
-
-	// Estimate the slippage for a $5000 LONG trade
-	const solMarketAccount = driftClient.getPerpMarketAccount(
-		solMarketInfo.marketIndex
-	);
-
-	const slippage = convertToNumber(
-		calculateTradeSlippage(
-			PositionDirection.LONG,
-			new BN(1).mul(BASE_PRECISION),
-			solMarketAccount,
-			'base',
-			driftClient.getOracleDataForPerpMarket(solMarketInfo.marketIndex)
-		)[0],
-		PRICE_PRECISION
-	);
-
-	console.log(`Slippage for a 1 SOL-PERP would be $${slippage}`);
-
-	await driftClient.placePerpOrder(
-		getMarketOrderParams({
-			baseAssetAmount: new BN(1).mul(BASE_PRECISION),
-			direction: PositionDirection.LONG,
-			marketIndex: solMarketAccount.marketIndex,
-		})
-	);
-	console.log(`Placed a 1 SOL-PERP LONG order`);
-};
-
-main();