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

package/src/accounts/pollingClearingHouseAccountSubscriber.js

@@ -0,0 +1,465 @@
+"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 __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+exports.__esModule = true;
+exports.PollingClearingHouseAccountSubscriber = void 0;
+var types_1 = require("./types");
+var events_1 = require("events");
+var pda_1 = require("../addresses/pda");
+var utils_1 = require("./utils");
+var web3_js_1 = require("@solana/web3.js");
+var oracleClientCache_1 = require("../oracles/oracleClientCache");
+var quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
+var PollingClearingHouseAccountSubscriber = /** @class */ (function () {
+    function PollingClearingHouseAccountSubscriber(program, accountLoader, perpMarketIndexes, spotMarketIndexes, oracleInfos) {
+        this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
+        this.accountsToPoll = new Map();
+        this.oraclesToPoll = new Map();
+        this.perpMarket = new Map();
+        this.spotMarket = new Map();
+        this.oracles = new Map();
+        this.isSubscribing = false;
+        this.isSubscribed = false;
+        this.program = program;
+        this.eventEmitter = new events_1.EventEmitter();
+        this.accountLoader = accountLoader;
+        this.perpMarketIndexes = perpMarketIndexes;
+        this.spotMarketIndexes = spotMarketIndexes;
+        this.oracleInfos = oracleInfos;
+    }
+    PollingClearingHouseAccountSubscriber.prototype.subscribe = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var subscriptionSucceeded, retries;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (this.isSubscribed) {
+                            return [2 /*return*/, true];
+                        }
+                        if (!this.isSubscribing) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.subscriptionPromise];
+                    case 1: return [2 /*return*/, _a.sent()];
+                    case 2:
+                        this.isSubscribing = true;
+                        this.subscriptionPromise = new Promise(function (res) {
+                            _this.subscriptionPromiseResolver = res;
+                        });
+                        return [4 /*yield*/, this.updateAccountsToPoll()];
+                    case 3:
+                        _a.sent();
+                        return [4 /*yield*/, this.updateOraclesToPoll()];
+                    case 4:
+                        _a.sent();
+                        return [4 /*yield*/, this.addToAccountLoader()];
+                    case 5:
+                        _a.sent();
+                        subscriptionSucceeded = false;
+                        retries = 0;
+                        _a.label = 6;
+                    case 6:
+                        if (!(!subscriptionSucceeded && retries < 5)) return [3 /*break*/, 8];
+                        return [4 /*yield*/, this.fetch()];
+                    case 7:
+                        _a.sent();
+                        subscriptionSucceeded = this.didSubscriptionSucceed();
+                        retries++;
+                        return [3 /*break*/, 6];
+                    case 8:
+                        if (subscriptionSucceeded) {
+                            this.eventEmitter.emit('update');
+                        }
+                        this.isSubscribing = false;
+                        this.isSubscribed = subscriptionSucceeded;
+                        this.subscriptionPromiseResolver(subscriptionSucceeded);
+                        return [2 /*return*/, subscriptionSucceeded];
+                }
+            });
+        });
+    };
+    PollingClearingHouseAccountSubscriber.prototype.updateAccountsToPoll = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var accounts;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (this.accountsToPoll.size > 0) {
+                            return [2 /*return*/];
+                        }
+                        return [4 /*yield*/, this.getClearingHouseAccounts()];
+                    case 1:
+                        accounts = _a.sent();
+                        this.accountsToPoll.set(accounts.state.toString(), {
+                            key: 'state',
+                            publicKey: accounts.state,
+                            eventType: 'stateAccountUpdate'
+                        });
+                        return [4 /*yield*/, this.updateMarketAccountsToPoll()];
+                    case 2:
+                        _a.sent();
+                        return [4 /*yield*/, this.updateSpotMarketAccountsToPoll()];
+                    case 3:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    PollingClearingHouseAccountSubscriber.prototype.updateMarketAccountsToPoll = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _i, _a, marketIndex;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _i = 0, _a = this.perpMarketIndexes;
+                        _b.label = 1;
+                    case 1:
+                        if (!(_i < _a.length)) return [3 /*break*/, 4];
+                        marketIndex = _a[_i];
+                        return [4 /*yield*/, this.addMarketAccountToPoll(marketIndex)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        _i++;
+                        return [3 /*break*/, 1];
+                    case 4: return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    PollingClearingHouseAccountSubscriber.prototype.addMarketAccountToPoll = function (marketIndex) {
+        return __awaiter(this, void 0, void 0, function () {
+            var marketPublicKey;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, (0, pda_1.getMarketPublicKey)(this.program.programId, marketIndex)];
+                    case 1:
+                        marketPublicKey = _a.sent();
+                        this.accountsToPoll.set(marketPublicKey.toString(), {
+                            key: 'perpMarket',
+                            publicKey: marketPublicKey,
+                            eventType: 'perpMarketAccountUpdate',
+                            mapKey: marketIndex.toNumber()
+                        });
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    PollingClearingHouseAccountSubscriber.prototype.updateSpotMarketAccountsToPoll = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _i, _a, marketIndex;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _i = 0, _a = this.spotMarketIndexes;
+                        _b.label = 1;
+                    case 1:
+                        if (!(_i < _a.length)) return [3 /*break*/, 4];
+                        marketIndex = _a[_i];
+                        return [4 /*yield*/, this.addSpotMarketAccountToPoll(marketIndex)];
+                    case 2:
+                        _b.sent();
+                        _b.label = 3;
+                    case 3:
+                        _i++;
+                        return [3 /*break*/, 1];
+                    case 4: return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    PollingClearingHouseAccountSubscriber.prototype.addSpotMarketAccountToPoll = function (marketIndex) {
+        return __awaiter(this, void 0, void 0, function () {
+            var marketPublicKey;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex)];
+                    case 1:
+                        marketPublicKey = _a.sent();
+                        this.accountsToPoll.set(marketPublicKey.toString(), {
+                            key: 'spotMarket',
+                            publicKey: marketPublicKey,
+                            eventType: 'spotMarketAccountUpdate',
+                            mapKey: marketIndex.toNumber()
+                        });
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    PollingClearingHouseAccountSubscriber.prototype.updateOraclesToPoll = function () {
+        for (var _i = 0, _a = this.oracleInfos; _i < _a.length; _i++) {
+            var oracleInfo = _a[_i];
+            if (!oracleInfo.publicKey.equals(web3_js_1.PublicKey["default"])) {
+                this.addOracleToPoll(oracleInfo);
+            }
+        }
+        return true;
+    };
+    PollingClearingHouseAccountSubscriber.prototype.addOracleToPoll = function (oracleInfo) {
+        this.oraclesToPoll.set(oracleInfo.publicKey.toString(), {
+            publicKey: oracleInfo.publicKey,
+            source: oracleInfo.source
+        });
+        return true;
+    };
+    PollingClearingHouseAccountSubscriber.prototype.getClearingHouseAccounts = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var statePublicKey, accounts;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, (0, pda_1.getClearingHouseStateAccountPublicKey)(this.program.programId)];
+                    case 1:
+                        statePublicKey = _a.sent();
+                        accounts = {
+                            state: statePublicKey
+                        };
+                        return [2 /*return*/, accounts];
+                }
+            });
+        });
+    };
+    PollingClearingHouseAccountSubscriber.prototype.addToAccountLoader = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _i, _a, _b, _1, accountToPoll, _c, _d, _e, _2, oracleToPoll;
+            var _this = this;
+            return __generator(this, function (_f) {
+                for (_i = 0, _a = this.accountsToPoll; _i < _a.length; _i++) {
+                    _b = _a[_i], _1 = _b[0], accountToPoll = _b[1];
+                    this.addAccountToAccountLoader(accountToPoll);
+                }
+                for (_c = 0, _d = this.oraclesToPoll; _c < _d.length; _c++) {
+                    _e = _d[_c], _2 = _e[0], oracleToPoll = _e[1];
+                    this.addOracleToAccountLoader(oracleToPoll);
+                }
+                this.errorCallbackId = this.accountLoader.addErrorCallbacks(function (error) {
+                    _this.eventEmitter.emit('error', error);
+                });
+                return [2 /*return*/];
+            });
+        });
+    };
+    PollingClearingHouseAccountSubscriber.prototype.addAccountToAccountLoader = function (accountToPoll) {
+        var _this = this;
+        accountToPoll.callbackId = this.accountLoader.addAccount(accountToPoll.publicKey, function (buffer, slot) {
+            if (!buffer)
+                return;
+            var account = _this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
+            var dataAndSlot = {
+                data: account,
+                slot: slot
+            };
+            if (accountToPoll.mapKey != undefined) {
+                _this[accountToPoll.key].set(accountToPoll.mapKey, dataAndSlot);
+            }
+            else {
+                _this[accountToPoll.key] = dataAndSlot;
+            }
+            // @ts-ignore
+            _this.eventEmitter.emit(accountToPoll.eventType, account);
+            _this.eventEmitter.emit('update');
+            if (!_this.isSubscribed) {
+                _this.isSubscribed = _this.didSubscriptionSucceed();
+            }
+        });
+    };
+    PollingClearingHouseAccountSubscriber.prototype.addOracleToAccountLoader = function (oracleToPoll) {
+        var _this = this;
+        var oracleClient = this.oracleClientCache.get(oracleToPoll.source, this.program.provider.connection);
+        oracleToPoll.callbackId = this.accountLoader.addAccount(oracleToPoll.publicKey, function (buffer, slot) {
+            if (!buffer)
+                return;
+            var oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(buffer);
+            var dataAndSlot = {
+                data: oraclePriceData,
+                slot: slot
+            };
+            _this.oracles.set(oracleToPoll.publicKey.toString(), dataAndSlot);
+            _this.eventEmitter.emit('oraclePriceUpdate', oracleToPoll.publicKey, oraclePriceData);
+            _this.eventEmitter.emit('update');
+        });
+    };
+    PollingClearingHouseAccountSubscriber.prototype.fetch = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _i, _a, _b, _3, accountToPoll, _c, buffer, slot, account, _d, _e, _f, _4, oracleToPoll, _g, buffer, slot, oracleClient, oraclePriceData;
+            return __generator(this, function (_h) {
+                switch (_h.label) {
+                    case 0: return [4 /*yield*/, this.accountLoader.load()];
+                    case 1:
+                        _h.sent();
+                        for (_i = 0, _a = this.accountsToPoll; _i < _a.length; _i++) {
+                            _b = _a[_i], _3 = _b[0], accountToPoll = _b[1];
+                            _c = this.accountLoader.getBufferAndSlot(accountToPoll.publicKey), buffer = _c.buffer, slot = _c.slot;
+                            if (buffer) {
+                                account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
+                                if (accountToPoll.mapKey != undefined) {
+                                    this[accountToPoll.key].set(accountToPoll.mapKey, {
+                                        data: account,
+                                        slot: slot
+                                    });
+                                }
+                                else {
+                                    this[accountToPoll.key] = {
+                                        data: account,
+                                        slot: slot
+                                    };
+                                }
+                            }
+                        }
+                        for (_d = 0, _e = this.oraclesToPoll; _d < _e.length; _d++) {
+                            _f = _e[_d], _4 = _f[0], oracleToPoll = _f[1];
+                            _g = this.accountLoader.getBufferAndSlot(oracleToPoll.publicKey), buffer = _g.buffer, slot = _g.slot;
+                            if (buffer) {
+                                oracleClient = this.oracleClientCache.get(oracleToPoll.source, this.program.provider.connection);
+                                oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(buffer);
+                                this.oracles.set(oracleToPoll.publicKey.toString(), {
+                                    data: oraclePriceData,
+                                    slot: slot
+                                });
+                            }
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    PollingClearingHouseAccountSubscriber.prototype.didSubscriptionSucceed = function () {
+        if (this.state)
+            return true;
+        return false;
+    };
+    PollingClearingHouseAccountSubscriber.prototype.unsubscribe = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _i, _a, _b, _5, accountToPoll, _c, _d, _e, _6, oracleToPoll;
+            return __generator(this, function (_f) {
+                if (!this.isSubscribed) {
+                    return [2 /*return*/];
+                }
+                for (_i = 0, _a = this.accountsToPoll; _i < _a.length; _i++) {
+                    _b = _a[_i], _5 = _b[0], accountToPoll = _b[1];
+                    this.accountLoader.removeAccount(accountToPoll.publicKey, accountToPoll.callbackId);
+                }
+                for (_c = 0, _d = this.oraclesToPoll; _c < _d.length; _c++) {
+                    _e = _d[_c], _6 = _e[0], oracleToPoll = _e[1];
+                    this.accountLoader.removeAccount(oracleToPoll.publicKey, oracleToPoll.callbackId);
+                }
+                this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
+                this.errorCallbackId = undefined;
+                this.accountsToPoll.clear();
+                this.oraclesToPoll.clear();
+                this.isSubscribed = false;
+                return [2 /*return*/];
+            });
+        });
+    };
+    PollingClearingHouseAccountSubscriber.prototype.addSpotMarket = function (marketIndex) {
+        return __awaiter(this, void 0, void 0, function () {
+            var accountToPoll;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.addSpotMarketAccountToPoll(marketIndex)];
+                    case 1:
+                        _a.sent();
+                        accountToPoll = this.accountsToPoll.get(marketIndex.toString());
+                        this.addAccountToAccountLoader(accountToPoll);
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    PollingClearingHouseAccountSubscriber.prototype.addPerpMarket = function (marketIndex) {
+        return __awaiter(this, void 0, void 0, function () {
+            var accountToPoll;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.addMarketAccountToPoll(marketIndex)];
+                    case 1:
+                        _a.sent();
+                        accountToPoll = this.accountsToPoll.get(marketIndex.toString());
+                        this.addAccountToAccountLoader(accountToPoll);
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    PollingClearingHouseAccountSubscriber.prototype.addOracle = function (oracleInfo) {
+        return __awaiter(this, void 0, void 0, function () {
+            var oracleToPoll;
+            return __generator(this, function (_a) {
+                if (oracleInfo.publicKey.equals(web3_js_1.PublicKey["default"])) {
+                    return [2 /*return*/, true];
+                }
+                this.addOracleToPoll(oracleInfo);
+                oracleToPoll = this.oraclesToPoll.get(oracleInfo.publicKey.toString());
+                this.addOracleToAccountLoader(oracleToPoll);
+                return [2 /*return*/, true];
+            });
+        });
+    };
+    PollingClearingHouseAccountSubscriber.prototype.assertIsSubscribed = function () {
+        if (!this.isSubscribed) {
+            throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
+        }
+    };
+    PollingClearingHouseAccountSubscriber.prototype.getStateAccountAndSlot = function () {
+        this.assertIsSubscribed();
+        return this.state;
+    };
+    PollingClearingHouseAccountSubscriber.prototype.getMarketAccountAndSlot = function (marketIndex) {
+        return this.perpMarket.get(marketIndex.toNumber());
+    };
+    PollingClearingHouseAccountSubscriber.prototype.getMarketAccountsAndSlots = function () {
+        return Array.from(this.perpMarket.values());
+    };
+    PollingClearingHouseAccountSubscriber.prototype.getSpotMarketAccountAndSlot = function (marketIndex) {
+        return this.spotMarket.get(marketIndex.toNumber());
+    };
+    PollingClearingHouseAccountSubscriber.prototype.getOraclePriceDataAndSlot = function (oraclePublicKey) {
+        this.assertIsSubscribed();
+        if (oraclePublicKey.equals(web3_js_1.PublicKey["default"])) {
+            return {
+                data: quoteAssetOracleClient_1.QUOTE_ORACLE_PRICE_DATA,
+                slot: 0
+            };
+        }
+        return this.oracles.get(oraclePublicKey.toString());
+    };
+    return PollingClearingHouseAccountSubscriber;
+}());
+exports.PollingClearingHouseAccountSubscriber = PollingClearingHouseAccountSubscriber;

package/src/accounts/pollingClearingHouseAccountSubscriber.ts

@@ -10,14 +10,14 @@ import { BN, Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import {
-	BankAccount,
-	MarketAccount,
+	SpotMarketAccount,
+	PerpMarketAccount,
 	StateAccount,
 	UserAccount,
 } from '../types';
 import {
 	getClearingHouseStateAccountPublicKey,
-	getBankPublicKey,
+	getSpotMarketPublicKey,
 	getMarketPublicKey,
 } from '../addresses/pda';
 import { BulkAccountLoader } from './bulkAccountLoader';
@@ -32,8 +32,8 @@ export class PollingClearingHouseAccountSubscriber
 {
 	isSubscribed: boolean;
 	program: Program;
-	marketIndexes: BN[];
-	bankIndexes: BN[];
+	perpMarketIndexes: BN[];
+	spotMarketIndexes: BN[];
 	oracleInfos: OracleInfo[];
 	oracleClientCache = new OracleClientCache();
 
@@ -45,8 +45,8 @@ export class PollingClearingHouseAccountSubscriber
 	errorCallbackId?: string;
 
 	state?: DataAndSlot<StateAccount>;
-	market = new Map<number, DataAndSlot<MarketAccount>>();
-	bank = new Map<number, DataAndSlot<BankAccount>>();
+	perpMarket = new Map<number, DataAndSlot<PerpMarketAccount>>();
+	spotMarket = new Map<number, DataAndSlot<SpotMarketAccount>>();
 	oracles = new Map<string, DataAndSlot<OraclePriceData>>();
 	user?: DataAndSlot<UserAccount>;
 
@@ -57,16 +57,16 @@ export class PollingClearingHouseAccountSubscriber
 	public constructor(
 		program: Program,
 		accountLoader: BulkAccountLoader,
-		marketIndexes: BN[],
-		bankIndexes: BN[],
+		perpMarketIndexes: BN[],
+		spotMarketIndexes: BN[],
 		oracleInfos: OracleInfo[]
 	) {
 		this.isSubscribed = false;
 		this.program = program;
 		this.eventEmitter = new EventEmitter();
 		this.accountLoader = accountLoader;
-		this.marketIndexes = marketIndexes;
-		this.bankIndexes = bankIndexes;
+		this.perpMarketIndexes = perpMarketIndexes;
+		this.spotMarketIndexes = spotMarketIndexes;
 		this.oracleInfos = oracleInfos;
 	}
 
@@ -122,11 +122,11 @@ export class PollingClearingHouseAccountSubscriber
 		});
 
 		await this.updateMarketAccountsToPoll();
-		await this.updateBankAccountsToPoll();
+		await this.updateSpotMarketAccountsToPoll();
 	}
 
 	async updateMarketAccountsToPoll(): Promise<boolean> {
-		for (const marketIndex of this.marketIndexes) {
+		for (const marketIndex of this.perpMarketIndexes) {
 			await this.addMarketAccountToPoll(marketIndex);
 		}
 		return true;
@@ -139,34 +139,34 @@ export class PollingClearingHouseAccountSubscriber
 		);
 
 		this.accountsToPoll.set(marketPublicKey.toString(), {
-			key: 'market',
+			key: 'perpMarket',
 			publicKey: marketPublicKey,
-			eventType: 'marketAccountUpdate',
+			eventType: 'perpMarketAccountUpdate',
 			mapKey: marketIndex.toNumber(),
 		});
 
 		return true;
 	}
 
-	async updateBankAccountsToPoll(): Promise<boolean> {
-		for (const bankIndex of this.bankIndexes) {
-			await this.addBankAccountToPoll(bankIndex);
+	async updateSpotMarketAccountsToPoll(): Promise<boolean> {
+		for (const marketIndex of this.spotMarketIndexes) {
+			await this.addSpotMarketAccountToPoll(marketIndex);
 		}
 
 		return true;
 	}
 
-	async addBankAccountToPoll(bankIndex: BN): Promise<boolean> {
-		const bankPublicKey = await getBankPublicKey(
+	async addSpotMarketAccountToPoll(marketIndex: BN): Promise<boolean> {
+		const marketPublicKey = await getSpotMarketPublicKey(
 			this.program.programId,
-			bankIndex
+			marketIndex
 		);
 
-		this.accountsToPoll.set(bankPublicKey.toString(), {
-			key: 'bank',
-			publicKey: bankPublicKey,
-			eventType: 'bankAccountUpdate',
-			mapKey: bankIndex.toNumber(),
+		this.accountsToPoll.set(marketPublicKey.toString(), {
+			key: 'spotMarket',
+			publicKey: marketPublicKey,
+			eventType: 'spotMarketAccountUpdate',
+			mapKey: marketIndex.toNumber(),
 		});
 		return true;
 	}
@@ -353,14 +353,14 @@ export class PollingClearingHouseAccountSubscriber
 		this.isSubscribed = false;
 	}
 
-	async addBank(bankIndex: BN): Promise<boolean> {
-		await this.addBankAccountToPoll(bankIndex);
-		const accountToPoll = this.accountsToPoll.get(bankIndex.toString());
+	async addSpotMarket(marketIndex: BN): Promise<boolean> {
+		await this.addSpotMarketAccountToPoll(marketIndex);
+		const accountToPoll = this.accountsToPoll.get(marketIndex.toString());
 		this.addAccountToAccountLoader(accountToPoll);
 		return true;
 	}
 
-	async addMarket(marketIndex: BN): Promise<boolean> {
+	async addPerpMarket(marketIndex: BN): Promise<boolean> {
 		await this.addMarketAccountToPoll(marketIndex);
 		const accountToPoll = this.accountsToPoll.get(marketIndex.toString());
 		this.addAccountToAccountLoader(accountToPoll);
@@ -395,18 +395,18 @@ export class PollingClearingHouseAccountSubscriber
 
 	public getMarketAccountAndSlot(
 		marketIndex: BN
-	): DataAndSlot<MarketAccount> | undefined {
-		return this.market.get(marketIndex.toNumber());
+	): DataAndSlot<PerpMarketAccount> | undefined {
+		return this.perpMarket.get(marketIndex.toNumber());
 	}
 
-	public getMarketAccountsAndSlots(): DataAndSlot<MarketAccount>[] {
-		return Array.from(this.market.values());
+	public getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[] {
+		return Array.from(this.perpMarket.values());
 	}
 
-	public getBankAccountAndSlot(
-		bankIndex: BN
-	): DataAndSlot<BankAccount> | undefined {
-		return this.bank.get(bankIndex.toNumber());
+	public getSpotMarketAccountAndSlot(
+		marketIndex: BN
+	): DataAndSlot<SpotMarketAccount> | undefined {
+		return this.spotMarket.get(marketIndex.toNumber());
 	}
 
 	public getOraclePriceDataAndSlot(