@drift-labs/sdk 2.98.0-beta.10 → 2.98.0-beta.12

package/VERSION

@@ -1 +1 @@
-2.98.0-beta.10
+2.98.0-beta.12

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

@@ -3880,6 +3880,9 @@ 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);
+        // create associated token account because it may not exist
+        const associatedTokenAccountPublicKey = (0, spl_token_1.getAssociatedTokenAddressSync)(spotMarketAccount.mint, this.wallet.publicKey, true);
+        addIfStakeIxs.push(await (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(this.wallet.publicKey, associatedTokenAccountPublicKey, this.wallet.publicKey, spotMarketAccount.mint));
         let tokenAccount;
         if (!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))) {
             addIfStakeIxs.push(await this.getInitializeUserStatsIx());

package/lib/browser/index.d.ts

@@ -10,6 +10,7 @@ export * from './constants/perpMarkets';
 export * from './accounts/fetch';
 export * from './accounts/webSocketDriftClientAccountSubscriber';
 export * from './accounts/webSocketInsuranceFundStakeAccountSubscriber';
+export * from './accounts/webSocketHighLeverageModeConfigAccountSubscriber';
 export * from './accounts/bulkAccountLoader';
 export * from './accounts/bulkUserSubscription';
 export * from './accounts/bulkUserStatsSubscription';
@@ -19,6 +20,7 @@ export * from './accounts/pollingTokenAccountSubscriber';
 export * from './accounts/pollingUserAccountSubscriber';
 export * from './accounts/pollingUserStatsAccountSubscriber';
 export * from './accounts/pollingInsuranceFundStakeAccountSubscriber';
+export * from './accounts/pollingHighLeverageModeConfigAccountSubscriber';
 export * from './accounts/basicUserAccountSubscriber';
 export * from './accounts/oneShotUserAccountSubscriber';
 export * from './accounts/types';

package/lib/browser/index.js

@@ -33,6 +33,7 @@ __exportStar(require("./constants/perpMarkets"), exports);
 __exportStar(require("./accounts/fetch"), exports);
 __exportStar(require("./accounts/webSocketDriftClientAccountSubscriber"), exports);
 __exportStar(require("./accounts/webSocketInsuranceFundStakeAccountSubscriber"), exports);
+__exportStar(require("./accounts/webSocketHighLeverageModeConfigAccountSubscriber"), exports);
 __exportStar(require("./accounts/bulkAccountLoader"), exports);
 __exportStar(require("./accounts/bulkUserSubscription"), exports);
 __exportStar(require("./accounts/bulkUserStatsSubscription"), exports);
@@ -42,6 +43,7 @@ __exportStar(require("./accounts/pollingTokenAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingUserAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingUserStatsAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingInsuranceFundStakeAccountSubscriber"), exports);
+__exportStar(require("./accounts/pollingHighLeverageModeConfigAccountSubscriber"), exports);
 __exportStar(require("./accounts/basicUserAccountSubscriber"), exports);
 __exportStar(require("./accounts/oneShotUserAccountSubscriber"), exports);
 __exportStar(require("./accounts/types"), exports);

package/lib/node/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/node/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/node/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/node/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/node/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/node/driftClient.js

@@ -3880,6 +3880,9 @@ 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);
+        // create associated token account because it may not exist
+        const associatedTokenAccountPublicKey = (0, spl_token_1.getAssociatedTokenAddressSync)(spotMarketAccount.mint, this.wallet.publicKey, true);
+        addIfStakeIxs.push(await (0, spl_token_1.createAssociatedTokenAccountIdempotentInstruction)(this.wallet.publicKey, associatedTokenAccountPublicKey, this.wallet.publicKey, spotMarketAccount.mint));
         let tokenAccount;
         if (!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))) {
             addIfStakeIxs.push(await this.getInitializeUserStatsIx());

package/lib/node/index.d.ts

@@ -10,6 +10,7 @@ export * from './constants/perpMarkets';
 export * from './accounts/fetch';
 export * from './accounts/webSocketDriftClientAccountSubscriber';
 export * from './accounts/webSocketInsuranceFundStakeAccountSubscriber';
+export * from './accounts/webSocketHighLeverageModeConfigAccountSubscriber';
 export * from './accounts/bulkAccountLoader';
 export * from './accounts/bulkUserSubscription';
 export * from './accounts/bulkUserStatsSubscription';
@@ -19,6 +20,7 @@ export * from './accounts/pollingTokenAccountSubscriber';
 export * from './accounts/pollingUserAccountSubscriber';
 export * from './accounts/pollingUserStatsAccountSubscriber';
 export * from './accounts/pollingInsuranceFundStakeAccountSubscriber';
+export * from './accounts/pollingHighLeverageModeConfigAccountSubscriber';
 export * from './accounts/basicUserAccountSubscriber';
 export * from './accounts/oneShotUserAccountSubscriber';
 export * from './accounts/types';

package/lib/node/index.js

@@ -33,6 +33,7 @@ __exportStar(require("./constants/perpMarkets"), exports);
 __exportStar(require("./accounts/fetch"), exports);
 __exportStar(require("./accounts/webSocketDriftClientAccountSubscriber"), exports);
 __exportStar(require("./accounts/webSocketInsuranceFundStakeAccountSubscriber"), exports);
+__exportStar(require("./accounts/webSocketHighLeverageModeConfigAccountSubscriber"), exports);
 __exportStar(require("./accounts/bulkAccountLoader"), exports);
 __exportStar(require("./accounts/bulkUserSubscription"), exports);
 __exportStar(require("./accounts/bulkUserStatsSubscription"), exports);
@@ -42,6 +43,7 @@ __exportStar(require("./accounts/pollingTokenAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingUserAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingUserStatsAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingInsuranceFundStakeAccountSubscriber"), exports);
+__exportStar(require("./accounts/pollingHighLeverageModeConfigAccountSubscriber"), exports);
 __exportStar(require("./accounts/basicUserAccountSubscriber"), exports);
 __exportStar(require("./accounts/oneShotUserAccountSubscriber"), exports);
 __exportStar(require("./accounts/types"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.98.0-beta.10",
+	"version": "2.98.0-beta.12",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"browser": "./lib/browser/index.js",

package/src/accounts/pollingHighLeverageModeConfigAccountSubscriber.ts

@@ -0,0 +1,189 @@
+import {
+	DataAndSlot,
+	NotSubscribedError,
+	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 class PollingHighLeverageModeConfigAccountSubscriber
+	implements HighLeverageModeConfigAccountSubscriber
+{
+	isSubscribed: boolean;
+	program: Program;
+	eventEmitter: StrictEventEmitter<
+		EventEmitter,
+		HighLeverageModeConfigAccountEvents
+	>;
+	highLeverageModeConfigAccountPublicKey: PublicKey;
+
+	accountLoader: BulkAccountLoader;
+	callbackId?: string;
+	errorCallbackId?: string;
+
+	highLeverageModeConfigAccountAndSlot?: DataAndSlot<HighLeverageModeConfig>;
+
+	public constructor(
+		program: Program,
+		publicKey: PublicKey,
+		accountLoader: BulkAccountLoader
+	) {
+		this.isSubscribed = false;
+		this.program = program;
+		this.highLeverageModeConfigAccountPublicKey = publicKey;
+		this.accountLoader = accountLoader;
+		this.eventEmitter = new EventEmitter();
+	}
+
+	async subscribe(
+		highLeverageModeConfig?: HighLeverageModeConfig
+	): Promise<boolean> {
+		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(): Promise<void> {
+		if (this.callbackId) {
+			return;
+		}
+
+		this.callbackId = await this.accountLoader.addAccount(
+			this.highLeverageModeConfigAccountPublicKey,
+			(buffer, slot: number) => {
+				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(): Promise<void> {
+		if (this.highLeverageModeConfigAccountAndSlot === undefined) {
+			await this.fetch();
+		}
+	}
+
+	async fetch(): Promise<void> {
+		try {
+			const dataAndContext =
+				await this.program.account.highLeverageModeConfig.fetchAndContext(
+					this.highLeverageModeConfigAccountPublicKey,
+					this.accountLoader.commitment
+				);
+			if (
+				dataAndContext.context.slot >
+				(this.highLeverageModeConfigAccountAndSlot?.slot ?? 0)
+			) {
+				this.highLeverageModeConfigAccountAndSlot = {
+					data: dataAndContext.data as HighLeverageModeConfig,
+					slot: dataAndContext.context.slot,
+				};
+			}
+		} catch (e) {
+			console.log(
+				`PollingHighLeverageModeConfigAccountSubscriber.fetch() HighLeverageModeConfig does not exist: ${e.message}`
+			);
+		}
+	}
+
+	doesAccountExist(): boolean {
+		return this.highLeverageModeConfigAccountAndSlot !== undefined;
+	}
+
+	async unsubscribe(): Promise<void> {
+		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(): void {
+		if (!this.isSubscribed) {
+			throw new NotSubscribedError(
+				'You must call `subscribe` before using this function'
+			);
+		}
+	}
+
+	public getHighLeverageModeConfigAccountAndSlot(): DataAndSlot<HighLeverageModeConfig> {
+		this.assertIsSubscribed();
+		return this.highLeverageModeConfigAccountAndSlot;
+	}
+
+	didSubscriptionSucceed(): boolean {
+		return !!this.highLeverageModeConfigAccountAndSlot;
+	}
+
+	public updateData(
+		highLeverageModeConfig: HighLeverageModeConfig,
+		slot: number
+	): void {
+		if (
+			!this.highLeverageModeConfigAccountAndSlot ||
+			this.highLeverageModeConfigAccountAndSlot.slot < slot
+		) {
+			this.highLeverageModeConfigAccountAndSlot = {
+				data: highLeverageModeConfig,
+				slot,
+			};
+			this.eventEmitter.emit(
+				'highLeverageModeConfigAccountUpdate',
+				highLeverageModeConfig
+			);
+			this.eventEmitter.emit('update');
+		}
+	}
+}

package/src/accounts/types.ts

@@ -11,7 +11,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> {
@@ -215,3 +215,27 @@ 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/src/accounts/webSocketHighLeverageModeConfigAccountSubscriber.ts

@@ -0,0 +1,131 @@
+import {
+	DataAndSlot,
+	AccountSubscriber,
+	NotSubscribedError,
+	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 { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
+import { HighLeverageModeConfig } from '../types';
+
+export class WebSocketHighLeverageModeConfigAccountSubscriber
+	implements HighLeverageModeConfigAccountSubscriber
+{
+	isSubscribed: boolean;
+	resubTimeoutMs?: number;
+	commitment?: Commitment;
+	program: Program;
+	eventEmitter: StrictEventEmitter<
+		EventEmitter,
+		HighLeverageModeConfigAccountEvents
+	>;
+	highLeverageModeConfigAccountPublicKey: PublicKey;
+
+	highLeverageModeConfigDataAccountSubscriber: AccountSubscriber<HighLeverageModeConfig>;
+
+	public constructor(
+		program: Program,
+		highLeverageModeConfigAccountPublicKey: PublicKey,
+		resubTimeoutMs?: number,
+		commitment?: Commitment
+	) {
+		this.isSubscribed = false;
+		this.program = program;
+		this.highLeverageModeConfigAccountPublicKey =
+			highLeverageModeConfigAccountPublicKey;
+		this.eventEmitter = new EventEmitter();
+		this.resubTimeoutMs = resubTimeoutMs;
+		this.commitment = commitment;
+	}
+
+	async subscribe(
+		highLeverageModeConfigAccount?: HighLeverageModeConfig
+	): Promise<boolean> {
+		if (this.isSubscribed) {
+			return true;
+		}
+
+		this.highLeverageModeConfigDataAccountSubscriber =
+			new WebSocketAccountSubscriber(
+				'highLeverageModeConfig',
+				this.program,
+				this.highLeverageModeConfigAccountPublicKey,
+				undefined,
+				{
+					resubTimeoutMs: this.resubTimeoutMs,
+				},
+				this.commitment
+			);
+
+		if (highLeverageModeConfigAccount) {
+			this.highLeverageModeConfigDataAccountSubscriber.setData(
+				highLeverageModeConfigAccount
+			);
+		}
+
+		await this.highLeverageModeConfigDataAccountSubscriber.subscribe(
+			(data: HighLeverageModeConfig) => {
+				this.eventEmitter.emit('highLeverageModeConfigAccountUpdate', data);
+				this.eventEmitter.emit('update');
+			}
+		);
+
+		this.eventEmitter.emit('update');
+		this.isSubscribed = true;
+		return true;
+	}
+
+	async fetch(): Promise<void> {
+		await Promise.all([
+			this.highLeverageModeConfigDataAccountSubscriber.fetch(),
+		]);
+	}
+
+	async unsubscribe(): Promise<void> {
+		if (!this.isSubscribed) {
+			return;
+		}
+
+		await Promise.all([
+			this.highLeverageModeConfigDataAccountSubscriber.unsubscribe(),
+		]);
+
+		this.isSubscribed = false;
+	}
+
+	assertIsSubscribed(): void {
+		if (!this.isSubscribed) {
+			throw new NotSubscribedError(
+				'You must call `subscribe` before using this function'
+			);
+		}
+	}
+
+	public getHighLeverageModeConfigAccountAndSlot(): DataAndSlot<HighLeverageModeConfig> {
+		this.assertIsSubscribed();
+		return this.highLeverageModeConfigDataAccountSubscriber.dataAndSlot;
+	}
+
+	public updateData(
+		highLeverageModeConfig: HighLeverageModeConfig,
+		slot: number
+	): void {
+		const currentDataSlot =
+			this.highLeverageModeConfigDataAccountSubscriber.dataAndSlot?.slot || 0;
+		if (currentDataSlot <= slot) {
+			this.highLeverageModeConfigDataAccountSubscriber.setData(
+				highLeverageModeConfig,
+				slot
+			);
+			this.eventEmitter.emit(
+				'highLeverageModeConfigAccountUpdate',
+				highLeverageModeConfig
+			);
+			this.eventEmitter.emit('update');
+		}
+	}
+}

package/src/driftClient.ts

@@ -11,11 +11,13 @@ import bs58 from 'bs58';
 import {
 	ASSOCIATED_TOKEN_PROGRAM_ID,
 	createAssociatedTokenAccountInstruction,
+	createAssociatedTokenAccountIdempotentInstruction,
 	createCloseAccountInstruction,
 	createInitializeAccountInstruction,
 	getAssociatedTokenAddress,
 	TOKEN_2022_PROGRAM_ID,
 	TOKEN_PROGRAM_ID,
+	getAssociatedTokenAddressSync,
 } from '@solana/spl-token';
 import {
 	DriftClientMetricsEvents,
@@ -7407,6 +7409,22 @@ export class DriftClient {
 		const createWSOLTokenAccount =
 			isSolMarket && collateralAccountPublicKey.equals(this.wallet.publicKey);
 
+		// create associated token account because it may not exist
+		const associatedTokenAccountPublicKey = getAssociatedTokenAddressSync(
+			spotMarketAccount.mint,
+			this.wallet.publicKey,
+			true
+		);
+
+		addIfStakeIxs.push(
+			await createAssociatedTokenAccountIdempotentInstruction(
+				this.wallet.publicKey,
+				associatedTokenAccountPublicKey,
+				this.wallet.publicKey,
+				spotMarketAccount.mint
+			)
+		);
+
 		let tokenAccount;
 
 		if (

package/src/index.ts

@@ -11,6 +11,7 @@ export * from './constants/perpMarkets';
 export * from './accounts/fetch';
 export * from './accounts/webSocketDriftClientAccountSubscriber';
 export * from './accounts/webSocketInsuranceFundStakeAccountSubscriber';
+export * from './accounts/webSocketHighLeverageModeConfigAccountSubscriber';
 export * from './accounts/bulkAccountLoader';
 export * from './accounts/bulkUserSubscription';
 export * from './accounts/bulkUserStatsSubscription';
@@ -20,6 +21,7 @@ export * from './accounts/pollingTokenAccountSubscriber';
 export * from './accounts/pollingUserAccountSubscriber';
 export * from './accounts/pollingUserStatsAccountSubscriber';
 export * from './accounts/pollingInsuranceFundStakeAccountSubscriber';
+export * from './accounts/pollingHighLeverageModeConfigAccountSubscriber';
 export * from './accounts/basicUserAccountSubscriber';
 export * from './accounts/oneShotUserAccountSubscriber';
 export * from './accounts/types';