@drift-labs/sdk 2.25.0-beta.2 → 2.25.1

package/lib/addresses/pda.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { PublicKey } from '@solana/web3.js';
 import { BN } from '@coral-xyz/anchor';
 export declare function getDriftStateAccountPublicKeyAndNonce(programId: PublicKey): Promise<[PublicKey, number]>;

package/lib/adminClient.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { PublicKey, TransactionSignature } from '@solana/web3.js';
 import { FeeStructure, OracleGuardRails, OracleSource, ExchangeStatus, MarketStatus, ContractTier, AssetTier, SpotFulfillmentConfigStatus } from './types';
 import { BN } from '@coral-xyz/anchor';

package/lib/constants/numericConstants.d.ts

@@ -1,62 +1,60 @@
-/// <reference types="bn.js" />
-import { BN } from '../';
-export declare const ZERO: BN;
-export declare const ONE: BN;
-export declare const TWO: BN;
-export declare const THREE: BN;
-export declare const FOUR: BN;
-export declare const FIVE: BN;
-export declare const SIX: BN;
-export declare const SEVEN: BN;
-export declare const EIGHT: BN;
-export declare const NINE: BN;
-export declare const TEN: BN;
-export declare const TEN_THOUSAND: BN;
-export declare const BN_MAX: BN;
-export declare const TEN_MILLION: BN;
-export declare const MAX_LEVERAGE: BN;
-export declare const MAX_LEVERAGE_ORDER_SIZE: BN;
-export declare const PERCENTAGE_PRECISION_EXP: BN;
-export declare const PERCENTAGE_PRECISION: BN;
-export declare const CONCENTRATION_PRECISION: BN;
-export declare const QUOTE_PRECISION_EXP: BN;
-export declare const FUNDING_RATE_BUFFER_PRECISION_EXP: BN;
-export declare const PRICE_PRECISION_EXP: BN;
-export declare const FUNDING_RATE_PRECISION_EXP: BN;
-export declare const PEG_PRECISION_EXP: BN;
-export declare const AMM_RESERVE_PRECISION_EXP: BN;
-export declare const SPOT_MARKET_RATE_PRECISION_EXP: BN;
-export declare const SPOT_MARKET_RATE_PRECISION: BN;
-export declare const SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP: BN;
-export declare const SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION: BN;
-export declare const SPOT_MARKET_UTILIZATION_PRECISION_EXP: BN;
-export declare const SPOT_MARKET_UTILIZATION_PRECISION: BN;
-export declare const SPOT_MARKET_WEIGHT_PRECISION: BN;
-export declare const SPOT_MARKET_BALANCE_PRECISION_EXP: BN;
-export declare const SPOT_MARKET_BALANCE_PRECISION: BN;
-export declare const SPOT_MARKET_IMF_PRECISION_EXP: BN;
-export declare const SPOT_MARKET_IMF_PRECISION: BN;
-export declare const LIQUIDATION_FEE_PRECISION: BN;
-export declare const QUOTE_PRECISION: BN;
-export declare const PRICE_PRECISION: BN;
-export declare const FUNDING_RATE_PRECISION: BN;
-export declare const FUNDING_RATE_BUFFER_PRECISION: BN;
-export declare const PEG_PRECISION: BN;
-export declare const AMM_RESERVE_PRECISION: BN;
-export declare const BASE_PRECISION: BN;
-export declare const BASE_PRECISION_EXP: BN;
-export declare const AMM_TO_QUOTE_PRECISION_RATIO: BN;
-export declare const PRICE_DIV_PEG: BN;
-export declare const PRICE_TO_QUOTE_PRECISION: BN;
-export declare const AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO: BN;
-export declare const MARGIN_PRECISION: BN;
-export declare const BID_ASK_SPREAD_PRECISION: BN;
-export declare const LIQUIDATION_PCT_PRECISION: BN;
-export declare const FIVE_MINUTE: BN;
-export declare const ONE_HOUR: BN;
-export declare const ONE_YEAR: BN;
+export declare const ZERO: any;
+export declare const ONE: any;
+export declare const TWO: any;
+export declare const THREE: any;
+export declare const FOUR: any;
+export declare const FIVE: any;
+export declare const SIX: any;
+export declare const SEVEN: any;
+export declare const EIGHT: any;
+export declare const NINE: any;
+export declare const TEN: any;
+export declare const TEN_THOUSAND: any;
+export declare const BN_MAX: any;
+export declare const TEN_MILLION: any;
+export declare const MAX_LEVERAGE: any;
+export declare const MAX_LEVERAGE_ORDER_SIZE: any;
+export declare const PERCENTAGE_PRECISION_EXP: any;
+export declare const PERCENTAGE_PRECISION: any;
+export declare const CONCENTRATION_PRECISION: any;
+export declare const QUOTE_PRECISION_EXP: any;
+export declare const FUNDING_RATE_BUFFER_PRECISION_EXP: any;
+export declare const PRICE_PRECISION_EXP: any;
+export declare const FUNDING_RATE_PRECISION_EXP: any;
+export declare const PEG_PRECISION_EXP: any;
+export declare const AMM_RESERVE_PRECISION_EXP: any;
+export declare const SPOT_MARKET_RATE_PRECISION_EXP: any;
+export declare const SPOT_MARKET_RATE_PRECISION: any;
+export declare const SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP: any;
+export declare const SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION: any;
+export declare const SPOT_MARKET_UTILIZATION_PRECISION_EXP: any;
+export declare const SPOT_MARKET_UTILIZATION_PRECISION: any;
+export declare const SPOT_MARKET_WEIGHT_PRECISION: any;
+export declare const SPOT_MARKET_BALANCE_PRECISION_EXP: any;
+export declare const SPOT_MARKET_BALANCE_PRECISION: any;
+export declare const SPOT_MARKET_IMF_PRECISION_EXP: any;
+export declare const SPOT_MARKET_IMF_PRECISION: any;
+export declare const LIQUIDATION_FEE_PRECISION: any;
+export declare const QUOTE_PRECISION: any;
+export declare const PRICE_PRECISION: any;
+export declare const FUNDING_RATE_PRECISION: any;
+export declare const FUNDING_RATE_BUFFER_PRECISION: any;
+export declare const PEG_PRECISION: any;
+export declare const AMM_RESERVE_PRECISION: any;
+export declare const BASE_PRECISION: any;
+export declare const BASE_PRECISION_EXP: any;
+export declare const AMM_TO_QUOTE_PRECISION_RATIO: any;
+export declare const PRICE_DIV_PEG: any;
+export declare const PRICE_TO_QUOTE_PRECISION: any;
+export declare const AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO: any;
+export declare const MARGIN_PRECISION: any;
+export declare const BID_ASK_SPREAD_PRECISION: any;
+export declare const LIQUIDATION_PCT_PRECISION: any;
+export declare const FIVE_MINUTE: any;
+export declare const ONE_HOUR: any;
+export declare const ONE_YEAR: any;
 export declare const QUOTE_SPOT_MARKET_INDEX = 0;
-export declare const LAMPORTS_PRECISION: BN;
-export declare const LAMPORTS_EXP: BN;
-export declare const OPEN_ORDER_MARGIN_REQUIREMENT: BN;
-export declare const DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT: BN;
+export declare const LAMPORTS_PRECISION: any;
+export declare const LAMPORTS_EXP: any;
+export declare const OPEN_ORDER_MARGIN_REQUIREMENT: any;
+export declare const DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT: any;

package/lib/constants/perpMarkets.js

@@ -176,6 +176,16 @@ exports.MainnetPerpMarkets = [
         launchTs: 1680808053000,
         oracleSource: __1.OracleSource.PYTH,
     },
+    {
+        fullName: 'Binance Coin',
+        category: ['Exchange'],
+        symbol: 'BNB-PERP',
+        baseAssetSymbol: 'BNB',
+        marketIndex: 8,
+        oracle: new web3_js_1.PublicKey('4CkQJBxhU8EZ2UjhigbtdaPbpTe6mqf811fipYBFbSYN'),
+        launchTs: 1680808053000,
+        oracleSource: __1.OracleSource.PYTH,
+    },
 ];
 exports.PerpMarkets = {
     devnet: exports.DevnetPerpMarkets,

package/lib/constants/spotMarkets.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { PublicKey } from '@solana/web3.js';
 import { BN, DriftEnv, OracleSource } from '../';
 export type SpotMarketConfig = {

package/lib/dlob/DLOB.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { NodeList } from './NodeList';
 import { MarketType, BN, DriftClient, Order, SpotMarketAccount, PerpMarketAccount, OraclePriceData, SlotSubscriber, MarketTypeStr, StateAccount, UserMap, OrderRecord, OrderActionRecord } from '..';
 import { PublicKey } from '@solana/web3.js';

package/lib/dlob/DLOBNode.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN, OraclePriceData, Order } from '..';
 import { PublicKey } from '@solana/web3.js';
 export interface DLOBNode {

package/lib/dlob/NodeList.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN, MarketTypeStr, Order } from '..';
 import { PublicKey } from '@solana/web3.js';
 import { DLOBNode, DLOBNodeMap } from './DLOBNode';

package/lib/driftClient.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="bn.js" />
 import { AnchorProvider, BN, Program, ProgramAccount } from '@coral-xyz/anchor';
 import { StateAccount, IWallet, PositionDirection, UserAccount, PerpMarketAccount, OrderParams, Order, SpotMarketAccount, SpotPosition, MakerInfo, TakerInfo, OptionalOrderParams, ReferrerInfo, MarketType, TxParams, SerumV3FulfillmentConfigAccount, ReferrerNameAccount, OrderTriggerCondition, PerpMarketExtendedInfo, UserStatsAccount, ModifyOrderParams } from './types';
 import * as anchor from '@coral-xyz/anchor';
@@ -362,7 +361,11 @@ export declare class DriftClient {
     }): Promise<TransactionSignature>;
     requestRemoveInsuranceFundStake(marketIndex: number, amount: BN): Promise<TransactionSignature>;
     cancelRequestRemoveInsuranceFundStake(marketIndex: number): Promise<TransactionSignature>;
-    removeInsuranceFundStake(marketIndex: number, collateralAccountPublicKey: PublicKey): Promise<TransactionSignature>;
+    removeInsuranceFundStake(marketIndex: number, collateralAccountPublicKey: PublicKey, 
+    /**
+     * If unstaking SOL, it's required to pass in the amount
+     */
+    amount?: BN): Promise<TransactionSignature>;
     settleRevenueToInsuranceFund(marketIndex: number): Promise<TransactionSignature>;
     resolvePerpPnlDeficit(spotMarketIndex: number, perpMarketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     getResolvePerpPnlDeficitIx(spotMarketIndex: number, perpMarketIndex: number): Promise<TransactionInstruction>;

package/lib/driftClient.js

@@ -2474,26 +2474,29 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async removeInsuranceFundStake(marketIndex, collateralAccountPublicKey) {
+    async removeInsuranceFundStake(marketIndex, collateralAccountPublicKey, 
+    /**
+     * If unstaking SOL, it's required to pass in the amount
+     */
+    amount) {
         const tx = new web3_js_1.Transaction();
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
-        const tokenAccount = collateralAccountPublicKey;
-        // Todo wsol remove iF stake... how do we determine the amount?
-        // const amount = // get balance here...?
-        // const additionalSigners: Array<Signer> = [];
-        // const isSolMarket = spotMarketAccount.mint.equals(WRAPPED_SOL_MINT);
-        // const createWSOLTokenAccount =
-        // 	isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
-        // if (createWSOLTokenAccount) {
-        // 	const { ixs, signers, pubkey } =
-        // 		await this.getWrappedSolAccountCreationIxs(amount, true);
-        // 	tokenAccount = pubkey;
-        // 	ixs.forEach((ix) => {
-        // 		tx.add(ix);
-        // 	});
-        // 	signers.forEach((signer) => additionalSigners.push(signer));
-        // }
+        const additionalSigners = [];
+        const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
+        const createWSOLTokenAccount = isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
+        let tokenAccount;
+        if (createWSOLTokenAccount) {
+            const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
+            tokenAccount = pubkey;
+            ixs.forEach((ix) => {
+                tx.add(ix);
+            });
+            signers.forEach((signer) => additionalSigners.push(signer));
+        }
+        else {
+            tokenAccount = collateralAccountPublicKey;
+        }
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [this.getUserAccount()],
             useMarketLastSlotCache: true,
@@ -2514,6 +2517,10 @@ class DriftClient {
             remainingAccounts,
         });
         tx.add(removeStakeIx);
+        // Close the wrapped sol account at the end of the transaction
+        if (createWSOLTokenAccount) {
+            tx.add(spl_token_1.Token.createCloseAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, tokenAccount, this.wallet.publicKey, this.wallet.publicKey, []));
+        }
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }

package/lib/factory/bigNum.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from '@coral-xyz/anchor';
 export declare class BigNum {
     val: BN;
@@ -44,11 +43,11 @@ export declare class BigNum {
     gte(bn: BigNum | BN, ignorePrecision?: boolean): boolean;
     lte(bn: BigNum | BN, ignorePrecision?: boolean): boolean;
     eq(bn: BigNum | BN, ignorePrecision?: boolean): boolean;
-    eqZero(): boolean;
-    gtZero(): boolean;
-    ltZero(): boolean;
-    gteZero(): boolean;
-    lteZero(): boolean;
+    eqZero(): any;
+    gtZero(): any;
+    ltZero(): any;
+    gteZero(): any;
+    lteZero(): any;
     abs(): BigNum;
     neg(): BigNum;
     toString: (base?: number | 'hex', length?: number) => string;
@@ -88,8 +87,8 @@ export declare class BigNum {
     toNotional(useTradePrecision?: boolean, precisionOverride?: number): string;
     toMillified(precision?: number, rounded?: boolean): string;
     toJSON(): {
-        val: string;
-        precision: string;
+        val: any;
+        precision: any;
     };
     isNeg(): boolean;
     isPos(): boolean;

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.25.0-beta.2",
+    "version": "2.25.1",
     "name": "drift",
     "instructions": [
         {

package/lib/math/amm.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from '@coral-xyz/anchor';
 import { AMM, PositionDirection, SwapDirection, PerpMarketAccount } from '../types';
 import { OraclePriceData } from '../oracles/types';
@@ -87,7 +86,7 @@ export declare function getSwapDirection(inputAssetType: AssetType, positionDire
  * @param market
  * @returns cost : Precision PRICE_PRECISION
  */
-export declare function calculateTerminalPrice(market: PerpMarketAccount): BN;
+export declare function calculateTerminalPrice(market: PerpMarketAccount): any;
 export declare function calculateMaxBaseAssetAmountToTrade(amm: AMM, limit_price: BN, direction: PositionDirection, oraclePriceData?: OraclePriceData, now?: BN): [BN, PositionDirection];
 export declare function calculateQuoteAssetAmountSwapped(quoteAssetReserves: BN, pegMultiplier: BN, swapDirection: SwapDirection): BN;
 export declare function calculateMaxBaseAssetAmountFillable(amm: AMM, orderDirection: PositionDirection): BN;

package/lib/math/auction.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { Order } from '../types';
 import { BN } from '../.';
 export declare function isAuctionComplete(order: Order, slot: number): boolean;

package/lib/math/conversion.d.ts

@@ -1,2 +1 @@
-import { BN } from '../';
-export declare const convertToNumber: (bigNumber: BN, precision?: BN) => number;
+export declare const convertToNumber: (bigNumber: BN, precision?: BN) => any;

package/lib/math/funding.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from '@coral-xyz/anchor';
 import { PerpMarketAccount } from '../types';
 import { OraclePriceData } from '../oracles/types';

package/lib/math/insurance.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from '../index';
 export declare function stakeAmountToShares(amount: BN, totalIfShares: BN, insuranceFundVaultBalance: BN): BN;
 export declare function unstakeSharesToAmount(nShares: BN, totalIfShares: BN, insuranceFundVaultBalance: BN): BN;

package/lib/math/margin.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from '@coral-xyz/anchor';
 import { OraclePriceData } from '../oracles/types';
 import { PerpMarketAccount, PerpPosition } from '..';

package/lib/math/market.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from '@coral-xyz/anchor';
 import { PerpMarketAccount, PositionDirection, MarginCategory, SpotMarketAccount } from '../types';
 import { OraclePriceData } from '../oracles/types';

package/lib/math/oracles.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { AMM, OracleGuardRails } from '../types';
 import { OraclePriceData } from '../oracles/types';
 import { BN, HistoricalOracleData, PerpMarketAccount } from '../index';

package/lib/math/orders.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { User } from '../user';
 import { PerpMarketAccount, AMM, Order } from '../types';
 import { BN } from '@coral-xyz/anchor';

package/lib/math/position.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN, SpotMarketAccount } from '../';
 import { OraclePriceData } from '../oracles/types';
 import { PerpMarketAccount, PositionDirection, PerpPosition } from '../types';

package/lib/math/repeg.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from '@coral-xyz/anchor';
 import { AMM } from '../types';
 /**

package/lib/math/spotBalance.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { SpotMarketAccount, SpotBalanceType, MarginCategory } from '../types';
 import { BN } from '@coral-xyz/anchor';
 import { OraclePriceData } from '../oracles/types';

package/lib/math/spotMarket.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from '@coral-xyz/anchor';
 import { MarginCategory, SpotBalanceType, SpotMarketAccount } from '../types';
 export declare function castNumberToSpotPrecision(value: number, spotMarket: SpotMarketAccount): BN;

package/lib/math/spotPosition.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { SpotMarketAccount, SpotPosition } from '../types';
 import { BN } from '@coral-xyz/anchor';
 import { OraclePriceData } from '../oracles/types';

package/lib/math/trade.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { PerpMarketAccount, PositionDirection, SpotMarketAccount } from '../types';
 import { BN } from '@coral-xyz/anchor';
 import { AssetType } from './amm';

package/lib/math/utils.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from '../';
 export declare function clampBN(x: BN, min: BN, max: BN): BN;
 export declare const squareRootBN: (n: BN) => BN;

package/lib/oracles/pythClient.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 /// <reference types="node" />
 import { Connection, PublicKey } from '@solana/web3.js';
 import { OracleClient, OraclePriceData } from './types';
@@ -7,7 +6,7 @@ export declare class PythClient implements OracleClient {
     private connection;
     private multiple;
     private stableCoin;
-    constructor(connection: Connection, multiple?: BN, stableCoin?: boolean);
+    constructor(connection: Connection, multiple?: any, stableCoin?: boolean);
     getOraclePriceData(pricePublicKey: PublicKey): Promise<OraclePriceData>;
     getOraclePriceDataFromBuffer(buffer: Buffer): OraclePriceData;
 }

package/lib/oracles/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 /// <reference types="node" />
 import { BN } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';

package/lib/orderParams.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { OptionalOrderParams, OrderTriggerCondition } from './types';
 import { BN } from '@coral-xyz/anchor';
 export declare function getLimitOrderParams(params: Omit<OptionalOrderParams, 'orderType' | 'marketType'> & {

package/lib/serum/serumSubscriber.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { Connection, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 import { Market, Orderbook } from '@project-serum/serum';

package/lib/tokenFaucet.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import * as anchor from '@coral-xyz/anchor';
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { AccountInfo } from '@solana/spl-token';

package/lib/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { PublicKey, Transaction } from '@solana/web3.js';
 import { BN } from '.';
 export declare enum ExchangeStatus {

package/lib/user.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="bn.js" />
 import { PublicKey } from '@solana/web3.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.25.0-beta.2",
+	"version": "2.25.1",
 	"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

@@ -187,6 +187,16 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1680808053000,
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'Binance Coin',
+		category: ['Exchange'],
+		symbol: 'BNB-PERP',
+		baseAssetSymbol: 'BNB',
+		marketIndex: 8,
+		oracle: new PublicKey('4CkQJBxhU8EZ2UjhigbtdaPbpTe6mqf811fipYBFbSYN'),
+		launchTs: 1680808053000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

package/src/driftClient.ts

@@ -4404,7 +4404,11 @@ export class DriftClient {
 
 	public async removeInsuranceFundStake(
 		marketIndex: number,
-		collateralAccountPublicKey: PublicKey
+		collateralAccountPublicKey: PublicKey,
+		/**
+		 * If unstaking SOL, it's required to pass in the amount
+		 */
+		amount?: BN
 	): Promise<TransactionSignature> {
 		const tx = new Transaction();
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
@@ -4413,26 +4417,26 @@ export class DriftClient {
 			this.wallet.publicKey,
 			marketIndex
 		);
-		const tokenAccount = collateralAccountPublicKey;
 
-		// Todo wsol remove iF stake... how do we determine the amount?
-		// const amount = // get balance here...?
+		const additionalSigners: Array<Signer> = [];
+		const isSolMarket = spotMarketAccount.mint.equals(WRAPPED_SOL_MINT);
+		const createWSOLTokenAccount =
+			isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
 
-		// const additionalSigners: Array<Signer> = [];
-		// const isSolMarket = spotMarketAccount.mint.equals(WRAPPED_SOL_MINT);
-		// const createWSOLTokenAccount =
-		// 	isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
+		let tokenAccount;
 
-		// if (createWSOLTokenAccount) {
-		// 	const { ixs, signers, pubkey } =
-		// 		await this.getWrappedSolAccountCreationIxs(amount, true);
-		// 	tokenAccount = pubkey;
-		// 	ixs.forEach((ix) => {
-		// 		tx.add(ix);
-		// 	});
+		if (createWSOLTokenAccount) {
+			const { ixs, signers, pubkey } =
+				await this.getWrappedSolAccountCreationIxs(amount, true);
+			tokenAccount = pubkey;
+			ixs.forEach((ix) => {
+				tx.add(ix);
+			});
 
-		// 	signers.forEach((signer) => additionalSigners.push(signer));
-		// }
+			signers.forEach((signer) => additionalSigners.push(signer));
+		} else {
+			tokenAccount = collateralAccountPublicKey;
+		}
 
 		const remainingAccounts = this.getRemainingAccounts({
 			userAccounts: [this.getUserAccount()],
@@ -4458,6 +4462,19 @@ export class DriftClient {
 
 		tx.add(removeStakeIx);
 
+		// Close the wrapped sol account at the end of the transaction
+		if (createWSOLTokenAccount) {
+			tx.add(
+				Token.createCloseAccountInstruction(
+					TOKEN_PROGRAM_ID,
+					tokenAccount,
+					this.wallet.publicKey,
+					this.wallet.publicKey,
+					[]
+				)
+			);
+		}
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
 	}

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.25.0-beta.2",
+  "version": "2.25.1",
   "name": "drift",
   "instructions": [
     {

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/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/getTokenAddress.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTokenAddress = void 0;
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+const getTokenAddress = (mintAddress, userPubKey) => {
+    return spl_token_1.Token.getAssociatedTokenAddress(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, spl_token_1.TOKEN_PROGRAM_ID, new web3_js_1.PublicKey(mintAddress), new web3_js_1.PublicKey(userPubKey));
+};
+exports.getTokenAddress = getTokenAddress;

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;