@drift-labs/sdk 2.98.0-beta.9 → 2.99.0-beta.1

package/VERSION

@@ -1 +1 @@
-2.98.0-beta.9
+2.99.0-beta.1

package/lib/browser/accounts/pollingHighLeverageModeConfigAccountSubscriber.d.ts

@@ -0,0 +1,29 @@
+/// <reference types="node" />
+import { DataAndSlot, HighLeverageModeConfigAccountEvents, HighLeverageModeConfigAccountSubscriber } from './types';
+import { Program } from '@coral-xyz/anchor';
+import StrictEventEmitter from 'strict-event-emitter-types';
+import { EventEmitter } from 'events';
+import { PublicKey } from '@solana/web3.js';
+import { BulkAccountLoader } from './bulkAccountLoader';
+import { HighLeverageModeConfig } from '../types';
+export declare class PollingHighLeverageModeConfigAccountSubscriber implements HighLeverageModeConfigAccountSubscriber {
+    isSubscribed: boolean;
+    program: Program;
+    eventEmitter: StrictEventEmitter<EventEmitter, HighLeverageModeConfigAccountEvents>;
+    highLeverageModeConfigAccountPublicKey: PublicKey;
+    accountLoader: BulkAccountLoader;
+    callbackId?: string;
+    errorCallbackId?: string;
+    highLeverageModeConfigAccountAndSlot?: DataAndSlot<HighLeverageModeConfig>;
+    constructor(program: Program, publicKey: PublicKey, accountLoader: BulkAccountLoader);
+    subscribe(highLeverageModeConfig?: HighLeverageModeConfig): Promise<boolean>;
+    addToAccountLoader(): Promise<void>;
+    fetchIfUnloaded(): Promise<void>;
+    fetch(): Promise<void>;
+    doesAccountExist(): boolean;
+    unsubscribe(): Promise<void>;
+    assertIsSubscribed(): void;
+    getHighLeverageModeConfigAccountAndSlot(): DataAndSlot<HighLeverageModeConfig>;
+    didSubscriptionSucceed(): boolean;
+    updateData(highLeverageModeConfig: HighLeverageModeConfig, slot: number): void;
+}

package/lib/browser/accounts/pollingHighLeverageModeConfigAccountSubscriber.js

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PollingHighLeverageModeConfigAccountSubscriber = void 0;
+const types_1 = require("./types");
+const events_1 = require("events");
+class PollingHighLeverageModeConfigAccountSubscriber {
+    constructor(program, publicKey, accountLoader) {
+        this.isSubscribed = false;
+        this.program = program;
+        this.highLeverageModeConfigAccountPublicKey = publicKey;
+        this.accountLoader = accountLoader;
+        this.eventEmitter = new events_1.EventEmitter();
+    }
+    async subscribe(highLeverageModeConfig) {
+        if (this.isSubscribed) {
+            return true;
+        }
+        if (highLeverageModeConfig) {
+            this.highLeverageModeConfigAccountAndSlot = {
+                data: highLeverageModeConfig,
+                slot: undefined,
+            };
+        }
+        await this.addToAccountLoader();
+        await this.fetchIfUnloaded();
+        if (this.doesAccountExist()) {
+            this.eventEmitter.emit('update');
+        }
+        this.isSubscribed = true;
+        return true;
+    }
+    async addToAccountLoader() {
+        if (this.callbackId) {
+            return;
+        }
+        this.callbackId = await this.accountLoader.addAccount(this.highLeverageModeConfigAccountPublicKey, (buffer, slot) => {
+            if (!buffer) {
+                return;
+            }
+            if (this.highLeverageModeConfigAccountAndSlot &&
+                this.highLeverageModeConfigAccountAndSlot.slot > slot) {
+                return;
+            }
+            const account = this.program.account.user.coder.accounts.decode('HighLeverageModeConfig', buffer);
+            this.highLeverageModeConfigAccountAndSlot = { data: account, slot };
+            this.eventEmitter.emit('highLeverageModeConfigAccountUpdate', account);
+            this.eventEmitter.emit('update');
+        });
+        this.errorCallbackId = this.accountLoader.addErrorCallbacks((error) => {
+            this.eventEmitter.emit('error', error);
+        });
+    }
+    async fetchIfUnloaded() {
+        if (this.highLeverageModeConfigAccountAndSlot === undefined) {
+            await this.fetch();
+        }
+    }
+    async fetch() {
+        var _a, _b;
+        try {
+            const dataAndContext = await this.program.account.highLeverageModeConfig.fetchAndContext(this.highLeverageModeConfigAccountPublicKey, this.accountLoader.commitment);
+            if (dataAndContext.context.slot >
+                ((_b = (_a = this.highLeverageModeConfigAccountAndSlot) === null || _a === void 0 ? void 0 : _a.slot) !== null && _b !== void 0 ? _b : 0)) {
+                this.highLeverageModeConfigAccountAndSlot = {
+                    data: dataAndContext.data,
+                    slot: dataAndContext.context.slot,
+                };
+            }
+        }
+        catch (e) {
+            console.log(`PollingHighLeverageModeConfigAccountSubscriber.fetch() HighLeverageModeConfig does not exist: ${e.message}`);
+        }
+    }
+    doesAccountExist() {
+        return this.highLeverageModeConfigAccountAndSlot !== undefined;
+    }
+    async unsubscribe() {
+        if (!this.isSubscribed) {
+            return;
+        }
+        this.accountLoader.removeAccount(this.highLeverageModeConfigAccountPublicKey, this.callbackId);
+        this.callbackId = undefined;
+        this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
+        this.errorCallbackId = undefined;
+        this.isSubscribed = false;
+    }
+    assertIsSubscribed() {
+        if (!this.isSubscribed) {
+            throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
+        }
+    }
+    getHighLeverageModeConfigAccountAndSlot() {
+        this.assertIsSubscribed();
+        return this.highLeverageModeConfigAccountAndSlot;
+    }
+    didSubscriptionSucceed() {
+        return !!this.highLeverageModeConfigAccountAndSlot;
+    }
+    updateData(highLeverageModeConfig, slot) {
+        if (!this.highLeverageModeConfigAccountAndSlot ||
+            this.highLeverageModeConfigAccountAndSlot.slot < slot) {
+            this.highLeverageModeConfigAccountAndSlot = {
+                data: highLeverageModeConfig,
+                slot,
+            };
+            this.eventEmitter.emit('highLeverageModeConfigAccountUpdate', highLeverageModeConfig);
+            this.eventEmitter.emit('update');
+        }
+    }
+}
+exports.PollingHighLeverageModeConfigAccountSubscriber = PollingHighLeverageModeConfigAccountSubscriber;

package/lib/browser/accounts/types.d.ts

@@ -6,7 +6,7 @@ import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { Context, PublicKey } from '@solana/web3.js';
 import { Account } from '@solana/spl-token';
-import { OracleInfo, OraclePriceData } from '..';
+import { HighLeverageModeConfig, OracleInfo, OraclePriceData } from '..';
 import { ChannelOptions, CommitmentLevel } from '../isomorphic/grpc';
 export interface AccountSubscriber<T> {
     dataAndSlot?: DataAndSlot<T>;
@@ -153,3 +153,16 @@ export type GrpcConfigs = {
     commitmentLevel?: CommitmentLevel;
     channelOptions?: ChannelOptions;
 };
+export interface HighLeverageModeConfigAccountSubscriber {
+    eventEmitter: StrictEventEmitter<EventEmitter, HighLeverageModeConfigAccountEvents>;
+    isSubscribed: boolean;
+    subscribe(highLeverageModeConfigAccount?: HighLeverageModeConfig): Promise<boolean>;
+    fetch(): Promise<void>;
+    unsubscribe(): Promise<void>;
+    getHighLeverageModeConfigAccountAndSlot(): DataAndSlot<HighLeverageModeConfig>;
+}
+export interface HighLeverageModeConfigAccountEvents {
+    highLeverageModeConfigAccountUpdate: (payload: HighLeverageModeConfig) => void;
+    update: void;
+    error: (e: Error) => void;
+}

package/lib/browser/accounts/webSocketHighLeverageModeConfigAccountSubscriber.d.ts

@@ -0,0 +1,23 @@
+/// <reference types="node" />
+import { DataAndSlot, AccountSubscriber, HighLeverageModeConfigAccountEvents, HighLeverageModeConfigAccountSubscriber } from './types';
+import { Program } from '@coral-xyz/anchor';
+import StrictEventEmitter from 'strict-event-emitter-types';
+import { EventEmitter } from 'events';
+import { Commitment, PublicKey } from '@solana/web3.js';
+import { HighLeverageModeConfig } from '../types';
+export declare class WebSocketHighLeverageModeConfigAccountSubscriber implements HighLeverageModeConfigAccountSubscriber {
+    isSubscribed: boolean;
+    resubTimeoutMs?: number;
+    commitment?: Commitment;
+    program: Program;
+    eventEmitter: StrictEventEmitter<EventEmitter, HighLeverageModeConfigAccountEvents>;
+    highLeverageModeConfigAccountPublicKey: PublicKey;
+    highLeverageModeConfigDataAccountSubscriber: AccountSubscriber<HighLeverageModeConfig>;
+    constructor(program: Program, highLeverageModeConfigAccountPublicKey: PublicKey, resubTimeoutMs?: number, commitment?: Commitment);
+    subscribe(highLeverageModeConfigAccount?: HighLeverageModeConfig): Promise<boolean>;
+    fetch(): Promise<void>;
+    unsubscribe(): Promise<void>;
+    assertIsSubscribed(): void;
+    getHighLeverageModeConfigAccountAndSlot(): DataAndSlot<HighLeverageModeConfig>;
+    updateData(highLeverageModeConfig: HighLeverageModeConfig, slot: number): void;
+}

package/lib/browser/accounts/webSocketHighLeverageModeConfigAccountSubscriber.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebSocketHighLeverageModeConfigAccountSubscriber = void 0;
+const types_1 = require("./types");
+const events_1 = require("events");
+const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
+class WebSocketHighLeverageModeConfigAccountSubscriber {
+    constructor(program, highLeverageModeConfigAccountPublicKey, resubTimeoutMs, commitment) {
+        this.isSubscribed = false;
+        this.program = program;
+        this.highLeverageModeConfigAccountPublicKey =
+            highLeverageModeConfigAccountPublicKey;
+        this.eventEmitter = new events_1.EventEmitter();
+        this.resubTimeoutMs = resubTimeoutMs;
+        this.commitment = commitment;
+    }
+    async subscribe(highLeverageModeConfigAccount) {
+        if (this.isSubscribed) {
+            return true;
+        }
+        this.highLeverageModeConfigDataAccountSubscriber =
+            new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('highLeverageModeConfig', this.program, this.highLeverageModeConfigAccountPublicKey, undefined, {
+                resubTimeoutMs: this.resubTimeoutMs,
+            }, this.commitment);
+        if (highLeverageModeConfigAccount) {
+            this.highLeverageModeConfigDataAccountSubscriber.setData(highLeverageModeConfigAccount);
+        }
+        await this.highLeverageModeConfigDataAccountSubscriber.subscribe((data) => {
+            this.eventEmitter.emit('highLeverageModeConfigAccountUpdate', data);
+            this.eventEmitter.emit('update');
+        });
+        this.eventEmitter.emit('update');
+        this.isSubscribed = true;
+        return true;
+    }
+    async fetch() {
+        await Promise.all([
+            this.highLeverageModeConfigDataAccountSubscriber.fetch(),
+        ]);
+    }
+    async unsubscribe() {
+        if (!this.isSubscribed) {
+            return;
+        }
+        await Promise.all([
+            this.highLeverageModeConfigDataAccountSubscriber.unsubscribe(),
+        ]);
+        this.isSubscribed = false;
+    }
+    assertIsSubscribed() {
+        if (!this.isSubscribed) {
+            throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
+        }
+    }
+    getHighLeverageModeConfigAccountAndSlot() {
+        this.assertIsSubscribed();
+        return this.highLeverageModeConfigDataAccountSubscriber.dataAndSlot;
+    }
+    updateData(highLeverageModeConfig, slot) {
+        var _a;
+        const currentDataSlot = ((_a = this.highLeverageModeConfigDataAccountSubscriber.dataAndSlot) === null || _a === void 0 ? void 0 : _a.slot) || 0;
+        if (currentDataSlot <= slot) {
+            this.highLeverageModeConfigDataAccountSubscriber.setData(highLeverageModeConfig, slot);
+            this.eventEmitter.emit('highLeverageModeConfigAccountUpdate', highLeverageModeConfig);
+            this.eventEmitter.emit('update');
+        }
+    }
+}
+exports.WebSocketHighLeverageModeConfigAccountSubscriber = WebSocketHighLeverageModeConfigAccountSubscriber;

package/lib/browser/addresses/pda.d.ts

@@ -9,6 +9,7 @@ export declare function getUserAccountPublicKey(programId: PublicKey, authority:
 export declare function getUserAccountPublicKeySync(programId: PublicKey, authority: PublicKey, subAccountId?: number): PublicKey;
 export declare function getUserStatsAccountPublicKey(programId: PublicKey, authority: PublicKey): PublicKey;
 export declare function getRFQUserAccountPublicKey(programId: PublicKey, userAccountPublicKey: PublicKey): PublicKey;
+export declare function getSwiftUserAccountPublicKey(programId: PublicKey, userAccountPublicKey: PublicKey): PublicKey;
 export declare function getPerpMarketPublicKey(programId: PublicKey, marketIndex: number): Promise<PublicKey>;
 export declare function getPerpMarketPublicKeySync(programId: PublicKey, marketIndex: number): PublicKey;
 export declare function getSpotMarketPublicKey(programId: PublicKey, marketIndex: number): Promise<PublicKey>;

package/lib/browser/addresses/pda.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHighLeverageModeConfigPublicKey = exports.getTokenProgramForSpotMarket = exports.getPythPullOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getOpenbookV2FulfillmentConfigPublicKey = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKeySync = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKeySync = exports.getPerpMarketPublicKey = exports.getRFQUserAccountPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
+exports.getHighLeverageModeConfigPublicKey = exports.getTokenProgramForSpotMarket = exports.getPythPullOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getOpenbookV2FulfillmentConfigPublicKey = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKeySync = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKeySync = exports.getPerpMarketPublicKey = exports.getSwiftUserAccountPublicKey = exports.getRFQUserAccountPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const spl_token_1 = require("@solana/spl-token");
@@ -69,6 +69,13 @@ function getRFQUserAccountPublicKey(programId, userAccountPublicKey) {
     ], programId)[0];
 }
 exports.getRFQUserAccountPublicKey = getRFQUserAccountPublicKey;
+function getSwiftUserAccountPublicKey(programId, userAccountPublicKey) {
+    return web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('SWIFT')),
+        userAccountPublicKey.toBuffer(),
+    ], programId)[0];
+}
+exports.getSwiftUserAccountPublicKey = getSwiftUserAccountPublicKey;
 async function getPerpMarketPublicKey(programId, marketIndex) {
     return (await web3_js_1.PublicKey.findProgramAddress([
         Buffer.from(anchor.utils.bytes.utf8.encode('perp_market')),

package/lib/browser/constants/perpMarkets.js

@@ -872,6 +872,17 @@ exports.MainnetPerpMarkets = [
         oracleSource: __1.OracleSource.PYTH_1K_PULL,
         pythFeedId: '0x514aed52ca5294177f20187ae883cec4a018619772ddce41efcc36a6448f5d5d',
     },
+    {
+        fullName: 'MICHI',
+        category: ['Meme'],
+        symbol: 'MICHI-PERP',
+        baseAssetSymbol: 'MICHI',
+        marketIndex: 52,
+        oracle: new web3_js_1.PublicKey('GHzvsMDMSiuyZoWhEAuM27MKFdN2Y4fA4wSDuSd6dLMA'),
+        launchTs: 1730402722000,
+        oracleSource: __1.OracleSource.PYTH_PULL,
+        pythFeedId: '0x63a45218d6b13ffd28ca04748615511bf70eff80a3411c97d96b8ed74a6decab',
+    },
 ];
 exports.PerpMarkets = {
     devnet: exports.DevnetPerpMarkets,

package/lib/browser/constants/spotMarkets.js

@@ -337,12 +337,12 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'BNSOL',
         marketIndex: 25,
-        oracle: new web3_js_1.PublicKey('BAtFj4kQttZRVep3UZS2aZRDixkGYgWsbqTBVDbnSsPF'),
+        oracle: new web3_js_1.PublicKey('8DmXTfhhtb9kTcpTVfb6Ygx8WhZ8wexGqcpxfn23zooe'),
         oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('BNso1VUJnh4zcfpZa6986Ea66P6TCp59hvtNJ8b1X85'),
         precision: numericConstants_1.LAMPORTS_PRECISION,
         precisionExp: numericConstants_1.LAMPORTS_EXP,
-        pythFeedId: '0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d',
+        pythFeedId: '0x55f8289be7450f1ae564dd9798e49e7d797d89adbc54fe4f8c906b1fcb94b0c3',
     },
     {
         symbol: 'MOTHER',

package/lib/browser/driftClient.d.ts

@@ -22,6 +22,7 @@ import { UserStatsSubscriptionConfig } from './userStatsConfig';
 import { TxHandler } from './tx/txHandler';
 import { WormholeCoreBridgeSolana } from '@pythnetwork/pyth-solana-receiver/lib/idl/wormhole_core_bridge_solana';
 import { PythSolanaReceiver } from '@pythnetwork/pyth-solana-receiver/lib/idl/pyth_solana_receiver';
+import { Slothash } from './slot/SlothashSubscriber';
 type RemainingAccountParams = {
     userAccounts: UserAccount[];
     writablePerpMarketIndexes?: number[];
@@ -140,6 +141,8 @@ export declare class DriftClient {
     getInitializeUserStatsIx(): Promise<TransactionInstruction>;
     initializeRFQUser(userAccountPublicKey: PublicKey, txParams?: TxParams): Promise<[TransactionSignature, PublicKey]>;
     getInitializeRFQUserInstruction(userAccountPublicKey: PublicKey): Promise<[PublicKey, TransactionInstruction]>;
+    initializeSwiftUserOrdersAccount(userAccountPublicKey: PublicKey, txParams?: TxParams): Promise<[TransactionSignature, PublicKey]>;
+    getInitializeSwiftUserOrdersAccountInstruction(userAccountPublicKey: PublicKey): Promise<[PublicKey, TransactionInstruction]>;
     getInitializeUserInstructions(subAccountId?: number, name?: string, referrerInfo?: ReferrerInfo): Promise<[PublicKey, TransactionInstruction]>;
     getNextSubAccountId(): Promise<number>;
     initializeReferrerName(name: string): Promise<TransactionSignature>;
@@ -531,12 +534,12 @@ export declare class DriftClient {
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
     }): Promise<TransactionInstruction[]>;
-    placeAndMakeSwiftPerpOrder(encodedSwiftMessage: Buffer, swiftSignature: Buffer, encodedSwiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, takerExpectedOrderId: number, takerInfo: {
+    placeAndMakeSwiftPerpOrder(encodedSwiftMessage: Buffer, swiftSignature: Buffer, encodedSwiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, swiftOrderUuid: Uint8Array, takerInfo: {
         taker: PublicKey;
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
     }, orderParams: OptionalOrderParams, referrerInfo?: ReferrerInfo, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
-    getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftMessage: Buffer, swiftSignature: Buffer, encodedSwiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, takerExpectedOrderId: number, takerInfo: {
+    getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftMessage: Buffer, swiftSignature: Buffer, encodedSwiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, swiftOrderUuid: Uint8Array, takerInfo: {
         taker: PublicKey;
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
@@ -759,6 +762,13 @@ export declare class DriftClient {
     resolvePerpPnlDeficit(spotMarketIndex: number, perpMarketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     getResolvePerpPnlDeficitIx(spotMarketIndex: number, perpMarketIndex: number): Promise<TransactionInstruction>;
     getDepositIntoSpotMarketRevenuePoolIx(marketIndex: number, amount: BN, userTokenAccountPublicKey: PublicKey): Promise<TransactionInstruction>;
+    /**
+     * This ix will donate your funds to drift revenue pool. It does not deposit into your user account
+     * @param marketIndex
+     * @param amount
+     * @param userTokenAccountPublicKey
+     * @returns
+     */
     depositIntoSpotMarketRevenuePool(marketIndex: number, amount: BN, userTokenAccountPublicKey: PublicKey): Promise<TransactionSignature>;
     getPerpMarketExtendedInfo(marketIndex: number): PerpMarketExtendedInfo;
     /**
@@ -794,8 +804,8 @@ export declare class DriftClient {
             proof: number[][];
         };
     }, feedId: string, encodedVaaAddress: PublicKey): Promise<TransactionInstruction>;
-    getPostSwitchboardOnDemandUpdateAtomicIx(feed: PublicKey, numSignatures?: number): Promise<TransactionInstruction | undefined>;
-    postSwitchboardOnDemandUpdate(feed: PublicKey, numSignatures?: number): Promise<TransactionSignature>;
+    getPostSwitchboardOnDemandUpdateAtomicIx(feed: PublicKey, recentSlothash?: Slothash, numSignatures?: number): Promise<TransactionInstruction | undefined>;
+    postSwitchboardOnDemandUpdate(feed: PublicKey, recentSlothash?: Slothash, numSignatures?: number): Promise<TransactionSignature>;
     private getBuildEncodedVaaIxs;
     enableUserHighLeverageMode(subAccountId: number, txParams?: TxParams): Promise<TransactionSignature>;
     getEnableHighLeverageModeIx(subAccountId: number, depositToTradeArgs?: {

package/lib/browser/driftClient.js

@@ -186,7 +186,7 @@ class DriftClient {
         if (config.env && !this.marketLookupTable) {
             this.marketLookupTable = new web3_js_1.PublicKey(config_1.configs[config.env].MARKET_LOOKUP_TABLE);
         }
-        const delistedMarketSetting = config.delistedMarketSetting || types_2.DelistedMarketSetting.Subscribe;
+        const delistedMarketSetting = config.delistedMarketSetting || types_2.DelistedMarketSetting.Unsubscribe;
         const noMarketsAndOraclesSpecified = config.perpMarketIndexes === undefined &&
             config.spotMarketIndexes === undefined &&
             config.oracleInfos === undefined;
@@ -600,6 +600,28 @@ class DriftClient {
         });
         return [rfqUserAccountPublicKey, initializeUserAccountIx];
     }
+    async initializeSwiftUserOrdersAccount(userAccountPublicKey, txParams) {
+        const initializeIxs = [];
+        const [swiftUserAccountPublicKey, initializeUserAccountIx] = await this.getInitializeSwiftUserOrdersAccountInstruction(userAccountPublicKey);
+        initializeIxs.push(initializeUserAccountIx);
+        const tx = await this.buildTransaction(initializeIxs, txParams);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return [txSig, swiftUserAccountPublicKey];
+    }
+    async getInitializeSwiftUserOrdersAccountInstruction(userAccountPublicKey) {
+        const swiftUserAccountPublicKey = (0, pda_1.getSwiftUserAccountPublicKey)(this.program.programId, userAccountPublicKey);
+        const initializeUserAccountIx = await this.program.instruction.initializeSwiftUserOrders({
+            accounts: {
+                swiftUserOrders: swiftUserAccountPublicKey,
+                authority: this.wallet.publicKey,
+                user: userAccountPublicKey,
+                payer: this.wallet.publicKey,
+                rent: anchor.web3.SYSVAR_RENT_PUBKEY,
+                systemProgram: anchor.web3.SystemProgram.programId,
+            },
+        });
+        return [swiftUserAccountPublicKey, initializeUserAccountIx];
+    }
     async getInitializeUserInstructions(subAccountId = 0, name, referrerInfo) {
         const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, subAccountId);
         const remainingAccounts = new Array();
@@ -2993,15 +3015,12 @@ class DriftClient {
         });
     }
     encodeSwiftServerMessage(message) {
-        const messageWithBuffer = {
-            slot: message.slot,
-            swiftOrderSignature: message.swiftOrderSignature,
-        };
-        return this.program.coder.types.encode('SwiftServerMessage', messageWithBuffer);
+        return this.program.coder.types.encode('SwiftServerMessage', message);
     }
     decodeSwiftServerMessage(encodedMessage) {
         const decodedSwiftMessage = this.program.coder.types.decode('SwiftServerMessage', encodedMessage);
         return {
+            uuid: decodedSwiftMessage.uuid,
             slot: decodedSwiftMessage.slot,
             swiftOrderSignature: decodedSwiftMessage.swiftSignature,
         };
@@ -3049,6 +3068,7 @@ class DriftClient {
                 state: await this.getStatePublicKey(),
                 user: takerInfo.taker,
                 userStats: takerInfo.takerStats,
+                swiftUserOrders: (0, pda_1.getSwiftUserAccountPublicKey)(this.program.programId, takerInfo.taker),
                 authority: this.wallet.publicKey,
                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             },
@@ -3060,13 +3080,13 @@ class DriftClient {
             placeTakerSwiftPerpOrderIx,
         ];
     }
-    async placeAndMakeSwiftPerpOrder(encodedSwiftMessage, swiftSignature, encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, takerExpectedOrderId, takerInfo, orderParams, referrerInfo, txParams, subAccountId) {
-        const ixs = await this.getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftMessage, swiftSignature, encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, takerExpectedOrderId, takerInfo, orderParams, referrerInfo, subAccountId);
+    async placeAndMakeSwiftPerpOrder(encodedSwiftMessage, swiftSignature, encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, swiftOrderUuid, takerInfo, orderParams, referrerInfo, txParams, subAccountId) {
+        const ixs = await this.getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftMessage, swiftSignature, encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, swiftOrderUuid, takerInfo, orderParams, referrerInfo, subAccountId);
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(ixs, txParams), [], this.opts);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
-    async getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftMessage, swiftSignature, encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, takerExpectedOrderId, takerInfo, orderParams, referrerInfo, subAccountId) {
+    async getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftMessage, swiftSignature, encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, swiftOrderUuid, takerInfo, orderParams, referrerInfo, subAccountId) {
         const [swiftServerSignatureIx, swiftOrderSignatureIx, placeTakerSwiftPerpOrderIx,] = await this.getPlaceSwiftTakerPerpOrderIxs(encodedSwiftMessage, swiftSignature, encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, orderParams.marketIndex, takerInfo);
         orderParams = (0, orderParams_1.getOrderParams)(orderParams, { marketType: types_1.MarketType.PERP });
         const userStatsPublicKey = this.getUserStatsAccountPublicKey();
@@ -3091,7 +3111,7 @@ class DriftClient {
                 isSigner: false,
             });
         }
-        const placeAndMakeIx = await this.program.instruction.placeAndMakePerpOrder(orderParams, takerExpectedOrderId, {
+        const placeAndMakeIx = await this.program.instruction.placeAndMakeSwiftPerpOrder(orderParams, swiftOrderUuid, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user,
@@ -3099,6 +3119,7 @@ class DriftClient {
                 taker: takerInfo.taker,
                 takerStats: takerInfo.takerStats,
                 authority: this.wallet.publicKey,
+                takerSwiftUserOrders: (0, pda_1.getSwiftUserAccountPublicKey)(this.program.programId, takerInfo.taker),
             },
             remainingAccounts,
         });
@@ -3718,6 +3739,7 @@ class DriftClient {
             writableSpotMarketIndexes: [marketIndex],
         });
         const spotMarket = this.getSpotMarketAccount(marketIndex);
+        const tokenProgramId = this.getTokenProgramForSpotMarket(spotMarket);
         this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
         return await this.program.instruction.resolveSpotBankruptcy(marketIndex, {
             accounts: {
@@ -3730,7 +3752,7 @@ class DriftClient {
                 spotMarketVault: spotMarket.vault,
                 insuranceFundVault: spotMarket.insuranceFund.vault,
                 driftSigner: this.getSignerPublicKey(),
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram: tokenProgramId,
             },
             remainingAccounts: remainingAccounts,
         });
@@ -3880,6 +3902,10 @@ class DriftClient {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         const createWSOLTokenAccount = isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
+        const tokenProgramId = this.getTokenProgramForSpotMarket(spotMarketAccount);
+        // create associated token account because it may not exist
+        const associatedTokenAccountPublicKey = (0, spl_token_1.getAssociatedTokenAddressSync)(spotMarketAccount.mint, this.wallet.publicKey, true, tokenProgramId);
+        addIfStakeIxs.push(await (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(this.wallet.publicKey, associatedTokenAccountPublicKey, this.wallet.publicKey, spotMarketAccount.mint, tokenProgramId));
         let tokenAccount;
         if (!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))) {
             addIfStakeIxs.push(await this.getInitializeUserStatsIx());
@@ -3952,6 +3978,7 @@ class DriftClient {
         const additionalSigners = [];
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         const createWSOLTokenAccount = isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
+        const tokenProgramId = this.getTokenProgramForSpotMarket(spotMarketAccount);
         let tokenAccount;
         if (createWSOLTokenAccount) {
             const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(numericConstants_1.ZERO, true);
@@ -3964,7 +3991,7 @@ class DriftClient {
             tokenAccount = collateralAccountPublicKey;
             const tokenAccountExists = await this.checkIfAccountExists(tokenAccount);
             if (!tokenAccountExists) {
-                const createTokenAccountIx = await this.createAssociatedTokenAccountIdempotentInstruction(tokenAccount, this.wallet.publicKey, this.wallet.publicKey, spotMarketAccount.mint);
+                const createTokenAccountIx = await this.createAssociatedTokenAccountIdempotentInstruction(tokenAccount, this.wallet.publicKey, this.wallet.publicKey, spotMarketAccount.mint, tokenProgramId);
                 removeIfStakeIxs.push(createTokenAccountIx);
             }
         }
@@ -4045,6 +4072,7 @@ class DriftClient {
     }
     async getSettleRevenueToInsuranceFundIx(spotMarketIndex) {
         const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
+        const tokenProgramId = this.getTokenProgramForSpotMarket(spotMarketAccount);
         const remainingAccounts = [];
         this.addTokenMintToRemainingAccounts(spotMarketAccount, remainingAccounts);
         const ix = await this.program.instruction.settleRevenueToInsuranceFund(spotMarketIndex, {
@@ -4054,7 +4082,7 @@ class DriftClient {
                 spotMarketVault: spotMarketAccount.vault,
                 driftSigner: this.getSignerPublicKey(),
                 insuranceFundVault: spotMarketAccount.insuranceFund.vault,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram: tokenProgramId,
             },
             remainingAccounts,
         });
@@ -4072,6 +4100,7 @@ class DriftClient {
             writableSpotMarketIndexes: [spotMarketIndex],
         });
         const spotMarket = this.getSpotMarketAccount(spotMarketIndex);
+        const tokenProgramId = this.getTokenProgramForSpotMarket(spotMarket);
         return await this.program.instruction.resolvePerpPnlDeficit(spotMarketIndex, perpMarketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -4079,7 +4108,7 @@ class DriftClient {
                 spotMarketVault: spotMarket.vault,
                 insuranceFundVault: spotMarket.insuranceFund.vault,
                 driftSigner: this.getSignerPublicKey(),
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                tokenProgram: tokenProgramId,
             },
             remainingAccounts: remainingAccounts,
         });
@@ -4101,6 +4130,13 @@ class DriftClient {
         });
         return ix;
     }
+    /**
+     * This ix will donate your funds to drift revenue pool. It does not deposit into your user account
+     * @param marketIndex
+     * @param amount
+     * @param userTokenAccountPublicKey
+     * @returns
+     */
     async depositIntoSpotMarketRevenuePool(marketIndex, amount, userTokenAccountPublicKey) {
         const ix = await this.getDepositIntoSpotMarketRevenuePoolIx(marketIndex, amount, userTokenAccountPublicKey);
         const tx = await this.buildTransaction([ix]);
@@ -4148,7 +4184,14 @@ class DriftClient {
             else {
                 marketAccount = this.getSpotMarketAccount(marketIndex);
             }
-            takerFee += (takerFee * marketAccount.feeAdjustment) / 100;
+            let takeFeeAdjustment;
+            if (user && user.isHighLeverageMode()) {
+                takeFeeAdjustment = 100;
+            }
+            else {
+                takeFeeAdjustment = marketAccount.feeAdjustment;
+            }
+            takerFee += (takerFee * takeFeeAdjustment) / 100;
             makerFee += (makerFee * marketAccount.feeAdjustment) / 100;
         }
         return {
@@ -4289,7 +4332,7 @@ class DriftClient {
             },
         });
     }
-    async getPostSwitchboardOnDemandUpdateAtomicIx(feed, numSignatures = 3) {
+    async getPostSwitchboardOnDemandUpdateAtomicIx(feed, recentSlothash, numSignatures = 3) {
         const program = await this.getSwitchboardOnDemandProgram();
         const feedAccount = new on_demand_1.PullFeed(program, feed);
         if (!this.sbProgramFeedConfigs) {
@@ -4301,14 +4344,16 @@ class DriftClient {
         }
         const [pullIx, _responses, success] = await feedAccount.fetchUpdateIx({
             numSignatures,
-        });
+        }, recentSlothash
+            ? [[new anchor_1.BN(recentSlothash.slot), recentSlothash.hash]]
+            : undefined);
         if (!success) {
             return undefined;
         }
         return pullIx;
     }
-    async postSwitchboardOnDemandUpdate(feed, numSignatures = 3) {
-        const pullIx = await this.getPostSwitchboardOnDemandUpdateAtomicIx(feed, numSignatures);
+    async postSwitchboardOnDemandUpdate(feed, recentSlothash, numSignatures = 3) {
+        const pullIx = await this.getPostSwitchboardOnDemandUpdateAtomicIx(feed, recentSlothash, numSignatures);
         if (!pullIx) {
             return undefined;
         }