@drift-labs/sdk 0.2.0-master.24 → 0.2.0-master.25

package/lib/addresses/pda.d.ts

@@ -14,3 +14,4 @@ export declare function getBankVaultAuthorityPublicKey(programId: PublicKey, ban
 export declare function getInsuranceFundVaultPublicKey(programId: PublicKey, bankIndex: BN): Promise<PublicKey>;
 export declare function getInsuranceFundVaultAuthorityPublicKey(programId: PublicKey, bankIndex: BN): Promise<PublicKey>;
 export declare function getInsuranceFundStakeAccountPublicKey(programId: PublicKey, authority: PublicKey, bankIndex: BN): PublicKey;
+export declare function getClearingHouseSignerPublicKey(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.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultAuthorityPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getBankVaultAuthorityPublicKey = exports.getBankVaultPublicKey = exports.getBankPublicKey = exports.getMarketPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getClearingHouseStateAccountPublicKey = exports.getClearingHouseStateAccountPublicKeyAndNonce = void 0;
+exports.getClearingHouseSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultAuthorityPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getBankVaultAuthorityPublicKey = exports.getBankVaultPublicKey = exports.getBankPublicKey = exports.getMarketPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getClearingHouseStateAccountPublicKey = exports.getClearingHouseStateAccountPublicKeyAndNonce = void 0;
 const anchor = __importStar(require("@project-serum/anchor"));
 async function getClearingHouseStateAccountPublicKeyAndNonce(programId) {
     return anchor.web3.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('clearing_house'))], programId);
@@ -110,3 +110,7 @@ function getInsuranceFundStakeAccountPublicKey(programId, authority, bankIndex)
     ], programId)[0];
 }
 exports.getInsuranceFundStakeAccountPublicKey = getInsuranceFundStakeAccountPublicKey;
+function getClearingHouseSignerPublicKey(programId) {
+    return anchor.web3.PublicKey.findProgramAddressSync([Buffer.from(anchor.utils.bytes.utf8.encode('clearing_house_signer'))], programId)[0];
+}
+exports.getClearingHouseSignerPublicKey = getClearingHouseSignerPublicKey;

package/lib/admin.js

@@ -40,17 +40,16 @@ class Admin extends clearingHouse_1.ClearingHouse {
         if (stateAccountRPCResponse.value !== null) {
             throw new Error('Clearing house already initialized');
         }
-        const [insuranceVaultPublicKey] = await web3_js_1.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('insurance_vault'))], this.program.programId);
-        const [insuranceVaultAuthority] = await web3_js_1.PublicKey.findProgramAddress([insuranceVaultPublicKey.toBuffer()], this.program.programId);
         const [clearingHouseStatePublicKey] = await (0, pda_1.getClearingHouseStateAccountPublicKeyAndNonce)(this.program.programId);
+        const [insuranceVaultPublicKey] = await web3_js_1.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('insurance_vault'))], this.program.programId);
         const initializeTx = await this.program.transaction.initialize(adminControlsPrices, {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: clearingHouseStatePublicKey,
                 quoteAssetMint: usdcMint,
-                insuranceVault: insuranceVaultPublicKey,
-                insuranceVaultAuthority: insuranceVaultAuthority,
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                insuranceVault: insuranceVaultPublicKey,
+                clearingHouseSigner: this.getSignerPublicKey(),
                 systemProgram: anchor.web3.SystemProgram.programId,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
@@ -62,18 +61,15 @@ class Admin extends clearingHouse_1.ClearingHouse {
         const bankIndex = this.getStateAccount().numberOfBanks;
         const bank = await (0, pda_1.getBankPublicKey)(this.program.programId, bankIndex);
         const bankVault = await (0, pda_1.getBankVaultPublicKey)(this.program.programId, bankIndex);
-        const bankVaultAuthority = await (0, pda_1.getBankVaultAuthorityPublicKey)(this.program.programId, bankIndex);
         const insuranceFundVault = await (0, pda_1.getInsuranceFundVaultPublicKey)(this.program.programId, bankIndex);
-        const insuranceFundVaultAuthority = await (0, pda_1.getInsuranceFundVaultAuthorityPublicKey)(this.program.programId, bankIndex);
         const initializeTx = await this.program.transaction.initializeBank(optimalUtilization, optimalRate, maxRate, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor, liquidationFee, {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 bank,
                 bankVault,
-                bankVaultAuthority,
                 insuranceFundVault,
-                insuranceFundVaultAuthority,
+                clearingHouseSigner: this.getSignerPublicKey(),
                 bankMint: mint,
                 oracle,
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
@@ -188,7 +184,7 @@ class Admin extends clearingHouse_1.ClearingHouse {
                 state: await this.getStatePublicKey(),
                 bank: bank.pubkey,
                 insuranceVault: state.insuranceVault,
-                insuranceVaultAuthority: state.insuranceVaultAuthority,
+                clearingHouseSigner: this.getSignerPublicKey(),
                 recipient: recipient,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
@@ -204,7 +200,7 @@ class Admin extends clearingHouse_1.ClearingHouse {
                 market: marketPublicKey,
                 bank: bank.pubkey,
                 bankVault: bank.vault,
-                bankVaultAuthority: bank.vaultAuthority,
+                clearingHouseSigner: this.getSignerPublicKey(),
                 recipient: recipient,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
@@ -219,10 +215,9 @@ class Admin extends clearingHouse_1.ClearingHouse {
                 state: await this.getStatePublicKey(),
                 market: await (0, pda_1.getMarketPublicKey)(this.program.programId, marketIndex),
                 insuranceVault: state.insuranceVault,
-                insuranceVaultAuthority: state.insuranceVaultAuthority,
+                clearingHouseSigner: this.getSignerPublicKey(),
                 bank: bank.pubkey,
                 bankVault: bank.vault,
-                bankVaultAuthority: bank.vaultAuthority,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
         });

package/lib/clearingHouse.d.ts

@@ -47,6 +47,8 @@ export declare class ClearingHouse {
     unsubscribeUsers(): Promise<void>[];
     statePublicKey?: PublicKey;
     getStatePublicKey(): Promise<PublicKey>;
+    signerPublicKey?: PublicKey;
+    getSignerPublicKey(): PublicKey;
     getStateAccount(): StateAccount;
     getMarketAccount(marketIndex: BN | number): MarketAccount | undefined;
     getMarketAccounts(): MarketAccount[];

package/lib/clearingHouse.js

@@ -159,6 +159,13 @@ class ClearingHouse {
         this.statePublicKey = await (0, pda_1.getClearingHouseStateAccountPublicKey)(this.program.programId);
         return this.statePublicKey;
     }
+    getSignerPublicKey() {
+        if (this.signerPublicKey) {
+            return this.signerPublicKey;
+        }
+        this.signerPublicKey = (0, pda_1.getClearingHouseSignerPublicKey)(this.program.programId);
+        return this.signerPublicKey;
+    }
     getStateAccount() {
         return this.accountSubscriber.getStateAccountAndSlot().data;
     }
@@ -631,7 +638,7 @@ class ClearingHouse {
                 state: await this.getStatePublicKey(),
                 bank: bank.pubkey,
                 bankVault: bank.vault,
-                bankVaultAuthority: bank.vaultAuthority,
+                clearingHouseSigner: this.getSignerPublicKey(),
                 user: userAccountPublicKey,
                 userStats: this.getUserStatsAccountPublicKey(),
                 userTokenAccount: userTokenAccount,
@@ -1320,7 +1327,7 @@ class ClearingHouse {
                 liquidator: liquidatorPublicKey,
                 bankVault: bank.vault,
                 insuranceFundVault: bank.insuranceFundVault,
-                insuranceFundVaultAuthority: bank.insuranceFundVaultAuthority,
+                clearingHouseSigner: this.getSignerPublicKey(),
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
             remainingAccounts: remainingAccounts,
@@ -1345,7 +1352,7 @@ class ClearingHouse {
                 liquidator: liquidatorPublicKey,
                 bankVault: bank.vault,
                 insuranceFundVault: bank.insuranceFundVault,
-                insuranceFundVaultAuthority: bank.insuranceFundVaultAuthority,
+                clearingHouseSigner: this.getSignerPublicKey(),
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
             remainingAccounts: remainingAccounts,
@@ -1621,7 +1628,7 @@ class ClearingHouse {
                 userStats: this.getUserStatsAccountPublicKey(),
                 authority: this.wallet.publicKey,
                 insuranceFundVault: bank.insuranceFundVault,
-                insuranceFundVaultAuthority: bank.insuranceFundVaultAuthority,
+                clearingHouseSigner: this.getSignerPublicKey(),
                 userTokenAccount: collateralAccountPublicKey,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
@@ -1638,7 +1645,7 @@ class ClearingHouse {
                 state: await this.getStatePublicKey(),
                 bank: bank.pubkey,
                 bankVault: bank.vault,
-                bankVaultAuthority: bank.vaultAuthority,
+                clearingHouseSigner: this.getSignerPublicKey(),
                 insuranceFundVault: bank.insuranceFundVault,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },

package/lib/clearingHouseUser.d.ts

@@ -52,7 +52,9 @@ export declare class ClearingHouseUser {
     exists(): Promise<boolean>;
     /**
      * calculates the market position if the lp position was settled
-     * @returns : userPosition
+     * @returns : the settled userPosition
+     * @returns : the dust base asset amount (ie, < stepsize)
+     * @returns : pnl from settle
      */
     getSettledLPPosition(marketIndex: BN): [UserPosition, BN, BN];
     /**

package/lib/clearingHouseUser.js

@@ -105,7 +105,9 @@ class ClearingHouseUser {
     }
     /**
      * calculates the market position if the lp position was settled
-     * @returns : userPosition
+     * @returns : the settled userPosition
+     * @returns : the dust base asset amount (ie, < stepsize)
+     * @returns : pnl from settle
      */
     getSettledLPPosition(marketIndex) {
         const _position = this.getUserPosition(marketIndex);
@@ -138,8 +140,6 @@ class ClearingHouseUser {
         }
         const standardizedBaa = deltaBaa.sub(remainderBaa);
         const reaminderPerLP = remainderBaa.mul(numericConstants_1.AMM_RESERVE_PRECISION).div(nShares);
-        position.baseAssetAmount = position.baseAssetAmount.add(standardizedBaa);
-        position.quoteAssetAmount = position.quoteAssetAmount.add(deltaQaa);
         position.lastNetBaseAssetAmountPerLp =
             market.amm.marketPositionPerLp.baseAssetAmount.sub(reaminderPerLP);
         let updateType;
@@ -168,13 +168,15 @@ class ClearingHouseUser {
             newQuoteEntry = position.quoteEntryAmount.sub(position.quoteEntryAmount
                 .mul(deltaBaa.abs())
                 .div(position.baseAssetAmount.abs()));
-            pnl = position.quoteEntryAmount.sub(newQuoteEntry);
+            pnl = position.quoteEntryAmount.sub(newQuoteEntry).add(deltaQaa);
         }
         else {
             newQuoteEntry = deltaQaa.sub(deltaQaa.mul(position.baseAssetAmount.abs()).div(deltaBaa.abs()));
             pnl = position.quoteEntryAmount.add(deltaQaa.sub(newQuoteEntry));
         }
         position.quoteEntryAmount = newQuoteEntry;
+        position.baseAssetAmount = position.baseAssetAmount.add(standardizedBaa);
+        position.quoteAssetAmount = position.quoteAssetAmount.add(deltaQaa);
         if (position.baseAssetAmount.gt(numericConstants_1.ZERO)) {
             position.lastCumulativeFundingRate = market.amm.cumulativeFundingRateLong;
         }

package/lib/config.js

@@ -7,7 +7,7 @@ exports.configs = {
     devnet: {
         ENV: 'devnet',
         PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-        CLEARING_HOUSE_PROGRAM_ID: 'HbUKwqFPjz9r7ZtT416AU8aaecDQMKKiDCTS3AdXnS6c',
+        CLEARING_HOUSE_PROGRAM_ID: '3v1iEjbSSLSSYyt1pmx4UB5rqJGurmz71RibXF7X6UF3',
         USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
         MARKETS: markets_1.DevnetMarkets,
         BANKS: banks_1.DevnetBanks,

package/lib/events/eventSubscriber.d.ts

@@ -15,10 +15,12 @@ export declare class EventSubscriber {
     private awaitTxResolver;
     private logProvider;
     eventEmitter: StrictEventEmitter<EventEmitter, EventSubscriberEvents>;
+    private lastSeenSlot;
+    lastSeenTxSig: string;
     constructor(connection: Connection, program: Program, options?: EventSubscriptionOptions);
-    subscribe(): boolean;
+    subscribe(): Promise<boolean>;
     private handleTxLogs;
-    private fetchPreviousTx;
+    fetchPreviousTx(fetchMax?: boolean): Promise<void>;
     unsubscribe(): Promise<boolean>;
     private parseEventsFromLogs;
     awaitTx(txSig: TransactionSignature): Promise<void>;

package/lib/events/eventSubscriber.js

@@ -30,17 +30,21 @@ class EventSubscriber {
             this.logProvider = new pollingLogProvider_1.PollingLogProvider(this.connection, this.program.programId, options.commitment, this.options.logProviderConfig.frequency);
         }
     }
-    subscribe() {
-        if (this.logProvider.isSubscribed()) {
+    async subscribe() {
+        try {
+            if (this.logProvider.isSubscribed()) {
+                return true;
+            }
+            this.logProvider.subscribe((txSig, slot, logs) => {
+                this.handleTxLogs(txSig, slot, logs);
+            }, true);
             return true;
         }
-        this.fetchPreviousTx().catch((e) => {
+        catch (e) {
             console.error('Error fetching previous txs in event subscriber');
             console.error(e);
-        });
-        return this.logProvider.subscribe((txSig, slot, logs) => {
-            this.handleTxLogs(txSig, slot, logs);
-        });
+            return false;
+        }
     }
     handleTxLogs(txSig, slot, logs) {
         if (this.txEventCache.has(txSig)) {
@@ -56,10 +60,13 @@ class EventSubscriber {
             this.awaitTxResolver.get(txSig)();
             this.awaitTxResolver.delete(txSig);
         }
+        if (slot > this.lastSeenSlot) {
+            this.lastSeenTxSig = txSig;
+        }
         this.txEventCache.add(txSig, wrappedEvents);
     }
-    async fetchPreviousTx() {
-        if (!this.options.untilTx) {
+    async fetchPreviousTx(fetchMax) {
+        if (!this.options.untilTx && !fetchMax) {
             return;
         }
         let txFetched = 0;

package/lib/events/fetchLogs.d.ts

@@ -1,4 +1,6 @@
+import { Program } from '@project-serum/anchor';
 import { Connection, Finality, PublicKey, TransactionSignature } from '@solana/web3.js';
+import { WrappedEvents } from './types';
 declare type Log = {
     txSig: TransactionSignature;
     slot: number;
@@ -7,7 +9,14 @@ declare type Log = {
 declare type FetchLogsResponse = {
     earliestTx: string;
     mostRecentTx: string;
+    earliestSlot: number;
+    mostRecentSlot: number;
     transactionLogs: Log[];
 };
-export declare function fetchLogs(connection: Connection, programId: PublicKey, finality: Finality, beforeTx?: TransactionSignature, untilTx?: TransactionSignature): Promise<FetchLogsResponse | undefined>;
+export declare function fetchLogs(connection: Connection, programId: PublicKey, finality: Finality, beforeTx?: TransactionSignature, untilTx?: TransactionSignature, limit?: number): Promise<FetchLogsResponse>;
+export declare class LogParser {
+    private program;
+    constructor(program: Program);
+    parseEventsFromLogs(event: Log): WrappedEvents;
+}
 export {};

package/lib/events/fetchLogs.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchLogs = void 0;
-async function fetchLogs(connection, programId, finality, beforeTx, untilTx) {
+exports.LogParser = exports.fetchLogs = void 0;
+async function fetchLogs(connection, programId, finality, beforeTx, untilTx, limit) {
     const signatures = await connection.getSignaturesForAddress(programId, {
         before: beforeTx,
         until: untilTx,
+        limit,
     }, finality);
-    const sortedSignatures = signatures.sort((a, b) => a.slot < b.slot ? -1 : 1);
+    const sortedSignatures = signatures.sort((a, b) => a.slot === b.slot ? 0 : a.slot < b.slot ? -1 : 1);
     const filteredSignatures = sortedSignatures.filter((signature) => !signature.err);
     if (filteredSignatures.length === 0) {
         return undefined;
@@ -22,12 +23,14 @@ async function fetchLogs(connection, programId, finality, beforeTx, untilTx) {
             };
         });
     }))).flat();
-    const earliestTx = filteredSignatures[0].signature;
-    const mostRecentTx = filteredSignatures[filteredSignatures.length - 1].signature;
+    const earliest = filteredSignatures[0];
+    const mostRecent = filteredSignatures[filteredSignatures.length - 1];
     return {
         transactionLogs: transactionLogs,
-        earliestTx: earliestTx,
-        mostRecentTx: mostRecentTx,
+        earliestTx: earliest.signature,
+        mostRecentTx: mostRecent.signature,
+        earliestSlot: earliest.slot,
+        mostRecentSlot: mostRecent.slot,
     };
 }
 exports.fetchLogs = fetchLogs;
@@ -37,3 +40,20 @@ function chunk(array, size) {
         .map((_, index) => index * size)
         .map((begin) => array.slice(begin, begin + size));
 }
+class LogParser {
+    constructor(program) {
+        this.program = program;
+    }
+    parseEventsFromLogs(event) {
+        const records = [];
+        // @ts-ignore
+        this.program._events._eventParser.parseLogs(event.logs, (eventLog) => {
+            eventLog.data.txSig = event.txSig;
+            eventLog.data.slot = event.slot;
+            eventLog.data.eventType = eventLog.name;
+            records.push(eventLog.data);
+        });
+        return records;
+    }
+}
+exports.LogParser = LogParser;

package/lib/events/pollingLogProvider.d.ts

@@ -8,8 +8,9 @@ export declare class PollingLogProvider implements LogProvider {
     private intervalId;
     private mostRecentSeenTx?;
     private mutex;
+    private firstFetch;
     constructor(connection: Connection, programId: PublicKey, commitment: Commitment, frequency?: number);
-    subscribe(callback: logProviderCallback): boolean;
+    subscribe(callback: logProviderCallback, skipHistory?: boolean): boolean;
     isSubscribed(): boolean;
     unsubscribe(): Promise<boolean>;
 }

package/lib/events/pollingLogProvider.js

@@ -7,9 +7,10 @@ class PollingLogProvider {
         this.connection = connection;
         this.programId = programId;
         this.frequency = frequency;
+        this.firstFetch = true;
         this.finality = commitment === 'finalized' ? 'finalized' : 'confirmed';
     }
-    subscribe(callback) {
+    subscribe(callback, skipHistory) {
         if (this.intervalId) {
             return true;
         }
@@ -19,7 +20,10 @@ class PollingLogProvider {
             }
             this.mutex = 1;
             try {
-                const response = await (0, fetchLogs_1.fetchLogs)(this.connection, this.programId, this.finality, undefined, this.mostRecentSeenTx);
+                const response = await (0, fetchLogs_1.fetchLogs)(this.connection, this.programId, this.finality, undefined, this.mostRecentSeenTx, 
+                // If skipping history, only fetch one log back, not the maximum amount available
+                skipHistory && this.firstFetch ? 1 : undefined);
+                this.firstFetch = false;
                 if (response === undefined) {
                     return;
                 }

package/lib/events/types.d.ts

@@ -1,5 +1,5 @@
 import { Commitment, TransactionSignature } from '@solana/web3.js';
-import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord } from '../index';
+import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord, LPRecord } from '../index';
 export declare type EventSubscriptionOptions = {
     eventTypes?: EventType[];
     maxEventsPerType?: number;
@@ -30,6 +30,7 @@ export declare type EventMap = {
     OrderActionRecord: Event<OrderActionRecord>;
     SettlePnlRecord: Event<SettlePnlRecord>;
     NewUserRecord: Event<NewUserRecord>;
+    LPRecord: Event<LPRecord>;
 };
 export declare type EventType = keyof EventMap;
 export interface EventSubscriberEvents {
@@ -39,7 +40,7 @@ export declare type SortFn = (currentRecord: EventMap[EventType], newRecord: Eve
 export declare type logProviderCallback = (txSig: TransactionSignature, slot: number, logs: string[]) => void;
 export interface LogProvider {
     isSubscribed(): boolean;
-    subscribe(callback: logProviderCallback): boolean;
+    subscribe(callback: logProviderCallback, skipHistory?: boolean): boolean;
     unsubscribe(): Promise<boolean>;
 }
 export declare type WebSocketLogProviderConfig = {

package/lib/events/types.js

@@ -11,6 +11,7 @@ exports.DefaultEventSubscriptionOptions = {
         'FundingRateRecord',
         'NewUserRecord',
         'SettlePnlRecord',
+        'LPRecord',
     ],
     maxEventsPerType: 4096,
     orderBy: 'blockchain',

package/lib/examples/makeTradeExample.js

@@ -11,9 +11,10 @@ const getTokenAddress = (mintAddress, userPubKey) => {
     return spl_token_1.Token.getAssociatedTokenAddress(new web3_js_1.PublicKey(`ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL`), spl_token_1.TOKEN_PROGRAM_ID, new web3_js_1.PublicKey(mintAddress), new web3_js_1.PublicKey(userPubKey));
 };
 exports.getTokenAddress = getTokenAddress;
+const cluster = 'devnet';
 const main = async () => {
     // Initialize Drift SDK
-    const sdkConfig = (0, __2.initialize)({ env: 'devnet' });
+    const sdkConfig = (0, __2.initialize)({ env: cluster });
     // Set up the Wallet and Provider
     const privateKey = process.env.BOT_PRIVATE_KEY; // stored as an array string
     const keypair = web3_js_1.Keypair.fromSecretKey(Uint8Array.from(JSON.parse(privateKey)));
@@ -30,16 +31,27 @@ const main = async () => {
     const usdcTokenAddress = await (0, exports.getTokenAddress)(sdkConfig.USDC_MINT_ADDRESS, wallet.publicKey.toString());
     // Set up the Drift Clearing House
     const clearingHousePublicKey = new web3_js_1.PublicKey(sdkConfig.CLEARING_HOUSE_PROGRAM_ID);
+    const bulkAccountLoader = new __2.BulkAccountLoader(connection, 'confirmed', 1000);
     const clearingHouse = new __2.ClearingHouse({
         connection,
         wallet: provider.wallet,
         programID: clearingHousePublicKey,
+        marketIndexes: __2.Markets[cluster].map((market) => market.marketIndex),
+        bankIndexes: banks_1.Banks[cluster].map((bank) => bank.bankIndex),
+        accountSubscription: {
+            type: 'polling',
+            accountLoader: bulkAccountLoader,
+        },
     });
     await clearingHouse.subscribe();
     // Set up Clearing House user client
     const user = new __2.ClearingHouseUser({
         clearingHouse,
         userAccountPublicKey: await clearingHouse.getUserAccountPublicKey(),
+        accountSubscription: {
+            type: 'polling',
+            accountLoader: bulkAccountLoader,
+        },
     });
     //// Check if clearing house account exists for the current wallet
     const userAccountExists = await user.exists();