@velocity-exchange/sdk 0.1.0 → 0.2.1

package/src/events/eventsServerLogProvider.ts

@@ -21,15 +21,13 @@ export class EventsServerLogProvider implements LogProvider {
 	private lastHeartbeat = 0;
 	private timeoutId?: ReturnType<typeof setTimeout>;
 	private reconnectAttempts = 0;
-	eventEmitter?: EventEmitter;
+	eventEmitter: EventEmitter = new EventEmitter();
 
 	public constructor(
 		private readonly url: string,
 		private readonly eventTypes: EventType[],
 		private readonly userAccount?: string
-	) {
-		this.eventEmitter = new EventEmitter();
-	}
+	) {}
 
 	public isSubscribed(): boolean {
 		return this.ws !== undefined;
@@ -39,24 +37,29 @@ export class EventsServerLogProvider implements LogProvider {
 		if (this.ws !== undefined) {
 			return true;
 		}
-		this.ws = new WebSocketImpl(this.url);
+		const ws = new WebSocketImpl(this.url);
+		this.ws = ws;
 
 		this.callback = callback;
-		this.ws.addEventListener('open', () => {
+		ws.addEventListener('open', () => {
 			for (const channel of this.eventTypes) {
-				const subscribeMessage = {
+				const subscribeMessage: {
+					type: string;
+					channel: EventType;
+					user?: string;
+				} = {
 					type: 'subscribe',
 					channel: channel,
 				};
 				if (this.userAccount) {
-					subscribeMessage['user'] = this.userAccount;
+					subscribeMessage.user = this.userAccount;
 				}
-				this.ws.send(JSON.stringify(subscribeMessage));
+				ws.send(JSON.stringify(subscribeMessage));
 			}
 			this.reconnectAttempts = 0;
 		});
 
-		this.ws.addEventListener('message', (data) => {
+		ws.addEventListener('message', (data) => {
 			try {
 				if (!this.isUnsubscribing) {
 					clearTimeout(this.timeoutId);
@@ -78,6 +81,9 @@ export class EventsServerLogProvider implements LogProvider {
 					return;
 				}
 				const event = JSON.parse(parsedData.data);
+				if (this.callback === undefined) {
+					return;
+				}
 				this.callback(
 					event.txSig,
 					event.slot,
@@ -94,11 +100,11 @@ export class EventsServerLogProvider implements LogProvider {
 			}
 		});
 
-		this.ws.addEventListener('close', () => {
+		ws.addEventListener('close', () => {
 			console.log('eventsServerLogProvider: WebSocket closed');
 		});
 
-		this.ws.addEventListener('error', (error) => {
+		ws.addEventListener('error', (error) => {
 			console.error('eventsServerLogProvider: WebSocket error:', error);
 		});
 
@@ -142,10 +148,13 @@ export class EventsServerLogProvider implements LogProvider {
 						this.reconnectAttempts + 1
 					}`
 				);
+				const callback = this.callback;
 				await this.unsubscribe();
 				this.reconnectAttempts++;
 				this.eventEmitter.emit('reconnect', this.reconnectAttempts);
-				this.subscribe(this.callback);
+				if (callback !== undefined) {
+					this.subscribe(callback);
+				}
 			}
 		}, EVENT_SERVER_HEARTBEAT_INTERVAL_MS * 2);
 	}

package/src/events/fetchLogs.ts

@@ -27,7 +27,7 @@ function mapTransactionResponseToLog(
 	return {
 		txSig: transaction.transaction.signatures[0],
 		slot: transaction.slot,
-		logs: transaction.meta.logMessages,
+		logs: transaction.meta?.logMessages ?? [],
 	};
 }
 
@@ -39,7 +39,7 @@ export async function fetchLogs(
 	untilTx?: TransactionSignature,
 	limit?: number,
 	batchSize = 25
-): Promise<FetchLogsResponse> {
+): Promise<FetchLogsResponse | undefined> {
 	const signatures = await connection.getSignaturesForAddress(
 		address,
 		{
@@ -85,7 +85,7 @@ export async function fetchLogs(
 		mostRecentTx: mostRecent.signature,
 		earliestSlot: earliest.slot,
 		mostRecentSlot: mostRecent.slot,
-		mostRecentBlockTime: mostRecent.blockTime,
+		mostRecentBlockTime: mostRecent.blockTime ?? undefined,
 	};
 }
 

package/src/events/pollingLogProvider.ts

@@ -10,9 +10,9 @@ import { fetchLogs } from './fetchLogs';
 
 export class PollingLogProvider implements LogProvider {
 	private finality: Finality;
-	private intervalId: ReturnType<typeof setTimeout>;
+	private intervalId?: ReturnType<typeof setTimeout>;
 	private mostRecentSeenTx?: TransactionSignature;
-	private mutex: number;
+	private mutex = 0;
 	private firstFetch = true;
 
 	public constructor(

package/src/events/txEventCache.ts

@@ -24,8 +24,14 @@ export class TxEventCache {
 			this.detach(existingNode);
 			this.size--;
 		} else if (this.size === this.maxTx) {
-			delete this.cacheMap[this.tail.key];
-			this.detach(this.tail);
+			const tail = this.tail;
+			if (tail === undefined) {
+				throw new Error(
+					'TxEventCache.add: cache at capacity but tail is unset'
+				);
+			}
+			delete this.cacheMap[tail.key];
+			this.detach(tail);
 			this.size--;
 		}
 

package/src/events/types.ts

@@ -16,8 +16,6 @@ import {
 	SpotMarketVaultDepositRecord,
 	SignedMsgOrderRecord,
 	DeleteUserRecord,
-	InsuranceFundSwapRecord,
-	TransferProtocolIfSharesToRevenuePoolRecord,
 	LPMintRedeemRecord,
 	LPSettleRecord,
 	LPSwapRecord,
@@ -57,8 +55,6 @@ export const DefaultEventSubscriptionOptions: EventSubscriptionOptions = {
 		'SpotMarketVaultDepositRecord',
 		'SignedMsgOrderRecord',
 		'DeleteUserRecord',
-		'InsuranceFundSwapRecord',
-		'TransferProtocolIfSharesToRevenuePoolRecord',
 		'LPMintRedeemRecord',
 		'LPSettleRecord',
 		'LPSwapRecord',
@@ -106,8 +102,6 @@ export type EventMap = {
 	SpotMarketVaultDepositRecord: Event<SpotMarketVaultDepositRecord>;
 	SignedMsgOrderRecord: Event<SignedMsgOrderRecord>;
 	DeleteUserRecord: Event<DeleteUserRecord>;
-	InsuranceFundSwapRecord: Event<InsuranceFundSwapRecord>;
-	TransferProtocolIfSharesToRevenuePoolRecord: Event<TransferProtocolIfSharesToRevenuePoolRecord>;
 	LPSettleRecord: Event<LPSettleRecord>;
 	LPMintRedeemRecord: Event<LPMintRedeemRecord>;
 	LPSwapRecord: Event<LPSwapRecord>;
@@ -132,8 +126,6 @@ export type VelocityEvent =
 	| Event<SpotMarketVaultDepositRecord>
 	| Event<SignedMsgOrderRecord>
 	| Event<DeleteUserRecord>
-	| Event<InsuranceFundSwapRecord>
-	| Event<TransferProtocolIfSharesToRevenuePoolRecord>
 	| Event<LPSettleRecord>
 	| Event<LPMintRedeemRecord>
 	| Event<LPSwapRecord>

package/src/events/webSocketLogProvider.ts

@@ -9,7 +9,7 @@ import {
 import { EventEmitter } from 'events';
 
 export class WebSocketLogProvider implements LogProvider {
-	private subscriptionId: number;
+	private subscriptionId?: number;
 	private isUnsubscribing = false;
 	private externalUnsubscribe = false;
 	private receivingData = false;
@@ -113,8 +113,10 @@ export class WebSocketLogProvider implements LogProvider {
 				await this.unsubscribe();
 				this.receivingData = false;
 				this.reconnectAttempts++;
-				this.eventEmitter.emit('reconnect', this.reconnectAttempts);
-				this.subscribe(this.callback);
+				this.eventEmitter?.emit('reconnect', this.reconnectAttempts);
+				if (this.callback) {
+					this.subscribe(this.callback);
+				}
 			}
 		}, this.resubTimeoutMs);
 	}

package/src/factory/bigNum.ts

@@ -259,7 +259,7 @@ export class BigNum {
 		).split(BigNum.delim);
 
 		let formattedLeftSide = leftSide;
-		let formattedRightSide = rightSide;
+		let formattedRightSide: string | undefined = rightSide;
 
 		// Apply decimal override if specified
 		if (decimalOverride !== undefined) {
@@ -658,7 +658,7 @@ export class BigNum {
 		precision?: BN | number | string
 	): BigNum {
 		assert(
-			new BN(precision).lt(new BN(100)),
+			new BN(precision ?? 0).lt(new BN(100)),
 			'Tried to create a bignum with precision higher than 10^100'
 		);
 		return new BigNum(val, precision);