@drift-labs/sdk 2.23.0-beta.1 → 2.24.0

package/lib/adminClient.d.ts

@@ -7,7 +7,8 @@ export declare class AdminClient extends DriftClient {
     initialize(usdcMint: PublicKey, _adminControlsPrices: boolean): Promise<[TransactionSignature]>;
     initializeSpotMarket(mint: PublicKey, optimalUtilization: number, optimalRate: number, maxRate: number, oracle: PublicKey, oracleSource: OracleSource, initialAssetWeight: number, maintenanceAssetWeight: number, initialLiabilityWeight: number, maintenanceLiabilityWeight: number, imfFactor?: number, liquidatorFee?: number, activeStatus?: boolean, name?: string): Promise<TransactionSignature>;
     initializeSerumFulfillmentConfig(marketIndex: number, serumMarket: PublicKey, serumProgram: PublicKey): Promise<TransactionSignature>;
-    initializePerpMarket(priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, marginRatioInitial?: number, marginRatioMaintenance?: number, liquidatorFee?: number, activeStatus?: boolean, name?: string): Promise<TransactionSignature>;
+    initializePerpMarket(marketIndex: number, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, marginRatioInitial?: number, marginRatioMaintenance?: number, liquidatorFee?: number, activeStatus?: boolean, name?: string): Promise<TransactionSignature>;
+    deleteInitializedPerpMarket(marketIndex: number): Promise<TransactionSignature>;
     moveAmmPrice(perpMarketIndex: number, baseAssetReserve: BN, quoteAssetReserve: BN, sqrtK?: BN): Promise<TransactionSignature>;
     updateK(perpMarketIndex: number, sqrtK: BN): Promise<TransactionSignature>;
     updatePerpMarketConcentrationScale(perpMarketIndex: number, concentrationScale: BN): Promise<TransactionSignature>;

package/lib/adminClient.js

@@ -107,11 +107,11 @@ class AdminClient extends driftClient_1.DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async initializePerpMarket(priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, marginRatioInitial = 2000, marginRatioMaintenance = 500, liquidatorFee = 0, activeStatus = true, name = userName_1.DEFAULT_MARKET_NAME) {
+    async initializePerpMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, marginRatioInitial = 2000, marginRatioMaintenance = 500, liquidatorFee = 0, activeStatus = true, name = userName_1.DEFAULT_MARKET_NAME) {
         const currentPerpMarketIndex = this.getStateAccount().numberOfMarkets;
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, currentPerpMarketIndex);
         const nameBuffer = (0, userName_1.encodeName)(name);
-        const initializeMarketTx = await this.program.transaction.initializePerpMarket(baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, marginRatioInitial, marginRatioMaintenance, liquidatorFee, activeStatus, nameBuffer, {
+        const initializeMarketTx = await this.program.transaction.initializePerpMarket(marketIndex, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, marginRatioInitial, marginRatioMaintenance, liquidatorFee, activeStatus, nameBuffer, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 admin: this.wallet.publicKey,
@@ -132,6 +132,18 @@ class AdminClient extends driftClient_1.DriftClient {
         });
         return txSig;
     }
+    async deleteInitializedPerpMarket(marketIndex) {
+        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex);
+        const deleteInitializeMarketTx = await this.program.transaction.deleteInitializedPerpMarket(marketIndex, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                admin: this.wallet.publicKey,
+                perpMarket: perpMarketPublicKey,
+            },
+        });
+        const { txSig } = await this.sendTransaction(deleteInitializeMarketTx, [], this.opts);
+        return txSig;
+    }
     async moveAmmPrice(perpMarketIndex, baseAssetReserve, quoteAssetReserve, sqrtK) {
         const marketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
         if (sqrtK == undefined) {

package/lib/constants/perpMarkets.js

@@ -46,7 +46,7 @@ exports.DevnetPerpMarkets = [
     },
     {
         fullName: 'Bonk',
-        category: ['Meme'],
+        category: ['Meme', 'Dog'],
         symbol: '1MBONK-PERP',
         baseAssetSymbol: '1MBONK',
         marketIndex: 4,
@@ -74,6 +74,16 @@ exports.DevnetPerpMarkets = [
         launchTs: 1679501812000,
         oracleSource: __1.OracleSource.PYTH,
     },
+    {
+        fullName: 'Doge',
+        category: ['Meme', 'Dog'],
+        symbol: 'DOGE-PERP',
+        baseAssetSymbol: 'DOGE',
+        marketIndex: 7,
+        oracle: new web3_js_1.PublicKey('4L6YhY8VvUgmqG5MvJkUJATtzB2rFqdrJwQCmFLv4Jzy'),
+        launchTs: 1680808053000,
+        oracleSource: __1.OracleSource.PYTH,
+    },
 ];
 exports.MainnetPerpMarkets = [
     {
@@ -146,6 +156,16 @@ exports.MainnetPerpMarkets = [
         launchTs: 1679501812000,
         oracleSource: __1.OracleSource.PYTH,
     },
+    {
+        fullName: 'Doge',
+        category: ['Meme', 'Dog'],
+        symbol: 'DOGE-PERP',
+        baseAssetSymbol: 'DOGE',
+        marketIndex: 7,
+        oracle: new web3_js_1.PublicKey('FsSM3s38PX9K7Dn6eGzuE29S2Dsk1Sss1baytTQdCaQj'),
+        launchTs: 1680808053000,
+        oracleSource: __1.OracleSource.PYTH,
+    },
 ];
 exports.PerpMarkets = {
     devnet: exports.DevnetPerpMarkets,

package/lib/driftClient.d.ts

@@ -93,6 +93,7 @@ export declare class DriftClient {
     updateWallet(newWallet: IWallet, subAccountIds?: number[], activeSubAccountId?: number): Promise<void>;
     switchActiveUser(subAccountId: number): void;
     addUser(subAccountId: number): Promise<void>;
+    addAllUsers(): Promise<void>;
     initializeUserAccount(subAccountId?: number, name?: string, referrerInfo?: ReferrerInfo): Promise<[TransactionSignature, PublicKey]>;
     getInitializeUserInstructions(subAccountId?: number, name?: string, referrerInfo?: ReferrerInfo): Promise<[PublicKey, TransactionInstruction]>;
     getInitializeUserStatsIx(): Promise<TransactionInstruction>;
@@ -103,6 +104,7 @@ export declare class DriftClient {
     updateUserDelegate(delegate: PublicKey, subAccountId?: number): Promise<TransactionSignature>;
     fetchAllUserAccounts(includeIdle?: boolean): Promise<ProgramAccount<UserAccount>[]>;
     getUserAccountsForDelegate(delegate: PublicKey): Promise<UserAccount[]>;
+    getUserAccountsAndAddressesForAuthority(authority: PublicKey): Promise<ProgramAccount<UserAccount>[]>;
     getUserAccountsForAuthority(authority: PublicKey): Promise<UserAccount[]>;
     getReferredUserStatsAccountsByReferrer(referrer: PublicKey): Promise<UserStatsAccount[]>;
     getReferrerNameAccountsForAuthority(authority: PublicKey): Promise<ReferrerNameAccount[]>;
@@ -323,7 +325,25 @@ export declare class DriftClient {
     getOracleDataForSpotMarket(marketIndex: number): OraclePriceData;
     initializeInsuranceFundStake(marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     getInitializeInsuranceFundStakeIx(marketIndex: number): Promise<TransactionInstruction>;
-    addInsuranceFundStake(marketIndex: number, amount: BN, collateralAccountPublicKey: PublicKey): Promise<TransactionSignature>;
+    getAddInsuranceFundStakeIx(marketIndex: number, amount: BN, collateralAccountPublicKey: PublicKey): Promise<TransactionInstruction>;
+    /**
+     * Add to an insurance fund stake and optionally initialize the account
+     */
+    addInsuranceFundStake({ marketIndex, amount, collateralAccountPublicKey, initializeStakeAccount, }: {
+        /**
+         * Spot market index
+         */
+        marketIndex: number;
+        amount: BN;
+        /**
+         * The account where the funds to stake come from. Usually an associated token account
+         */
+        collateralAccountPublicKey: PublicKey;
+        /**
+         * Add instructions to initialize the staking account -- required if its the first time the currrent authority has staked in this market
+         */
+        initializeStakeAccount?: boolean;
+    }): Promise<TransactionSignature>;
     requestRemoveInsuranceFundStake(marketIndex: number, amount: BN): Promise<TransactionSignature>;
     cancelRequestRemoveInsuranceFundStake(marketIndex: number): Promise<TransactionSignature>;
     removeInsuranceFundStake(marketIndex: number, collateralAccountPublicKey: PublicKey): Promise<TransactionSignature>;

package/lib/driftClient.js

@@ -246,7 +246,6 @@ class DriftClient {
         if (!this.marketLookupTable) {
             throw Error('Market lookup table address not set');
         }
-        // @ts-ignore
         return (await this.connection.getAddressLookupTable(this.marketLookupTable))
             .value;
     }
@@ -298,6 +297,12 @@ class DriftClient {
         await user.subscribe();
         this.users.set(subAccountId, user);
     }
+    async addAllUsers() {
+        const userAccounts = await this.getUserAccountsForAuthority(this.authority);
+        for (const userAccount of userAccounts) {
+            await this.addUser(userAccount.subAccountId);
+        }
+    }
     async initializeUserAccount(subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, referrerInfo) {
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
         const tx = new web3_js_1.Transaction();
@@ -453,6 +458,18 @@ class DriftClient {
         ]);
         return programAccounts.map((programAccount) => programAccount.account);
     }
+    async getUserAccountsAndAddressesForAuthority(authority) {
+        const programAccounts = await this.program.account.user.all([
+            {
+                memcmp: {
+                    offset: 8,
+                    /** data to match, as base-58 encoded string and limited to less than 129 bytes */
+                    bytes: bs58_1.default.encode(authority.toBuffer()),
+                },
+            },
+        ]);
+        return programAccounts.map((programAccount) => programAccount);
+    }
     async getUserAccountsForAuthority(authority) {
         const programAccounts = await this.program.account.user.all([
             {
@@ -801,9 +818,7 @@ class DriftClient {
     }
     async deposit(amount, marketIndex, collateralAccountPublicKey, subAccountId, reduceOnly = false) {
         const tx = new web3_js_1.Transaction();
-        tx.add(
-        // @ts-ignore
-        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: 600000,
         }));
         const additionalSigners = [];
@@ -916,15 +931,11 @@ class DriftClient {
         const spotMarket = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarket.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         const tx = new web3_js_1.Transaction();
-        tx.add(
-        // @ts-ignore
-        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: (_a = txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits) !== null && _a !== void 0 ? _a : 600000,
         }));
         if (txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice) {
-            tx.add(
-            // @ts-ignore
-            web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+            tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
                 microLamports: txParams.computeUnitsPrice,
             }));
         }
@@ -971,9 +982,7 @@ class DriftClient {
     }
     async withdraw(amount, marketIndex, userTokenAccount, reduceOnly = false) {
         const tx = new web3_js_1.Transaction();
-        tx.add(
-        // @ts-ignore
-        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: 600000,
         }));
         const additionalSigners = [];
@@ -2048,9 +2057,7 @@ class DriftClient {
             ? await this.getPlaceSpotOrderIx(newOrderParams)
             : await this.getPlacePerpOrderIx(newOrderParams);
         const tx = new web3_js_1.Transaction();
-        tx.add(
-        // @ts-ignore
-        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: 1000000,
         }));
         tx.add(cancelOrderIx);
@@ -2125,9 +2132,7 @@ class DriftClient {
             ? await this.getPlaceSpotOrderIx(newOrderParams)
             : await this.getPlacePerpOrderIx(newOrderParams);
         const tx = new web3_js_1.Transaction();
-        tx.add(
-        // @ts-ignore
-        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: 1000000,
         }));
         tx.add(cancelOrderIx);
@@ -2150,9 +2155,7 @@ class DriftClient {
             }
         }
         const tx = new web3_js_1.Transaction()
-            .add(
-        // @ts-ignore
-        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+            .add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: 1000000,
         }))
             .add(...ixs);
@@ -2415,7 +2418,7 @@ class DriftClient {
             },
         });
     }
-    async addInsuranceFundStake(marketIndex, amount, collateralAccountPublicKey) {
+    async getAddInsuranceFundStakeIx(marketIndex, amount, collateralAccountPublicKey) {
         const spotMarket = this.getSpotMarketAccount(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const remainingAccounts = this.getRemainingAccounts({
@@ -2423,7 +2426,7 @@ class DriftClient {
             useMarketLastSlotCache: true,
             writableSpotMarketIndexes: [marketIndex],
         });
-        const tx = await this.program.transaction.addInsuranceFundStake(marketIndex, amount, {
+        const ix = this.program.instruction.addInsuranceFundStake(marketIndex, amount, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarket.pubkey,
@@ -2438,7 +2441,39 @@ class DriftClient {
             },
             remainingAccounts,
         });
-        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return ix;
+    }
+    /**
+     * Add to an insurance fund stake and optionally initialize the account
+     */
+    async addInsuranceFundStake({ marketIndex, amount, collateralAccountPublicKey, initializeStakeAccount, }) {
+        const tx = new web3_js_1.Transaction();
+        const additionalSigners = [];
+        const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+        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;
+        }
+        if (initializeStakeAccount) {
+            const initializeIx = await this.getInitializeInsuranceFundStakeIx(marketIndex);
+            tx.add(initializeIx);
+        }
+        const addFundsIx = await this.getAddInsuranceFundStakeIx(marketIndex, amount, tokenAccount);
+        tx.add(addFundsIx);
+        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, additionalSigners, this.opts);
         return txSig;
     }
     async requestRemoveInsuranceFundStake(marketIndex, amount) {
@@ -2486,14 +2521,31 @@ class DriftClient {
         return txSig;
     }
     async removeInsuranceFundStake(marketIndex, collateralAccountPublicKey) {
+        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 remainingAccounts = this.getRemainingAccounts({
             userAccounts: [this.getUserAccount()],
             useMarketLastSlotCache: true,
             writableSpotMarketIndexes: [marketIndex],
         });
-        const tx = await this.program.transaction.removeInsuranceFundStake(marketIndex, {
+        const removeStakeIx = await this.program.instruction.removeInsuranceFundStake(marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarketAccount.pubkey,
@@ -2502,11 +2554,12 @@ class DriftClient {
                 authority: this.wallet.publicKey,
                 insuranceFundVault: spotMarketAccount.insuranceFund.vault,
                 driftSigner: this.getSignerPublicKey(),
-                userTokenAccount: collateralAccountPublicKey,
+                userTokenAccount: tokenAccount,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
             remainingAccounts,
         });
+        tx.add(removeStakeIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.23.0-beta.1",
+    "version": "2.24.0",
     "name": "drift",
     "instructions": [
         {
@@ -2283,6 +2283,10 @@
                 }
             ],
             "args": [
+                {
+                    "name": "marketIndex",
+                    "type": "u16"
+                },
                 {
                     "name": "ammBaseAssetReserve",
                     "type": "u128"
@@ -2332,6 +2336,32 @@
                 }
             ]
         },
+        {
+            "name": "deleteInitializedPerpMarket",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "perpMarket",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "marketIndex",
+                    "type": "u16"
+                }
+            ]
+        },
         {
             "name": "moveAmmPrice",
             "accounts": [
@@ -5994,6 +6024,22 @@
                 ]
             }
         },
+        {
+            "name": "FulfillmentParams",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "SerumFulfillmentParams",
+                        "fields": [
+                            {
+                                "defined": "SerumFulfillmentParams<'a,'b>"
+                            }
+                        ]
+                    }
+                ]
+            }
+        },
         {
             "name": "SpotFulfillmentType",
             "type": {
@@ -8810,6 +8856,11 @@
             "code": 6239,
             "name": "RevertFill",
             "msg": "RevertFill"
+        },
+        {
+            "code": 6240,
+            "name": "InvalidMarketAccountforDeletion",
+            "msg": "Invalid MarketAccount for Deletion"
         }
     ]
 }

package/lib/tx/utils.js

@@ -6,16 +6,12 @@ const COMPUTE_UNITS_DEFAULT = 200000;
 function wrapInTx(instruction, computeUnits = 600000, computeUnitsPrice = 0) {
     const tx = new web3_js_1.Transaction();
     if (computeUnits != COMPUTE_UNITS_DEFAULT) {
-        tx.add(
-        // @ts-ignore
-        web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: computeUnits,
         }));
     }
     if (computeUnitsPrice != 0) {
-        tx.add(
-        // @ts-ignore
-        web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
             microLamports: computeUnitsPrice,
         }));
     }

package/lib/types.d.ts

@@ -991,6 +991,7 @@ export type OracleGuardRails = {
 };
 export type MarginCategory = 'Initial' | 'Maintenance';
 export type InsuranceFundStake = {
+    costBasis: BN;
     marketIndex: number;
     authority: PublicKey;
     ifShares: BN;

package/lib/user.js

@@ -1249,7 +1249,8 @@ class User {
             }
         }
         for (const spotPosition of userAccount.spotPositions) {
-            if ((0, types_1.isVariant)(spotPosition.balanceType, 'borrow')) {
+            if ((0, types_1.isVariant)(spotPosition.balanceType, 'borrow') &&
+                spotPosition.scaledBalance.gt(numericConstants_1.ZERO)) {
                 return false;
             }
             if (spotPosition.openOrders !== 0) {

package/package.json

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

package/src/adminClient.ts

@@ -182,6 +182,7 @@ export class AdminClient extends DriftClient {
 	}
 
 	public async initializePerpMarket(
+		marketIndex: number,
 		priceOracle: PublicKey,
 		baseAssetReserve: BN,
 		quoteAssetReserve: BN,
@@ -203,6 +204,7 @@ export class AdminClient extends DriftClient {
 		const nameBuffer = encodeName(name);
 		const initializeMarketTx =
 			await this.program.transaction.initializePerpMarket(
+				marketIndex,
 				baseAssetReserve,
 				quoteAssetReserve,
 				periodicity,
@@ -243,6 +245,32 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async deleteInitializedPerpMarket(
+		marketIndex: number
+	): Promise<TransactionSignature> {
+		const perpMarketPublicKey = await getPerpMarketPublicKey(
+			this.program.programId,
+			marketIndex
+		);
+
+		const deleteInitializeMarketTx =
+			await this.program.transaction.deleteInitializedPerpMarket(marketIndex, {
+				accounts: {
+					state: await this.getStatePublicKey(),
+					admin: this.wallet.publicKey,
+					perpMarket: perpMarketPublicKey,
+				},
+			});
+
+		const { txSig } = await this.sendTransaction(
+			deleteInitializeMarketTx,
+			[],
+			this.opts
+		);
+
+		return txSig;
+	}
+
 	public async moveAmmPrice(
 		perpMarketIndex: number,
 		baseAssetReserve: BN,

package/src/constants/perpMarkets.ts

@@ -56,7 +56,7 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 	},
 	{
 		fullName: 'Bonk',
-		category: ['Meme'],
+		category: ['Meme', 'Dog'],
 		symbol: '1MBONK-PERP',
 		baseAssetSymbol: '1MBONK',
 		marketIndex: 4,
@@ -84,6 +84,16 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1679501812000, //todo
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'Doge',
+		category: ['Meme', 'Dog'],
+		symbol: 'DOGE-PERP',
+		baseAssetSymbol: 'DOGE',
+		marketIndex: 7,
+		oracle: new PublicKey('4L6YhY8VvUgmqG5MvJkUJATtzB2rFqdrJwQCmFLv4Jzy'),
+		launchTs: 1680808053000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const MainnetPerpMarkets: PerpMarketConfig[] = [
@@ -157,6 +167,16 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1679501812000, //todo
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'Doge',
+		category: ['Meme', 'Dog'],
+		symbol: 'DOGE-PERP',
+		baseAssetSymbol: 'DOGE',
+		marketIndex: 7,
+		oracle: new PublicKey('FsSM3s38PX9K7Dn6eGzuE29S2Dsk1Sss1baytTQdCaQj'),
+		launchTs: 1680808053000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

package/src/driftClient.ts

@@ -418,7 +418,6 @@ export class DriftClient {
 			throw Error('Market lookup table address not set');
 		}
 
-		// @ts-ignore
 		return (await this.connection.getAddressLookupTable(this.marketLookupTable))
 			.value;
 	}
@@ -500,6 +499,13 @@ export class DriftClient {
 		this.users.set(subAccountId, user);
 	}
 
+	public async addAllUsers(): Promise<void> {
+		const userAccounts = await this.getUserAccountsForAuthority(this.authority);
+		for (const userAccount of userAccounts) {
+			await this.addUser(userAccount.subAccountId);
+		}
+	}
+
 	public async initializeUserAccount(
 		subAccountId = 0,
 		name = DEFAULT_USER_NAME,
@@ -760,6 +766,24 @@ export class DriftClient {
 		);
 	}
 
+	public async getUserAccountsAndAddressesForAuthority(
+		authority: PublicKey
+	): Promise<ProgramAccount<UserAccount>[]> {
+		const programAccounts = await this.program.account.user.all([
+			{
+				memcmp: {
+					offset: 8,
+					/** data to match, as base-58 encoded string and limited to less than 129 bytes */
+					bytes: bs58.encode(authority.toBuffer()),
+				},
+			},
+		]);
+
+		return programAccounts.map(
+			(programAccount) => programAccount as ProgramAccount<UserAccount>
+		);
+	}
+
 	public async getUserAccountsForAuthority(
 		authority: PublicKey
 	): Promise<UserAccount[]> {
@@ -1233,7 +1257,6 @@ export class DriftClient {
 	): Promise<TransactionSignature> {
 		const tx = new Transaction();
 		tx.add(
-			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: 600_000,
 			})
@@ -1459,7 +1482,6 @@ export class DriftClient {
 		const tx = new Transaction();
 
 		tx.add(
-			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: txParams?.computeUnits ?? 600_000,
 			})
@@ -1467,7 +1489,6 @@ export class DriftClient {
 
 		if (txParams?.computeUnitsPrice) {
 			tx.add(
-				// @ts-ignore
 				ComputeBudgetProgram.setComputeUnitPrice({
 					microLamports: txParams.computeUnitsPrice,
 				})
@@ -1598,7 +1619,6 @@ export class DriftClient {
 	): Promise<TransactionSignature> {
 		const tx = new Transaction();
 		tx.add(
-			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: 600_000,
 			})
@@ -3458,7 +3478,6 @@ export class DriftClient {
 
 		const tx = new Transaction();
 		tx.add(
-			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: 1_000_000,
 			})
@@ -3570,7 +3589,6 @@ export class DriftClient {
 
 		const tx = new Transaction();
 		tx.add(
-			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: 1_000_000,
 			})
@@ -3611,7 +3629,6 @@ export class DriftClient {
 
 		const tx = new Transaction()
 			.add(
-				// @ts-ignore
 				ComputeBudgetProgram.setComputeUnitLimit({
 					units: 1_000_000,
 				})
@@ -4206,11 +4223,11 @@ export class DriftClient {
 		);
 	}
 
-	public async addInsuranceFundStake(
+	public async getAddInsuranceFundStakeIx(
 		marketIndex: number,
 		amount: BN,
 		collateralAccountPublicKey: PublicKey
-	): Promise<TransactionSignature> {
+	): Promise<TransactionInstruction> {
 		const spotMarket = this.getSpotMarketAccount(marketIndex);
 		const ifStakeAccountPublicKey = getInsuranceFundStakeAccountPublicKey(
 			this.program.programId,
@@ -4224,7 +4241,7 @@ export class DriftClient {
 			writableSpotMarketIndexes: [marketIndex],
 		});
 
-		const tx = await this.program.transaction.addInsuranceFundStake(
+		const ix = this.program.instruction.addInsuranceFundStake(
 			marketIndex,
 			amount,
 			{
@@ -4244,7 +4261,88 @@ export class DriftClient {
 			}
 		);
 
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return ix;
+	}
+
+	/**
+	 * Add to an insurance fund stake and optionally initialize the account
+	 */
+	public async addInsuranceFundStake({
+		marketIndex,
+		amount,
+		collateralAccountPublicKey,
+		initializeStakeAccount,
+	}: {
+		/**
+		 * Spot market index
+		 */
+		marketIndex: number;
+		amount: BN;
+		/**
+		 * The account where the funds to stake come from. Usually an associated token account
+		 */
+		collateralAccountPublicKey: PublicKey;
+		/**
+		 * Add instructions to initialize the staking account -- required if its the first time the currrent authority has staked in this market
+		 */
+		initializeStakeAccount?: boolean;
+	}): Promise<TransactionSignature> {
+		const tx = new Transaction();
+
+		const additionalSigners: Array<Signer> = [];
+		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+		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);
+			});
+
+			signers.forEach((signer) => additionalSigners.push(signer));
+		} else {
+			tokenAccount = collateralAccountPublicKey;
+		}
+
+		if (initializeStakeAccount) {
+			const initializeIx = await this.getInitializeInsuranceFundStakeIx(
+				marketIndex
+			);
+			tx.add(initializeIx);
+		}
+
+		const addFundsIx = await this.getAddInsuranceFundStakeIx(
+			marketIndex,
+			amount,
+			tokenAccount
+		);
+
+		tx.add(addFundsIx);
+
+		if (createWSOLTokenAccount) {
+			tx.add(
+				Token.createCloseAccountInstruction(
+					TOKEN_PROGRAM_ID,
+					tokenAccount,
+					this.wallet.publicKey,
+					this.wallet.publicKey,
+					[]
+				)
+			);
+		}
+
+		const { txSig } = await this.sendTransaction(
+			tx,
+			additionalSigners,
+			this.opts
+		);
+
 		return txSig;
 	}
 
@@ -4325,12 +4423,33 @@ export class DriftClient {
 		marketIndex: number,
 		collateralAccountPublicKey: PublicKey
 	): Promise<TransactionSignature> {
+		const tx = new Transaction();
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
 		const ifStakeAccountPublicKey = 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 remainingAccounts = this.getRemainingAccounts({
 			userAccounts: [this.getUserAccount()],
@@ -4338,9 +4457,8 @@ export class DriftClient {
 			writableSpotMarketIndexes: [marketIndex],
 		});
 
-		const tx = await this.program.transaction.removeInsuranceFundStake(
-			marketIndex,
-			{
+		const removeStakeIx =
+			await this.program.instruction.removeInsuranceFundStake(marketIndex, {
 				accounts: {
 					state: await this.getStatePublicKey(),
 					spotMarket: spotMarketAccount.pubkey,
@@ -4349,12 +4467,13 @@ export class DriftClient {
 					authority: this.wallet.publicKey,
 					insuranceFundVault: spotMarketAccount.insuranceFund.vault,
 					driftSigner: this.getSignerPublicKey(),
-					userTokenAccount: collateralAccountPublicKey,
+					userTokenAccount: tokenAccount,
 					tokenProgram: TOKEN_PROGRAM_ID,
 				},
 				remainingAccounts,
-			}
-		);
+			});
+
+		tx.add(removeStakeIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.23.0-beta.1",
+  "version": "2.24.0",
   "name": "drift",
   "instructions": [
     {
@@ -2283,6 +2283,10 @@
         }
       ],
       "args": [
+        {
+          "name": "marketIndex",
+          "type": "u16"
+        },
         {
           "name": "ammBaseAssetReserve",
           "type": "u128"
@@ -2332,6 +2336,32 @@
         }
       ]
     },
+    {
+      "name": "deleteInitializedPerpMarket",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "perpMarket",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "marketIndex",
+          "type": "u16"
+        }
+      ]
+    },
     {
       "name": "moveAmmPrice",
       "accounts": [
@@ -5994,6 +6024,22 @@
         ]
       }
     },
+    {
+      "name": "FulfillmentParams",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "SerumFulfillmentParams",
+            "fields": [
+              {
+                "defined": "SerumFulfillmentParams<'a,'b>"
+              }
+            ]
+          }
+        ]
+      }
+    },
     {
       "name": "SpotFulfillmentType",
       "type": {
@@ -8810,6 +8856,11 @@
       "code": 6239,
       "name": "RevertFill",
       "msg": "RevertFill"
+    },
+    {
+      "code": 6240,
+      "name": "InvalidMarketAccountforDeletion",
+      "msg": "Invalid MarketAccount for Deletion"
     }
   ]
 }

package/src/tx/utils.ts

@@ -14,7 +14,6 @@ export function wrapInTx(
 	const tx = new Transaction();
 	if (computeUnits != COMPUTE_UNITS_DEFAULT) {
 		tx.add(
-			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: computeUnits,
 			})
@@ -23,7 +22,6 @@ export function wrapInTx(
 
 	if (computeUnitsPrice != 0) {
 		tx.add(
-			// @ts-ignore
 			ComputeBudgetProgram.setComputeUnitPrice({
 				microLamports: computeUnitsPrice,
 			})

package/src/types.ts

@@ -974,6 +974,8 @@ export type OracleGuardRails = {
 export type MarginCategory = 'Initial' | 'Maintenance';
 
 export type InsuranceFundStake = {
+	costBasis: BN;
+
 	marketIndex: number;
 	authority: PublicKey;
 

package/src/user.ts

@@ -2253,7 +2253,10 @@ export class User {
 		}
 
 		for (const spotPosition of userAccount.spotPositions) {
-			if (isVariant(spotPosition.balanceType, 'borrow')) {
+			if (
+				isVariant(spotPosition.balanceType, 'borrow') &&
+				spotPosition.scaledBalance.gt(ZERO)
+			) {
 				return false;
 			}