@drift-labs/sdk 0.1.23-master.3 → 0.1.25-master.0

package/lib/index.d.ts

@@ -1,7 +1,9 @@
 import { BN } from '@project-serum/anchor';
 import { PublicKey } from '@solana/web3.js';
 export * from './mockUSDCFaucet';
-export * from './pythClient';
+export * from './oracles/types';
+export * from './oracles/pythClient';
+export * from './oracles/switchboardClient';
 export * from './types';
 export * from './constants/markets';
 export * from './accounts/webSocketClearingHouseAccountSubscriber';
@@ -16,6 +18,7 @@ export * from './clearingHouseUser';
 export * from './clearingHouse';
 export * from './factory/clearingHouse';
 export * from './factory/clearingHouseUser';
+export * from './factory/oracleClient';
 export * from './math/conversion';
 export * from './math/funding';
 export * from './math/insuranceFund';

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -16,7 +20,9 @@ Object.defineProperty(exports, "BN", { enumerable: true, get: function () { retu
 const web3_js_1 = require("@solana/web3.js");
 Object.defineProperty(exports, "PublicKey", { enumerable: true, get: function () { return web3_js_1.PublicKey; } });
 __exportStar(require("./mockUSDCFaucet"), exports);
-__exportStar(require("./pythClient"), exports);
+__exportStar(require("./oracles/types"), exports);
+__exportStar(require("./oracles/pythClient"), exports);
+__exportStar(require("./oracles/switchboardClient"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./constants/markets"), exports);
 __exportStar(require("./accounts/webSocketClearingHouseAccountSubscriber"), exports);
@@ -31,6 +37,7 @@ __exportStar(require("./clearingHouseUser"), exports);
 __exportStar(require("./clearingHouse"), exports);
 __exportStar(require("./factory/clearingHouse"), exports);
 __exportStar(require("./factory/clearingHouseUser"), exports);
+__exportStar(require("./factory/oracleClient"), exports);
 __exportStar(require("./math/conversion"), exports);
 __exportStar(require("./math/funding"), exports);
 __exportStar(require("./math/insuranceFund"), exports);

package/lib/math/funding.d.ts

@@ -1,15 +1,15 @@
 /// <reference types="bn.js" />
 import { BN } from '@project-serum/anchor';
-import { PriceData } from '@pythnetwork/client';
 import { Market } from '../types';
+import { OraclePriceData } from '../oracles/types';
 /**
  *
  * @param market
- * @param pythClient
+ * @param oraclePriceData
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export declare function calculateAllEstimatedFundingRate(market: Market, oraclePriceData: PriceData, periodAdjustment?: BN): Promise<[BN, BN, BN, BN, BN]>;
+export declare function calculateAllEstimatedFundingRate(market: Market, oraclePriceData: OraclePriceData, periodAdjustment?: BN): Promise<[BN, BN, BN, BN, BN]>;
 /**
  *
  * @param market
@@ -18,7 +18,7 @@ export declare function calculateAllEstimatedFundingRate(market: Market, oracleP
  * @param estimationMethod
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export declare function calculateEstimatedFundingRate(market: Market, oraclePriceData: PriceData, periodAdjustment: BN, estimationMethod: 'interpolated' | 'lowerbound' | 'capped'): Promise<BN>;
+export declare function calculateEstimatedFundingRate(market: Market, oraclePriceData: OraclePriceData, periodAdjustment: BN, estimationMethod: 'interpolated' | 'lowerbound' | 'capped'): Promise<BN>;
 /**
  *
  * @param market
@@ -26,7 +26,7 @@ export declare function calculateEstimatedFundingRate(market: Market, oraclePric
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export declare function calculateLongShortFundingRate(market: Market, oraclePriceData: PriceData, periodAdjustment?: BN): Promise<[BN, BN]>;
+export declare function calculateLongShortFundingRate(market: Market, oraclePriceData: OraclePriceData, periodAdjustment?: BN): Promise<[BN, BN]>;
 /**
  *
  * @param market
@@ -34,7 +34,7 @@ export declare function calculateLongShortFundingRate(market: Market, oraclePric
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export declare function calculateLongShortFundingRateAndLiveTwaps(market: Market, oraclePriceData: PriceData, periodAdjustment?: BN): Promise<[BN, BN, BN, BN]>;
+export declare function calculateLongShortFundingRateAndLiveTwaps(market: Market, oraclePriceData: OraclePriceData, periodAdjustment?: BN): Promise<[BN, BN, BN, BN]>;
 /**
  *
  * @param market

package/lib/math/funding.js

@@ -16,7 +16,7 @@ const market_1 = require("./market");
 /**
  *
  * @param market
- * @param pythClient
+ * @param oraclePriceData
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
@@ -51,21 +51,9 @@ function calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustm
         const lastOraclePriceTwapTs = market.amm.lastOraclePriceTwapTs;
         const timeSinceLastOracleTwapUpdate = now.sub(lastOraclePriceTwapTs);
         const oracleTwapTimeSinceLastUpdate = anchor_1.BN.max(secondsInHour, secondsInHour.sub(timeSinceLastOracleTwapUpdate));
-        // verify pyth input is positive for live update
-        let oracleStablePriceNum = 0;
-        let oracleInputCount = 0;
-        if (oraclePriceData.price >= 0) {
-            oracleStablePriceNum += oraclePriceData.price;
-            oracleInputCount += 1;
-        }
-        if (oraclePriceData.previousPrice >= 0) {
-            oracleStablePriceNum += oraclePriceData.previousPrice;
-            oracleInputCount += 1;
-        }
-        oracleStablePriceNum = oracleStablePriceNum / oracleInputCount;
-        const oraclePriceStableWithMantissa = new anchor_1.BN(oracleStablePriceNum * numericConstants_1.MARK_PRICE_PRECISION.toNumber());
+        const oraclePrice = oraclePriceData.price;
         let oracleTwapWithMantissa = lastOracleTwapWithMantissa;
-        const oracleLiveVsTwap = oraclePriceStableWithMantissa
+        const oracleLiveVsTwap = oraclePrice
             .sub(lastOracleTwapWithMantissa)
             .abs()
             .mul(numericConstants_1.MARK_PRICE_PRECISION)
@@ -75,7 +63,7 @@ function calculateAllEstimatedFundingRate(market, oraclePriceData, periodAdjustm
         if (oracleLiveVsTwap.lte(numericConstants_1.MARK_PRICE_PRECISION.mul(new anchor_1.BN(10)))) {
             oracleTwapWithMantissa = oracleTwapTimeSinceLastUpdate
                 .mul(lastOracleTwapWithMantissa)
-                .add(timeSinceLastMarkChange.mul(oraclePriceStableWithMantissa))
+                .add(timeSinceLastMarkChange.mul(oraclePrice))
                 .div(timeSinceLastOracleTwapUpdate.add(oracleTwapTimeSinceLastUpdate));
         }
         const twapSpread = lastMarkTwapWithMantissa.sub(lastOracleTwapWithMantissa);

package/lib/math/orders.d.ts

@@ -2,3 +2,4 @@ import { ClearingHouseUser } from '../clearingHouseUser';
 import { Order } from '../types';
 export declare function isOrderRiskIncreasing(user: ClearingHouseUser, order: Order): boolean;
 export declare function isOrderRiskIncreasingInSameDirection(user: ClearingHouseUser, order: Order): boolean;
+export declare function isOrderReduceOnly(user: ClearingHouseUser, order: Order): boolean;

package/lib/math/orders.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isOrderRiskIncreasingInSameDirection = exports.isOrderRiskIncreasing = void 0;
+exports.isOrderReduceOnly = exports.isOrderRiskIncreasingInSameDirection = exports.isOrderRiskIncreasing = void 0;
 const types_1 = require("../types");
 const numericConstants_1 = require("../constants/numericConstants");
 function isOrderRiskIncreasing(user, order) {
@@ -52,3 +52,21 @@ function isOrderRiskIncreasingInSameDirection(user, order) {
     return false;
 }
 exports.isOrderRiskIncreasingInSameDirection = isOrderRiskIncreasingInSameDirection;
+function isOrderReduceOnly(user, order) {
+    if ((0, types_1.isVariant)(order.status, 'init')) {
+        return false;
+    }
+    const position = user.getUserPosition(order.marketIndex) ||
+        user.getEmptyPosition(order.marketIndex);
+    // if position is long and order is long
+    if (position.baseAssetAmount.gt(numericConstants_1.ZERO) && (0, types_1.isVariant)(order.direction, 'long')) {
+        return false;
+    }
+    // if position is short and order is short
+    if (position.baseAssetAmount.lt(numericConstants_1.ZERO) &&
+        (0, types_1.isVariant)(order.direction, 'short')) {
+        return false;
+    }
+    return order.baseAssetAmount.abs().lte(position.baseAssetAmount.abs());
+}
+exports.isOrderReduceOnly = isOrderReduceOnly;

package/lib/mockUSDCFaucet.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/oracles/pythClient.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="node" />
+/// <reference types="bn.js" />
+import { PriceData } from '@pythnetwork/client';
+import { Connection, PublicKey } from '@solana/web3.js';
+import { OraclePriceData } from './types';
+import { BN } from '@project-serum/anchor';
+export declare class PythClient {
+    private connection;
+    constructor(connection: Connection);
+    getPriceData(pricePublicKey: PublicKey): Promise<PriceData>;
+    getOraclePriceData(pricePublicKey: PublicKey): Promise<OraclePriceData>;
+    getOraclePriceDataFromBuffer(buffer: Buffer): Promise<OraclePriceData>;
+}
+export declare function convertPythPrice(price: number, exponent: number): BN;

package/lib/oracles/pythClient.js

@@ -0,0 +1,53 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertPythPrice = exports.PythClient = void 0;
+const client_1 = require("@pythnetwork/client");
+const anchor_1 = require("@project-serum/anchor");
+const numericConstants_1 = require("../constants/numericConstants");
+class PythClient {
+    constructor(connection) {
+        this.connection = connection;
+    }
+    getPriceData(pricePublicKey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const account = yield this.connection.getAccountInfo(pricePublicKey);
+            return (0, client_1.parsePriceData)(account.data);
+        });
+    }
+    getOraclePriceData(pricePublicKey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const accountInfo = yield this.connection.getAccountInfo(pricePublicKey);
+            return this.getOraclePriceDataFromBuffer(accountInfo.data);
+        });
+    }
+    getOraclePriceDataFromBuffer(buffer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const priceData = (0, client_1.parsePriceData)(buffer);
+            return {
+                price: convertPythPrice(priceData.price, priceData.exponent),
+                slot: new anchor_1.BN(priceData.lastSlot.toString()),
+                confidence: convertPythPrice(priceData.confidence, priceData.exponent),
+                twap: convertPythPrice(priceData.twap.value, priceData.exponent),
+                twapConfidence: convertPythPrice(priceData.twac.value, priceData.exponent),
+            };
+        });
+    }
+}
+exports.PythClient = PythClient;
+function convertPythPrice(price, exponent) {
+    exponent = Math.abs(exponent);
+    const pythPrecision = numericConstants_1.TEN.pow(new anchor_1.BN(exponent).abs());
+    return new anchor_1.BN(price * Math.pow(10, exponent))
+        .mul(numericConstants_1.MARK_PRICE_PRECISION)
+        .div(pythPrecision);
+}
+exports.convertPythPrice = convertPythPrice;

package/lib/oracles/switchboardClient.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="node" />
+import { Connection, PublicKey } from '@solana/web3.js';
+import { DriftEnv } from '../config';
+import { Program } from '@project-serum/anchor';
+import { OracleClient, OraclePriceData } from './types';
+export declare class SwitchboardClient implements OracleClient {
+    connection: Connection;
+    env: DriftEnv;
+    constructor(connection: Connection, env: DriftEnv);
+    getOraclePriceData(pricePublicKey: PublicKey): Promise<OraclePriceData>;
+    getOraclePriceDataFromBuffer(buffer: Buffer): Promise<OraclePriceData>;
+    getProgram(): Promise<Program>;
+}

package/lib/oracles/switchboardClient.js

@@ -0,0 +1,76 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SwitchboardClient = void 0;
+const switchboard_v2_1 = require("@switchboard-xyz/switchboard-v2");
+const web3_js_1 = require("@solana/web3.js");
+const anchor_1 = require("@project-serum/anchor");
+const numericConstants_1 = require("../constants/numericConstants");
+const wallet_1 = require("../wallet");
+const switchboard_v2_json_1 = __importDefault(require("../idl/switchboard_v2.json"));
+// cache switchboard program for every client object since itll always be the same
+const programMap = new Map();
+class SwitchboardClient {
+    constructor(connection, env) {
+        this.connection = connection;
+        this.env = env;
+    }
+    getOraclePriceData(pricePublicKey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const accountInfo = yield this.connection.getAccountInfo(pricePublicKey);
+            return this.getOraclePriceDataFromBuffer(accountInfo.data);
+        });
+    }
+    getOraclePriceDataFromBuffer(buffer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const program = yield this.getProgram();
+            const aggregatorAccountData = program.account.aggregatorAccountData.coder.accounts.decode('AggregatorAccountData', buffer);
+            const price = convertSwitchboardDecimal(aggregatorAccountData.latestConfirmedRound.result);
+            const confidence = convertSwitchboardDecimal(aggregatorAccountData.latestConfirmedRound
+                .stdDeviation);
+            const slot = aggregatorAccountData.latestConfirmedRound.roundOpenSlot;
+            return {
+                price,
+                slot,
+                confidence,
+            };
+        });
+    }
+    getProgram() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (programMap.has(this.env)) {
+                return programMap.get(this.env);
+            }
+            const program = yield getSwitchboardProgram(this.env, this.connection);
+            programMap.set(this.env, program);
+            return program;
+        });
+    }
+}
+exports.SwitchboardClient = SwitchboardClient;
+function getSwitchboardProgram(env, connection) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const DEFAULT_KEYPAIR = web3_js_1.Keypair.fromSeed(new Uint8Array(32).fill(1));
+        const programId = (0, switchboard_v2_1.getSwitchboardPid)(env);
+        const wallet = new wallet_1.Wallet(DEFAULT_KEYPAIR);
+        const provider = new anchor_1.Provider(connection, wallet, {});
+        return new anchor_1.Program(switchboard_v2_json_1.default, programId, provider);
+    });
+}
+function convertSwitchboardDecimal(switchboardDecimal) {
+    const switchboardPrecision = numericConstants_1.TEN.pow(new anchor_1.BN(switchboardDecimal.scale));
+    return switchboardDecimal.mantissa
+        .mul(numericConstants_1.MARK_PRICE_PRECISION)
+        .div(switchboardPrecision);
+}

package/lib/oracles/types.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="bn.js" />
+/// <reference types="node" />
+import { BN } from '@project-serum/anchor';
+import { PublicKey } from '@solana/web3.js';
+export declare type OraclePriceData = {
+    price: BN;
+    slot: BN;
+    confidence: BN;
+    twap?: BN;
+    twapConfidence?: BN;
+};
+export interface OracleClient {
+    getOraclePriceDataFromBuffer(buffer: Buffer): Promise<OraclePriceData>;
+    getOraclePriceData(publicKey: PublicKey): Promise<OraclePriceData>;
+}

package/lib/oracles/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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): OrderParams;
+export declare function getLimitOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, price: BN, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean, userOrderId?: number, postOnly?: 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) {
+function getLimitOrderParams(marketIndex, direction, baseAssetAmount, price, reduceOnly, discountToken = false, referrer = false, userOrderId = 0, postOnly = false) {
     return {
         orderType: types_1.OrderType.LIMIT,
         userOrderId,
@@ -13,7 +13,7 @@ function getLimitOrderParams(marketIndex, direction, baseAssetAmount, price, red
         baseAssetAmount,
         price,
         reduceOnly,
-        postOnly: false,
+        postOnly,
         immediateOrCancel: false,
         positionLimit: numericConstants_1.ZERO,
         padding0: true,

package/lib/orders.js

@@ -137,7 +137,7 @@ function isTriggerConditionSatisfied(market, order) {
     }
 }
 function calculateBaseAssetAmountUserCanExecute(market, order, user) {
-    const maxLeverage = user.getMaxLeverage('Initial');
+    const maxLeverage = user.getMaxLeverage(order.marketIndex, 'Initial');
     const freeCollateral = user.getFreeCollateral();
     let quoteAssetAmount;
     if ((0, _1.isOrderRiskIncreasingInSameDirection)(user, order)) {

package/lib/types.d.ts

@@ -225,6 +225,7 @@ export declare type OrderRecord = {
     fee: BN;
     fillerReward: BN;
     tradeRecordId: BN;
+    quoteAssetAmountSurplus: BN;
 };
 export declare type StateAccount = {
     admin: PublicKey;
@@ -272,7 +273,6 @@ export declare type OrderStateAccount = {
     minOrderQuoteAssetAmount: BN;
 };
 export declare type MarketsAccount = {
-    accountIndex: BN;
     markets: Market[];
 };
 export declare type Market = {
@@ -282,6 +282,9 @@ export declare type Market = {
     baseAssetAmountShort: BN;
     initialized: boolean;
     openInterest: BN;
+    marginRatioInitial: number;
+    marginRatioMaintenance: number;
+    marginRatioPartial: number;
 };
 export declare type AMM = {
     baseAssetReserve: BN;
@@ -434,3 +437,4 @@ export declare type OrderFillerRewardStructure = {
     rewardDenominator: BN;
     timeBasedRewardLowerBound: BN;
 };
+export declare type MarginCategory = 'Initial' | 'Partial' | 'Maintenance';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.1.23-master.3",
+	"version": "0.1.25-master.0",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -32,6 +32,7 @@
 		"@pythnetwork/client": "^2.5.1",
 		"@solana/spl-token": "^0.1.6",
 		"@solana/web3.js": "^1.22.0",
+		"@switchboard-xyz/switchboard-v2": "^0.0.67",
 		"strict-event-emitter-types": "^2.0.0",
 		"uuid": "^8.3.2"
 	},

package/src/accounts/bulkAccountLoader.ts

@@ -9,6 +9,8 @@ type AccountToLoad = {
 
 const GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE = 99;
 
+const fiveMinutes = 5 * 60 * 1000;
+
 export class BulkAccountLoader {
 	connection: Connection;
 	commitment: Commitment;
@@ -20,6 +22,8 @@ export class BulkAccountLoader {
 	// to handle clients spamming load
 	loadPromise?: Promise<void>;
 	loadPromiseResolver: () => void;
+	loggingEnabled = false;
+	lastUpdate = Date.now();
 
 	public constructor(
 		connection: Connection,
@@ -100,6 +104,10 @@ export class BulkAccountLoader {
 			this.loadPromiseResolver = resolver;
 		});
 
+		if (this.loggingEnabled) {
+			console.log('Loading accounts');
+		}
+
 		try {
 			const chunks = this.chunks(
 				Array.from(this.accountsToLoad.values()),
@@ -120,6 +128,20 @@ export class BulkAccountLoader {
 		} finally {
 			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
+				);
+			}
 		}
 	}
 
@@ -135,19 +157,11 @@ export class BulkAccountLoader {
 			{ commitment: this.commitment },
 		];
 
-		let rpcResponse;
-		try {
-			// @ts-ignore
-			rpcResponse = await this.connection._rpcRequest(
-				'getMultipleAccounts',
-				args
-			);
-		} catch (e) {
-			for (const [_, callback] of this.errorCallbacks) {
-				callback(e);
-			}
-			return;
-		}
+		// @ts-ignore
+		const rpcResponse = await this.connection._rpcRequest(
+			'getMultipleAccounts',
+			args
+		);
 
 		const newSlot = rpcResponse.result.context.slot;
 
@@ -169,6 +183,7 @@ export class BulkAccountLoader {
 					buffer: newBuffer,
 				});
 				this.handleAccountCallbacks(accountToLoad, newBuffer);
+				this.lastUpdate = Date.now();
 				continue;
 			}
 
@@ -183,6 +198,7 @@ export class BulkAccountLoader {
 					buffer: newBuffer,
 				});
 				this.handleAccountCallbacks(accountToLoad, newBuffer);
+				this.lastUpdate = Date.now();
 			}
 		}
 	}
@@ -203,6 +219,10 @@ export class BulkAccountLoader {
 			return;
 		}
 
+		if (this.loggingEnabled) {
+			console.log(`startPolling`);
+		}
+
 		this.intervalId = setInterval(this.load.bind(this), this.pollingFrequency);
 	}
 
@@ -210,6 +230,10 @@ export class BulkAccountLoader {
 		if (this.intervalId) {
 			clearInterval(this.intervalId);
 			this.intervalId = undefined;
+
+			if (this.loggingEnabled) {
+				console.log(`stopPolling`);
+			}
 		}
 	}
 }

package/src/accounts/types.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NotSubscribedError = void 0;
+class NotSubscribedError extends Error {
+    constructor() {
+        super(...arguments);
+        this.name = 'NotSubscribedError';
+    }
+}
+exports.NotSubscribedError = NotSubscribedError;

package/src/accounts/utils.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.capitalize = void 0;
+function capitalize(value) {
+    return value[0].toUpperCase() + value.slice(1);
+}
+exports.capitalize = capitalize;