@drift-labs/sdk 2.65.0-beta.11 → 2.65.0-beta.12

package/VERSION

@@ -1 +1 @@
-2.65.0-beta.11
+2.65.0-beta.12

package/lib/events/eventSubscriber.js

@@ -122,7 +122,7 @@ class EventSubscriber {
     parseEventsFromLogs(txSig, slot, logs) {
         const records = [];
         // @ts-ignore
-        const events = (0, parse_1.parseLogs)(this.program, slot, logs);
+        const events = (0, parse_1.parseLogs)(this.program, logs);
         let runningEventIndex = 0;
         for (const event of events) {
             // @ts-ignore

package/lib/events/fetchLogs.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LogParser = exports.fetchTransactionLogs = exports.fetchLogs = void 0;
 const promiseTimeout_1 = require("../util/promiseTimeout");
+const parse_1 = require("./parse");
 function mapTransactionResponseToLog(transaction) {
     return {
         txSig: transaction.transaction.signatures[0],
@@ -82,14 +83,13 @@ class LogParser {
         const records = [];
         if (!event.logs)
             return records;
-        // @ts-ignore
-        const eventGenerator = this.program._events._eventParser.parseLogs(event.logs, false);
         let runningEventIndex = 0;
-        for (const eventLog of eventGenerator) {
+        for (const eventLog of (0, parse_1.parseLogs)(this.program, event.logs)) {
             eventLog.data.txSig = event.txSig;
             eventLog.data.slot = event.slot;
             eventLog.data.eventType = eventLog.name;
             eventLog.data.txSigIndex = runningEventIndex;
+            // @ts-ignore
             records.push(eventLog.data);
             runningEventIndex++;
         }

package/lib/events/parse.d.ts

@@ -1,2 +1,2 @@
 import { Program, Event } from '@coral-xyz/anchor';
-export declare function parseLogs(program: Program, slot: number, logs: string[]): Event[];
+export declare function parseLogs(program: Program, logs: string[]): Event[];

package/lib/events/parse.js

@@ -7,10 +7,13 @@ const PROGRAM_LOG = 'Program log: ';
 const PROGRAM_DATA = 'Program data: ';
 const PROGRAM_LOG_START_INDEX = PROGRAM_LOG.length;
 const PROGRAM_DATA_START_INDEX = PROGRAM_DATA.length;
-function parseLogs(program, slot, logs) {
+function parseLogs(program, logs) {
     const events = [];
     const execution = new ExecutionContext();
     for (const log of logs) {
+        if (log.startsWith('Log truncated')) {
+            break;
+        }
         const [event, newProgram, didPop] = handleLog(execution, log, program);
         if (event) {
             events.push(event);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.65.0-beta.11",
+	"version": "2.65.0-beta.12",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/events/eventSubscriber.ts

@@ -213,7 +213,7 @@ export class EventSubscriber {
 	): WrappedEvents {
 		const records = [];
 		// @ts-ignore
-		const events = parseLogs(this.program, slot, logs);
+		const events = parseLogs(this.program, logs);
 		let runningEventIndex = 0;
 		for (const event of events) {
 			// @ts-ignore

package/src/events/fetchLogs.ts

@@ -9,6 +9,7 @@ import {
 } from '@solana/web3.js';
 import { WrappedEvents } from './types';
 import { promiseTimeout } from '../util/promiseTimeout';
+import { parseLogs } from './parse';
 
 type Log = { txSig: TransactionSignature; slot: number; logs: string[] };
 type FetchLogsResponse = {
@@ -153,17 +154,13 @@ export class LogParser {
 
 		if (!event.logs) return records;
 
-		// @ts-ignore
-		const eventGenerator = this.program._events._eventParser.parseLogs(
-			event.logs,
-			false
-		);
 		let runningEventIndex = 0;
-		for (const eventLog of eventGenerator) {
+		for (const eventLog of parseLogs(this.program, event.logs)) {
 			eventLog.data.txSig = event.txSig;
 			eventLog.data.slot = event.slot;
 			eventLog.data.eventType = eventLog.name;
 			eventLog.data.txSigIndex = runningEventIndex;
+			// @ts-ignore
 			records.push(eventLog.data);
 			runningEventIndex++;
 		}

package/src/events/parse.ts

@@ -7,14 +7,14 @@ const PROGRAM_DATA = 'Program data: ';
 const PROGRAM_LOG_START_INDEX = PROGRAM_LOG.length;
 const PROGRAM_DATA_START_INDEX = PROGRAM_DATA.length;
 
-export function parseLogs(
-	program: Program,
-	slot: number,
-	logs: string[]
-): Event[] {
+export function parseLogs(program: Program, logs: string[]): Event[] {
 	const events = [];
 	const execution = new ExecutionContext();
 	for (const log of logs) {
+		if (log.startsWith('Log truncated')) {
+			break;
+		}
+
 		const [event, newProgram, didPop] = handleLog(execution, log, program);
 		if (event) {
 			events.push(event);