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

package/src/tokenFaucet.ts

@@ -1,10 +1,11 @@
 import * as anchor from '@coral-xyz/anchor';
 import { AnchorProvider, Idl, Program } from '@coral-xyz/anchor';
 import {
-	AccountInfo,
-	ASSOCIATED_TOKEN_PROGRAM_ID,
-	Token,
 	TOKEN_PROGRAM_ID,
+	getAccount,
+	Account,
+	createAssociatedTokenAccountInstruction,
+	getAssociatedTokenAddress,
 } from '@solana/spl-token';
 import {
 	ConfirmOptions,
@@ -174,15 +175,12 @@ export class TokenFaucet {
 			{ userPubKey: userPublicKey }
 		);
 
-		const createAssociatedAccountIx =
-			Token.createAssociatedTokenAccountInstruction(
-				ASSOCIATED_TOKEN_PROGRAM_ID,
-				TOKEN_PROGRAM_ID,
-				state.mint,
-				associateTokenPublicKey,
-				userPublicKey,
-				this.wallet.publicKey
-			);
+		const createAssociatedAccountIx = createAssociatedTokenAccountInstruction(
+			this.wallet.publicKey,
+			associateTokenPublicKey,
+			userPublicKey,
+			state.mint
+		);
 
 		const mintToIx = await this.mintToUserIx(associateTokenPublicKey, amount);
 
@@ -194,36 +192,19 @@ export class TokenFaucet {
 	}): Promise<anchor.web3.PublicKey> {
 		const state: any = await this.fetchState();
 
-		return Token.getAssociatedTokenAddress(
-			ASSOCIATED_TOKEN_PROGRAM_ID,
-			TOKEN_PROGRAM_ID,
-			state.mint,
-			props.userPubKey
-		);
+		return getAssociatedTokenAddress(state.mint, props.userPubKey);
 	}
 
 	public async getTokenAccountInfo(props: {
 		userPubKey: PublicKey;
-	}): Promise<AccountInfo> {
-		const assosciatedKey = await this.getAssosciatedMockUSDMintAddress(props);
-
-		const state: any = await this.fetchState();
-
-		const token = new Token(
-			this.connection,
-			state.mint,
-			TOKEN_PROGRAM_ID,
-			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-			// @ts-ignore
-			this.provider.payer
-		);
-
-		return await token.getAccountInfo(assosciatedKey);
+	}): Promise<Account> {
+		const associatedKey = await this.getAssosciatedMockUSDMintAddress(props);
+		return await getAccount(this.connection, associatedKey);
 	}
 
 	public async subscribeToTokenAccount(props: {
 		userPubKey: PublicKey;
-		callback: (accountInfo: AccountInfo) => void;
+		callback: (accountInfo: Account) => void;
 	}): Promise<boolean> {
 		try {
 			const tokenAccountKey = await this.getAssosciatedMockUSDMintAddress(

package/src/tx/retryTxSender.ts

@@ -122,6 +122,10 @@ export class RetryTxSender implements TxSender {
 		// @ts-ignore
 		tx.sign((additionalSigners ?? []).concat(this.provider.wallet.payer));
 
+		if (opts === undefined) {
+			opts = this.provider.opts;
+		}
+
 		return this.sendRawTransaction(tx.serialize(), opts);
 	}
 

package/src/types.ts

@@ -1,4 +1,4 @@
-import { PublicKey, Transaction } from '@solana/web3.js';
+import { PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js';
 import { BN, ZERO } from '.';
 
 // # Utility Types / Enums / Constants
@@ -505,6 +505,18 @@ export type OrderActionRecord = {
 	oraclePrice: BN;
 };
 
+export type SwapRecord = {
+	ts: BN;
+	user: PublicKey;
+	amountOut: BN;
+	amountIn: BN;
+	outMarketIndex: number;
+	inMarketIndex: number;
+	outOraclePrice: BN;
+	inOraclePrice: BN;
+	fee: BN;
+};
+
 export type StateAccount = {
 	admin: PublicKey;
 	exchangeStatus: number;
@@ -645,6 +657,10 @@ export type SpotMarketAccount = {
 	nextFillRecordId: BN;
 	spotFeePool: PoolBalance;
 	totalSpotFee: BN;
+	totalSwapFee: BN;
+
+	flashLoanAmount: BN;
+	flashLoanInitialTokenAmount: BN;
 
 	ordersEnabled: boolean;
 };
@@ -801,6 +817,7 @@ export type UserAccount = {
 	totalWithdraws: BN;
 	totalSocialLoss: BN;
 	cumulativePerpFunding: BN;
+	cumulativeSpotFees: BN;
 	liquidationMarginFreed: BN;
 	lastActiveSlot: BN;
 	isMarginTradingEnabled: boolean;
@@ -934,12 +951,26 @@ export type TxParams = {
 	computeUnitsPrice?: number;
 };
 
+export class SwapReduceOnly {
+	static readonly In = { in: {} };
+	static readonly Out = { out: {} };
+}
+
 // # Misc Types
 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[];

package/src/util/computeUnits.js

@@ -0,0 +1,27 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findComputeUnitConsumption = void 0;
+function findComputeUnitConsumption(programId, connection, txSignature, commitment = 'confirmed') {
+    return __awaiter(this, void 0, void 0, function* () {
+        const tx = yield connection.getTransaction(txSignature, { commitment });
+        const computeUnits = [];
+        const regex = new RegExp(`Program ${programId.toString()} consumed ([0-9]{0,6}) of ([0-9]{0,7}) compute units`);
+        tx.meta.logMessages.forEach((logMessage) => {
+            const match = logMessage.match(regex);
+            if (match && match[1]) {
+                computeUnits.push(match[1]);
+            }
+        });
+        return computeUnits;
+    });
+}
+exports.findComputeUnitConsumption = findComputeUnitConsumption;

package/src/util/promiseTimeout.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.promiseTimeout = void 0;
+function promiseTimeout(promise, timeoutMs) {
+    let timeoutId;
+    const timeoutPromise = new Promise((resolve) => {
+        timeoutId = setTimeout(() => resolve(null), timeoutMs);
+    });
+    return Promise.race([promise, timeoutPromise]).then((result) => {
+        clearTimeout(timeoutId);
+        return result;
+    });
+}
+exports.promiseTimeout = promiseTimeout;

package/src/util/tps.js

@@ -0,0 +1,27 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.estimateTps = void 0;
+function estimateTps(programId, connection, failed) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let signatures = yield connection.getSignaturesForAddress(programId, undefined, 'finalized');
+        if (failed) {
+            signatures = signatures.filter((signature) => signature.err);
+        }
+        const numberOfSignatures = signatures.length;
+        if (numberOfSignatures === 0) {
+            return 0;
+        }
+        return (numberOfSignatures /
+            (signatures[0].blockTime - signatures[numberOfSignatures - 1].blockTime));
+    });
+}
+exports.estimateTps = estimateTps;

package/src/wallet.ts

@@ -1,9 +1,14 @@
-import { Keypair, PublicKey, Transaction } from '@solana/web3.js';
-import { IWallet } from './types';
+import {
+	Keypair,
+	PublicKey,
+	Transaction,
+	VersionedTransaction,
+} from '@solana/web3.js';
+import { IWallet, IVersionedWallet } from './types';
 import fs from 'fs';
 import bs58 from 'bs58';
 
-export class Wallet implements IWallet {
+export class Wallet implements IWallet, IVersionedWallet {
 	constructor(readonly payer: Keypair) {}
 
 	async signTransaction(tx: Transaction): Promise<Transaction> {
@@ -11,6 +16,13 @@ export class Wallet implements IWallet {
 		return tx;
 	}
 
+	async signVersionedTransaction(
+		tx: VersionedTransaction
+	): Promise<VersionedTransaction> {
+		tx.sign([this.payer]);
+		return tx;
+	}
+
 	async signAllTransactions(txs: Transaction[]): Promise<Transaction[]> {
 		return txs.map((t) => {
 			t.partialSign(this.payer);
@@ -18,6 +30,15 @@ export class Wallet implements IWallet {
 		});
 	}
 
+	async signAllVersionedTransactions(
+		txs: VersionedTransaction[]
+	): Promise<VersionedTransaction[]> {
+		return txs.map((t) => {
+			t.sign([this.payer]);
+			return t;
+		});
+	}
+
 	get publicKey(): PublicKey {
 		return this.payer.publicKey;
 	}
@@ -27,17 +48,18 @@ export function loadKeypair(privateKey: string): Keypair {
 	// try to load privateKey as a filepath
 	let loadedKey: Uint8Array;
 	if (fs.existsSync(privateKey)) {
-		loadedKey = new Uint8Array(
-			JSON.parse(fs.readFileSync(privateKey).toString())
+		privateKey = fs.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.decode(privateKey));
-		}
+		privateKey = privateKey.replace(/\s/g, '');
+		loadedKey = new Uint8Array(bs58.decode(privateKey));
 	}
 
 	return Keypair.fromSecretKey(Uint8Array.from(loadedKey));

package/tests/dlob/helpers.ts

@@ -309,6 +309,9 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 			marketIndex: 0,
 		},
 		totalSpotFee: new BN(0),
+		totalSwapFee: new BN(0),
+		flashLoanAmount: new BN(0),
+		flashLoanInitialTokenAmount: new BN(0),
 		oracleSource: OracleSource.PYTH,
 		historicalOracleData: {
 			lastOraclePrice: new BN(0),
@@ -384,6 +387,9 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 			marketIndex: 0,
 		},
 		totalSpotFee: new BN(0),
+		totalSwapFee: new BN(0),
+		flashLoanAmount: new BN(0),
+		flashLoanInitialTokenAmount: new BN(0),
 		oracleSource: OracleSource.PYTH,
 		historicalOracleData: {
 			lastOraclePrice: new BN(0),
@@ -459,6 +465,9 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 			marketIndex: 0,
 		},
 		totalSpotFee: new BN(0),
+		totalSwapFee: new BN(0),
+		flashLoanAmount: new BN(0),
+		flashLoanInitialTokenAmount: new BN(0),
 		oracleSource: OracleSource.PYTH,
 		historicalOracleData: {
 			lastOraclePrice: new BN(0),