@drift-labs/sdk 2.30.0-beta.1 → 2.30.0

package/lib/token/index.js

@@ -2,37 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseTokenAccount = void 0;
 const spl_token_1 = require("@solana/spl-token");
-const web3_js_1 = require("@solana/web3.js");
-function parseTokenAccount(data) {
-    const accountInfo = spl_token_1.AccountLayout.decode(data);
-    accountInfo.mint = new web3_js_1.PublicKey(accountInfo.mint);
-    accountInfo.owner = new web3_js_1.PublicKey(accountInfo.owner);
-    accountInfo.amount = spl_token_1.u64.fromBuffer(accountInfo.amount);
-    if (accountInfo.delegateOption === 0) {
-        accountInfo.delegate = null;
-        // eslint-disable-next-line new-cap
-        accountInfo.delegatedAmount = spl_token_1.u64.fromBuffer(Buffer.from('0'));
-    }
-    else {
-        accountInfo.delegate = new web3_js_1.PublicKey(accountInfo.delegate);
-        accountInfo.delegatedAmount = spl_token_1.u64.fromBuffer(accountInfo.delegatedAmount);
-    }
-    accountInfo.isInitialized = accountInfo.state !== 0;
-    accountInfo.isFrozen = accountInfo.state === 2;
-    if (accountInfo.isNativeOption === 1) {
-        accountInfo.rentExemptReserve = spl_token_1.u64.fromBuffer(accountInfo.isNative);
-        accountInfo.isNative = true;
-    }
-    else {
-        accountInfo.rentExemptReserve = null;
-        accountInfo.isNative = false;
-    }
-    if (accountInfo.closeAuthorityOption === 0) {
-        accountInfo.closeAuthority = null;
-    }
-    else {
-        accountInfo.closeAuthority = new web3_js_1.PublicKey(accountInfo.closeAuthority);
-    }
-    return accountInfo;
+function parseTokenAccount(data, pubkey) {
+    // mock AccountInfo so unpackAccount can be used
+    const accountInfo = {
+        data,
+        owner: spl_token_1.TOKEN_PROGRAM_ID,
+        executable: false,
+        lamports: 0,
+    };
+    return (0, spl_token_1.unpackAccount)(pubkey, accountInfo, spl_token_1.TOKEN_PROGRAM_ID);
 }
 exports.parseTokenAccount = parseTokenAccount;

package/lib/tokenFaucet.d.ts

@@ -1,6 +1,6 @@
 import * as anchor from '@coral-xyz/anchor';
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
-import { AccountInfo } from '@solana/spl-token';
+import { Account } from '@solana/spl-token';
 import { ConfirmOptions, Connection, PublicKey, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
 import { BN } from '.';
 import { IWallet } from './types';
@@ -30,9 +30,9 @@ export declare class TokenFaucet {
     }): Promise<anchor.web3.PublicKey>;
     getTokenAccountInfo(props: {
         userPubKey: PublicKey;
-    }): Promise<AccountInfo>;
+    }): Promise<Account>;
     subscribeToTokenAccount(props: {
         userPubKey: PublicKey;
-        callback: (accountInfo: AccountInfo) => void;
+        callback: (accountInfo: Account) => void;
     }): Promise<boolean>;
 }

package/lib/tokenFaucet.js

@@ -123,22 +123,17 @@ class TokenFaucet {
     async createAssociatedTokenAccountAndMintToInstructions(userPublicKey, amount) {
         const state = await this.fetchState();
         const associateTokenPublicKey = await this.getAssosciatedMockUSDMintAddress({ userPubKey: userPublicKey });
-        const createAssociatedAccountIx = spl_token_1.Token.createAssociatedTokenAccountInstruction(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, spl_token_1.TOKEN_PROGRAM_ID, state.mint, associateTokenPublicKey, userPublicKey, this.wallet.publicKey);
+        const createAssociatedAccountIx = (0, spl_token_1.createAssociatedTokenAccountInstruction)(this.wallet.publicKey, associateTokenPublicKey, userPublicKey, state.mint);
         const mintToIx = await this.mintToUserIx(associateTokenPublicKey, amount);
         return [associateTokenPublicKey, createAssociatedAccountIx, mintToIx];
     }
     async getAssosciatedMockUSDMintAddress(props) {
         const state = await this.fetchState();
-        return spl_token_1.Token.getAssociatedTokenAddress(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, spl_token_1.TOKEN_PROGRAM_ID, state.mint, props.userPubKey);
+        return (0, spl_token_1.getAssociatedTokenAddress)(state.mint, props.userPubKey);
     }
     async getTokenAccountInfo(props) {
-        const assosciatedKey = await this.getAssosciatedMockUSDMintAddress(props);
-        const state = await this.fetchState();
-        const token = new spl_token_1.Token(this.connection, state.mint, spl_token_1.TOKEN_PROGRAM_ID, 
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        this.provider.payer);
-        return await token.getAccountInfo(assosciatedKey);
+        const associatedKey = await this.getAssosciatedMockUSDMintAddress(props);
+        return await (0, spl_token_1.getAccount)(this.connection, associatedKey);
     }
     async subscribeToTokenAccount(props) {
         try {

package/lib/tx/retryTxSender.js

@@ -57,6 +57,9 @@ class RetryTxSender {
     async sendVersionedTransaction(tx, additionalSigners, opts) {
         // @ts-ignore
         tx.sign((additionalSigners !== null && additionalSigners !== void 0 ? additionalSigners : []).concat(this.provider.wallet.payer));
+        if (opts === undefined) {
+            opts = this.provider.opts;
+        }
         return this.sendRawTransaction(tx.serialize(), opts);
     }
     async sendRawTransaction(rawTransaction, opts) {

package/lib/types.d.ts

@@ -1,4 +1,4 @@
-import { PublicKey, Transaction } from '@solana/web3.js';
+import { PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js';
 import { BN } from '.';
 export declare enum ExchangeStatus {
     ACTIVE = 0,
@@ -585,7 +585,7 @@ export type OrderActionRecord = {
     oraclePrice: BN;
 };
 export type SwapRecord = {
-    ts: number;
+    ts: BN;
     user: PublicKey;
     amountOut: BN;
     amountIn: BN;
@@ -979,11 +979,24 @@ export type TxParams = {
     computeUnits?: number;
     computeUnitsPrice?: number;
 };
+export declare class SwapReduceOnly {
+    static readonly In: {
+        in: {};
+    };
+    static readonly Out: {
+        out: {};
+    };
+}
 export interface IWallet {
     signTransaction(tx: Transaction): Promise<Transaction>;
     signAllTransactions(txs: Transaction[]): Promise<Transaction[]>;
     publicKey: PublicKey;
 }
+export interface IVersionedWallet {
+    signVersionedTransaction(tx: VersionedTransaction): Promise<VersionedTransaction>;
+    signAllVersionedTransactions(txs: VersionedTransaction[]): Promise<VersionedTransaction[]>;
+    publicKey: PublicKey;
+}
 export type FeeStructure = {
     feeTiers: FeeTier[];
     makerRebateNumerator: BN;

package/lib/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultOrderParams = exports.ModifyOrderPolicy = exports.PostOnlyParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.getVariant = exports.isOneOfVariant = exports.isVariant = exports.StakeAction = exports.SpotFulfillmentConfigStatus = exports.SettlePnlExplanation = exports.DepositExplanation = exports.SpotFulfillmentStatus = exports.SpotFulfillmentType = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderStatus = exports.MarketType = exports.OrderType = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.SpotBalanceType = exports.SwapDirection = exports.AssetTier = exports.ContractTier = exports.ContractType = exports.UserStatus = exports.MarketStatus = exports.ExchangeStatus = void 0;
+exports.SwapReduceOnly = exports.DefaultOrderParams = exports.ModifyOrderPolicy = exports.PostOnlyParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.getVariant = exports.isOneOfVariant = exports.isVariant = exports.StakeAction = exports.SpotFulfillmentConfigStatus = exports.SettlePnlExplanation = exports.DepositExplanation = exports.SpotFulfillmentStatus = exports.SpotFulfillmentType = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderStatus = exports.MarketType = exports.OrderType = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.SpotBalanceType = exports.SwapDirection = exports.AssetTier = exports.ContractTier = exports.ContractType = exports.UserStatus = exports.MarketStatus = exports.ExchangeStatus = void 0;
 const _1 = require(".");
 // # Utility Types / Enums / Constants
 var ExchangeStatus;
@@ -266,3 +266,8 @@ exports.DefaultOrderParams = {
     auctionStartPrice: null,
     auctionEndPrice: null,
 };
+class SwapReduceOnly {
+}
+exports.SwapReduceOnly = SwapReduceOnly;
+SwapReduceOnly.In = { in: {} };
+SwapReduceOnly.Out = { out: {} };

package/lib/wallet.d.ts

@@ -1,10 +1,12 @@
-import { Keypair, PublicKey, Transaction } from '@solana/web3.js';
-import { IWallet } from './types';
-export declare class Wallet implements IWallet {
+import { Keypair, PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js';
+import { IWallet, IVersionedWallet } from './types';
+export declare class Wallet implements IWallet, IVersionedWallet {
     readonly payer: Keypair;
     constructor(payer: Keypair);
     signTransaction(tx: Transaction): Promise<Transaction>;
+    signVersionedTransaction(tx: VersionedTransaction): Promise<VersionedTransaction>;
     signAllTransactions(txs: Transaction[]): Promise<Transaction[]>;
+    signAllVersionedTransactions(txs: VersionedTransaction[]): Promise<VersionedTransaction[]>;
     get publicKey(): PublicKey;
 }
 export declare function loadKeypair(privateKey: string): Keypair;

package/lib/wallet.js

@@ -15,12 +15,22 @@ class Wallet {
         tx.partialSign(this.payer);
         return tx;
     }
+    async signVersionedTransaction(tx) {
+        tx.sign([this.payer]);
+        return tx;
+    }
     async signAllTransactions(txs) {
         return txs.map((t) => {
             t.partialSign(this.payer);
             return t;
         });
     }
+    async signAllVersionedTransactions(txs) {
+        return txs.map((t) => {
+            t.sign([this.payer]);
+            return t;
+        });
+    }
     get publicKey() {
         return this.payer.publicKey;
     }
@@ -30,15 +40,17 @@ function loadKeypair(privateKey) {
     // try to load privateKey as a filepath
     let loadedKey;
     if (fs_1.default.existsSync(privateKey)) {
-        loadedKey = new Uint8Array(JSON.parse(fs_1.default.readFileSync(privateKey).toString()));
+        privateKey = fs_1.default.readFileSync(privateKey).toString();
+    }
+    if (privateKey.includes('[') && privateKey.includes(']')) {
+        loadedKey = Uint8Array.from(JSON.parse(privateKey));
+    }
+    else if (privateKey.includes(',')) {
+        loadedKey = Uint8Array.from(privateKey.split(',').map((val) => Number(val)));
     }
     else {
-        if (privateKey.includes(',')) {
-            loadedKey = Uint8Array.from(privateKey.split(',').map((val) => Number(val)));
-        }
-        else {
-            loadedKey = new Uint8Array(bs58_1.default.decode(privateKey));
-        }
+        privateKey = privateKey.replace(/\s/g, '');
+        loadedKey = new Uint8Array(bs58_1.default.decode(privateKey));
     }
     return web3_js_1.Keypair.fromSecretKey(Uint8Array.from(loadedKey));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.30.0-beta.1",
+	"version": "2.30.0",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -37,7 +37,7 @@
 		"@ellipsis-labs/phoenix-sdk": "^1.4.2",
 		"@project-serum/serum": "^0.13.38",
 		"@pythnetwork/client": "2.5.3",
-		"@solana/spl-token": "^0.1.6",
+		"@solana/spl-token": "^0.3.7",
 		"@solana/web3.js": "1.73.2",
 		"strict-event-emitter-types": "^2.0.0",
 		"uuid": "^8.3.2"

package/src/accounts/pollingTokenAccountSubscriber.ts

@@ -9,7 +9,7 @@ import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './bulkAccountLoader';
-import { AccountInfo } from '@solana/spl-token';
+import { Account } from '@solana/spl-token';
 import { parseTokenAccount } from '../token';
 
 export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
@@ -22,7 +22,7 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 	callbackId?: string;
 	errorCallbackId?: string;
 
-	tokenAccountAndSlot?: DataAndSlot<AccountInfo>;
+	tokenAccountAndSlot?: DataAndSlot<Account>;
 
 	public constructor(publicKey: PublicKey, accountLoader: BulkAccountLoader) {
 		this.isSubscribed = false;
@@ -61,7 +61,7 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 		this.callbackId = await this.accountLoader.addAccount(
 			this.publicKey,
 			(buffer, slot: number) => {
-				const tokenAccount = parseTokenAccount(buffer);
+				const tokenAccount = parseTokenAccount(buffer, this.publicKey);
 				this.tokenAccountAndSlot = { data: tokenAccount, slot };
 				// @ts-ignore
 				this.eventEmitter.emit('tokenAccountUpdate', tokenAccount);
@@ -79,7 +79,10 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 		const { buffer, slot } = this.accountLoader.getBufferAndSlot(
 			this.publicKey
 		);
-		this.tokenAccountAndSlot = { data: parseTokenAccount(buffer), slot };
+		this.tokenAccountAndSlot = {
+			data: parseTokenAccount(buffer, this.publicKey),
+			slot,
+		};
 	}
 
 	async unsubscribe(): Promise<void> {
@@ -104,7 +107,7 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 		}
 	}
 
-	public getTokenAccountAndSlot(): DataAndSlot<AccountInfo> {
+	public getTokenAccountAndSlot(): DataAndSlot<Account> {
 		this.assertIsSubscribed();
 		return this.tokenAccountAndSlot;
 	}

package/src/accounts/types.ts

@@ -9,7 +9,7 @@ import {
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
-import { AccountInfo } from '@solana/spl-token';
+import { Account } from '@solana/spl-token';
 import { OracleInfo, OraclePriceData } from '..';
 
 export interface AccountSubscriber<T> {
@@ -82,7 +82,7 @@ export interface UserAccountSubscriber {
 }
 
 export interface TokenAccountEvents {
-	tokenAccountUpdate: (payload: AccountInfo) => void;
+	tokenAccountUpdate: (payload: Account) => void;
 	update: void;
 	error: (e: Error) => void;
 }
@@ -95,7 +95,7 @@ export interface TokenAccountSubscriber {
 	fetch(): Promise<void>;
 	unsubscribe(): Promise<void>;
 
-	getTokenAccountAndSlot(): DataAndSlot<AccountInfo>;
+	getTokenAccountAndSlot(): DataAndSlot<Account>;
 }
 
 export interface OracleEvents {

package/src/constants/spotMarkets.ts

@@ -6,6 +6,7 @@ import {
 	LAMPORTS_EXP,
 	LAMPORTS_PRECISION,
 	SIX,
+	NINE,
 } from './numericConstants';
 
 export type SpotMarketConfig = {
@@ -82,6 +83,16 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 			'4DoNfFBfF7UokCC2FQzriy7yHK6DY6NVdYpuekQ5pRgg'
 		),
 	},
+	{
+		symbol: 'mSOL',
+		marketIndex: 2,
+		oracle: new PublicKey('E4v1BBgoso9s64TQvmyownAVJbhbEPGyzA3qn4n46qj9'),
+		oracleSource: OracleSource.PYTH,
+		mint: new PublicKey('mSoLzYCxHdYgdzU16g5QSh3i5K3z3KZK7ytfqcJm7So'),
+		precision: new BN(10).pow(NINE),
+		precisionExp: NINE,
+		serumMarket: new PublicKey('9Lyhks5bQQxb9EyyX55NtgKQzpM4WK7JCmeaWuQ5MoXD'),
+	},
 ];
 
 export const SpotMarkets: { [key in DriftEnv]: SpotMarketConfig[] } = {

package/src/dlob/DLOB.ts

@@ -1,5 +1,6 @@
 import { getOrderSignature, getVammNodeGenerator, NodeList } from './NodeList';
 import {
+	BASE_PRECISION,
 	BN,
 	calculateAskPrice,
 	calculateBidPrice,
@@ -24,12 +25,15 @@ import {
 	OrderActionRecord,
 	OrderRecord,
 	PerpMarketAccount,
+	PositionDirection,
 	PRICE_PRECISION,
+	QUOTE_PRECISION,
 	SlotSubscriber,
 	SpotMarketAccount,
 	StateAccount,
 	TriggerOrderNode,
 	UserMap,
+	ZERO,
 } from '..';
 import { PublicKey } from '@solana/web3.js';
 import { ammPaused, exchangePaused, fillPaused } from '../math/exchangeStatus';
@@ -1849,4 +1853,75 @@ export class DLOB {
 			asks,
 		};
 	}
+
+	private estimateFillExactBaseAmountInForSide(
+		baseAmountIn: BN,
+		oraclePriceData: OraclePriceData,
+		slot: number,
+		dlobSide: Generator<DLOBNode>
+	): BN {
+		let runningSumQuote = ZERO;
+		let runningSumBase = ZERO;
+		for (const side of dlobSide) {
+			const price = side.getPrice(oraclePriceData, slot); //side.order.quoteAssetAmount.div(side.order.baseAssetAmount);
+			const baseAmountRemaining = side.order.baseAssetAmount.sub(
+				side.order.baseAssetAmountFilled
+			);
+			if (runningSumBase.add(baseAmountRemaining).gt(baseAmountIn)) {
+				const remainingBase = baseAmountIn.sub(runningSumBase);
+				runningSumBase = runningSumBase.add(remainingBase);
+				runningSumQuote = runningSumQuote.add(remainingBase.mul(price));
+				break;
+			} else {
+				runningSumBase = runningSumBase.add(baseAmountRemaining);
+				runningSumQuote = runningSumQuote.add(baseAmountRemaining.mul(price));
+			}
+		}
+
+		return runningSumQuote
+			.mul(QUOTE_PRECISION)
+			.div(BASE_PRECISION.mul(PRICE_PRECISION));
+	}
+
+	/**
+	 *
+	 * @param param.marketIndex the index of the market
+	 * @param param.marketType the type of the market
+	 * @param param.baseAmount the base amount in to estimate
+	 * @param param.orderDirection the direction of the trade
+	 * @param param.slot current slot for estimating dlob node price
+	 * @param param.oraclePriceData the oracle price data
+	 * @returns the estimated quote amount filled: QUOTE_PRECISION
+	 */
+	public estimateFillWithExactBaseAmount({
+		marketIndex,
+		marketType,
+		baseAmount,
+		orderDirection,
+		slot,
+		oraclePriceData,
+	}: {
+		marketIndex: number;
+		marketType: MarketType;
+		baseAmount: BN;
+		orderDirection: PositionDirection;
+		slot: number;
+		oraclePriceData: OraclePriceData;
+	}): BN {
+		if (isVariant(orderDirection, 'long')) {
+			return this.estimateFillExactBaseAmountInForSide(
+				baseAmount,
+				oraclePriceData,
+				slot,
+				this.getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData)
+			);
+		} else if (isVariant(orderDirection, 'short')) {
+			return this.estimateFillExactBaseAmountInForSide(
+				baseAmount,
+				oraclePriceData,
+				slot,
+				this.getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData)
+			);
+		}
+	}
 }