@drift-labs/sdk 2.25.4 → 2.26.0-beta.1

package/lib/driftClient.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 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 { StateAccount, IWallet, PositionDirection, UserAccount, PerpMarketAccount, OrderParams, Order, SpotMarketAccount, SpotPosition, MakerInfo, TakerInfo, OptionalOrderParams, ReferrerInfo, MarketType, TxParams, SerumV3FulfillmentConfigAccount, ReferrerNameAccount, OrderTriggerCondition, PerpMarketExtendedInfo, UserStatsAccount, ModifyOrderParams, PhoenixV1FulfillmentConfigAccount } from './types';
 import * as anchor from '@coral-xyz/anchor';
 import { Connection, PublicKey, TransactionSignature, ConfirmOptions, Transaction, TransactionInstruction, AccountMeta, Signer, AddressLookupTableAccount } from '@solana/web3.js';
 import { TokenFaucet } from './tokenFaucet';
@@ -43,6 +43,7 @@ export declare class DriftClient {
     spotMarketLastSlotCache: Map<number, number>;
     authority: PublicKey;
     marketLookupTable: PublicKey;
+    lookupTableAccount: AddressLookupTableAccount;
     get isSubscribed(): boolean;
     set isSubscribed(val: boolean);
     constructor(config: DriftClientConfig);
@@ -82,6 +83,7 @@ export declare class DriftClient {
     getQuoteSpotMarketAccount(): SpotMarketAccount;
     getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
     getSerumV3FulfillmentConfig(serumMarket: PublicKey): Promise<SerumV3FulfillmentConfigAccount>;
+    getPhoenixV1FulfillmentConfig(phoenixMarket: PublicKey): Promise<PhoenixV1FulfillmentConfigAccount>;
     fetchMarketLookupTableAccount(): Promise<AddressLookupTableAccount>;
     /**
      * Update the wallet to use for drift transactions and linked user account
@@ -199,10 +201,11 @@ export declare class DriftClient {
     getRevertFillIx(): Promise<TransactionInstruction>;
     placeSpotOrder(orderParams: OptionalOrderParams, txParams?: TxParams): Promise<TransactionSignature>;
     getPlaceSpotOrderIx(orderParams: OptionalOrderParams): Promise<TransactionInstruction>;
-    fillSpotOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<TransactionSignature>;
-    getFillSpotOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
-    addSpotFulfillmentAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig?: SerumV3FulfillmentConfigAccount): void;
+    fillSpotOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount | PhoenixV1FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<TransactionSignature>;
+    getFillSpotOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount | PhoenixV1FulfillmentConfigAccount, makerInfo?: MakerInfo, referrerInfo?: ReferrerInfo): Promise<TransactionInstruction>;
+    addSpotFulfillmentAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig?: SerumV3FulfillmentConfigAccount | PhoenixV1FulfillmentConfigAccount): void;
     addSerumRemainingAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig: SerumV3FulfillmentConfigAccount): void;
+    addPhoenixRemainingAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig: PhoenixV1FulfillmentConfigAccount): void;
     triggerOrder(userAccountPublicKey: PublicKey, user: UserAccount, order: Order, txParams?: TxParams): Promise<TransactionSignature>;
     getTriggerOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order: Order): Promise<TransactionInstruction>;
     forceCancelOrders(userAccountPublicKey: PublicKey, user: UserAccount, txParams?: TxParams): Promise<TransactionSignature>;
@@ -344,7 +347,7 @@ export declare class DriftClient {
     /**
      * Add to an insurance fund stake and optionally initialize the account
      */
-    addInsuranceFundStake({ marketIndex, amount, collateralAccountPublicKey, initializeStakeAccount, }: {
+    addInsuranceFundStake({ marketIndex, amount, collateralAccountPublicKey, initializeStakeAccount, fromSubaccount, }: {
         /**
          * Spot market index
          */
@@ -358,14 +361,14 @@ export declare class DriftClient {
          * Add instructions to initialize the staking account -- required if its the first time the currrent authority has staked in this market
          */
         initializeStakeAccount?: boolean;
+        /**
+         * Optional -- withdraw from current subaccount to fund stake amount, instead of wallet balance
+         */
+        fromSubaccount?: boolean;
     }): Promise<TransactionSignature>;
     requestRemoveInsuranceFundStake(marketIndex: number, amount: BN): Promise<TransactionSignature>;
     cancelRequestRemoveInsuranceFundStake(marketIndex: number): Promise<TransactionSignature>;
-    removeInsuranceFundStake(marketIndex: number, collateralAccountPublicKey: PublicKey, 
-    /**
-     * If unstaking SOL, it's required to pass in the amount
-     */
-    amount?: BN): Promise<TransactionSignature>;
+    removeInsuranceFundStake(marketIndex: number, collateralAccountPublicKey: PublicKey): 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

@@ -242,12 +242,20 @@ class DriftClient {
         const address = await (0, pda_1.getSerumFulfillmentConfigPublicKey)(this.program.programId, serumMarket);
         return (await this.program.account.serumV3FulfillmentConfig.fetch(address));
     }
+    async getPhoenixV1FulfillmentConfig(phoenixMarket) {
+        const address = await (0, pda_1.getPhoenixFulfillmentConfigPublicKey)(this.program.programId, phoenixMarket);
+        return (await this.program.account.phoenixV1FulfillmentConfig.fetch(address));
+    }
     async fetchMarketLookupTableAccount() {
+        if (this.lookupTableAccount)
+            return this.lookupTableAccount;
         if (!this.marketLookupTable) {
-            throw Error('Market lookup table address not set');
+            console.log('Market lookup table address not set');
+            return;
         }
-        return (await this.connection.getAddressLookupTable(this.marketLookupTable))
-            .value;
+        const lookupTableAccount = (await this.connection.getAddressLookupTable(this.marketLookupTable)).value;
+        this.lookupTableAccount = lookupTableAccount;
+        return lookupTableAccount;
     }
     /**
      * Update the wallet to use for drift transactions and linked user account
@@ -887,7 +895,7 @@ class DriftClient {
             return false;
         }
     }
-    async getWrappedSolAccountCreationIxs(amount, isDeposit) {
+    async getWrappedSolAccountCreationIxs(amount, includeRent) {
         const wrappedSolAccount = new web3_js_1.Keypair();
         const result = {
             ixs: [],
@@ -895,7 +903,7 @@ class DriftClient {
             pubkey: wrappedSolAccount.publicKey,
         };
         const rentSpaceLamports = new anchor_1.BN(web3_js_1.LAMPORTS_PER_SOL / 100);
-        const lamports = isDeposit
+        const lamports = includeRent
             ? amount.add(rentSpaceLamports)
             : rentSpaceLamports;
         const authority = this.wallet.publicKey;
@@ -1206,26 +1214,54 @@ class DriftClient {
      * @returns
      */
     async sendMarketOrderAndGetSignedFillTx(orderParams, userAccountPublicKey, userAccount, makerInfo, txParams, bracketOrdersParams = new Array(), referrerInfo) {
+        var _a, _b;
         const marketIndex = orderParams.marketIndex;
         const orderId = userAccount.nextOrderId;
-        const marketOrderTx = (0, utils_1.wrapInTx)(await this.getPlacePerpOrderIx(orderParams), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice);
+        const bracketOrderIxs = [];
+        const placePerpOrderIx = await this.getPlacePerpOrderIx(orderParams);
         for (const bracketOrderParams of bracketOrdersParams) {
-            marketOrderTx.add(await this.getPlacePerpOrderIx(bracketOrderParams));
+            const placeBracketOrderIx = await this.getPlacePerpOrderIx(bracketOrderParams);
+            bracketOrderIxs.push(placeBracketOrderIx);
         }
-        const fillTx = (0, utils_1.wrapInTx)(await this.getFillPerpOrderIx(userAccountPublicKey, userAccount, {
+        const fillPerpOrderIx = await this.getFillPerpOrderIx(userAccountPublicKey, userAccount, {
             orderId,
             marketIndex,
-        }, makerInfo, referrerInfo), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice);
-        // Apply the latest blockhash to the txs so that we can sign before sending them
-        const currentBlockHash = (await this.connection.getLatestBlockhash('finalized')).blockhash;
-        marketOrderTx.recentBlockhash = currentBlockHash;
-        fillTx.recentBlockhash = currentBlockHash;
-        marketOrderTx.feePayer = userAccount.authority;
-        fillTx.feePayer = userAccount.authority;
-        const [signedMarketOrderTx, signedFillTx] = await this.provider.wallet.signAllTransactions([marketOrderTx, fillTx]);
-        const { txSig, slot } = await this.sendTransaction(signedMarketOrderTx, [], this.opts, true);
-        this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
-        return { txSig, signedFillTx };
+        }, makerInfo, referrerInfo);
+        const lookupTableAccount = await this.fetchMarketLookupTableAccount();
+        const walletSupportsVersionedTxns = 
+        //@ts-ignore
+        (_b = (_a = this.wallet.supportedTransactionVersions) === null || _a === void 0 ? void 0 : _a.size) !== null && _b !== void 0 ? _b : 0 > 1;
+        // use versioned transactions if there is a lookup table account and wallet is compatible
+        if (walletSupportsVersionedTxns && lookupTableAccount) {
+            const versionedMarketOrderTx = await this.txSender.getVersionedTransaction([placePerpOrderIx].concat(bracketOrderIxs), [lookupTableAccount], [], this.opts);
+            const versionedFillTx = await this.txSender.getVersionedTransaction([fillPerpOrderIx], [lookupTableAccount], [], this.opts);
+            const [signedVersionedMarketOrderTx, signedVersionedFillTx] = await this.provider.wallet.signAllTransactions([
+                //@ts-ignore
+                versionedMarketOrderTx,
+                //@ts-ignore
+                versionedFillTx,
+            ]);
+            const { txSig, slot } = await this.txSender.sendRawTransaction(signedVersionedMarketOrderTx.serialize(), this.opts);
+            this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
+            return { txSig, signedFillTx: signedVersionedFillTx };
+        }
+        else {
+            const marketOrderTx = (0, utils_1.wrapInTx)(placePerpOrderIx, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice);
+            if (bracketOrderIxs.length > 0) {
+                marketOrderTx.add(...bracketOrderIxs);
+            }
+            const fillTx = (0, utils_1.wrapInTx)(fillPerpOrderIx, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice);
+            // Apply the latest blockhash to the txs so that we can sign before sending them
+            const currentBlockHash = (await this.connection.getLatestBlockhash('finalized')).blockhash;
+            marketOrderTx.recentBlockhash = currentBlockHash;
+            fillTx.recentBlockhash = currentBlockHash;
+            marketOrderTx.feePayer = userAccount.authority;
+            fillTx.feePayer = userAccount.authority;
+            const [signedMarketOrderTx, signedFillTx] = await this.provider.wallet.signAllTransactions([marketOrderTx, fillTx]);
+            const { txSig, slot } = await this.sendTransaction(signedMarketOrderTx, [], this.opts, true);
+            this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
+            return { txSig, signedFillTx };
+        }
     }
     async placePerpOrder(orderParams, txParams) {
         const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlacePerpOrderIx(orderParams), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
@@ -1574,7 +1610,15 @@ class DriftClient {
     }
     addSpotFulfillmentAccounts(marketIndex, remainingAccounts, fulfillmentConfig) {
         if (fulfillmentConfig) {
-            this.addSerumRemainingAccounts(marketIndex, remainingAccounts, fulfillmentConfig);
+            if ('serumProgramId' in fulfillmentConfig) {
+                this.addSerumRemainingAccounts(marketIndex, remainingAccounts, fulfillmentConfig);
+            }
+            else if ('phoenixProgramId' in fulfillmentConfig) {
+                this.addPhoenixRemainingAccounts(marketIndex, remainingAccounts, fulfillmentConfig);
+            }
+            else {
+                throw Error('Invalid fulfillment config type');
+            }
         }
         else {
             remainingAccounts.push({
@@ -1671,6 +1715,58 @@ class DriftClient {
             isSigner: false,
         });
     }
+    addPhoenixRemainingAccounts(marketIndex, remainingAccounts, fulfillmentConfig) {
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.pubkey,
+            isWritable: false,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.phoenixProgramId,
+            isWritable: false,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.phoenixLogAuthority,
+            isWritable: false,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.phoenixMarket,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: this.getSignerPublicKey(),
+            isWritable: false,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.phoenixBaseVault,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.phoenixQuoteVault,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: this.getSpotMarketAccount(marketIndex).vault,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: this.getQuoteSpotMarketAccount().vault,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: spl_token_1.TOKEN_PROGRAM_ID,
+            isWritable: false,
+            isSigner: false,
+        });
+    }
     async triggerOrder(userAccountPublicKey, user, order, txParams) {
         const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getTriggerOrderIx(userAccountPublicKey, user, order), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
         return txSig;
@@ -2400,7 +2496,7 @@ class DriftClient {
     /**
      * Add to an insurance fund stake and optionally initialize the account
      */
-    async addInsuranceFundStake({ marketIndex, amount, collateralAccountPublicKey, initializeStakeAccount, }) {
+    async addInsuranceFundStake({ marketIndex, amount, collateralAccountPublicKey, initializeStakeAccount, fromSubaccount, }) {
         const tx = new web3_js_1.Transaction();
         const additionalSigners = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
@@ -2418,6 +2514,10 @@ class DriftClient {
         else {
             tokenAccount = collateralAccountPublicKey;
         }
+        if (fromSubaccount) {
+            const withdrawIx = await this.getWithdrawIx(amount, marketIndex, tokenAccount);
+            tx.add(withdrawIx);
+        }
         if (initializeStakeAccount) {
             const initializeIx = await this.getInitializeInsuranceFundStakeIx(marketIndex);
             tx.add(initializeIx);
@@ -2474,11 +2574,7 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async removeInsuranceFundStake(marketIndex, collateralAccountPublicKey, 
-    /**
-     * If unstaking SOL, it's required to pass in the amount
-     */
-    amount) {
+    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);
@@ -2487,7 +2583,7 @@ class DriftClient {
         const createWSOLTokenAccount = isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
         let tokenAccount;
         if (createWSOLTokenAccount) {
-            const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
+            const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(numericConstants_1.ZERO, true);
             tokenAccount = pubkey;
             ixs.forEach((ix) => {
                 tx.add(ix);
@@ -2521,7 +2617,7 @@ class DriftClient {
         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);
+        const { txSig } = await this.sendTransaction(tx, additionalSigners, this.opts);
         return txSig;
     }
     async settleRevenueToInsuranceFund(marketIndex) {

package/lib/examples/loadDlob.js

@@ -38,16 +38,14 @@ const main = async () => {
         accountLoader: bulkAccountLoader,
     });
     // fetches all users and subscribes for updates
-    await userMap.fetchAllUsers();
+    await userMap.subscribe();
     console.log('Loading dlob from user map...');
     const dlob = new __1.DLOB();
     await dlob.initFromUserMap(userMap, bulkAccountLoader.mostRecentSlot);
     console.log('number of orders', dlob.getDLOBOrders().length);
     dlob.clear();
     console.log('Unsubscribing users...');
-    for (const user of userMap.values()) {
-        await user.unsubscribe();
-    }
+    await userMap.unsubscribe();
     console.log('Unsubscribing drift client...');
     await driftClient.unsubscribe();
 };