@drift-labs/sdk 0.2.0-master.14 → 0.2.0-master.15

package/lib/accounts/bulkUserStatsSubscription.d.ts

@@ -0,0 +1,7 @@
+import { ClearingHouseUserStats } from '../clearingHouseUserStats';
+import { BulkAccountLoader } from './bulkAccountLoader';
+/**
+ * @param userStats
+ * @param accountLoader
+ */
+export declare function bulkPollingUserStatsSubscribe(userStats: ClearingHouseUserStats[], accountLoader: BulkAccountLoader): Promise<void>;

package/lib/accounts/bulkUserStatsSubscription.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bulkPollingUserStatsSubscribe = void 0;
+/**
+ * @param userStats
+ * @param accountLoader
+ */
+async function bulkPollingUserStatsSubscribe(userStats, accountLoader) {
+    if (userStats.length === 0) {
+        await accountLoader.load();
+        return;
+    }
+    await Promise.all(userStats.map((userStat) => {
+        return userStat.accountSubscriber.addToAccountLoader();
+    }));
+    await accountLoader.load();
+    await Promise.all(userStats.map(async (userStat) => {
+        return userStat.subscribe();
+    }));
+}
+exports.bulkPollingUserStatsSubscribe = bulkPollingUserStatsSubscribe;

package/lib/accounts/bulkUserSubscription.js

@@ -11,7 +11,6 @@ async function bulkPollingUserSubscribe(users, accountLoader) {
         return;
     }
     await Promise.all(users.map((user) => {
-        // Pull the keys from the authority map so we can skip fetching them in addToAccountLoader
         return user.accountSubscriber.addToAccountLoader();
     }));
     await accountLoader.load();

package/lib/accounts/types.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="node" />
 /// <reference types="bn.js" />
-/// <reference types="node" />
 import { BankAccount, MarketAccount, OracleSource, StateAccount, UserAccount, UserStatsAccount } from '../types';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';

package/lib/factory/bigNum.js

@@ -137,7 +137,8 @@ class BigNum {
      */
     print() {
         (0, assert_1.assert)(this.precision.gte(numericConstants_1.ZERO), 'Tried to print a BN with precision lower than zero');
-        const plainString = this.toString();
+        const isNeg = this.isNeg();
+        const plainString = this.abs().toString();
         const precisionNum = this.precision.toNumber();
         // make a string with at least the precisionNum number of zeroes
         let printString = [
@@ -152,14 +153,11 @@ class BigNum {
         // remove leading zeroes
         printString = printString.replace(/^0+/, '');
         // add zero if leading delim
-        if (this.isNeg()) {
-            if (printString[1] === BigNum.delim)
-                printString = printString.replace('-.', '-0.');
-        }
-        else {
-            if (printString[0] === BigNum.delim)
-                printString = `0${printString}`;
-        }
+        if (printString[0] === BigNum.delim)
+            printString = `0${printString}`;
+        // Add minus if negative
+        if (isNeg)
+            printString = `-${printString}`;
         // remove trailing delim
         if (printString[printString.length - 1] === BigNum.delim)
             printString = printString.slice(0, printString.length - 1);

package/lib/math/bankBalance.js

@@ -109,7 +109,7 @@ function calculateInterestAccumulated(bank, now) {
             .mul(borrowRateSlope)
             .div(numericConstants_1.BANK_UTILIZATION_PRECISION);
     }
-    const timeSinceLastUpdate = now.sub(bank.lastUpdated);
+    const timeSinceLastUpdate = now.sub(bank.lastInterestTs);
     const modifiedBorrowRate = interest_rate.mul(timeSinceLastUpdate);
     const modifiedDepositRate = modifiedBorrowRate
         .mul(utilization)
@@ -130,7 +130,7 @@ function calculateWithdrawLimit(bank, now) {
     const bankDepositTokenAmount = getTokenAmount(bank.depositBalance, bank, types_1.BankBalanceType.DEPOSIT);
     const bankBorrowTokenAmount = getTokenAmount(bank.borrowBalance, bank, types_1.BankBalanceType.BORROW);
     const twentyFourHours = new anchor_1.BN(60 * 60 * 24);
-    const sinceLast = now.sub(bank.lastUpdated);
+    const sinceLast = now.sub(bank.lastTwapTs);
     const sinceStart = anchor_1.BN.max(numericConstants_1.ZERO, twentyFourHours.sub(sinceLast));
     const borrowTokenTwapLive = bank.borrowTokenTwap
         .mul(sinceStart)

package/lib/types.d.ts

@@ -368,7 +368,8 @@ export declare type BankAccount = {
     cumulativeBorrowInterest: BN;
     depositBalance: BN;
     borrowBalance: BN;
-    lastUpdated: BN;
+    lastInterestTs: BN;
+    lastTwapTs: BN;
     oracle: PublicKey;
     initialAssetWeight: BN;
     maintenanceAssetWeight: BN;

package/package.json

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

package/src/accounts/bulkUserStatsSubscription.ts

@@ -0,0 +1,33 @@
+import { ClearingHouseUserStats } from '../clearingHouseUserStats';
+import { BulkAccountLoader } from './bulkAccountLoader';
+import { PollingUserStatsAccountSubscriber } from './pollingUserStatsAccountSubscriber';
+
+/**
+ * @param userStats
+ * @param accountLoader
+ */
+export async function bulkPollingUserStatsSubscribe(
+	userStats: ClearingHouseUserStats[],
+	accountLoader: BulkAccountLoader
+): Promise<void> {
+	if (userStats.length === 0) {
+		await accountLoader.load();
+		return;
+	}
+
+	await Promise.all(
+		userStats.map((userStat) => {
+			return (
+				userStat.accountSubscriber as PollingUserStatsAccountSubscriber
+			).addToAccountLoader();
+		})
+	);
+
+	await accountLoader.load();
+
+	await Promise.all(
+		userStats.map(async (userStat) => {
+			return userStat.subscribe();
+		})
+	);
+}

package/src/accounts/bulkUserSubscription.ts

@@ -17,7 +17,6 @@ export async function bulkPollingUserSubscribe(
 
 	await Promise.all(
 		users.map((user) => {
-			// Pull the keys from the authority map so we can skip fetching them in addToAccountLoader
 			return (
 				user.accountSubscriber as PollingUserAccountSubscriber
 			).addToAccountLoader();

package/src/factory/bigNum.ts

@@ -211,7 +211,8 @@ export class BigNum {
 			'Tried to print a BN with precision lower than zero'
 		);
 
-		const plainString = this.toString();
+		const isNeg = this.isNeg();
+		const plainString = this.abs().toString();
 		const precisionNum = this.precision.toNumber();
 
 		// make a string with at least the precisionNum number of zeroes
@@ -230,12 +231,10 @@ export class BigNum {
 		printString = printString.replace(/^0+/, '');
 
 		// add zero if leading delim
-		if (this.isNeg()) {
-			if (printString[1] === BigNum.delim)
-				printString = printString.replace('-.', '-0.');
-		} else {
-			if (printString[0] === BigNum.delim) printString = `0${printString}`;
-		}
+		if (printString[0] === BigNum.delim) printString = `0${printString}`;
+
+		// Add minus if negative
+		if (isNeg) printString = `-${printString}`;
 
 		// remove trailing delim
 		if (printString[printString.length - 1] === BigNum.delim)

package/src/math/bankBalance.ts

@@ -187,7 +187,7 @@ export function calculateInterestAccumulated(
 			.div(BANK_UTILIZATION_PRECISION);
 	}
 
-	const timeSinceLastUpdate = now.sub(bank.lastUpdated);
+	const timeSinceLastUpdate = now.sub(bank.lastInterestTs);
 
 	const modifiedBorrowRate = interest_rate.mul(timeSinceLastUpdate);
 
@@ -224,7 +224,7 @@ export function calculateWithdrawLimit(
 	);
 
 	const twentyFourHours = new BN(60 * 60 * 24);
-	const sinceLast = now.sub(bank.lastUpdated);
+	const sinceLast = now.sub(bank.lastTwapTs);
 	const sinceStart = BN.max(ZERO, twentyFourHours.sub(sinceLast));
 	const borrowTokenTwapLive = bank.borrowTokenTwap
 		.mul(sinceStart)

package/src/types.ts

@@ -350,7 +350,8 @@ export type BankAccount = {
 	cumulativeBorrowInterest: BN;
 	depositBalance: BN;
 	borrowBalance: BN;
-	lastUpdated: BN;
+	lastInterestTs: BN;
+	lastTwapTs: BN;
 	oracle: PublicKey;
 	initialAssetWeight: BN;
 	maintenanceAssetWeight: BN;

package/tests/bn/test.ts

@@ -127,6 +127,14 @@ describe('BigNum Tests', () => {
 		expect(BigNum.fromPrint('123456789').toMillified(5)).to.equal('123.45M');
 
 		expect(BigNum.from(-95, 2).print()).to.equal('-0.95');
+
+		// Case 6 strange numbers
+		expect(BigNum.from('-100', 2).print()).to.equal('-1.00');
+		expect(BigNum.from('-8402189', 13).print()).to.equal('-0.0000008402189');
+		expect(BigNum.from('-10000000000000', 13).print()).to.equal(
+			'-1.0000000000000'
+		);
+		expect(BigNum.from('-100', 6).print()).to.equal('-0.000100');
 	});
 
 	it('can initialise from string values correctly', () => {

package/src/addresses/marketAddresses.js

@@ -1,26 +0,0 @@
-"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.getMarketAddress = void 0;
-const pda_1 = require("./pda");
-const CACHE = new Map();
-function getMarketAddress(programId, marketIndex) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const cacheKey = `${programId.toString()}-${marketIndex.toString()}`;
-        if (CACHE.has(cacheKey)) {
-            return CACHE.get(cacheKey);
-        }
-        const publicKey = yield pda_1.getMarketPublicKey(programId, marketIndex);
-        CACHE.set(cacheKey, publicKey);
-        return publicKey;
-    });
-}
-exports.getMarketAddress = getMarketAddress;

package/src/assert/assert.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assert = void 0;
-function assert(condition, error) {
-    if (!condition) {
-        throw new Error(error || 'Unspecified AssertionError');
-    }
-}
-exports.assert = assert;

package/src/constants/banks.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Banks = exports.MainnetBanks = exports.DevnetBanks = exports.WRAPPED_SOL_MINT = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const __1 = require("../");
-exports.WRAPPED_SOL_MINT = new web3_js_1.PublicKey('So11111111111111111111111111111111111111112');
-exports.DevnetBanks = [
-    {
-        symbol: 'USDC',
-        bankIndex: new __1.BN(0),
-        oracle: web3_js_1.PublicKey.default,
-        oracleSource: __1.OracleSource.QUOTE_ASSET,
-        mint: new web3_js_1.PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
-    },
-    {
-        symbol: 'SOL',
-        bankIndex: new __1.BN(1),
-        oracle: new web3_js_1.PublicKey('J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix'),
-        oracleSource: __1.OracleSource.PYTH,
-        mint: new web3_js_1.PublicKey(exports.WRAPPED_SOL_MINT),
-    },
-    {
-        symbol: 'BTC',
-        bankIndex: new __1.BN(2),
-        oracle: new web3_js_1.PublicKey('HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J'),
-        oracleSource: __1.OracleSource.PYTH,
-        mint: new web3_js_1.PublicKey('3BZPwbcqB5kKScF3TEXxwNfx5ipV13kbRVDvfVp5c6fv'),
-    },
-];
-exports.MainnetBanks = [
-    {
-        symbol: 'USDC',
-        bankIndex: new __1.BN(0),
-        oracle: web3_js_1.PublicKey.default,
-        oracleSource: __1.OracleSource.QUOTE_ASSET,
-        mint: new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'),
-    },
-];
-exports.Banks = {
-    devnet: exports.DevnetBanks,
-    'mainnet-beta': exports.MainnetBanks,
-};

package/src/constants/markets.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Markets = exports.MainnetMarkets = exports.DevnetMarkets = void 0;
-const __1 = require("../");
-const web3_js_1 = require("@solana/web3.js");
-exports.DevnetMarkets = [
-    {
-        fullName: 'Solana',
-        category: ['L1', 'Infra'],
-        symbol: 'SOL-PERP',
-        baseAssetSymbol: 'SOL',
-        marketIndex: new __1.BN(0),
-        oracle: new web3_js_1.PublicKey('J83w4HKfqxwcq3BEMMkPFSppX3gqekLyLJBexebFVkix'),
-        launchTs: 1655751353000,
-        oracleSource: __1.OracleSource.PYTH,
-    },
-    {
-        fullName: 'Bitcoin',
-        category: ['L1', 'Payment'],
-        symbol: 'BTC-PERP',
-        baseAssetSymbol: 'BTC',
-        marketIndex: new __1.BN(1),
-        oracle: new web3_js_1.PublicKey('HovQMDrbAgAYPCmHVSrezcSmkMtXSSUsLDFANExrZh2J'),
-        launchTs: 1655751353000,
-        oracleSource: __1.OracleSource.PYTH,
-    },
-    {
-        fullName: 'Ethereum',
-        category: ['L1', 'Infra'],
-        symbol: 'ETH-PERP',
-        baseAssetSymbol: 'ETH',
-        marketIndex: new __1.BN(2),
-        oracle: new web3_js_1.PublicKey('EdVCmQ9FSPcVe5YySXDPCRmc8aDQLKJ9xvYBMZPie1Vw'),
-        launchTs: 1637691133472,
-        oracleSource: __1.OracleSource.PYTH,
-    },
-];
-exports.MainnetMarkets = [];
-exports.Markets = {
-    devnet: exports.DevnetMarkets,
-    'mainnet-beta': [],
-};

package/src/constants/numericConstants.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QUOTE_ASSET_BANK_INDEX = exports.ONE_YEAR = exports.BID_ASK_SPREAD_PRECISION = exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.PRICE_DIV_PEG = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION_EXP = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_PAYMENT_PRECISION = exports.MARK_PRICE_PRECISION = exports.QUOTE_PRECISION = exports.LIQUIDATION_FEE_PRECISION = exports.BANK_BALANCE_PRECISION = exports.BANK_BALANCE_PRECISION_EXP = exports.BANK_WEIGHT_PRECISION = exports.BANK_RATE_PRECISION = exports.BANK_UTILIZATION_PRECISION = exports.BANK_CUMULATIVE_INTEREST_PRECISION = exports.BANK_INTEREST_PRECISION = exports.AMM_RESERVE_PRECISION_EXP = exports.PEG_PRECISION_EXP = exports.FUNDING_RATE_PRECISION_EXP = exports.MARK_PRICE_PRECISION_EXP = exports.FUNDING_PAYMENT_PRECISION_EXP = exports.QUOTE_PRECISION_EXP = exports.MAX_LEVERAGE = exports.TEN_MILLION = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.TWO = exports.ONE = exports.ZERO = void 0;
-const __1 = require("../");
-exports.ZERO = new __1.BN(0);
-exports.ONE = new __1.BN(1);
-exports.TWO = new __1.BN(2);
-exports.TEN = new __1.BN(10);
-exports.TEN_THOUSAND = new __1.BN(10000);
-exports.BN_MAX = new __1.BN(Number.MAX_SAFE_INTEGER);
-exports.TEN_MILLION = exports.TEN_THOUSAND.mul(exports.TEN_THOUSAND);
-exports.MAX_LEVERAGE = new __1.BN(5);
-exports.QUOTE_PRECISION_EXP = new __1.BN(6);
-exports.FUNDING_PAYMENT_PRECISION_EXP = new __1.BN(4);
-exports.MARK_PRICE_PRECISION_EXP = new __1.BN(10);
-exports.FUNDING_RATE_PRECISION_EXP = exports.MARK_PRICE_PRECISION_EXP.mul(exports.FUNDING_PAYMENT_PRECISION_EXP);
-exports.PEG_PRECISION_EXP = new __1.BN(3);
-exports.AMM_RESERVE_PRECISION_EXP = new __1.BN(13);
-exports.BANK_INTEREST_PRECISION = new __1.BN(1000000);
-exports.BANK_CUMULATIVE_INTEREST_PRECISION = new __1.BN(10000000000);
-exports.BANK_UTILIZATION_PRECISION = new __1.BN(1000000);
-exports.BANK_RATE_PRECISION = new __1.BN(1000000);
-exports.BANK_WEIGHT_PRECISION = new __1.BN(100);
-exports.BANK_BALANCE_PRECISION_EXP = new __1.BN(6);
-exports.BANK_BALANCE_PRECISION = new __1.BN(10).pow(exports.BANK_BALANCE_PRECISION_EXP);
-exports.LIQUIDATION_FEE_PRECISION = new __1.BN(1000000);
-exports.QUOTE_PRECISION = new __1.BN(10).pow(exports.QUOTE_PRECISION_EXP);
-exports.MARK_PRICE_PRECISION = new __1.BN(10).pow(exports.MARK_PRICE_PRECISION_EXP);
-exports.FUNDING_PAYMENT_PRECISION = new __1.BN(10).pow(exports.FUNDING_PAYMENT_PRECISION_EXP);
-exports.PEG_PRECISION = new __1.BN(10).pow(exports.PEG_PRECISION_EXP);
-exports.AMM_RESERVE_PRECISION = new __1.BN(10).pow(exports.AMM_RESERVE_PRECISION_EXP);
-exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION;
-exports.BASE_PRECISION_EXP = exports.AMM_RESERVE_PRECISION_EXP;
-exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.AMM_RESERVE_PRECISION.div(exports.QUOTE_PRECISION); // 10^7
-exports.PRICE_DIV_PEG = exports.MARK_PRICE_PRECISION.div(exports.PEG_PRECISION); //10^7
-exports.PRICE_TO_QUOTE_PRECISION = exports.MARK_PRICE_PRECISION.div(exports.QUOTE_PRECISION);
-exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.AMM_RESERVE_PRECISION.mul(exports.PEG_PRECISION).div(exports.QUOTE_PRECISION); // 10^10
-exports.MARGIN_PRECISION = exports.TEN_THOUSAND;
-exports.BID_ASK_SPREAD_PRECISION = new __1.BN(1000000);
-exports.ONE_YEAR = new __1.BN(31536000);
-exports.QUOTE_ASSET_BANK_INDEX = new __1.BN(0);

package/src/events/eventList.js

@@ -1,77 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EventList = void 0;
-class Node {
-    constructor(event, next, prev) {
-        this.event = event;
-        this.next = next;
-        this.prev = prev;
-    }
-}
-class EventList {
-    constructor(eventType, maxSize, sortFn, orderDirection) {
-        this.eventType = eventType;
-        this.maxSize = maxSize;
-        this.sortFn = sortFn;
-        this.orderDirection = orderDirection;
-        this.size = 0;
-    }
-    insert(event) {
-        this.size++;
-        const newNode = new Node(event);
-        if (this.head === undefined) {
-            this.head = this.tail = newNode;
-            return;
-        }
-        if (this.sortFn(this.head.event, newNode.event) ===
-            (this.orderDirection === 'asc' ? 'less than' : 'greater than')) {
-            this.head.prev = newNode;
-            newNode.next = this.head;
-            this.head = newNode;
-        }
-        else {
-            let currentNode = this.head;
-            while (currentNode.next !== undefined &&
-                this.sortFn(currentNode.next.event, newNode.event) !==
-                    (this.orderDirection === 'asc' ? 'less than' : 'greater than')) {
-                currentNode = currentNode.next;
-            }
-            newNode.next = currentNode.next;
-            if (currentNode.next !== undefined) {
-                newNode.next.prev = newNode;
-            }
-            currentNode.next = newNode;
-            newNode.prev = currentNode;
-        }
-        if (this.size > this.maxSize) {
-            this.detach();
-        }
-    }
-    detach() {
-        const node = this.tail;
-        if (node.prev !== undefined) {
-            node.prev.next = node.next;
-        }
-        else {
-            this.head = node.next;
-        }
-        if (node.next !== undefined) {
-            node.next.prev = node.prev;
-        }
-        else {
-            this.tail = node.prev;
-        }
-        this.size--;
-    }
-    toArray() {
-        return Array.from(this);
-    }
-    *[Symbol.iterator]() {
-        let node = this.head;
-        while (node) {
-            yield node.event;
-            node = node.next;
-        }
-    }
-}
-exports.EventList = EventList;

package/src/events/eventSubscriber.js

@@ -1,139 +0,0 @@
-"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.EventSubscriber = void 0;
-const types_1 = require("./types");
-const txEventCache_1 = require("./txEventCache");
-const eventList_1 = require("./eventList");
-const pollingLogProvider_1 = require("./pollingLogProvider");
-const fetchLogs_1 = require("./fetchLogs");
-const webSocketLogProvider_1 = require("./webSocketLogProvider");
-const events_1 = require("events");
-const sort_1 = require("./sort");
-class EventSubscriber {
-    constructor(connection, program, options = types_1.DefaultEventSubscriptionOptions) {
-        this.connection = connection;
-        this.program = program;
-        this.options = options;
-        this.awaitTxPromises = new Map();
-        this.awaitTxResolver = new Map();
-        this.options = Object.assign({}, types_1.DefaultEventSubscriptionOptions, options);
-        this.txEventCache = new txEventCache_1.TxEventCache(this.options.maxTx);
-        this.eventListMap = new Map();
-        for (const eventType of this.options.eventTypes) {
-            this.eventListMap.set(eventType, new eventList_1.EventList(eventType, this.options.maxEventsPerType, sort_1.getSortFn(this.options.orderBy, this.options.orderDir, eventType), this.options.orderDir));
-        }
-        this.eventEmitter = new events_1.EventEmitter();
-        if (this.options.logProviderConfig.type === 'websocket') {
-            this.logProvider = new webSocketLogProvider_1.WebSocketLogProvider(this.connection, this.program.programId, this.options.commitment);
-        }
-        else {
-            this.logProvider = new pollingLogProvider_1.PollingLogProvider(this.connection, this.program.programId, options.commitment, this.options.logProviderConfig.frequency);
-        }
-    }
-    subscribe() {
-        if (this.logProvider.isSubscribed()) {
-            return true;
-        }
-        this.fetchPreviousTx().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);
-        });
-    }
-    handleTxLogs(txSig, slot, logs) {
-        if (this.txEventCache.has(txSig)) {
-            return;
-        }
-        const wrappedEvents = this.parseEventsFromLogs(txSig, slot, logs);
-        for (const wrappedEvent of wrappedEvents) {
-            this.eventListMap.get(wrappedEvent.eventType).insert(wrappedEvent);
-            this.eventEmitter.emit('newEvent', wrappedEvent);
-        }
-        if (this.awaitTxPromises.has(txSig)) {
-            this.awaitTxPromises.delete(txSig);
-            this.awaitTxResolver.get(txSig)();
-            this.awaitTxResolver.delete(txSig);
-        }
-        this.txEventCache.add(txSig, wrappedEvents);
-    }
-    fetchPreviousTx() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.options.untilTx) {
-                return;
-            }
-            let txFetched = 0;
-            let beforeTx = undefined;
-            const untilTx = this.options.untilTx;
-            while (txFetched < this.options.maxTx) {
-                const response = yield fetchLogs_1.fetchLogs(this.connection, this.program.programId, this.options.commitment === 'finalized' ? 'finalized' : 'confirmed', beforeTx, untilTx);
-                if (response === undefined) {
-                    break;
-                }
-                txFetched += response.transactionLogs.length;
-                beforeTx = response.earliestTx;
-                for (const { txSig, slot, logs } of response.transactionLogs) {
-                    this.handleTxLogs(txSig, slot, logs);
-                }
-            }
-        });
-    }
-    unsubscribe() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.logProvider.unsubscribe();
-        });
-    }
-    parseEventsFromLogs(txSig, slot, logs) {
-        const records = [];
-        // @ts-ignore
-        this.program._events._eventParser.parseLogs(logs, (event) => {
-            const expectRecordType = this.eventListMap.has(event.name);
-            if (expectRecordType) {
-                event.data.txSig = txSig;
-                event.data.slot = slot;
-                event.data.eventType = event.name;
-                records.push(event.data);
-            }
-        });
-        return records;
-    }
-    awaitTx(txSig) {
-        if (this.awaitTxPromises.has(txSig)) {
-            return this.awaitTxPromises.get(txSig);
-        }
-        if (this.txEventCache.has(txSig)) {
-            return Promise.resolve();
-        }
-        const promise = new Promise((resolve) => {
-            this.awaitTxResolver.set(txSig, resolve);
-        });
-        this.awaitTxPromises.set(txSig, promise);
-        return promise;
-    }
-    getEventList(eventType) {
-        return this.eventListMap.get(eventType);
-    }
-    /**
-     * This requires the EventList be cast to an array, which requires reallocation of memory.
-     * Would bias to using getEventList over getEvents
-     *
-     * @param eventType
-     */
-    getEventsArray(eventType) {
-        return this.eventListMap.get(eventType).toArray();
-    }
-    getEventsByTx(txSig) {
-        return this.txEventCache.get(txSig);
-    }
-}
-exports.EventSubscriber = EventSubscriber;