@drift-labs/sdk 2.31.0-beta.5 → 2.31.0-beta.7

package/lib/constants/perpMarkets.js

@@ -114,6 +114,16 @@ exports.DevnetPerpMarkets = [
         launchTs: 1683125906000,
         oracleSource: __1.OracleSource.PYTH_1M,
     },
+    {
+        fullName: 'OP',
+        category: ['L2', 'Infra'],
+        symbol: 'OP-PERP',
+        baseAssetSymbol: 'OP',
+        marketIndex: 11,
+        oracle: new web3_js_1.PublicKey('8ctSiDhA7eJoii4TkKV8Rx4KFdz3ycsA1FXy9wq56quG'),
+        launchTs: 1683125906000,
+        oracleSource: __1.OracleSource.PYTH,
+    },
 ];
 exports.MainnetPerpMarkets = [
     {
@@ -226,6 +236,16 @@ exports.MainnetPerpMarkets = [
         launchTs: 1683125906000,
         oracleSource: __1.OracleSource.PYTH_1M,
     },
+    {
+        fullName: 'OP',
+        category: ['L2', 'Infra'],
+        symbol: 'OP-PERP',
+        baseAssetSymbol: 'OP',
+        marketIndex: 11,
+        oracle: new web3_js_1.PublicKey('4o4CUwzFwLqCvmA5x1G4VzoZkAhAcbiuiYyjWX1CVbY2'),
+        launchTs: 1683125906000,
+        oracleSource: __1.OracleSource.PYTH,
+    },
 ];
 exports.PerpMarkets = {
     devnet: exports.DevnetPerpMarkets,

package/lib/driftClient.js

@@ -3040,7 +3040,7 @@ class DriftClient {
             return this.txSender.send(tx, additionalSigners, opts, preSigned);
         }
         else {
-            return this.txSender.sendVersionedTransaction(tx, additionalSigners, opts);
+            return this.txSender.sendVersionedTransaction(tx, additionalSigners, opts, preSigned);
         }
     }
     async buildTransaction(instructions, txParams, txVersion, lookupTables) {

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.31.0-beta.5",
+    "version": "2.31.0-beta.7",
     "name": "drift",
     "instructions": [
         {

package/lib/math/trade.d.ts

@@ -5,6 +5,7 @@ import { OraclePriceData } from '../oracles/types';
 import { DLOB } from '../dlob/DLOB';
 import { PublicKey } from '@solana/web3.js';
 import { Orderbook } from '@project-serum/serum';
+import { L2OrderBook } from '../dlob/orderBookLevels';
 export type PriceImpactUnit = 'entryPrice' | 'maxPrice' | 'priceDelta' | 'priceDeltaAsNumber' | 'pctAvg' | 'pctMax' | 'quoteAssetAmount' | 'quoteAssetAmountPeg' | 'acquiredBaseAssetAmount' | 'acquiredQuoteAssetAmount' | 'all';
 /**
  * Calculates avg/max slippage (price impact) for candidate trade
@@ -104,3 +105,11 @@ export declare function calculateEstimatedSpotEntryPrice(assetType: AssetType, a
     baseFilled: BN;
     quoteFilled: BN;
 };
+export declare function calculateEstimatedEntryPriceWithL2(assetType: AssetType, amount: BN, direction: PositionDirection, basePrecision: BN, l2: L2OrderBook): {
+    entryPrice: BN;
+    priceImpact: BN;
+    bestPrice: BN;
+    worstPrice: BN;
+    baseFilled: BN;
+    quoteFilled: BN;
+};

package/lib/math/trade.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateEstimatedSpotEntryPrice = exports.calculateEstimatedPerpEntryPrice = exports.calculateTargetPriceTrade = exports.calculateTradeAcquiredAmounts = exports.calculateTradeSlippage = void 0;
+exports.calculateEstimatedEntryPriceWithL2 = exports.calculateEstimatedSpotEntryPrice = exports.calculateEstimatedPerpEntryPrice = exports.calculateTargetPriceTrade = exports.calculateTradeAcquiredAmounts = exports.calculateTradeSlippage = void 0;
 const types_1 = require("../types");
 const anchor_1 = require("@coral-xyz/anchor");
 const assert_1 = require("../assert/assert");
@@ -571,3 +571,61 @@ function calculateEstimatedSpotEntryPrice(assetType, amount, direction, market,
     };
 }
 exports.calculateEstimatedSpotEntryPrice = calculateEstimatedSpotEntryPrice;
+function calculateEstimatedEntryPriceWithL2(assetType, amount, direction, basePrecision, l2) {
+    const takerIsLong = (0, types_2.isVariant)(direction, 'long');
+    let cumulativeBaseFilled = numericConstants_1.ZERO;
+    let cumulativeQuoteFilled = numericConstants_1.ZERO;
+    const levels = [...(takerIsLong ? l2.asks : l2.bids)];
+    let nextLevel = levels.shift();
+    let bestPrice;
+    let worstPrice;
+    if (nextLevel) {
+        bestPrice = nextLevel.price;
+        worstPrice = nextLevel.price;
+    }
+    else {
+        bestPrice = takerIsLong ? numericConstants_1.BN_MAX : numericConstants_1.ZERO;
+        worstPrice = bestPrice;
+    }
+    if (assetType === 'base') {
+        while (!cumulativeBaseFilled.eq(amount) && nextLevel) {
+            const price = nextLevel.price;
+            const size = nextLevel.size;
+            worstPrice = price;
+            const baseFilled = anchor_1.BN.min(size, amount.sub(cumulativeBaseFilled));
+            const quoteFilled = baseFilled.mul(price).div(basePrecision);
+            cumulativeBaseFilled = cumulativeBaseFilled.add(baseFilled);
+            cumulativeQuoteFilled = cumulativeQuoteFilled.add(quoteFilled);
+            nextLevel = levels.shift();
+        }
+    }
+    else {
+        while (!cumulativeQuoteFilled.eq(amount) && nextLevel) {
+            const price = nextLevel.price;
+            const size = nextLevel.size;
+            worstPrice = price;
+            const quoteFilled = anchor_1.BN.min(size.mul(price).div(basePrecision), amount.sub(cumulativeQuoteFilled));
+            const baseFilled = quoteFilled.mul(basePrecision).div(price);
+            cumulativeBaseFilled = cumulativeBaseFilled.add(baseFilled);
+            cumulativeQuoteFilled = cumulativeQuoteFilled.add(quoteFilled);
+            nextLevel = levels.shift();
+        }
+    }
+    const entryPrice = cumulativeQuoteFilled
+        .mul(basePrecision)
+        .div(cumulativeBaseFilled);
+    const priceImpact = entryPrice
+        .sub(bestPrice)
+        .mul(numericConstants_1.PRICE_PRECISION)
+        .div(bestPrice)
+        .abs();
+    return {
+        entryPrice,
+        priceImpact,
+        bestPrice,
+        worstPrice,
+        baseFilled: cumulativeBaseFilled,
+        quoteFilled: cumulativeQuoteFilled,
+    };
+}
+exports.calculateEstimatedEntryPriceWithL2 = calculateEstimatedEntryPriceWithL2;

package/lib/tx/retryTxSender.d.ts

@@ -14,7 +14,7 @@ export declare class RetryTxSender implements TxSender {
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions): Promise<Transaction>;
     getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;
-    sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TxSigAndSlot>;
+    sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
     confirmTransaction(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;
     getTimestamp(): number;

package/lib/tx/retryTxSender.js

@@ -54,12 +54,24 @@ class RetryTxSender {
         const tx = new web3_js_1.VersionedTransaction(message);
         return tx;
     }
-    async sendVersionedTransaction(tx, additionalSigners, opts) {
-        additionalSigners === null || additionalSigners === void 0 ? void 0 : additionalSigners.filter((s) => s !== undefined).forEach((kp) => {
-            tx.sign([kp]);
-        });
-        // @ts-ignore
-        const signedTx = await this.provider.wallet.signTransaction(tx);
+    async sendVersionedTransaction(tx, additionalSigners, opts, preSigned) {
+        let signedTx;
+        if (preSigned) {
+            signedTx = tx;
+            // @ts-ignore
+        }
+        else if (this.provider.wallet.payer) {
+            // @ts-ignore
+            tx.sign((additionalSigners !== null && additionalSigners !== void 0 ? additionalSigners : []).concat(this.provider.wallet.payer));
+            signedTx = tx;
+        }
+        else {
+            additionalSigners === null || additionalSigners === void 0 ? void 0 : additionalSigners.filter((s) => s !== undefined).forEach((kp) => {
+                tx.sign([kp]);
+            });
+            // @ts-ignore
+            signedTx = await this.provider.wallet.signTransaction(tx);
+        }
         if (opts === undefined) {
             opts = this.provider.opts;
         }

package/lib/tx/types.d.ts

@@ -8,7 +8,7 @@ export type TxSigAndSlot = {
 export interface TxSender {
     provider: Provider;
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
-    sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TxSigAndSlot>;
+    sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
 }

package/lib/user.d.ts

@@ -82,7 +82,7 @@ export declare class User {
      * @returns : the dust base asset amount (ie, < stepsize)
      * @returns : pnl from settle
      */
-    getSettledLPPosition(marketIndex: number): [PerpPosition, BN, BN];
+    getPerpPositionWithLPSettle(marketIndex: number, originalPosition?: PerpPosition): [PerpPosition, BN, BN];
     /**
      * calculates Buying Power = free collateral / initial margin ratio
      * @returns : Precision QUOTE_PRECISION

package/lib/user.js

@@ -175,12 +175,12 @@ class User {
      * @returns : the dust base asset amount (ie, < stepsize)
      * @returns : pnl from settle
      */
-    getSettledLPPosition(marketIndex) {
-        const _position = this.getPerpPosition(marketIndex);
-        const position = this.getClonedPosition(_position);
-        if (position.lpShares.eq(numericConstants_1.ZERO)) {
-            return [position, numericConstants_1.ZERO, numericConstants_1.ZERO];
+    getPerpPositionWithLPSettle(marketIndex, originalPosition) {
+        originalPosition = originalPosition !== null && originalPosition !== void 0 ? originalPosition : this.getPerpPosition(marketIndex);
+        if (originalPosition.lpShares.eq(numericConstants_1.ZERO)) {
+            return [originalPosition, numericConstants_1.ZERO, numericConstants_1.ZERO];
         }
+        const position = this.getClonedPosition(originalPosition);
         const market = this.driftClient.getPerpMarketAccount(position.marketIndex);
         const nShares = position.lpShares;
         const deltaBaa = market.amm.baseAssetAmountPerLp
@@ -192,11 +192,10 @@ class User {
             .mul(nShares)
             .div(numericConstants_1.AMM_RESERVE_PRECISION);
         function sign(v) {
-            const sign = { true: new _1.BN(1), false: new _1.BN(-1) }[v.gte(numericConstants_1.ZERO).toString()];
-            return sign;
+            return v.isNeg() ? new _1.BN(-1) : new _1.BN(1);
         }
-        function standardize(amount, stepsize) {
-            const remainder = amount.abs().mod(stepsize).mul(sign(amount));
+        function standardize(amount, stepSize) {
+            const remainder = amount.abs().mod(stepSize).mul(sign(amount));
             const standardizedAmount = amount.sub(remainder);
             return [standardizedAmount, remainder];
         }
@@ -319,7 +318,7 @@ class User {
             const quoteSpotMarket = this.driftClient.getSpotMarketAccount(market.quoteSpotMarketIndex);
             const quoteOraclePriceData = this.getOracleDataForSpotMarket(market.quoteSpotMarketIndex);
             if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
-                perpPosition = this.getSettledLPPosition(perpPosition.marketIndex)[0];
+                perpPosition = this.getPerpPositionWithLPSettle(perpPosition.marketIndex)[0];
             }
             let positionUnrealizedPnl = (0, _1.calculatePositionPNL)(market, perpPosition, withFunding, oraclePriceData);
             let quotePrice;
@@ -546,7 +545,7 @@ class User {
                 // clone so we dont mutate the position
                 perpPosition = this.getClonedPosition(perpPosition);
                 // settle position
-                const [settledPosition, dustBaa, _] = this.getSettledLPPosition(market.marketIndex);
+                const [settledPosition, dustBaa, _] = this.getPerpPositionWithLPSettle(market.marketIndex);
                 perpPosition.baseAssetAmount =
                     settledPosition.baseAssetAmount.add(dustBaa);
                 perpPosition.quoteAssetAmount = settledPosition.quoteAssetAmount;

package/package.json

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

package/src/assert/assert.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assert = void 0;
+function assert(condition, error) {
+    if (!condition) {
+        throw new Error(error || 'Unspecified AssertionError');
+    }
+}
+exports.assert = assert;

package/src/constants/perpMarkets.ts

@@ -124,6 +124,16 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1683125906000,
 		oracleSource: OracleSource.PYTH_1M,
 	},
+	{
+		fullName: 'OP',
+		category: ['L2', 'Infra'],
+		symbol: 'OP-PERP',
+		baseAssetSymbol: 'OP',
+		marketIndex: 11,
+		oracle: new PublicKey('8ctSiDhA7eJoii4TkKV8Rx4KFdz3ycsA1FXy9wq56quG'),
+		launchTs: 1683125906000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const MainnetPerpMarkets: PerpMarketConfig[] = [
@@ -237,6 +247,16 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1683125906000,
 		oracleSource: OracleSource.PYTH_1M,
 	},
+	{
+		fullName: 'OP',
+		category: ['L2', 'Infra'],
+		symbol: 'OP-PERP',
+		baseAssetSymbol: 'OP',
+		marketIndex: 11,
+		oracle: new PublicKey('4o4CUwzFwLqCvmA5x1G4VzoZkAhAcbiuiYyjWX1CVbY2'),
+		launchTs: 1683125906000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

package/src/driftClient.ts

@@ -5347,7 +5347,8 @@ export class DriftClient {
 			return this.txSender.sendVersionedTransaction(
 				tx as VersionedTransaction,
 				additionalSigners,
-				opts
+				opts,
+				preSigned
 			);
 		}
 	}

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.31.0-beta.5",
+  "version": "2.31.0-beta.7",
   "name": "drift",
   "instructions": [
     {

package/src/math/trade.ts

@@ -34,6 +34,7 @@ import { OraclePriceData } from '../oracles/types';
 import { DLOB } from '../dlob/DLOB';
 import { PublicKey } from '@solana/web3.js';
 import { Orderbook } from '@project-serum/serum';
+import { L2OrderBook } from '../dlob/orderBookLevels';
 
 const MAXPCT = new BN(1000); //percentage units are [0,1000] => [0,1]
 
@@ -884,3 +885,90 @@ export function calculateEstimatedSpotEntryPrice(
 		quoteFilled: cumulativeQuoteFilled,
 	};
 }
+
+export function calculateEstimatedEntryPriceWithL2(
+	assetType: AssetType,
+	amount: BN,
+	direction: PositionDirection,
+	basePrecision: BN,
+	l2: L2OrderBook
+): {
+	entryPrice: BN;
+	priceImpact: BN;
+	bestPrice: BN;
+	worstPrice: BN;
+	baseFilled: BN;
+	quoteFilled: BN;
+} {
+	const takerIsLong = isVariant(direction, 'long');
+
+	let cumulativeBaseFilled = ZERO;
+	let cumulativeQuoteFilled = ZERO;
+
+	const levels = [...(takerIsLong ? l2.asks : l2.bids)];
+	let nextLevel = levels.shift();
+
+	let bestPrice;
+	let worstPrice;
+	if (nextLevel) {
+		bestPrice = nextLevel.price;
+		worstPrice = nextLevel.price;
+	} else {
+		bestPrice = takerIsLong ? BN_MAX : ZERO;
+		worstPrice = bestPrice;
+	}
+
+	if (assetType === 'base') {
+		while (!cumulativeBaseFilled.eq(amount) && nextLevel) {
+			const price = nextLevel.price;
+			const size = nextLevel.size;
+
+			worstPrice = price;
+
+			const baseFilled = BN.min(size, amount.sub(cumulativeBaseFilled));
+			const quoteFilled = baseFilled.mul(price).div(basePrecision);
+
+			cumulativeBaseFilled = cumulativeBaseFilled.add(baseFilled);
+			cumulativeQuoteFilled = cumulativeQuoteFilled.add(quoteFilled);
+
+			nextLevel = levels.shift();
+		}
+	} else {
+		while (!cumulativeQuoteFilled.eq(amount) && nextLevel) {
+			const price = nextLevel.price;
+			const size = nextLevel.size;
+
+			worstPrice = price;
+
+			const quoteFilled = BN.min(
+				size.mul(price).div(basePrecision),
+				amount.sub(cumulativeQuoteFilled)
+			);
+			const baseFilled = quoteFilled.mul(basePrecision).div(price);
+
+			cumulativeBaseFilled = cumulativeBaseFilled.add(baseFilled);
+			cumulativeQuoteFilled = cumulativeQuoteFilled.add(quoteFilled);
+
+			nextLevel = levels.shift();
+		}
+	}
+
+	const entryPrice = cumulativeQuoteFilled
+		.mul(basePrecision)
+		.div(cumulativeBaseFilled);
+
+	const priceImpact = entryPrice
+		.sub(bestPrice)
+		.mul(PRICE_PRECISION)
+		.div(bestPrice)
+		.abs();
+
+	return {
+		entryPrice,
+		priceImpact,
+		bestPrice,
+		worstPrice,
+		baseFilled: cumulativeBaseFilled,
+		quoteFilled: cumulativeQuoteFilled,
+	};
+}

package/src/token/index.js

@@ -0,0 +1,38 @@
+"use strict";
+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 = new spl_token_1.u64(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;
+}
+exports.parseTokenAccount = parseTokenAccount;

package/src/tx/retryTxSender.ts

@@ -117,16 +117,26 @@ export class RetryTxSender implements TxSender {
 	async sendVersionedTransaction(
 		tx: VersionedTransaction,
 		additionalSigners?: Array<Signer>,
-		opts?: ConfirmOptions
+		opts?: ConfirmOptions,
+		preSigned?: boolean
 	): Promise<TxSigAndSlot> {
-		additionalSigners
-			?.filter((s): s is Signer => s !== undefined)
-			.forEach((kp) => {
-				tx.sign([kp]);
-			});
-
-		// @ts-ignore
-		const signedTx = await this.provider.wallet.signTransaction(tx);
+		let signedTx;
+		if (preSigned) {
+			signedTx = tx;
+			// @ts-ignore
+		} else if (this.provider.wallet.payer) {
+			// @ts-ignore
+			tx.sign((additionalSigners ?? []).concat(this.provider.wallet.payer));
+			signedTx = tx;
+		} else {
+			additionalSigners
+				?.filter((s): s is Signer => s !== undefined)
+				.forEach((kp) => {
+					tx.sign([kp]);
+				});
+			// @ts-ignore
+			signedTx = await this.provider.wallet.signTransaction(tx);
+		}
 
 		if (opts === undefined) {
 			opts = this.provider.opts;

package/src/tx/types.ts

@@ -27,7 +27,8 @@ export interface TxSender {
 	sendVersionedTransaction(
 		tx: VersionedTransaction,
 		additionalSigners?: Array<Signer>,
-		opts?: ConfirmOptions
+		opts?: ConfirmOptions,
+		preSigned?: boolean
 	): Promise<TxSigAndSlot>;
 
 	getVersionedTransaction(

package/src/user.ts

@@ -297,14 +297,18 @@ export class User {
 	 * @returns : the dust base asset amount (ie, < stepsize)
 	 * @returns : pnl from settle
 	 */
-	public getSettledLPPosition(marketIndex: number): [PerpPosition, BN, BN] {
-		const _position = this.getPerpPosition(marketIndex);
-		const position = this.getClonedPosition(_position);
+	public getPerpPositionWithLPSettle(
+		marketIndex: number,
+		originalPosition?: PerpPosition
+	): [PerpPosition, BN, BN] {
+		originalPosition = originalPosition ?? this.getPerpPosition(marketIndex);
 
-		if (position.lpShares.eq(ZERO)) {
-			return [position, ZERO, ZERO];
+		if (originalPosition.lpShares.eq(ZERO)) {
+			return [originalPosition, ZERO, ZERO];
 		}
 
+		const position = this.getClonedPosition(originalPosition);
+
 		const market = this.driftClient.getPerpMarketAccount(position.marketIndex);
 		const nShares = position.lpShares;
 
@@ -318,14 +322,11 @@ export class User {
 			.div(AMM_RESERVE_PRECISION);
 
 		function sign(v: BN) {
-			const sign = { true: new BN(1), false: new BN(-1) }[
-				v.gte(ZERO).toString()
-			];
-			return sign;
+			return v.isNeg() ? new BN(-1) : new BN(1);
 		}
 
-		function standardize(amount: BN, stepsize: BN) {
-			const remainder = amount.abs().mod(stepsize).mul(sign(amount));
+		function standardize(amount: BN, stepSize: BN) {
+			const remainder = amount.abs().mod(stepSize).mul(sign(amount));
 			const standardizedAmount = amount.sub(remainder);
 			return [standardizedAmount, remainder];
 		}
@@ -517,7 +518,9 @@ export class User {
 				);
 
 				if (perpPosition.lpShares.gt(ZERO)) {
-					perpPosition = this.getSettledLPPosition(perpPosition.marketIndex)[0];
+					perpPosition = this.getPerpPositionWithLPSettle(
+						perpPosition.marketIndex
+					)[0];
 				}
 
 				let positionUnrealizedPnl = calculatePositionPNL(
@@ -1022,9 +1025,8 @@ export class User {
 					perpPosition = this.getClonedPosition(perpPosition);
 
 					// settle position
-					const [settledPosition, dustBaa, _] = this.getSettledLPPosition(
-						market.marketIndex
-					);
+					const [settledPosition, dustBaa, _] =
+						this.getPerpPositionWithLPSettle(market.marketIndex);
 					perpPosition.baseAssetAmount =
 						settledPosition.baseAssetAmount.add(dustBaa);
 					perpPosition.quoteAssetAmount = settledPosition.quoteAssetAmount;

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/get_events.ts

@@ -1,47 +0,0 @@
-import { Connection, Keypair, PublicKey } from '@solana/web3.js';
-import {
-  configs,
-  DriftClient,
-  Wallet,
-} from "@drift-labs/sdk";
-
-
-async function main() {
-
-  const driftConfig = configs['mainnet-beta'];
-  const connection = new Connection('https://api.mainnet-beta.solana.com');
-
-  const driftClient = new DriftClient({
-    connection: connection,
-    wallet: new Wallet(new Keypair()),
-    programID: new PublicKey(driftConfig.DRIFT_PROGRAM_ID),
-    userStats: true,
-    env: 'mainnet-beta',
-  });
-  console.log(`driftClientSubscribed: ${await driftClient.subscribe()}`);
-
-  const txHash = "3gvGQufckXGHrFDv4dNWEXuXKRMy3NZkKHMyFrAhLoYScaXXTGCp9vq58kWkfyJ8oDYZrz4bTyGayjUy9PKigeLS";
-
-  const tx = await driftClient.connection.getParsedTransaction(txHash, {
-    commitment: "confirmed",
-    maxSupportedTransactionVersion: 0,
-  });
-
-  let logIdx = 0;
-  // @ts-ignore
-  for (const event of driftClient.program._events._eventParser.parseLogs(tx!.meta!.logMessages)) {
-    console.log("----------------------------------------");
-    console.log(`Log ${logIdx++}`);
-    console.log("----------------------------------------");
-    console.log(`${JSON.stringify(event, null, 2)}`);
-  }
-
-  console.log("========================================");
-  console.log("Raw transaction logs");
-  console.log("========================================");
-  console.log(JSON.stringify(tx!.meta!.logMessages, null, 2));
-
-  process.exit(0);
-}
-
-main().catch(console.error);