@drift-labs/sdk 2.41.0-beta.0 → 2.41.0-beta.1

package/README.md

@@ -244,4 +244,3 @@ Drift Protocol v2 is licensed under [Apache 2.0](./LICENSE).
 Unless you explicitly state otherwise, any contribution intentionally submitted
 for inclusion in Drift SDK by you, as defined in the Apache-2.0 license, shall be
 licensed as above, without any additional terms or conditions.
-

package/VERSION

@@ -1 +1 @@
-2.41.0-beta.0
+2.41.0-beta.1

package/lib/accounts/types.d.ts

@@ -3,7 +3,7 @@
 import { SpotMarketAccount, PerpMarketAccount, OracleSource, StateAccount, UserAccount, UserStatsAccount } from '../types';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-import { PublicKey } from '@solana/web3.js';
+import { Context, PublicKey } from '@solana/web3.js';
 import { Account } from '@solana/spl-token';
 import { OracleInfo, OraclePriceData } from '..';
 export interface AccountSubscriber<T> {
@@ -13,6 +13,10 @@ export interface AccountSubscriber<T> {
     unsubscribe(): Promise<void>;
     setData(userAccount: T, slot?: number): void;
 }
+export interface ProgramAccountSubscriber<T> {
+    subscribe(onChange: (accountId: PublicKey, data: T, context: Context) => void): Promise<void>;
+    unsubscribe(): Promise<void>;
+}
 export declare class NotSubscribedError extends Error {
     name: string;
 }

package/lib/accounts/webSocketAccountSubscriber.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { DataAndSlot, BufferAndSlot, AccountSubscriber } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { AccountInfo, Context, PublicKey } from '@solana/web3.js';
@@ -11,9 +12,13 @@ export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<
     decodeBufferFn: (buffer: Buffer) => T;
     onChange: (data: T) => void;
     listenerId?: number;
-    constructor(accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => T);
+    resubTimeoutMs?: number;
+    timeoutId?: NodeJS.Timeout;
+    receivingData: boolean;
+    constructor(accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => T, resubTimeoutMs?: number);
     subscribe(onChange: (data: T) => void): Promise<void>;
     setData(data: T, slot?: number): void;
+    private setTimeout;
     fetch(): Promise<void>;
     handleRpcResponse(context: Context, accountInfo?: AccountInfo<Buffer>): void;
     decodeBuffer(buffer: Buffer): T;

package/lib/accounts/webSocketAccountSubscriber.js

@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketAccountSubscriber = void 0;
 const utils_1 = require("./utils");
 class WebSocketAccountSubscriber {
-    constructor(accountName, program, accountPublicKey, decodeBuffer) {
+    constructor(accountName, program, accountPublicKey, decodeBuffer, resubTimeoutMs) {
         this.accountName = accountName;
         this.program = program;
         this.accountPublicKey = accountPublicKey;
         this.decodeBufferFn = decodeBuffer;
+        this.resubTimeoutMs = resubTimeoutMs;
+        this.receivingData = false;
     }
     async subscribe(onChange) {
         if (this.listenerId) {
@@ -18,8 +20,19 @@ class WebSocketAccountSubscriber {
             await this.fetch();
         }
         this.listenerId = this.program.provider.connection.onAccountChange(this.accountPublicKey, (accountInfo, context) => {
-            this.handleRpcResponse(context, accountInfo);
+            if (this.resubTimeoutMs) {
+                this.receivingData = true;
+                clearTimeout(this.timeoutId);
+                this.handleRpcResponse(context, accountInfo);
+                this.setTimeout();
+            }
+            else {
+                this.handleRpcResponse(context, accountInfo);
+            }
         }, this.program.provider.opts.commitment);
+        if (this.resubTimeoutMs) {
+            this.setTimeout();
+        }
     }
     setData(data, slot) {
         const newSlot = slot || 0;
@@ -31,6 +44,19 @@ class WebSocketAccountSubscriber {
             slot,
         };
     }
+    setTimeout() {
+        if (!this.onChange) {
+            throw new Error('onChange callback function must be set');
+        }
+        this.timeoutId = setTimeout(async () => {
+            if (this.receivingData) {
+                console.log(`No ws data from ${this.accountName} in ${this.resubTimeoutMs}ms, resubscribing`);
+                await this.unsubscribe();
+                this.receivingData = false;
+                await this.subscribe(this.onChange);
+            }
+        }, this.resubTimeoutMs);
+    }
     async fetch() {
         const rpcResponse = await this.program.provider.connection.getAccountInfoAndContext(this.accountPublicKey, this.program.provider.opts.commitment);
         this.handleRpcResponse(rpcResponse.context, rpcResponse === null || rpcResponse === void 0 ? void 0 : rpcResponse.value);

package/lib/accounts/webSocketDriftClientAccountSubscriber.d.ts

@@ -15,6 +15,7 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     spotMarketIndexes: number[];
     oracleInfos: OracleInfo[];
     oracleClientCache: OracleClientCache;
+    resubTimeoutMs?: number;
     shouldFindAllMarketsAndOracles: boolean;
     eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
     stateAccountSubscriber?: AccountSubscriber<StateAccount>;
@@ -24,7 +25,7 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     private isSubscribing;
     private subscriptionPromise;
     private subscriptionPromiseResolver;
-    constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean);
+    constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, resubTimeoutMs?: number);
     subscribe(): Promise<boolean>;
     subscribeToPerpMarketAccounts(): Promise<boolean>;
     subscribeToPerpMarketAccount(marketIndex: number): Promise<boolean>;

package/lib/accounts/webSocketDriftClientAccountSubscriber.js

@@ -10,7 +10,7 @@ const oracleClientCache_1 = require("../oracles/oracleClientCache");
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
 const config_1 = require("../config");
 class WebSocketDriftClientAccountSubscriber {
-    constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles) {
+    constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, resubTimeoutMs) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
         this.perpMarketAccountSubscribers = new Map();
         this.spotMarketAccountSubscribers = new Map();
@@ -23,6 +23,7 @@ class WebSocketDriftClientAccountSubscriber {
         this.spotMarketIndexes = spotMarketIndexes;
         this.oracleInfos = oracleInfos;
         this.shouldFindAllMarketsAndOracles = shouldFindAllMarketsAndOracles;
+        this.resubTimeoutMs = resubTimeoutMs;
     }
     async subscribe() {
         if (this.isSubscribed) {
@@ -43,7 +44,7 @@ class WebSocketDriftClientAccountSubscriber {
         }
         const statePublicKey = await (0, pda_1.getDriftStateAccountPublicKey)(this.program.programId);
         // create and activate main state account subscription
-        this.stateAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('state', this.program, statePublicKey);
+        this.stateAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('state', this.program, statePublicKey, undefined, this.resubTimeoutMs);
         await this.stateAccountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('stateAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -68,7 +69,7 @@ class WebSocketDriftClientAccountSubscriber {
     }
     async subscribeToPerpMarketAccount(marketIndex) {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex);
-        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('perpMarket', this.program, perpMarketPublicKey);
+        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('perpMarket', this.program, perpMarketPublicKey, undefined, this.resubTimeoutMs);
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('perpMarketAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -84,7 +85,7 @@ class WebSocketDriftClientAccountSubscriber {
     }
     async subscribeToSpotMarketAccount(marketIndex) {
         const marketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex);
-        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('spotMarket', this.program, marketPublicKey);
+        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('spotMarket', this.program, marketPublicKey, undefined, this.resubTimeoutMs);
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('spotMarketAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -104,7 +105,7 @@ class WebSocketDriftClientAccountSubscriber {
         const client = this.oracleClientCache.get(oracleInfo.source, this.program.provider.connection);
         const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('oracle', this.program, oracleInfo.publicKey, (buffer) => {
             return client.getOraclePriceDataFromBuffer(buffer);
-        });
+        }, this.resubTimeoutMs);
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('oraclePriceUpdate', oracleInfo.publicKey, data);
             this.eventEmitter.emit('update');

package/lib/accounts/webSocketProgramAccountSubscriber.d.ts

@@ -0,0 +1,32 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import { DataAndSlot, BufferAndSlot, ProgramAccountSubscriber } from './types';
+import { Program } from '@coral-xyz/anchor';
+import { Commitment, Context, KeyedAccountInfo, MemcmpFilter, PublicKey } from '@solana/web3.js';
+export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAccountSubscriber<T> {
+    subscriptionName: string;
+    accountDiscriminator: string;
+    dataAndSlot?: DataAndSlot<T> & {
+        accountId: PublicKey;
+    };
+    bufferAndSlot?: BufferAndSlot;
+    program: Program;
+    decodeBuffer: (accountName: string, ix: Buffer) => T;
+    onChange: (accountId: PublicKey, data: T, context: Context) => void;
+    listenerId?: number;
+    resubTimeoutMs?: number;
+    timeoutId?: NodeJS.Timeout;
+    options: {
+        filters: MemcmpFilter[];
+        commitment?: Commitment;
+    };
+    receivingData: boolean;
+    constructor(subscriptionName: string, accountDiscriminator: string, program: Program, decodeBufferFn: (accountName: string, ix: Buffer) => T, options?: {
+        filters: MemcmpFilter[];
+        commitment?: Commitment;
+    }, resubTimeoutMs?: number);
+    subscribe(onChange: (accountId: PublicKey, data: T, context: Context) => void): Promise<void>;
+    private setTimeout;
+    handleRpcResponse(context: Context, keyedAccountInfo: KeyedAccountInfo): void;
+    unsubscribe(): Promise<void>;
+}

package/lib/accounts/webSocketProgramAccountSubscriber.js

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebSocketProgramAccountSubscriber = void 0;
+class WebSocketProgramAccountSubscriber {
+    constructor(subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
+        filters: [],
+    }, resubTimeoutMs) {
+        this.receivingData = false;
+        this.subscriptionName = subscriptionName;
+        this.accountDiscriminator = accountDiscriminator;
+        this.program = program;
+        this.decodeBuffer = decodeBufferFn;
+        this.resubTimeoutMs = resubTimeoutMs;
+        this.options = options;
+        this.receivingData = false;
+    }
+    async subscribe(onChange) {
+        var _a;
+        if (this.listenerId) {
+            return;
+        }
+        this.onChange = onChange;
+        this.listenerId = this.program.provider.connection.onProgramAccountChange(this.program.programId, (keyedAccountInfo, context) => {
+            if (this.resubTimeoutMs) {
+                this.receivingData = true;
+                clearTimeout(this.timeoutId);
+                this.handleRpcResponse(context, keyedAccountInfo);
+                this.setTimeout();
+            }
+            else {
+                this.handleRpcResponse(context, keyedAccountInfo);
+            }
+        }, (_a = this.options.commitment) !== null && _a !== void 0 ? _a : this.program.provider.opts.commitment, this.options.filters);
+        if (this.resubTimeoutMs) {
+            this.setTimeout();
+        }
+    }
+    setTimeout() {
+        if (!this.onChange) {
+            throw new Error('onChange callback function must be set');
+        }
+        this.timeoutId = setTimeout(async () => {
+            if (this.receivingData) {
+                console.log(`No ws data from ${this.subscriptionName} in ${this.resubTimeoutMs}ms, resubscribing`);
+                await this.unsubscribe();
+                this.receivingData = false;
+                await this.subscribe(this.onChange);
+            }
+        }, this.resubTimeoutMs);
+    }
+    handleRpcResponse(context, keyedAccountInfo) {
+        const newSlot = context.slot;
+        let newBuffer = undefined;
+        if (keyedAccountInfo) {
+            newBuffer = keyedAccountInfo.accountInfo.data;
+        }
+        if (!this.bufferAndSlot) {
+            this.bufferAndSlot = {
+                buffer: newBuffer,
+                slot: newSlot,
+            };
+            if (newBuffer) {
+                const account = this.decodeBuffer(this.accountDiscriminator, newBuffer);
+                this.dataAndSlot = {
+                    data: account,
+                    slot: newSlot,
+                    accountId: keyedAccountInfo.accountId,
+                };
+                this.onChange(keyedAccountInfo.accountId, account, context);
+            }
+            return;
+        }
+        if (newSlot <= this.bufferAndSlot.slot) {
+            return;
+        }
+        const oldBuffer = this.bufferAndSlot.buffer;
+        if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
+            this.bufferAndSlot = {
+                buffer: newBuffer,
+                slot: newSlot,
+            };
+            const account = this.decodeBuffer(this.accountDiscriminator, newBuffer);
+            this.dataAndSlot = {
+                data: account,
+                slot: newSlot,
+                accountId: keyedAccountInfo.accountId,
+            };
+            this.onChange(keyedAccountInfo.accountId, account, context);
+        }
+    }
+    unsubscribe() {
+        if (this.listenerId) {
+            const promise = this.program.provider.connection.removeAccountChangeListener(this.listenerId);
+            this.listenerId = undefined;
+            return promise;
+        }
+    }
+}
+exports.WebSocketProgramAccountSubscriber = WebSocketProgramAccountSubscriber;

package/lib/accounts/webSocketUserAccountSubscriber.d.ts

@@ -7,11 +7,12 @@ import { PublicKey } from '@solana/web3.js';
 import { UserAccount } from '../types';
 export declare class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
     isSubscribed: boolean;
+    reconnectTimeoutMs?: number;
     program: Program;
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
     userAccountPublicKey: PublicKey;
     userDataAccountSubscriber: AccountSubscriber<UserAccount>;
-    constructor(program: Program, userAccountPublicKey: PublicKey);
+    constructor(program: Program, userAccountPublicKey: PublicKey, reconnectTimeoutMs?: number);
     subscribe(userAccount?: UserAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;

package/lib/accounts/webSocketUserAccountSubscriber.js

@@ -5,17 +5,18 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketUserAccountSubscriber {
-    constructor(program, userAccountPublicKey) {
+    constructor(program, userAccountPublicKey, reconnectTimeoutMs) {
         this.isSubscribed = false;
         this.program = program;
         this.userAccountPublicKey = userAccountPublicKey;
         this.eventEmitter = new events_1.EventEmitter();
+        this.reconnectTimeoutMs = reconnectTimeoutMs;
     }
     async subscribe(userAccount) {
         if (this.isSubscribed) {
             return true;
         }
-        this.userDataAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('user', this.program, this.userAccountPublicKey);
+        this.userDataAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('user', this.program, this.userAccountPublicKey, undefined, this.reconnectTimeoutMs);
         if (userAccount) {
             this.userDataAccountSubscriber.setData(userAccount);
         }

package/lib/accounts/webSocketUserStatsAccountSubsriber.d.ts

@@ -7,11 +7,12 @@ import { PublicKey } from '@solana/web3.js';
 import { UserStatsAccount } from '../types';
 export declare class WebSocketUserStatsAccountSubscriber implements UserStatsAccountSubscriber {
     isSubscribed: boolean;
+    reconnectTimeoutMs?: number;
     program: Program;
     eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
     userStatsAccountPublicKey: PublicKey;
     userStatsAccountSubscriber: AccountSubscriber<UserStatsAccount>;
-    constructor(program: Program, userStatsAccountPublicKey: PublicKey);
+    constructor(program: Program, userStatsAccountPublicKey: PublicKey, reconnectTimeoutMs?: number);
     subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;

package/lib/accounts/webSocketUserStatsAccountSubsriber.js

@@ -5,17 +5,18 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketUserStatsAccountSubscriber {
-    constructor(program, userStatsAccountPublicKey) {
+    constructor(program, userStatsAccountPublicKey, reconnectTimeoutMs) {
         this.isSubscribed = false;
         this.program = program;
         this.userStatsAccountPublicKey = userStatsAccountPublicKey;
         this.eventEmitter = new events_1.EventEmitter();
+        this.reconnectTimeoutMs = reconnectTimeoutMs;
     }
     async subscribe(userStatsAccount) {
         if (this.isSubscribed) {
             return true;
         }
-        this.userStatsAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userStats', this.program, this.userStatsAccountPublicKey);
+        this.userStatsAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userStats', this.program, this.userStatsAccountPublicKey, undefined, this.reconnectTimeoutMs);
         if (userStatsAccount) {
             this.userStatsAccountSubscriber.setData(userStatsAccount);
         }

package/lib/addresses/pda.d.ts

@@ -17,3 +17,4 @@ export declare function getSerumSignerPublicKey(programId: PublicKey, market: Pu
 export declare function getSerumFulfillmentConfigPublicKey(programId: PublicKey, market: PublicKey): PublicKey;
 export declare function getPhoenixFulfillmentConfigPublicKey(programId: PublicKey, market: PublicKey): PublicKey;
 export declare function getReferrerNamePublicKeySync(programId: PublicKey, nameBuffer: number[]): PublicKey;
+export declare function getProtocolIfSharesTransferConfigPublicKey(programId: PublicKey): PublicKey;

package/lib/addresses/pda.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getReferrerNamePublicKeySync = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
+exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKey = 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"));
 async function getDriftStateAccountPublicKeyAndNonce(programId) {
@@ -133,3 +133,7 @@ function getReferrerNamePublicKeySync(programId, nameBuffer) {
     ], programId)[0];
 }
 exports.getReferrerNamePublicKeySync = getReferrerNamePublicKeySync;
+function getProtocolIfSharesTransferConfigPublicKey(programId) {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from(anchor.utils.bytes.utf8.encode('if_shares_transfer_config'))], programId)[0];
+}
+exports.getProtocolIfSharesTransferConfigPublicKey = getProtocolIfSharesTransferConfigPublicKey;

package/lib/adminClient.d.ts

@@ -70,4 +70,6 @@ export declare class AdminClient extends DriftClient {
     updateSerumVault(srmVault: PublicKey): Promise<TransactionSignature>;
     updatePerpMarketLiquidationFee(perpMarketIndex: number, liquidatorFee: number, ifLiquidationFee: number): Promise<TransactionSignature>;
     updateSpotMarketLiquidationFee(spotMarketIndex: number, liquidatorFee: number, ifLiquidationFee: number): Promise<TransactionSignature>;
+    initializeProtocolIfSharesTransferConfig(): Promise<TransactionSignature>;
+    updateProtocolIfSharesTransferConfig(whitelistedSigners?: PublicKey[], maxTransferPerEpoch?: BN): Promise<TransactionSignature>;
 }

package/lib/adminClient.js

@@ -791,5 +791,25 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async initializeProtocolIfSharesTransferConfig() {
+        return await this.program.rpc.initializeProtocolIfSharesTransferConfig({
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                systemProgram: anchor.web3.SystemProgram.programId,
+                protocolIfSharesTransferConfig: (0, pda_1.getProtocolIfSharesTransferConfigPublicKey)(this.program.programId),
+            },
+        });
+    }
+    async updateProtocolIfSharesTransferConfig(whitelistedSigners, maxTransferPerEpoch) {
+        return await this.program.rpc.updateProtocolIfSharesTransferConfig(whitelistedSigners || null, maxTransferPerEpoch, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                protocolIfSharesTransferConfig: (0, pda_1.getProtocolIfSharesTransferConfigPublicKey)(this.program.programId),
+            },
+        });
+    }
 }
 exports.AdminClient = AdminClient;

package/lib/auctionSubscriber/auctionSubscriber.d.ts

@@ -5,9 +5,10 @@ import { EventEmitter } from 'events';
 export declare class AuctionSubscriber {
     private driftClient;
     private opts;
+    private resubTimeoutMs?;
     eventEmitter: StrictEventEmitter<EventEmitter, AuctionSubscriberEvents>;
-    private websocketId;
-    constructor({ driftClient, opts }: AuctionSubscriberConfig);
+    private subscriber;
+    constructor({ driftClient, opts, resubTimeoutMs }: AuctionSubscriberConfig);
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;
 }

package/lib/auctionSubscriber/auctionSubscriber.js

@@ -3,22 +3,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuctionSubscriber = void 0;
 const memcmp_1 = require("../memcmp");
 const events_1 = require("events");
+const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 class AuctionSubscriber {
-    constructor({ driftClient, opts }) {
+    constructor({ driftClient, opts, resubTimeoutMs }) {
         this.driftClient = driftClient;
         this.opts = opts || this.driftClient.opts;
         this.eventEmitter = new events_1.EventEmitter();
+        this.resubTimeoutMs = resubTimeoutMs;
     }
     async subscribe() {
-        this.websocketId = this.driftClient.connection.onProgramAccountChange(this.driftClient.program.programId, (keyAccountInfo, context) => {
-            const userAccount = this.driftClient.program.account.user.coder.accounts.decode('User', keyAccountInfo.accountInfo.data);
-            this.eventEmitter.emit('onAccountUpdate', userAccount, keyAccountInfo.accountId, context.slot);
-        }, this.driftClient.opts.commitment, [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithAuctionFilter)()]);
+        if (!this.subscriber) {
+            this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('AuctionSubscriber', 'User', this.driftClient.program, this.driftClient.program.account.user.coder.accounts.decode.bind(this.driftClient.program.account.user.coder.accounts), {
+                filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithAuctionFilter)()],
+                commitment: this.driftClient.opts.commitment,
+            }, this.resubTimeoutMs);
+        }
+        await this.subscriber.subscribe((accountId, data, context) => {
+            this.eventEmitter.emit('onAccountUpdate', data, accountId, context.slot);
+        });
     }
     async unsubscribe() {
-        if (this.websocketId) {
-            await this.driftClient.connection.removeProgramAccountChangeListener(this.websocketId);
+        if (!this.subscriber) {
+            return;
         }
+        this.subscriber.unsubscribe();
     }
 }
 exports.AuctionSubscriber = AuctionSubscriber;

package/lib/auctionSubscriber/types.d.ts

@@ -4,6 +4,7 @@ import { ConfirmOptions, PublicKey } from '@solana/web3.js';
 export type AuctionSubscriberConfig = {
     driftClient: DriftClient;
     opts?: ConfirmOptions;
+    resubTimeoutMs?: number;
 };
 export interface AuctionSubscriberEvents {
     onAccountUpdate: (account: UserAccount, pubkey: PublicKey, slot: number) => void;

package/lib/dlob/DLOB.d.ts

@@ -63,7 +63,7 @@ export declare class DLOB {
     mergeNodesToFill(restingLimitOrderNodesToFill: NodeToFill[], takingOrderNodesToFill: NodeToFill[]): NodeToFill[];
     findRestingLimitOrderNodesToFill(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, isAmmPaused: boolean, minAuctionDuration: number, fallbackAsk: BN | undefined, fallbackBid: BN | undefined): NodeToFill[];
     findTakingNodesToFill(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, isAmmPaused: boolean, minAuctionDuration: number, fallbackAsk: BN | undefined, fallbackBid?: BN | undefined): NodeToFill[];
-    findTakingNodesCrossingMakerNodes(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, takerNodeGenerator: Generator<DLOBNode>, makerNodeGeneratorFn: (marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, fallbackPrice?: BN) => Generator<DLOBNode>, doesCross: (takerPrice: BN | undefined, makerPrice: BN) => boolean, fallbackPrice?: BN): NodeToFill[];
+    findTakingNodesCrossingMakerNodes(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, takerNodeGenerator: Generator<DLOBNode>, makerNodeGeneratorFn: (marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData) => Generator<DLOBNode>, doesCross: (takerPrice: BN | undefined, makerPrice: BN) => boolean): NodeToFill[];
     findNodesCrossingFallbackLiquidity(marketType: MarketType, slot: number, oraclePriceData: OraclePriceData, nodeGenerator: Generator<DLOBNode>, fallbackPrice: BN, doesCross: (nodePrice: BN | undefined, fallbackPrice: BN) => boolean, minAuctionDuration: number): NodeToFill[];
     findExpiredNodesToFill(marketIndex: number, ts: number, marketType: MarketType): NodeToFill[];
     findJitAuctionNodesToFill(marketIndex: number, slot: number, oraclePriceData: OraclePriceData, marketType: MarketType): NodeToFill[];
@@ -107,18 +107,14 @@ export declare class DLOB {
      * @param slot
      * @param oraclePriceData
      * @param depth how many levels of the order book to return
-     * @param fallbackAsk best ask for fallback liquidity, only relevant for perps
-     * @param fallbackBid best bid for fallback liquidity, only relevant for perps
      * @param fallbackL2Generators L2 generators for fallback liquidity e.g. vAMM {@link getVammL2Generator}, openbook {@link SerumSubscriber}
      */
-    getL2({ marketIndex, marketType, slot, oraclePriceData, depth, fallbackAsk, fallbackBid, fallbackL2Generators, }: {
+    getL2({ marketIndex, marketType, slot, oraclePriceData, depth, fallbackL2Generators, }: {
         marketIndex: number;
         marketType: MarketType;
         slot: number;
         oraclePriceData: OraclePriceData;
         depth: number;
-        fallbackAsk?: BN;
-        fallbackBid?: BN;
         fallbackL2Generators?: L2OrderBookGenerator[];
     }): L2OrderBook;
     /**

package/lib/dlob/DLOB.js

@@ -365,7 +365,7 @@ class DLOB {
     findTakingNodesToFill(marketIndex, slot, marketType, oraclePriceData, isAmmPaused, minAuctionDuration, fallbackAsk, fallbackBid) {
         const nodesToFill = new Array();
         let takingOrderGenerator = this.getTakingAsks(marketIndex, marketType, slot, oraclePriceData);
-        const takingAsksCrossingBids = this.findTakingNodesCrossingMakerNodes(marketIndex, slot, marketType, oraclePriceData, takingOrderGenerator, this.getMakerLimitBids.bind(this), (takerPrice, makerPrice) => {
+        const takingAsksCrossingBids = this.findTakingNodesCrossingMakerNodes(marketIndex, slot, marketType, oraclePriceData, takingOrderGenerator, this.getRestingLimitBids.bind(this), (takerPrice, makerPrice) => {
             if ((0, __1.isVariant)(marketType, 'spot')) {
                 if (takerPrice === undefined) {
                     return false;
@@ -375,7 +375,7 @@ class DLOB {
                 }
             }
             return takerPrice === undefined || takerPrice.lte(makerPrice);
-        }, fallbackAsk);
+        });
         for (const takingAskCrossingBid of takingAsksCrossingBids) {
             nodesToFill.push(takingAskCrossingBid);
         }
@@ -389,7 +389,7 @@ class DLOB {
             }
         }
         takingOrderGenerator = this.getTakingBids(marketIndex, marketType, slot, oraclePriceData);
-        const takingBidsToFill = this.findTakingNodesCrossingMakerNodes(marketIndex, slot, marketType, oraclePriceData, takingOrderGenerator, this.getMakerLimitAsks.bind(this), (takerPrice, makerPrice) => {
+        const takingBidsToFill = this.findTakingNodesCrossingMakerNodes(marketIndex, slot, marketType, oraclePriceData, takingOrderGenerator, this.getRestingLimitAsks.bind(this), (takerPrice, makerPrice) => {
             if ((0, __1.isVariant)(marketType, 'spot')) {
                 if (takerPrice === undefined) {
                     return false;
@@ -399,7 +399,7 @@ class DLOB {
                 }
             }
             return takerPrice === undefined || takerPrice.gte(makerPrice);
-        }, fallbackBid);
+        });
         for (const takingBidToFill of takingBidsToFill) {
             nodesToFill.push(takingBidToFill);
         }
@@ -414,10 +414,10 @@ class DLOB {
         }
         return nodesToFill;
     }
-    findTakingNodesCrossingMakerNodes(marketIndex, slot, marketType, oraclePriceData, takerNodeGenerator, makerNodeGeneratorFn, doesCross, fallbackPrice) {
+    findTakingNodesCrossingMakerNodes(marketIndex, slot, marketType, oraclePriceData, takerNodeGenerator, makerNodeGeneratorFn, doesCross) {
         const nodesToFill = new Array();
         for (const takerNode of takerNodeGenerator) {
-            const makerNodeGenerator = makerNodeGeneratorFn(marketIndex, slot, marketType, oraclePriceData, fallbackPrice);
+            const makerNodeGenerator = makerNodeGeneratorFn(marketIndex, slot, marketType, oraclePriceData);
             for (const makerNode of makerNodeGenerator) {
                 // Can't match orders from the same user
                 const sameUser = takerNode.userAccount.equals(makerNode.userAccount);
@@ -964,12 +964,10 @@ class DLOB {
      * @param slot
      * @param oraclePriceData
      * @param depth how many levels of the order book to return
-     * @param fallbackAsk best ask for fallback liquidity, only relevant for perps
-     * @param fallbackBid best bid for fallback liquidity, only relevant for perps
      * @param fallbackL2Generators L2 generators for fallback liquidity e.g. vAMM {@link getVammL2Generator}, openbook {@link SerumSubscriber}
      */
-    getL2({ marketIndex, marketType, slot, oraclePriceData, depth, fallbackAsk, fallbackBid, fallbackL2Generators = [], }) {
-        const makerAskL2LevelGenerator = (0, orderBookLevels_1.getL2GeneratorFromDLOBNodes)(this.getMakerLimitAsks(marketIndex, slot, marketType, oraclePriceData, fallbackBid), oraclePriceData, slot);
+    getL2({ marketIndex, marketType, slot, oraclePriceData, depth, fallbackL2Generators = [], }) {
+        const makerAskL2LevelGenerator = (0, orderBookLevels_1.getL2GeneratorFromDLOBNodes)(this.getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData), oraclePriceData, slot);
         const fallbackAskGenerators = fallbackL2Generators.map((fallbackL2Generator) => {
             return fallbackL2Generator.getL2Asks();
         });
@@ -977,7 +975,7 @@ class DLOB {
             return a.price.lt(b.price);
         });
         const asks = (0, orderBookLevels_1.createL2Levels)(askL2LevelGenerator, depth);
-        const makerBidGenerator = (0, orderBookLevels_1.getL2GeneratorFromDLOBNodes)(this.getMakerLimitBids(marketIndex, slot, marketType, oraclePriceData, fallbackAsk), oraclePriceData, slot);
+        const makerBidGenerator = (0, orderBookLevels_1.getL2GeneratorFromDLOBNodes)(this.getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData), oraclePriceData, slot);
         const fallbackBidGenerators = fallbackL2Generators.map((fallbackOrders) => {
             return fallbackOrders.getL2Bids();
         });