@drift-labs/sdk-browser 2.162.0-beta.2 → 2.163.0-beta.9

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

@@ -1,10 +1,10 @@
 import { ResubOpts, GrpcConfigs } from './types';
-import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { UserAccount } from '../types';
 import { WebSocketUserAccountSubscriber } from './webSocketUserAccountSubscriber';
+import { DriftProgram } from '../config';
 export declare class grpcUserAccountSubscriber extends WebSocketUserAccountSubscriber {
     private grpcConfigs;
-    constructor(grpcConfigs: GrpcConfigs, program: Program, userAccountPublicKey: PublicKey, resubOpts?: ResubOpts);
+    constructor(grpcConfigs: GrpcConfigs, program: DriftProgram, userAccountPublicKey: PublicKey, resubOpts?: ResubOpts);
     subscribe(userAccount?: UserAccount): Promise<boolean>;
 }

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

@@ -1,10 +1,10 @@
 import { ResubOpts, GrpcConfigs } from './types';
-import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { UserStatsAccount } from '../types';
 import { WebSocketUserStatsAccountSubscriber } from './webSocketUserStatsAccountSubsriber';
+import { DriftProgram } from '../config';
 export declare class grpcUserStatsAccountSubscriber extends WebSocketUserStatsAccountSubscriber {
     private grpcConfigs;
-    constructor(grpcConfigs: GrpcConfigs, program: Program, userStatsAccountPublicKey: PublicKey, resubOpts?: ResubOpts);
+    constructor(grpcConfigs: GrpcConfigs, program: DriftProgram, userStatsAccountPublicKey: PublicKey, resubOpts?: ResubOpts);
     subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
 }

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { LaserGrpcConfigs, ResubOpts } from './types';
-import { Program } from '@coral-xyz/anchor';
 import { Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
+import { DriftProgram } from '../config';
 import { WebSocketProgramAccountSubscriber } from './webSocketProgramAccountSubscriber';
 import { LaserCommitmentLevel } from '../isomorphic/grpc';
 type LaserCommitment = (typeof LaserCommitmentLevel)[keyof typeof LaserCommitmentLevel];
@@ -12,7 +12,7 @@ export declare class LaserstreamProgramAccountSubscriber<T> extends WebSocketPro
     private readonly laserConfig;
     private readonly laserCommitmentLevel;
     private constructor();
-    static create<U>(grpcConfigs: LaserGrpcConfigs, subscriptionName: string, accountDiscriminator: string, program: Program, decodeBufferFn: (accountName: string, ix: Buffer) => U, options?: {
+    static create<U>(grpcConfigs: LaserGrpcConfigs, subscriptionName: string, accountDiscriminator: string, program: DriftProgram, decodeBufferFn: (accountName: string, ix: Buffer) => U, options?: {
         filters: MemcmpFilter[];
     }, resubOpts?: ResubOpts): Promise<LaserstreamProgramAccountSubscriber<U>>;
     subscribe(onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void): Promise<void>;

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

@@ -1,17 +1,17 @@
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { UserAccount } from '../types';
 import { BasicUserAccountSubscriber } from './basicUserAccountSubscriber';
-import { Program } from '@coral-xyz/anchor';
 import { UserAccountSubscriber } from './types';
+import { DriftProgram } from '../config';
 /**
  * Simple implementation of UserAccountSubscriber. It will fetch the UserAccount
  * date on subscribe (or call to fetch) if no account data is provided on init.
  * Expect to use only 1 RPC call unless you call fetch repeatedly.
  */
 export declare class OneShotUserAccountSubscriber extends BasicUserAccountSubscriber implements UserAccountSubscriber {
-    program: Program;
+    program: DriftProgram;
     commitment: Commitment;
-    constructor(program: Program, userAccountPublicKey: PublicKey, data?: UserAccount, slot?: number, commitment?: Commitment);
+    constructor(program: DriftProgram, userAccountPublicKey: PublicKey, data?: UserAccount, slot?: number, commitment?: Commitment);
     subscribe(userAccount?: UserAccount): Promise<boolean>;
     fetchIfUnloaded(): Promise<void>;
     fetch(): Promise<void>;

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

@@ -1,17 +1,17 @@
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { UserStatsAccount } from '../types';
 import { BasicUserStatsAccountSubscriber } from './basicUserStatsAccountSubscriber';
-import { Program } from '@coral-xyz/anchor';
 import { UserStatsAccountSubscriber } from './types';
+import { DriftProgram } from '../config';
 /**
  * Simple implementation of UserStatsAccountSubscriber. It will fetch the UserStatsAccount
  * data on subscribe (or call to fetch) if no account data is provided on init.
  * Expect to use only 1 RPC call unless you call fetch repeatedly.
  */
 export declare class OneShotUserStatsAccountSubscriber extends BasicUserStatsAccountSubscriber implements UserStatsAccountSubscriber {
-    program: Program;
+    program: DriftProgram;
     commitment: Commitment;
-    constructor(program: Program, userStatsAccountPublicKey: PublicKey, data?: UserStatsAccount, slot?: number, commitment?: Commitment);
+    constructor(program: DriftProgram, userStatsAccountPublicKey: PublicKey, data?: UserStatsAccount, slot?: number, commitment?: Commitment);
     subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
     fetchIfUnloaded(): Promise<void>;
     fetch(): Promise<void>;

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

@@ -1,6 +1,5 @@
 /// <reference types="node" />
 import { AccountToPoll, DataAndSlot, DelistedMarketSetting, DriftClientAccountEvents, DriftClientAccountSubscriber, OraclesToPoll } from './types';
-import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PerpMarketAccount, SpotMarketAccount, StateAccount, UserAccount } from '../types';
@@ -8,9 +7,10 @@ import { BulkAccountLoader } from './bulkAccountLoader';
 import { PublicKey } from '@solana/web3.js';
 import { OracleInfo, OraclePriceData } from '../oracles/types';
 import { OracleClientCache } from '../oracles/oracleClientCache';
+import { DriftProgram } from '../config';
 export declare class PollingDriftClientAccountSubscriber implements DriftClientAccountSubscriber {
     isSubscribed: boolean;
-    program: Program;
+    program: DriftProgram;
     perpMarketIndexes: number[];
     spotMarketIndexes: number[];
     oracleInfos: OracleInfo[];
@@ -34,7 +34,7 @@ export declare class PollingDriftClientAccountSubscriber implements DriftClientA
     private isSubscribing;
     private subscriptionPromise;
     private subscriptionPromiseResolver;
-    constructor(program: Program, accountLoader: BulkAccountLoader, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting);
+    constructor(program: DriftProgram, accountLoader: BulkAccountLoader, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting);
     subscribe(): Promise<boolean>;
     updateAccountsToPoll(): Promise<void>;
     updatePerpMarketAccountsToPoll(): Promise<boolean>;

package/lib/browser/accounts/pollingDriftClientAccountSubscriber.js

@@ -152,7 +152,7 @@ class PollingDriftClientAccountSubscriber {
         accountToPoll.callbackId = await this.accountLoader.addAccount(accountToPoll.publicKey, (buffer, slot) => {
             if (!buffer)
                 return;
-            const account = this.program.account[accountToPoll.key].coder.accounts.decodeUnchecked((0, utils_1.capitalize)(accountToPoll.key), buffer);
+            const account = this.program.coder.accounts.decodeUnchecked(accountToPoll.key, buffer);
             const dataAndSlot = {
                 data: account,
                 slot,
@@ -196,7 +196,7 @@ class PollingDriftClientAccountSubscriber {
             }
             const { buffer, slot } = bufferAndSlot;
             if (buffer) {
-                const account = this.program.account[accountToPoll.key].coder.accounts.decodeUnchecked((0, utils_1.capitalize)(accountToPoll.key), buffer);
+                const account = this.program.coder.accounts.decodeUnchecked(accountToPoll.key, buffer);
                 if (accountToPoll.mapKey != undefined) {
                     this[accountToPoll.key].set(accountToPoll.mapKey, {
                         data: account,

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { DataAndSlot, InsuranceFundStakeAccountEvents, InsuranceFundStakeAccountSubscriber } from './types';
-import { Program } from '@coral-xyz/anchor';
+import { DriftProgram } from '../config';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
@@ -8,14 +8,14 @@ import { BulkAccountLoader } from './bulkAccountLoader';
 import { InsuranceFundStake } from '../types';
 export declare class PollingInsuranceFundStakeAccountSubscriber implements InsuranceFundStakeAccountSubscriber {
     isSubscribed: boolean;
-    program: Program;
+    program: DriftProgram;
     eventEmitter: StrictEventEmitter<EventEmitter, InsuranceFundStakeAccountEvents>;
     insuranceFundStakeAccountPublicKey: PublicKey;
     accountLoader: BulkAccountLoader;
     callbackId?: string;
     errorCallbackId?: string;
     insuranceFundStakeAccountAndSlot?: DataAndSlot<InsuranceFundStake>;
-    constructor(program: Program, publicKey: PublicKey, accountLoader: BulkAccountLoader);
+    constructor(program: DriftProgram, publicKey: PublicKey, accountLoader: BulkAccountLoader);
     subscribe(insuranceFundStake?: InsuranceFundStake): Promise<boolean>;
     addToAccountLoader(): Promise<void>;
     fetchIfUnloaded(): Promise<void>;

package/lib/browser/accounts/pollingInsuranceFundStakeAccountSubscriber.js

@@ -40,7 +40,7 @@ class PollingInsuranceFundStakeAccountSubscriber {
                 this.insuranceFundStakeAccountAndSlot.slot > slot) {
                 return;
             }
-            const account = this.program.account.user.coder.accounts.decode('InsuranceFundStake', buffer);
+            const account = this.program.coder.accounts.decode('insuranceFundStake', buffer);
             this.insuranceFundStakeAccountAndSlot = { data: account, slot };
             this.eventEmitter.emit('insuranceFundStakeAccountUpdate', account);
             this.eventEmitter.emit('update');

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

@@ -1,14 +1,14 @@
 /// <reference types="node" />
 import { DataAndSlot, OracleEvents, OracleAccountSubscriber } 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 { OracleClient, OraclePriceData } from '../oracles/types';
+import { DriftProgram } from '../config';
 export declare class PollingOracleAccountSubscriber implements OracleAccountSubscriber {
     isSubscribed: boolean;
-    program: Program;
+    program: DriftProgram;
     eventEmitter: StrictEventEmitter<EventEmitter, OracleEvents>;
     publicKey: PublicKey;
     accountLoader: BulkAccountLoader;

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

@@ -1,14 +1,14 @@
 /// <reference types="node" />
 import { DataAndSlot, TokenAccountEvents, TokenAccountSubscriber } 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 { Account } from '@solana/spl-token';
+import { DriftProgram } from '../config';
 export declare class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
     isSubscribed: boolean;
-    program: Program;
+    program: DriftProgram;
     eventEmitter: StrictEventEmitter<EventEmitter, TokenAccountEvents>;
     publicKey: PublicKey;
     accountLoader: BulkAccountLoader;

package/lib/browser/accounts/pollingUserAccountSubscriber.js

@@ -38,7 +38,7 @@ class PollingUserAccountSubscriber {
             if (this.user && this.user.slot > slot) {
                 return;
             }
-            const account = this.decode('User', buffer);
+            const account = this.decode('user', buffer);
             this.user = { data: account, slot };
             this.eventEmitter.emit('userAccountUpdate', account);
             this.eventEmitter.emit('update');
@@ -58,7 +58,7 @@ class PollingUserAccountSubscriber {
             const dataAndContext = await this.connection.getAccountInfoAndContext(this.userAccountPublicKey, this.accountLoader.commitment);
             if (dataAndContext.context.slot > ((_b = (_a = this.user) === null || _a === void 0 ? void 0 : _a.slot) !== null && _b !== void 0 ? _b : 0)) {
                 this.user = {
-                    data: this.decode('User', dataAndContext.value.data),
+                    data: this.decode('user', dataAndContext.value.data),
                     slot: dataAndContext.context.slot,
                 };
             }

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

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { DataAndSlot, UserStatsAccountSubscriber, UserStatsAccountEvents } from './types';
-import { Program } from '@coral-xyz/anchor';
+import { DriftProgram } from '../config';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
@@ -8,14 +8,14 @@ import { UserStatsAccount } from '../types';
 import { BulkAccountLoader } from './bulkAccountLoader';
 export declare class PollingUserStatsAccountSubscriber implements UserStatsAccountSubscriber {
     isSubscribed: boolean;
-    program: Program;
+    program: DriftProgram;
     eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
     userStatsAccountPublicKey: PublicKey;
     accountLoader: BulkAccountLoader;
     callbackId?: string;
     errorCallbackId?: string;
     userStats?: DataAndSlot<UserStatsAccount>;
-    constructor(program: Program, userStatsAccountPublicKey: PublicKey, accountLoader: BulkAccountLoader);
+    constructor(program: DriftProgram, userStatsAccountPublicKey: PublicKey, accountLoader: BulkAccountLoader);
     subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
     addToAccountLoader(): Promise<void>;
     fetchIfUnloaded(): Promise<void>;

package/lib/browser/accounts/pollingUserStatsAccountSubscriber.js

@@ -37,7 +37,7 @@ class PollingUserStatsAccountSubscriber {
             if (this.userStats && this.userStats.slot > slot) {
                 return;
             }
-            const account = this.program.account.userStats.coder.accounts.decodeUnchecked('UserStats', buffer);
+            const account = this.program.coder.accounts.decodeUnchecked('userStats', buffer);
             this.userStats = { data: account, slot };
             this.eventEmitter.emit('userStatsAccountUpdate', account);
             this.eventEmitter.emit('update');

package/lib/browser/accounts/testBulkAccountLoader.js

@@ -7,22 +7,20 @@ class TestBulkAccountLoader extends bulkAccountLoader_1.BulkAccountLoader {
         if (accountsToLoadChunks.length === 0) {
             return;
         }
-        const accounts = [];
         for (const accountsToLoadChunk of accountsToLoadChunks) {
             for (const accountToLoad of accountsToLoadChunk) {
                 const account = await this.connection.getAccountInfoAndContext(accountToLoad.publicKey, this.commitment);
-                accounts.push(account);
                 const newSlot = account.context.slot;
                 if (newSlot > this.mostRecentSlot) {
                     this.mostRecentSlot = newSlot;
                 }
                 if (accountToLoad.callbacks.size === 0) {
-                    return;
+                    continue;
                 }
                 const key = accountToLoad.publicKey.toBase58();
                 const prev = this.bufferAndSlotMap.get(key);
                 if (prev && newSlot < prev.slot) {
-                    return;
+                    continue;
                 }
                 let newBuffer = undefined;
                 if (account.value) {
@@ -31,7 +29,7 @@ class TestBulkAccountLoader extends bulkAccountLoader_1.BulkAccountLoader {
                 if (!prev) {
                     this.bufferAndSlotMap.set(key, { slot: newSlot, buffer: newBuffer });
                     this.handleAccountCallbacks(accountToLoad, newBuffer, newSlot);
-                    return;
+                    continue;
                 }
                 const oldBuffer = prev.buffer;
                 if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {

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

@@ -1,7 +1,17 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-import { SpotMarketAccount, PerpMarketAccount, OracleSource, StateAccount, UserAccount, UserStatsAccount, InsuranceFundStake, ConstituentAccount, HighLeverageModeConfig } from '../types';
+/**
+ * Account subscription interfaces and types.
+ *
+ * DriftClient uses a `DriftClientAccountSubscriber` (WebSocket or polling) to keep
+ * market, oracle, and state accounts cached in memory. `User` uses a `UserAccountSubscriber`
+ * for the individual User account. All subscribers implement the interfaces defined here.
+ *
+ * Implementations: `webSocketDriftClientAccountSubscriber.ts` (default),
+ * `pollingDriftClientAccountSubscriber.ts`, `bulkAccountLoader.ts` (batched RPC).
+ */
+import { SpotMarketAccount, PerpMarketAccount, OracleSource, StateAccount, UserAccount, UserStatsAccount, InsuranceFundStake, ConstituentAccount } from '../types';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { Context, PublicKey } from '@solana/web3.js';
@@ -174,19 +184,6 @@ export type LaserGrpcConfigs = BaseGrpcConfigs & {
     channelOptions?: LaserstreamConfig['channelOptions'];
 };
 export type GrpcConfigs = YellowstoneGrpcConfigs | LaserGrpcConfigs;
-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;
-}
 export interface ConstituentAccountSubscriber {
     eventEmitter: StrictEventEmitter<EventEmitter, ConstituentAccountEvents>;
     isSubscribed: boolean;

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

@@ -1,13 +1,13 @@
 /// <reference types="node" />
 import { DataAndSlot, BufferAndSlot, AccountSubscriber, ResubOpts } from './types';
-import { Program } from '@coral-xyz/anchor';
 import { AccountInfo, Commitment, Context, PublicKey } from '@solana/web3.js';
+import { DriftProgram } from '../config';
 export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
     dataAndSlot?: DataAndSlot<T>;
     bufferAndSlot?: BufferAndSlot;
     accountName: string;
     logAccountName: string;
-    program: Program;
+    program: DriftProgram;
     accountPublicKey: PublicKey;
     decodeBufferFn: (buffer: Buffer) => T;
     onChange: (data: T) => void;
@@ -17,7 +17,7 @@ export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<
     isUnsubscribing: boolean;
     timeoutId?: ReturnType<typeof setTimeout>;
     receivingData: boolean;
-    constructor(accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => T, resubOpts?: ResubOpts, commitment?: Commitment);
+    constructor(accountName: string, program: DriftProgram, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => T, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(onChange: (data: T) => void): Promise<void>;
     setData(data: T, slot?: number): void;
     protected setTimeout(): void;

package/lib/browser/accounts/webSocketAccountSubscriber.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketAccountSubscriber = void 0;
-const utils_1 = require("./utils");
 class WebSocketAccountSubscriber {
     constructor(accountName, program, accountPublicKey, decodeBuffer, resubOpts, commitment) {
         var _a;
@@ -137,7 +136,7 @@ class WebSocketAccountSubscriber {
             return this.decodeBufferFn(buffer);
         }
         else {
-            return this.program.account[this.accountName].coder.accounts.decode((0, utils_1.capitalize)(this.accountName), buffer);
+            return this.program.account[this.accountName].coder.accounts.decode(this.accountName, buffer);
         }
     }
     unsubscribe(onResub = false) {

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { DataAndSlot, AccountSubscriber, ResubOpts, BufferAndSlot } from './types';
-import { Program } from '@coral-xyz/anchor';
+import { DriftProgram } from '../config';
 import { AccountInfoBase, AccountInfoWithBase64EncodedData, AccountInfoWithBase58EncodedData, Rpc, RpcSubscriptions, SolanaRpcSubscriptionsApi, Commitment } from 'gill';
 import { PublicKey } from '@solana/web3.js';
 /**
@@ -57,7 +57,7 @@ export declare class WebSocketAccountSubscriberV2<T> implements AccountSubscribe
     bufferAndSlot?: BufferAndSlot;
     accountName: string;
     logAccountName: string;
-    program: Program;
+    program: DriftProgram;
     accountPublicKey: PublicKey;
     decodeBufferFn: (buffer: Buffer) => T;
     onChange: (data: T) => void;
@@ -84,7 +84,7 @@ export declare class WebSocketAccountSubscriberV2<T> implements AccountSubscribe
      * @param rpcSubscriptions Optional override/injection for testing.
      * @param rpc Optional override/injection for testing.
      */
-    constructor(accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => T, resubOpts?: ResubOpts, commitment?: Commitment, rpcSubscriptions?: RpcSubscriptions<SolanaRpcSubscriptionsApi> & string, rpc?: Rpc<any>);
+    constructor(accountName: string, program: DriftProgram, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => T, resubOpts?: ResubOpts, commitment?: Commitment, rpcSubscriptions?: RpcSubscriptions<SolanaRpcSubscriptionsApi> & string, rpc?: Rpc<any>);
     private handleNotificationLoop;
     subscribe(onChange: (data: T) => void): Promise<void>;
     setData(data: T, slot?: number): void;

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

@@ -2,17 +2,17 @@
 /// <reference types="node" />
 import { AccountSubscriber, DataAndSlot, DelistedMarketSetting, DriftClientAccountEvents, DriftClientAccountSubscriber, ResubOpts } from './types';
 import { PerpMarketAccount, SpotMarketAccount, StateAccount } from '../types';
-import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { OracleInfo, OraclePriceData } from '../oracles/types';
 import { OracleClientCache } from '../oracles/oracleClientCache';
+import { DriftProgram } from '../config';
 import { WebSocketAccountSubscriberV2 } from './webSocketAccountSubscriberV2';
 export declare class WebSocketDriftClientAccountSubscriber implements DriftClientAccountSubscriber {
     isSubscribed: boolean;
-    program: Program;
+    program: DriftProgram;
     commitment?: Commitment;
     perpMarketIndexes: number[];
     spotMarketIndexes: number[];
@@ -33,12 +33,12 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     initialPerpMarketAccountData: Map<number, PerpMarketAccount>;
     initialSpotMarketAccountData: Map<number, SpotMarketAccount>;
     initialOraclePriceData: Map<string, OraclePriceData>;
-    customPerpMarketAccountSubscriber?: new (accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => AccountSubscriber<any>;
-    customOracleAccountSubscriber?: new (accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => AccountSubscriber<any>;
+    customPerpMarketAccountSubscriber?: new (accountName: string, program: DriftProgram, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => AccountSubscriber<any>;
+    customOracleAccountSubscriber?: new (accountName: string, program: DriftProgram, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => AccountSubscriber<any>;
     protected isSubscribing: boolean;
     protected subscriptionPromise: Promise<boolean>;
     protected subscriptionPromiseResolver: (val: boolean) => void;
-    constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting, resubOpts?: ResubOpts, commitment?: Commitment, customPerpMarketAccountSubscriber?: new (accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => WebSocketAccountSubscriberV2<any> | WebSocketAccountSubscriber<any>, customOracleAccountSubscriber?: new (accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => WebSocketAccountSubscriberV2<any> | WebSocketAccountSubscriber<any>);
+    constructor(program: DriftProgram, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting, resubOpts?: ResubOpts, commitment?: Commitment, customPerpMarketAccountSubscriber?: new (accountName: string, program: DriftProgram, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => WebSocketAccountSubscriberV2<any> | WebSocketAccountSubscriber<any>, customOracleAccountSubscriber?: new (accountName: string, program: DriftProgram, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => WebSocketAccountSubscriberV2<any> | WebSocketAccountSubscriber<any>);
     subscribe(): Promise<boolean>;
     chunks: <T>(array: readonly T[], size: number) => T[][];
     setInitialData(): Promise<void>;

package/lib/browser/accounts/webSocketDriftClientAccountSubscriber.js

@@ -99,7 +99,7 @@ class WebSocketDriftClientAccountSubscriber {
             this.initialPerpMarketAccountData = new Map(perpMarketAccountInfos
                 .filter((accountInfo) => !!accountInfo)
                 .map((accountInfo) => {
-                const perpMarket = this.program.coder.accounts.decode('PerpMarket', accountInfo.data);
+                const perpMarket = this.program.coder.accounts.decode('perpMarket', accountInfo.data);
                 return [perpMarket.marketIndex, perpMarket];
             }));
         }
@@ -110,7 +110,7 @@ class WebSocketDriftClientAccountSubscriber {
             this.initialSpotMarketAccountData = new Map(spotMarketAccountInfos
                 .filter((accountInfo) => !!accountInfo)
                 .map((accountInfo) => {
-                const spotMarket = this.program.coder.accounts.decode('SpotMarket', accountInfo.data);
+                const spotMarket = this.program.coder.accounts.decode('spotMarket', accountInfo.data);
                 return [spotMarket.marketIndex, spotMarket];
             }));
         }

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

@@ -1,18 +1,18 @@
 /// <reference types="node" />
 import { AccountSubscriber, DataAndSlot, DelistedMarketSetting, DriftClientAccountEvents, DriftClientAccountSubscriber, ResubOpts } from './types';
 import { PerpMarketAccount, SpotMarketAccount, StateAccount } 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 { Commitment } from 'gill';
 import { OracleInfo, OraclePriceData } from '../oracles/types';
 import { OracleClientCache } from '../oracles/oracleClientCache';
+import { DriftProgram } from '../config';
 import { WebSocketProgramAccountsSubscriberV2 } from './webSocketProgramAccountsSubscriberV2';
 import { WebSocketAccountSubscriberV2 } from './webSocketAccountSubscriberV2';
 export declare class WebSocketDriftClientAccountSubscriberV2 implements DriftClientAccountSubscriber {
     isSubscribed: boolean;
-    program: Program;
+    program: DriftProgram;
     commitment?: Commitment;
     perpMarketIndexes: number[];
     spotMarketIndexes: number[];
@@ -41,7 +41,7 @@ export declare class WebSocketDriftClientAccountSubscriberV2 implements DriftCli
     protected subscriptionPromiseResolver: (val: boolean) => void;
     private rpc;
     private rpcSubscriptions;
-    constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting, resubOpts?: ResubOpts, commitment?: Commitment, skipInitialData?: boolean);
+    constructor(program: DriftProgram, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting, resubOpts?: ResubOpts, commitment?: Commitment, skipInitialData?: boolean);
     subscribe(): Promise<boolean>;
     chunks: <T>(array: readonly T[], size: number) => T[][];
     fetch(): Promise<void>;

package/lib/browser/accounts/webSocketDriftClientAccountSubscriberV2.js

@@ -92,13 +92,13 @@ class WebSocketDriftClientAccountSubscriberV2 {
             }
             // Create subscribers
             this.perpMarketAllAccountsSubscriber =
-                new webSocketProgramAccountsSubscriberV2_1.WebSocketProgramAccountsSubscriberV2('PerpMarketAccountsSubscriber', 'PerpMarket', this.program, this.program.account.perpMarket.coder.accounts.decodeUnchecked.bind(this.program.account.perpMarket.coder.accounts), {
+                new webSocketProgramAccountsSubscriberV2_1.WebSocketProgramAccountsSubscriberV2('PerpMarketAccountsSubscriber', 'perpMarket', this.program, this.program.account.perpMarket.coder.accounts.decodeUnchecked.bind(this.program.account.perpMarket.coder.accounts), {
                     filters: [(0, memcmp_1.getPerpMarketAccountsFilter)()],
                     commitment: this.commitment,
                 }, this.resubOpts, perpMarketAccountPubkeys // because we pass these in, it will monitor these accounts and fetch them right away
                 );
             this.spotMarketAllAccountsSubscriber =
-                new webSocketProgramAccountsSubscriberV2_1.WebSocketProgramAccountsSubscriberV2('SpotMarketAccountsSubscriber', 'SpotMarket', this.program, this.program.account.spotMarket.coder.accounts.decodeUnchecked.bind(this.program.account.spotMarket.coder.accounts), {
+                new webSocketProgramAccountsSubscriberV2_1.WebSocketProgramAccountsSubscriberV2('SpotMarketAccountsSubscriber', 'spotMarket', this.program, this.program.account.spotMarket.coder.accounts.decodeUnchecked.bind(this.program.account.spotMarket.coder.accounts), {
                     filters: [(0, memcmp_1.getSpotMarketAccountsFilter)()],
                     commitment: this.commitment,
                 }, this.resubOpts, spotMarketAccountPubkeys // because we pass these in, it will monitor these accounts and fetch them right away

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

@@ -1,19 +1,19 @@
 /// <reference types="node" />
 import { DataAndSlot, AccountSubscriber, InsuranceFundStakeAccountEvents, InsuranceFundStakeAccountSubscriber } 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 { InsuranceFundStake } from '../types';
+import { DriftProgram } from '../config';
 export declare class WebSocketInsuranceFundStakeAccountSubscriber implements InsuranceFundStakeAccountSubscriber {
     isSubscribed: boolean;
     resubTimeoutMs?: number;
     commitment?: Commitment;
-    program: Program;
+    program: DriftProgram;
     eventEmitter: StrictEventEmitter<EventEmitter, InsuranceFundStakeAccountEvents>;
     insuranceFundStakeAccountPublicKey: PublicKey;
     insuranceFundStakeDataAccountSubscriber: AccountSubscriber<InsuranceFundStake>;
-    constructor(program: Program, insuranceFundStakeAccountPublicKey: PublicKey, resubTimeoutMs?: number, commitment?: Commitment);
+    constructor(program: DriftProgram, insuranceFundStakeAccountPublicKey: PublicKey, resubTimeoutMs?: number, commitment?: Commitment);
     subscribe(insuranceFundStakeAccount?: InsuranceFundStake): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;

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

@@ -1,13 +1,13 @@
 /// <reference types="node" />
 import { BufferAndSlot, ProgramAccountSubscriber, ResubOpts } from './types';
-import { Program } from '@coral-xyz/anchor';
 import { Commitment, Context, KeyedAccountInfo, MemcmpFilter, PublicKey } from '@solana/web3.js';
+import { DriftProgram } from '../config';
 export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAccountSubscriber<T> {
     subscriptionName: string;
     accountDiscriminator: string;
     bufferAndSlot?: BufferAndSlot;
     bufferAndSlotMap: Map<string, BufferAndSlot>;
-    program: Program;
+    program: DriftProgram;
     decodeBuffer: (accountName: string, ix: Buffer) => T;
     onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
     listenerId?: number;
@@ -19,7 +19,7 @@ export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAcco
         commitment?: Commitment;
     };
     receivingData: boolean;
-    constructor(subscriptionName: string, accountDiscriminator: string, program: Program, decodeBufferFn: (accountName: string, ix: Buffer) => T, options?: {
+    constructor(subscriptionName: string, accountDiscriminator: string, program: DriftProgram, decodeBufferFn: (accountName: string, ix: Buffer) => T, options?: {
         filters: MemcmpFilter[];
         commitment?: Commitment;
     }, resubOpts?: ResubOpts);

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { BufferAndSlot, ProgramAccountSubscriber, ResubOpts } from './types';
-import { Program } from '@coral-xyz/anchor';
+import { DriftProgram } from '../config';
 import { Commitment, Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
 import { AccountInfoBase, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, Address } from 'gill';
 /**
@@ -67,7 +67,7 @@ export declare class WebSocketProgramAccountsSubscriberV2<T> implements ProgramA
     subscriptionName: string;
     accountDiscriminator: string;
     bufferAndSlotMap: Map<string, BufferAndSlot>;
-    program: Program;
+    program: DriftProgram;
     decodeBuffer: (accountName: string, ix: Buffer) => T;
     onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
     listenerId?: number;
@@ -93,7 +93,7 @@ export declare class WebSocketProgramAccountsSubscriberV2<T> implements ProgramA
     private missedChangeDetected;
     private resubscriptionTimeout?;
     private accountsWithMissedUpdates;
-    constructor(subscriptionName: string, accountDiscriminator: string, program: Program, decodeBufferFn: (accountName: string, ix: Buffer) => T, options?: {
+    constructor(subscriptionName: string, accountDiscriminator: string, program: DriftProgram, decodeBufferFn: (accountName: string, ix: Buffer) => T, options?: {
         filters: MemcmpFilter[];
         commitment?: Commitment;
     }, resubOpts?: ResubOpts, accountsToMonitor?: PublicKey[]);

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { BufferAndSlot, ProgramAccountSubscriber, ResubOpts } from './types';
-import { Program } from '@coral-xyz/anchor';
+import { DriftProgram } from '../config';
 import { Commitment, Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
 import { AccountInfoBase, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, Address } from 'gill';
 /**
@@ -67,7 +67,7 @@ export declare class WebSocketProgramAccountsSubscriberV2<T> implements ProgramA
     subscriptionName: string;
     accountDiscriminator: string;
     bufferAndSlotMap: Map<string, BufferAndSlot>;
-    program: Program;
+    program: DriftProgram;
     decodeBuffer: (accountName: string, ix: Buffer) => T;
     onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
     listenerId?: number;
@@ -93,7 +93,7 @@ export declare class WebSocketProgramAccountsSubscriberV2<T> implements ProgramA
     private missedChangeDetected;
     private resubscriptionTimeout?;
     private accountsWithMissedUpdates;
-    constructor(subscriptionName: string, accountDiscriminator: string, program: Program, decodeBufferFn: (accountName: string, ix: Buffer) => T, options?: {
+    constructor(subscriptionName: string, accountDiscriminator: string, program: DriftProgram, decodeBufferFn: (accountName: string, ix: Buffer) => T, options?: {
         filters: MemcmpFilter[];
         commitment?: Commitment;
     }, resubOpts?: ResubOpts, accountsToMonitor?: PublicKey[]);