@drift-labs/sdk 0.1.29-master.1 → 0.1.30-master.1

package/lib/factory/clearingHouse.js

@@ -11,18 +11,19 @@ const webSocketClearingHouseAccountSubscriber_1 = require("../accounts/webSocket
 const defaultTxSender_1 = require("../tx/defaultTxSender");
 const pollingClearingHouseAccountSubscriber_1 = require("../accounts/pollingClearingHouseAccountSubscriber");
 const admin_1 = require("../admin");
-function getWebSocketClearingHouseConfig(connection, wallet, programID, opts = anchor_1.Provider.defaultOptions(), txSender) {
+const retryTxSender_1 = require("../tx/retryTxSender");
+function getWebSocketClearingHouseConfig(connection, wallet, programID, opts = anchor_1.Provider.defaultOptions(), txSenderConfig) {
     return {
         type: 'websocket',
         connection,
         wallet,
         programID,
         opts,
-        txSender,
+        txSenderConfig,
     };
 }
 exports.getWebSocketClearingHouseConfig = getWebSocketClearingHouseConfig;
-function getPollingClearingHouseConfig(connection, wallet, programID, accountLoader, opts = anchor_1.Provider.defaultOptions(), txSender) {
+function getPollingClearingHouseConfig(connection, wallet, programID, accountLoader, opts = anchor_1.Provider.defaultOptions(), txSenderConfig) {
     return {
         type: 'polling',
         connection,
@@ -30,11 +31,12 @@ function getPollingClearingHouseConfig(connection, wallet, programID, accountLoa
         programID,
         accountLoader,
         opts,
-        txSender,
+        txSenderConfig,
     };
 }
 exports.getPollingClearingHouseConfig = getPollingClearingHouseConfig;
 function getClearingHouse(config) {
+    var _a;
     const provider = new anchor_1.Provider(config.connection, config.wallet, config.opts);
     const program = new anchor_1.Program(clearing_house_json_1.default, config.programID, provider);
     let accountSubscriber;
@@ -44,11 +46,19 @@ function getClearingHouse(config) {
     else if (config.type === 'polling') {
         accountSubscriber = new pollingClearingHouseAccountSubscriber_1.PollingClearingHouseAccountSubscriber(program, config.accountLoader);
     }
-    const txSender = config.txSender || new defaultTxSender_1.DefaultTxSender(provider);
+    let txSender;
+    if (((_a = config.txSenderConfig) === null || _a === void 0 ? void 0 : _a.type) === 'retry') {
+        const txSenderConfig = config.txSenderConfig;
+        txSender = new retryTxSender_1.RetryTxSender(provider, txSenderConfig.timeout, txSenderConfig.retrySleep, txSenderConfig.additionalConnections);
+    }
+    else {
+        txSender = new defaultTxSender_1.DefaultTxSender(provider);
+    }
     return new clearingHouse_1.ClearingHouse(config.connection, config.wallet, program, accountSubscriber, txSender, config.opts);
 }
 exports.getClearingHouse = getClearingHouse;
 function getAdmin(config) {
+    var _a;
     const provider = new anchor_1.Provider(config.connection, config.wallet, config.opts);
     const program = new anchor_1.Program(clearing_house_json_1.default, config.programID, provider);
     let accountSubscriber;
@@ -58,7 +68,14 @@ function getAdmin(config) {
     else if (config.type === 'polling') {
         accountSubscriber = new pollingClearingHouseAccountSubscriber_1.PollingClearingHouseAccountSubscriber(program, config.accountLoader);
     }
-    const txSender = config.txSender || new defaultTxSender_1.DefaultTxSender(provider);
+    let txSender;
+    if (((_a = config.txSenderConfig) === null || _a === void 0 ? void 0 : _a.type) === 'retry') {
+        const txSenderConfig = config.txSenderConfig;
+        txSender = new retryTxSender_1.RetryTxSender(provider, txSenderConfig.timeout, txSenderConfig.retrySleep, txSenderConfig.additionalConnections);
+    }
+    else {
+        txSender = new defaultTxSender_1.DefaultTxSender(provider);
+    }
     return new admin_1.Admin(config.connection, config.wallet, program, accountSubscriber, txSender, config.opts);
 }
 exports.getAdmin = getAdmin;

package/lib/idl/clearing_house.json

@@ -677,6 +677,57 @@
                 }
             ]
         },
+        {
+            "name": "cancelAllOrders",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "orderState",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "user",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "authority",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "markets",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "userPositions",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "userOrders",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "fundingPaymentHistory",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "orderHistory",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": []
+        },
         {
             "name": "expireOrders",
             "accounts": [
@@ -1431,32 +1482,6 @@
                 }
             ]
         },
-        {
-            "name": "deleteUser",
-            "accounts": [
-                {
-                    "name": "user",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "userPositions",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "userOrders",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "authority",
-                    "isMut": false,
-                    "isSigner": true
-                }
-            ],
-            "args": []
-        },
         {
             "name": "settleFundingPayment",
             "accounts": [
@@ -3241,8 +3266,8 @@
                         "type": "u128"
                     },
                     {
-                        "name": "netRevenueSinceLastFunding",
-                        "type": "i64"
+                        "name": "padding1",
+                        "type": "u64"
                     },
                     {
                         "name": "padding2",
@@ -4249,11 +4274,6 @@
             "code": 6060,
             "name": "CantExpireOrders",
             "msg": "CantExpireOrders"
-        },
-        {
-            "code": 6061,
-            "name": "InvalidRepegPriceImpact",
-            "msg": "AMM repeg mark price impact vs oracle too large"
         }
     ]
 }

package/lib/math/amm.d.ts

@@ -38,6 +38,24 @@ export declare function calculateSwapOutput(inputAssetReserve: BN, swapAmount: B
  * @param positionDirection
  */
 export declare function getSwapDirection(inputAssetType: AssetType, positionDirection: PositionDirection): SwapDirection;
+/**
+ * Helper function calculating adjust k cost
+ * @param market
+ * @param marketIndex
+ * @param numerator
+ * @param denomenator
+ * @returns cost : Precision QUOTE_ASSET_PRECISION
+ */
+export declare function calculateAdjustKCost(market: Market, marketIndex: BN, numerator: BN, denomenator: BN): BN;
+/**
+ * Helper function calculating adjust pegMultiplier (repeg) cost
+ *
+ * @param market
+ * @param marketIndex
+ * @param newPeg
+ * @returns cost : Precision QUOTE_ASSET_PRECISION
+ */
+export declare function calculateRepegCost(market: Market, marketIndex: BN, newPeg: BN): BN;
 /**
  * Helper function calculating terminal price of amm
  *

package/lib/math/amm.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateBudgetedPeg = exports.calculateBudgetedK = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = void 0;
+exports.calculateBudgetedPeg = exports.calculateBudgetedK = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.calculateRepegCost = exports.calculateAdjustKCost = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = void 0;
 const anchor_1 = require("@project-serum/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
+const position_1 = require("./position");
 const types_1 = require("../types");
 const assert_1 = require("../assert/assert");
 const __1 = require("..");
@@ -87,6 +88,92 @@ function getSwapDirection(inputAssetType, positionDirection) {
     return types_1.SwapDirection.ADD;
 }
 exports.getSwapDirection = getSwapDirection;
+/**
+ * Helper function calculating adjust k cost
+ * @param market
+ * @param marketIndex
+ * @param numerator
+ * @param denomenator
+ * @returns cost : Precision QUOTE_ASSET_PRECISION
+ */
+function calculateAdjustKCost(market, marketIndex, numerator, denomenator) {
+    const netUserPosition = {
+        baseAssetAmount: market.baseAssetAmount,
+        lastCumulativeFundingRate: market.amm.cumulativeFundingRate,
+        marketIndex: new anchor_1.BN(marketIndex),
+        quoteAssetAmount: new anchor_1.BN(0),
+        openOrders: new anchor_1.BN(0),
+    };
+    const currentValue = (0, position_1.calculateBaseAssetValue)(market, netUserPosition);
+    const marketNewK = Object.assign({}, market);
+    marketNewK.amm = Object.assign({}, market.amm);
+    marketNewK.amm.baseAssetReserve = market.amm.baseAssetReserve
+        .mul(numerator)
+        .div(denomenator);
+    marketNewK.amm.quoteAssetReserve = market.amm.quoteAssetReserve
+        .mul(numerator)
+        .div(denomenator);
+    marketNewK.amm.sqrtK = market.amm.sqrtK.mul(numerator).div(denomenator);
+    netUserPosition.quoteAssetAmount = currentValue;
+    const cost = (0, __1.calculatePositionPNL)(marketNewK, netUserPosition);
+    const p = numericConstants_1.PEG_PRECISION.mul(numerator).div(denomenator);
+    const x = market.amm.baseAssetReserve;
+    const y = market.amm.quoteAssetReserve;
+    const delta = market.baseAssetAmount;
+    const k = market.amm.sqrtK.mul(market.amm.sqrtK);
+    const numer1 = numericConstants_1.PEG_PRECISION.sub(p).mul(y).div(numericConstants_1.PEG_PRECISION);
+    const numer20 = k
+        .mul(p)
+        .mul(p)
+        .div(numericConstants_1.PEG_PRECISION)
+        .div(numericConstants_1.PEG_PRECISION)
+        .div(x.mul(p).div(numericConstants_1.PEG_PRECISION).add(delta));
+    const numer21 = k.div(x.add(delta));
+    const formulaCost = numer21
+        .sub(numer20)
+        .sub(numer1)
+        .mul(market.amm.pegMultiplier)
+        .div(numericConstants_1.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO);
+    console.log((0, __1.convertToNumber)(formulaCost, numericConstants_1.QUOTE_PRECISION));
+    // p.div(p.mul(x).add(delta)).sub()
+    return cost;
+}
+exports.calculateAdjustKCost = calculateAdjustKCost;
+/**
+ * Helper function calculating adjust pegMultiplier (repeg) cost
+ *
+ * @param market
+ * @param marketIndex
+ * @param newPeg
+ * @returns cost : Precision QUOTE_ASSET_PRECISION
+ */
+function calculateRepegCost(market, marketIndex, newPeg) {
+    const netUserPosition = {
+        baseAssetAmount: market.baseAssetAmount,
+        lastCumulativeFundingRate: market.amm.cumulativeFundingRate,
+        marketIndex: new anchor_1.BN(marketIndex),
+        quoteAssetAmount: new anchor_1.BN(0),
+        openOrders: new anchor_1.BN(0),
+    };
+    const currentValue = (0, position_1.calculateBaseAssetValue)(market, netUserPosition);
+    netUserPosition.quoteAssetAmount = currentValue;
+    const prevMarketPrice = (0, __1.calculateMarkPrice)(market);
+    const marketNewPeg = Object.assign({}, market);
+    marketNewPeg.amm = Object.assign({}, market.amm);
+    // const marketNewPeg = JSON.parse(JSON.stringify(market));
+    marketNewPeg.amm.pegMultiplier = newPeg;
+    console.log('Price moves from', (0, __1.convertToNumber)(prevMarketPrice), 'to', (0, __1.convertToNumber)((0, __1.calculateMarkPrice)(marketNewPeg)));
+    const cost = (0, __1.calculatePositionPNL)(marketNewPeg, netUserPosition);
+    const k = market.amm.sqrtK.mul(market.amm.sqrtK);
+    const newQuoteAssetReserve = k.div(market.amm.baseAssetReserve.add(netUserPosition.baseAssetAmount));
+    const deltaQuoteAssetReserves = newQuoteAssetReserve.sub(market.amm.quoteAssetReserve);
+    const cost2 = deltaQuoteAssetReserves
+        .mul(market.amm.pegMultiplier.sub(newPeg))
+        .div(numericConstants_1.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO);
+    console.log((0, __1.convertToNumber)(cost2, numericConstants_1.QUOTE_PRECISION));
+    return cost;
+}
+exports.calculateRepegCost = calculateRepegCost;
 /**
  * Helper function calculating terminal price of amm
  *

package/lib/oracles/pythClient.js

@@ -33,7 +33,7 @@ class PythClient {
         return __awaiter(this, void 0, void 0, function* () {
             const priceData = (0, client_1.parsePriceData)(buffer);
             return {
-                price: convertPythPrice(priceData.price, priceData.exponent),
+                price: convertPythPrice(priceData.aggregate.price, priceData.exponent),
                 slot: new anchor_1.BN(priceData.lastSlot.toString()),
                 confidence: convertPythPrice(priceData.confidence, priceData.exponent),
                 twap: convertPythPrice(priceData.twap.value, priceData.exponent),

package/lib/orderParams.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="bn.js" />
 import { OrderParams, OrderTriggerCondition, PositionDirection } from './types';
 import { BN } from '@project-serum/anchor';
-export declare function getLimitOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, price: BN, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean, userOrderId?: number, postOnly?: boolean, oraclePriceOffset?: BN): OrderParams;
+export declare function getLimitOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, price: BN, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean, userOrderId?: number, postOnly?: boolean, oraclePriceOffset?: BN, immediateOrCancel?: boolean): OrderParams;
 export declare function getTriggerMarketOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, triggerPrice: BN, triggerCondition: OrderTriggerCondition, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean, userOrderId?: number): OrderParams;
 export declare function getTriggerLimitOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, price: BN, triggerPrice: BN, triggerCondition: OrderTriggerCondition, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean, userOrderId?: number): OrderParams;
 export declare function getMarketOrderParams(marketIndex: BN, direction: PositionDirection, quoteAssetAmount: BN, baseAssetAmount: BN, reduceOnly: boolean, price?: BN, discountToken?: boolean, referrer?: boolean): OrderParams;

package/lib/orderParams.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMarketOrderParams = exports.getTriggerLimitOrderParams = exports.getTriggerMarketOrderParams = exports.getLimitOrderParams = void 0;
 const types_1 = require("./types");
 const numericConstants_1 = require("./constants/numericConstants");
-function getLimitOrderParams(marketIndex, direction, baseAssetAmount, price, reduceOnly, discountToken = false, referrer = false, userOrderId = 0, postOnly = false, oraclePriceOffset = numericConstants_1.ZERO) {
+function getLimitOrderParams(marketIndex, direction, baseAssetAmount, price, reduceOnly, discountToken = false, referrer = false, userOrderId = 0, postOnly = false, oraclePriceOffset = numericConstants_1.ZERO, immediateOrCancel = false) {
     return {
         orderType: types_1.OrderType.LIMIT,
         userOrderId,
@@ -14,7 +14,7 @@ function getLimitOrderParams(marketIndex, direction, baseAssetAmount, price, red
         price,
         reduceOnly,
         postOnly,
-        immediateOrCancel: false,
+        immediateOrCancel,
         positionLimit: numericConstants_1.ZERO,
         padding0: true,
         padding1: numericConstants_1.ZERO,

package/lib/tx/retryTxSender.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="node" />
 import { TxSender } from './types';
-import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature } from '@solana/web3.js';
+import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature, Connection } from '@solana/web3.js';
 import { Provider } from '@project-serum/anchor';
 declare type ResolveReference = {
     resolve?: () => void;
@@ -8,12 +9,14 @@ export declare class RetryTxSender implements TxSender {
     provider: Provider;
     timeout: number;
     retrySleep: number;
-    constructor(provider: Provider, timeout?: number, retrySleep?: number);
+    additionalConnections: Connection[];
+    constructor(provider: Provider, timeout?: number, retrySleep?: number, additionalConnections?: Connection[]);
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TransactionSignature>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions): Promise<Transaction>;
     confirmTransaction(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;
     getTimestamp(): number;
     sleep(reference: ResolveReference): Promise<void>;
     promiseTimeout<T>(promise: Promise<T>, timeoutMs: number): Promise<T | null>;
+    sendToAdditionalConnections(rawTx: Buffer, opts: ConfirmOptions): void;
 }
 export {};

package/lib/tx/retryTxSender.js

@@ -18,10 +18,11 @@ const bs58_1 = __importDefault(require("bs58"));
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_RETRY = 8000;
 class RetryTxSender {
-    constructor(provider, timeout, retrySleep) {
+    constructor(provider, timeout, retrySleep, additionalConnections = new Array()) {
         this.provider = provider;
         this.timeout = timeout !== null && timeout !== void 0 ? timeout : DEFAULT_TIMEOUT;
         this.retrySleep = retrySleep !== null && retrySleep !== void 0 ? retrySleep : DEFAULT_RETRY;
+        this.additionalConnections = additionalConnections;
     }
     send(tx, additionalSigners, opts) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -35,6 +36,7 @@ class RetryTxSender {
             const rawTransaction = tx.serialize();
             const startTime = this.getTimestamp();
             const txid = yield this.provider.connection.sendRawTransaction(rawTransaction, opts);
+            this.sendToAdditionalConnections(rawTransaction, opts);
             let done = false;
             const resolveReference = {
                 resolve: undefined,
@@ -55,6 +57,7 @@ class RetryTxSender {
                             console.error(e);
                             stopWaiting();
                         });
+                        this.sendToAdditionalConnections(rawTransaction, opts);
                     }
                 }
             }))();
@@ -149,5 +152,15 @@ class RetryTxSender {
             return result;
         });
     }
+    sendToAdditionalConnections(rawTx, opts) {
+        this.additionalConnections.map((connection) => {
+            connection.sendRawTransaction(rawTx, opts).catch((e) => {
+                console.error(
+                // @ts-ignore
+                `error sending tx to additional connection ${connection._rpcEndpoint}`);
+                console.error(e);
+            });
+        });
+    }
 }
 exports.RetryTxSender = RetryTxSender;

package/lib/util/promiseTimeout.d.ts

@@ -0,0 +1 @@
+export declare function promiseTimeout<T>(promise: Promise<T>, timeoutMs: number): Promise<T | null>;

package/lib/util/promiseTimeout.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.promiseTimeout = void 0;
+function promiseTimeout(promise, timeoutMs) {
+    let timeoutId;
+    const timeoutPromise = new Promise((resolve) => {
+        timeoutId = setTimeout(() => resolve(null), timeoutMs);
+    });
+    return Promise.race([promise, timeoutPromise]).then((result) => {
+        clearTimeout(timeoutId);
+        return result;
+    });
+}
+exports.promiseTimeout = promiseTimeout;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.1.29-master.1",
+	"version": "0.1.30-master.1",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/accounts/bulkAccountLoader.ts

@@ -1,6 +1,7 @@
 import { Commitment, Connection, PublicKey } from '@solana/web3.js';
 import { v4 as uuidv4 } from 'uuid';
 import { AccountData } from './types';
+import { promiseTimeout } from '../util/promiseTimeout';
 
 type AccountToLoad = {
 	publicKey: PublicKey;
@@ -10,7 +11,6 @@ type AccountToLoad = {
 const GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE = 99;
 
 const oneMinute = 60 * 1000;
-const fiveMinutes = 5 * 60 * 1000;
 
 export class BulkAccountLoader {
 	connection: Connection;
@@ -24,7 +24,7 @@ export class BulkAccountLoader {
 	loadPromise?: Promise<void>;
 	loadPromiseResolver: () => void;
 	loggingEnabled = false;
-	lastUpdate = Date.now();
+	lastTimeLoadingPromiseCleared = Date.now();
 
 	public constructor(
 		connection: Connection,
@@ -43,10 +43,15 @@ export class BulkAccountLoader {
 		const existingSize = this.accountsToLoad.size;
 
 		const callbackId = uuidv4();
+		this.log(
+			`Adding account ${publicKey.toString()} callback id ${callbackId}`
+		);
 		const existingAccountToLoad = this.accountsToLoad.get(publicKey.toString());
 		if (existingAccountToLoad) {
+			this.log(`account already exists`);
 			existingAccountToLoad.callbacks.set(callbackId, callback);
 		} else {
+			this.log(`account doesn't already exist. creating new callback map`);
 			const callbacks = new Map<string, (buffer: Buffer) => void>();
 			callbacks.set(callbackId, callback);
 			const newAccountToLoad = {
@@ -67,6 +72,9 @@ export class BulkAccountLoader {
 	}
 
 	public removeAccount(publicKey: PublicKey, callbackId: string): void {
+		this.log(
+			`Removing account ${publicKey.toString()} callback id ${callbackId}`
+		);
 		const existingAccountToLoad = this.accountsToLoad.get(publicKey.toString());
 		if (existingAccountToLoad) {
 			existingAccountToLoad.callbacks.delete(callbackId);
@@ -99,17 +107,29 @@ export class BulkAccountLoader {
 
 	public async load(): Promise<void> {
 		if (this.loadPromise) {
-			return this.loadPromise;
+			const now = Date.now();
+			if (now - this.lastTimeLoadingPromiseCleared > oneMinute) {
+				this.log(`Load promise hasnt been clearing for one minute. Clearing.`);
+				this.loadPromise = undefined;
+			} else {
+				this.log(`Load promise exists. Returning early`);
+				return this.loadPromise;
+			}
 		}
+
 		this.loadPromise = new Promise((resolver) => {
 			this.loadPromiseResolver = resolver;
 		});
+		this.lastTimeLoadingPromiseCleared = Date.now();
+
+		this.log(`Loading`);
 
 		try {
 			const chunks = this.chunks(
 				Array.from(this.accountsToLoad.values()),
 				GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE
 			);
+			this.log(`${chunks.length} chunks`);
 
 			await Promise.all(
 				chunks.map((chunk) => {
@@ -122,28 +142,17 @@ export class BulkAccountLoader {
 			for (const [_, callback] of this.errorCallbacks) {
 				callback(e);
 			}
+			this.log('finished error callbacks');
 		} finally {
+			this.log(`resetting load promise`);
 			this.loadPromiseResolver();
 			this.loadPromise = undefined;
-
-			const now = Date.now();
-			if (now - this.lastUpdate > fiveMinutes) {
-				if (this.loggingEnabled) {
-					console.log(
-						"Haven't seen updated account in five minutes. Bulk account loader creating new Connection Object"
-					);
-				}
-				this.connection = new Connection(
-					// @ts-ignore
-					this.connection._rpcEndpoint,
-					this.connection.commitment
-				);
-			}
 		}
 	}
 
 	async loadChunk(accountsToLoad: AccountToLoad[]): Promise<void> {
 		if (accountsToLoad.length === 0) {
+			this.log(`no accounts in chunk`);
 			return;
 		}
 
@@ -154,15 +163,15 @@ export class BulkAccountLoader {
 			{ commitment: this.commitment },
 		];
 
-		// @ts-ignore
-		const rpcResponse = await this.connection._rpcRequest(
-			'getMultipleAccounts',
-			args
+		const rpcResponse: any | null = await promiseTimeout(
+			// @ts-ignore
+			this.connection._rpcRequest('getMultipleAccounts', args),
+			10 * 1000 // 30 second timeout
 		);
 
-		const oneMinuteSinceLastUpdate = Date.now() - this.lastUpdate > oneMinute;
-		if (this.loggingEnabled && oneMinuteSinceLastUpdate) {
-			console.log('rpcResponse', JSON.stringify(rpcResponse));
+		if (rpcResponse === null) {
+			this.log('request to rpc timed out', true);
+			return;
 		}
 
 		const newSlot = rpcResponse.result.context.slot;
@@ -179,44 +188,44 @@ export class BulkAccountLoader {
 				newBuffer = Buffer.from(raw, dataType);
 			}
 
-			if (this.loggingEnabled && oneMinuteSinceLastUpdate) {
-				console.log('oldRPCResponse', oldRPCResponse);
-			}
-
 			if (!oldRPCResponse) {
+				this.log('No old rpc response, updating account data');
 				this.accountData.set(key, {
 					slot: newSlot,
 					buffer: newBuffer,
 				});
 				this.handleAccountCallbacks(accountToLoad, newBuffer);
-				this.lastUpdate = Date.now();
 				continue;
 			}
 
 			if (newSlot <= oldRPCResponse.slot) {
+				this.log(`new slot ${newSlot} old slot ${oldRPCResponse.slot}`);
 				continue;
 			}
 
 			const oldBuffer = oldRPCResponse.buffer;
 			if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
+				this.log('new buffer, updating account data');
 				this.accountData.set(key, {
 					slot: newSlot,
 					buffer: newBuffer,
 				});
 				this.handleAccountCallbacks(accountToLoad, newBuffer);
-				this.lastUpdate = Date.now();
-			} else if (this.loggingEnabled) {
-				console.log('unable to update account for newest slot');
-				console.log('oldBuffer', oldBuffer);
-				console.log('newBuffer', newBuffer);
+			} else {
+				this.log('unable to update account for newest slot');
+				this.log('oldBuffer ' + oldBuffer);
+				this.log('newBuffer ' + newBuffer);
+				this.log('buffers equal ' + newBuffer.equals(oldBuffer));
 			}
 		}
 	}
 
 	handleAccountCallbacks(accountToLoad: AccountToLoad, buffer: Buffer): void {
+		this.log('handling account callbacks');
 		for (const [_, callback] of accountToLoad.callbacks) {
 			callback(buffer);
 		}
+		this.log('finished account callbacks');
 	}
 
 	public getAccountData(publicKey: PublicKey): Buffer | undefined {
@@ -229,9 +238,7 @@ export class BulkAccountLoader {
 			return;
 		}
 
-		if (this.loggingEnabled) {
-			console.log(`startPolling`);
-		}
+		this.log('startPolling');
 
 		this.intervalId = setInterval(this.load.bind(this), this.pollingFrequency);
 	}
@@ -241,9 +248,13 @@ export class BulkAccountLoader {
 			clearInterval(this.intervalId);
 			this.intervalId = undefined;
 
-			if (this.loggingEnabled) {
-				console.log(`stopPolling`);
-			}
+			this.log('stopPolling');
+		}
+	}
+
+	public log(msg: string, force = false): void {
+		if (this.loggingEnabled || force) {
+			console.log(msg);
 		}
 	}
 }