@drift-labs/sdk 2.142.0-beta.23 → 2.142.0-beta.24

package/VERSION

@@ -1 +1 @@
-2.142.0-beta.23
+2.142.0-beta.24

package/lib/browser/events/parse.d.ts

@@ -1,6 +1,8 @@
 import { Program, Event } from '@coral-xyz/anchor';
+import { CuUsageEvent } from './types';
 export declare function parseLogs(program: Program, logs: string[], programId?: string): Event[];
 export declare function parseLogsWithRaw(program: Program, logs: string[], programId?: string): {
     events: Event[];
     rawLogs: string[];
 };
+export declare function parseLogsForCuUsage(logs: string[], programId?: string): Event<CuUsageEvent>[];

package/lib/browser/events/parse.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseLogsWithRaw = exports.parseLogs = void 0;
+exports.parseLogsForCuUsage = exports.parseLogsWithRaw = exports.parseLogs = void 0;
 const driftProgramId = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
 const PROGRAM_LOG = 'Program log: ';
+const PROGRAM_INSTRUCTION = 'Program log: Instruction: ';
 const PROGRAM_DATA = 'Program data: ';
 const PROGRAM_LOG_START_INDEX = PROGRAM_LOG.length;
 const PROGRAM_DATA_START_INDEX = PROGRAM_DATA.length;
+const PROGRAM_INSTRUCTION_START_INDEX = PROGRAM_INSTRUCTION.length;
 function parseLogs(program, logs, programId = driftProgramId) {
     const { events } = parseLogsWithRaw(program, logs, programId);
     return events;
@@ -87,6 +89,7 @@ function handleSystemLog(log, programId = driftProgramId) {
 class ExecutionContext {
     constructor() {
         this.stack = [];
+        this.ixStack = [];
     }
     program() {
         if (!this.stack.length) {
@@ -103,4 +106,94 @@ class ExecutionContext {
         }
         this.stack.pop();
     }
+    ix() {
+        if (!this.ixStack.length) {
+            throw new Error('Expected the ix stack to have elements');
+        }
+        return this.ixStack[this.ixStack.length - 1];
+    }
+    pushIx(newIx) {
+        this.ixStack.push(newIx);
+    }
+    popIx() {
+        this.ixStack.pop();
+    }
+}
+function parseLogsForCuUsage(logs, programId = driftProgramId) {
+    const cuUsageEvents = [];
+    const execution = new ExecutionContext();
+    for (const log of logs) {
+        if (log.startsWith('Log truncated')) {
+            break;
+        }
+        const [newProgram, newIx, didPopProgram, didPopIx] = handleLogForCuUsage(execution, log, programId);
+        if (newProgram) {
+            execution.push(newProgram);
+        }
+        if (newIx) {
+            execution.pushIx(newIx);
+        }
+        if (didPopProgram) {
+            execution.pop();
+        }
+        if (didPopIx !== null) {
+            cuUsageEvents.push({
+                name: 'CuUsage',
+                data: {
+                    instruction: execution.ix(),
+                    cuUsage: didPopIx,
+                },
+            });
+            execution.popIx();
+        }
+    }
+    return cuUsageEvents;
+}
+exports.parseLogsForCuUsage = parseLogsForCuUsage;
+function handleLogForCuUsage(execution, log, programId = driftProgramId) {
+    if (execution.stack.length > 0 && execution.program() === programId) {
+        return handleProgramLogForCuUsage(log, programId);
+    }
+    else {
+        return handleSystemLogForCuUsage(log, programId);
+    }
+}
+function handleProgramLogForCuUsage(log, programId = driftProgramId) {
+    if (log.startsWith(PROGRAM_INSTRUCTION)) {
+        const ixStr = log.slice(PROGRAM_INSTRUCTION_START_INDEX);
+        return [null, ixStr, false, null];
+    }
+    else {
+        return handleSystemLogForCuUsage(log, programId);
+    }
+}
+function handleSystemLogForCuUsage(log, programId = driftProgramId) {
+    // System component.
+    const logStart = log.split(':')[0];
+    const programStart = `Program ${programId} invoke`;
+    // Did the program finish executing?
+    if (logStart.match(/^Program (.*) success/g) !== null) {
+        return [null, null, true, null];
+        // Recursive call.
+    }
+    else if (logStart.startsWith(programStart)) {
+        return [programId, null, false, null];
+        // Consumed CU log.
+    }
+    else if (log.startsWith(`Program ${programId} consumed `)) {
+        // Extract CU usage, e.g. 'Program ... consumed 29242 of 199700 compute units'
+        // We need to extract the consumed value (29242)
+        const matches = log.match(/consumed (\d+) of \d+ compute units/);
+        if (matches) {
+            return [null, null, false, Number(matches[1])];
+        }
+        return [null, null, false, null];
+    }
+    // CPI call.
+    else if (logStart.includes('invoke')) {
+        return ['cpi', null, false, null]; // Any string will do.
+    }
+    else {
+        return [null, null, false, null];
+    }
 }

package/lib/browser/events/types.d.ts

@@ -52,7 +52,7 @@ export type EventMap = {
     LPSwapRecord: Event<LPSwapRecord>;
 };
 export type EventType = keyof EventMap;
-export type DriftEvent = Event<DepositRecord> | Event<FundingPaymentRecord> | Event<LiquidationRecord> | Event<FundingRateRecord> | Event<OrderRecord> | Event<OrderActionRecord> | Event<SettlePnlRecord> | Event<NewUserRecord> | Event<LPRecord> | Event<InsuranceFundRecord> | Event<SpotInterestRecord> | Event<InsuranceFundStakeRecord> | Event<CurveRecord> | Event<SwapRecord> | Event<SpotMarketVaultDepositRecord> | Event<SignedMsgOrderRecord> | Event<DeleteUserRecord> | Event<FuelSweepRecord> | Event<FuelSeasonRecord> | Event<InsuranceFundSwapRecord> | Event<TransferProtocolIfSharesToRevenuePoolRecord> | Event<LPSettleRecord> | Event<LPMintRedeemRecord> | Event<LPSwapRecord> | Event<LPBorrowLendDepositRecord>;
+export type DriftEvent = Event<DepositRecord> | Event<FundingPaymentRecord> | Event<LiquidationRecord> | Event<FundingRateRecord> | Event<OrderRecord> | Event<OrderActionRecord> | Event<SettlePnlRecord> | Event<NewUserRecord> | Event<LPRecord> | Event<InsuranceFundRecord> | Event<SpotInterestRecord> | Event<InsuranceFundStakeRecord> | Event<CurveRecord> | Event<SwapRecord> | Event<SpotMarketVaultDepositRecord> | Event<SignedMsgOrderRecord> | Event<DeleteUserRecord> | Event<FuelSweepRecord> | Event<FuelSeasonRecord> | Event<InsuranceFundSwapRecord> | Event<TransferProtocolIfSharesToRevenuePoolRecord> | Event<LPSettleRecord> | Event<LPMintRedeemRecord> | Event<LPSwapRecord> | Event<LPBorrowLendDepositRecord> | Event<CuUsage>;
 export interface EventSubscriberEvents {
     newEvent: (event: WrappedEvent<EventType>) => void;
 }
@@ -84,3 +84,22 @@ export type EventsServerLogProviderConfig = StreamingLogProviderConfig & {
     url: string;
 };
 export type LogProviderConfig = WebSocketLogProviderConfig | PollingLogProviderConfig | EventsServerLogProviderConfig;
+export type CuUsageEvent = {
+    name: 'CuUsage';
+    fields: [
+        {
+            name: 'instruction';
+            type: 'string';
+            index: false;
+        },
+        {
+            name: 'cuUsage';
+            type: 'u32';
+            index: false;
+        }
+    ];
+};
+export type CuUsage = {
+    instruction: string;
+    cuUsage: number;
+};

package/lib/node/events/parse.d.ts

@@ -1,7 +1,9 @@
 import { Program, Event } from '@coral-xyz/anchor';
+import { CuUsageEvent } from './types';
 export declare function parseLogs(program: Program, logs: string[], programId?: string): Event[];
 export declare function parseLogsWithRaw(program: Program, logs: string[], programId?: string): {
     events: Event[];
     rawLogs: string[];
 };
+export declare function parseLogsForCuUsage(logs: string[], programId?: string): Event<CuUsageEvent>[];
 //# sourceMappingURL=parse.d.ts.map

package/lib/node/events/parse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../src/events/parse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAQnD,wBAAgB,SAAS,CACxB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EAAE,EACd,SAAS,SAAiB,GACxB,KAAK,EAAE,CAGT;AAED,wBAAgB,gBAAgB,CAC/B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EAAE,EACd,SAAS,SAAiB,GACxB;IAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CA2BxC"}
+{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../../src/events/parse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAUvC,wBAAgB,SAAS,CACxB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EAAE,EACd,SAAS,SAAiB,GACxB,KAAK,EAAE,CAGT;AAED,wBAAgB,gBAAgB,CAC/B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EAAE,EACd,SAAS,SAAiB,GACxB;IAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CA2BxC;AAsGD,wBAAgB,mBAAmB,CAClC,IAAI,EAAE,MAAM,EAAE,EACd,SAAS,SAAiB,GACxB,KAAK,CAAC,YAAY,CAAC,EAAE,CAmCvB"}

package/lib/node/events/parse.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseLogsWithRaw = exports.parseLogs = void 0;
+exports.parseLogsForCuUsage = exports.parseLogsWithRaw = exports.parseLogs = void 0;
 const driftProgramId = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
 const PROGRAM_LOG = 'Program log: ';
+const PROGRAM_INSTRUCTION = 'Program log: Instruction: ';
 const PROGRAM_DATA = 'Program data: ';
 const PROGRAM_LOG_START_INDEX = PROGRAM_LOG.length;
 const PROGRAM_DATA_START_INDEX = PROGRAM_DATA.length;
+const PROGRAM_INSTRUCTION_START_INDEX = PROGRAM_INSTRUCTION.length;
 function parseLogs(program, logs, programId = driftProgramId) {
     const { events } = parseLogsWithRaw(program, logs, programId);
     return events;
@@ -87,6 +89,7 @@ function handleSystemLog(log, programId = driftProgramId) {
 class ExecutionContext {
     constructor() {
         this.stack = [];
+        this.ixStack = [];
     }
     program() {
         if (!this.stack.length) {
@@ -103,4 +106,94 @@ class ExecutionContext {
         }
         this.stack.pop();
     }
+    ix() {
+        if (!this.ixStack.length) {
+            throw new Error('Expected the ix stack to have elements');
+        }
+        return this.ixStack[this.ixStack.length - 1];
+    }
+    pushIx(newIx) {
+        this.ixStack.push(newIx);
+    }
+    popIx() {
+        this.ixStack.pop();
+    }
+}
+function parseLogsForCuUsage(logs, programId = driftProgramId) {
+    const cuUsageEvents = [];
+    const execution = new ExecutionContext();
+    for (const log of logs) {
+        if (log.startsWith('Log truncated')) {
+            break;
+        }
+        const [newProgram, newIx, didPopProgram, didPopIx] = handleLogForCuUsage(execution, log, programId);
+        if (newProgram) {
+            execution.push(newProgram);
+        }
+        if (newIx) {
+            execution.pushIx(newIx);
+        }
+        if (didPopProgram) {
+            execution.pop();
+        }
+        if (didPopIx !== null) {
+            cuUsageEvents.push({
+                name: 'CuUsage',
+                data: {
+                    instruction: execution.ix(),
+                    cuUsage: didPopIx,
+                },
+            });
+            execution.popIx();
+        }
+    }
+    return cuUsageEvents;
+}
+exports.parseLogsForCuUsage = parseLogsForCuUsage;
+function handleLogForCuUsage(execution, log, programId = driftProgramId) {
+    if (execution.stack.length > 0 && execution.program() === programId) {
+        return handleProgramLogForCuUsage(log, programId);
+    }
+    else {
+        return handleSystemLogForCuUsage(log, programId);
+    }
+}
+function handleProgramLogForCuUsage(log, programId = driftProgramId) {
+    if (log.startsWith(PROGRAM_INSTRUCTION)) {
+        const ixStr = log.slice(PROGRAM_INSTRUCTION_START_INDEX);
+        return [null, ixStr, false, null];
+    }
+    else {
+        return handleSystemLogForCuUsage(log, programId);
+    }
+}
+function handleSystemLogForCuUsage(log, programId = driftProgramId) {
+    // System component.
+    const logStart = log.split(':')[0];
+    const programStart = `Program ${programId} invoke`;
+    // Did the program finish executing?
+    if (logStart.match(/^Program (.*) success/g) !== null) {
+        return [null, null, true, null];
+        // Recursive call.
+    }
+    else if (logStart.startsWith(programStart)) {
+        return [programId, null, false, null];
+        // Consumed CU log.
+    }
+    else if (log.startsWith(`Program ${programId} consumed `)) {
+        // Extract CU usage, e.g. 'Program ... consumed 29242 of 199700 compute units'
+        // We need to extract the consumed value (29242)
+        const matches = log.match(/consumed (\d+) of \d+ compute units/);
+        if (matches) {
+            return [null, null, false, Number(matches[1])];
+        }
+        return [null, null, false, null];
+    }
+    // CPI call.
+    else if (logStart.includes('invoke')) {
+        return ['cpi', null, false, null]; // Any string will do.
+    }
+    else {
+        return [null, null, false, null];
+    }
 }

package/lib/node/events/types.d.ts

@@ -52,7 +52,7 @@ export type EventMap = {
     LPSwapRecord: Event<LPSwapRecord>;
 };
 export type EventType = keyof EventMap;
-export type DriftEvent = Event<DepositRecord> | Event<FundingPaymentRecord> | Event<LiquidationRecord> | Event<FundingRateRecord> | Event<OrderRecord> | Event<OrderActionRecord> | Event<SettlePnlRecord> | Event<NewUserRecord> | Event<LPRecord> | Event<InsuranceFundRecord> | Event<SpotInterestRecord> | Event<InsuranceFundStakeRecord> | Event<CurveRecord> | Event<SwapRecord> | Event<SpotMarketVaultDepositRecord> | Event<SignedMsgOrderRecord> | Event<DeleteUserRecord> | Event<FuelSweepRecord> | Event<FuelSeasonRecord> | Event<InsuranceFundSwapRecord> | Event<TransferProtocolIfSharesToRevenuePoolRecord> | Event<LPSettleRecord> | Event<LPMintRedeemRecord> | Event<LPSwapRecord> | Event<LPBorrowLendDepositRecord>;
+export type DriftEvent = Event<DepositRecord> | Event<FundingPaymentRecord> | Event<LiquidationRecord> | Event<FundingRateRecord> | Event<OrderRecord> | Event<OrderActionRecord> | Event<SettlePnlRecord> | Event<NewUserRecord> | Event<LPRecord> | Event<InsuranceFundRecord> | Event<SpotInterestRecord> | Event<InsuranceFundStakeRecord> | Event<CurveRecord> | Event<SwapRecord> | Event<SpotMarketVaultDepositRecord> | Event<SignedMsgOrderRecord> | Event<DeleteUserRecord> | Event<FuelSweepRecord> | Event<FuelSeasonRecord> | Event<InsuranceFundSwapRecord> | Event<TransferProtocolIfSharesToRevenuePoolRecord> | Event<LPSettleRecord> | Event<LPMintRedeemRecord> | Event<LPSwapRecord> | Event<LPBorrowLendDepositRecord> | Event<CuUsage>;
 export interface EventSubscriberEvents {
     newEvent: (event: WrappedEvent<EventType>) => void;
 }
@@ -84,4 +84,23 @@ export type EventsServerLogProviderConfig = StreamingLogProviderConfig & {
     url: string;
 };
 export type LogProviderConfig = WebSocketLogProviderConfig | PollingLogProviderConfig | EventsServerLogProviderConfig;
+export type CuUsageEvent = {
+    name: 'CuUsage';
+    fields: [
+        {
+            name: 'instruction';
+            type: 'string';
+            index: false;
+        },
+        {
+            name: 'cuUsage';
+            type: 'u32';
+            index: false;
+        }
+    ];
+};
+export type CuUsage = {
+    instruction: string;
+    cuUsage: number;
+};
 //# sourceMappingURL=types.d.ts.map

package/lib/node/events/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/events/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/events/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.142.0-beta.23",
+	"version": "2.142.0-beta.24",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"module": "./lib/browser/index.js",
@@ -20,6 +20,7 @@
 		"test:bignum": "mocha -r ts-node/register tests/bn/**/*.ts",
 		"test:ci": "mocha -r ts-node/register tests/ci/**/*.ts",
 		"test:dlob": "mocha -r ts-node/register tests/dlob/**/*.ts",
+		"test:events": "mocha -r ts-node/register tests/events/**/*.ts",
 		"patch-and-pub": "npm version patch --force && npm publish",
 		"prettify": "prettier --check './src/***/*.ts'",
 		"prettify:fix": "prettier --write './{src,tests}/***/*.ts'",

package/src/events/parse.ts

@@ -1,10 +1,13 @@
 import { Program, Event } from '@coral-xyz/anchor';
+import { CuUsageEvent } from './types';
 
 const driftProgramId = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
 const PROGRAM_LOG = 'Program log: ';
+const PROGRAM_INSTRUCTION = 'Program log: Instruction: ';
 const PROGRAM_DATA = 'Program data: ';
 const PROGRAM_LOG_START_INDEX = PROGRAM_LOG.length;
 const PROGRAM_DATA_START_INDEX = PROGRAM_DATA.length;
+const PROGRAM_INSTRUCTION_START_INDEX = PROGRAM_INSTRUCTION.length;
 
 export function parseLogs(
 	program: Program,
@@ -112,6 +115,7 @@ function handleSystemLog(
 // executing for a given log.
 class ExecutionContext {
 	stack: string[] = [];
+	ixStack: string[] = [];
 
 	program(): string {
 		if (!this.stack.length) {
@@ -130,4 +134,115 @@ class ExecutionContext {
 		}
 		this.stack.pop();
 	}
+
+	ix(): string {
+		if (!this.ixStack.length) {
+			throw new Error('Expected the ix stack to have elements');
+		}
+		return this.ixStack[this.ixStack.length - 1];
+	}
+
+	pushIx(newIx: string) {
+		this.ixStack.push(newIx);
+	}
+
+	popIx() {
+		this.ixStack.pop();
+	}
+}
+
+export function parseLogsForCuUsage(
+	logs: string[],
+	programId = driftProgramId
+): Event<CuUsageEvent>[] {
+	const cuUsageEvents: Event<CuUsageEvent>[] = [];
+
+	const execution = new ExecutionContext();
+	for (const log of logs) {
+		if (log.startsWith('Log truncated')) {
+			break;
+		}
+
+		const [newProgram, newIx, didPopProgram, didPopIx] = handleLogForCuUsage(
+			execution,
+			log,
+			programId
+		);
+		if (newProgram) {
+			execution.push(newProgram);
+		}
+		if (newIx) {
+			execution.pushIx(newIx);
+		}
+		if (didPopProgram) {
+			execution.pop();
+		}
+		if (didPopIx !== null) {
+			cuUsageEvents.push({
+				name: 'CuUsage',
+				data: {
+					instruction: execution.ix(),
+					cuUsage: didPopIx!,
+				},
+			} as any);
+			execution.popIx();
+		}
+	}
+	return cuUsageEvents;
+}
+
+function handleLogForCuUsage(
+	execution: ExecutionContext,
+	log: string,
+	programId = driftProgramId
+): [string | null, string | null, boolean, number | null] {
+	if (execution.stack.length > 0 && execution.program() === programId) {
+		return handleProgramLogForCuUsage(log, programId);
+	} else {
+		return handleSystemLogForCuUsage(log, programId);
+	}
+}
+
+function handleProgramLogForCuUsage(
+	log: string,
+	programId = driftProgramId
+): [string | null, string | null, boolean, number | null] {
+	if (log.startsWith(PROGRAM_INSTRUCTION)) {
+		const ixStr = log.slice(PROGRAM_INSTRUCTION_START_INDEX);
+		return [null, ixStr, false, null];
+	} else {
+		return handleSystemLogForCuUsage(log, programId);
+	}
+}
+
+function handleSystemLogForCuUsage(
+	log: string,
+	programId = driftProgramId
+): [string | null, string | null, boolean, number | null] {
+	// System component.
+	const logStart = log.split(':')[0];
+	const programStart = `Program ${programId} invoke`;
+
+	// Did the program finish executing?
+	if (logStart.match(/^Program (.*) success/g) !== null) {
+		return [null, null, true, null];
+		// Recursive call.
+	} else if (logStart.startsWith(programStart)) {
+		return [programId, null, false, null];
+		// Consumed CU log.
+	} else if (log.startsWith(`Program ${programId} consumed `)) {
+		// Extract CU usage, e.g. 'Program ... consumed 29242 of 199700 compute units'
+		// We need to extract the consumed value (29242)
+		const matches = log.match(/consumed (\d+) of \d+ compute units/);
+		if (matches) {
+			return [null, null, false, Number(matches[1])];
+		}
+		return [null, null, false, null];
+	}
+	// CPI call.
+	else if (logStart.includes('invoke')) {
+		return ['cpi', null, false, null]; // Any string will do.
+	} else {
+		return [null, null, false, null];
+	}
 }

package/src/events/types.ts

@@ -149,7 +149,8 @@ export type DriftEvent =
 	| Event<LPSettleRecord>
 	| Event<LPMintRedeemRecord>
 	| Event<LPSwapRecord>
-	| Event<LPBorrowLendDepositRecord>;
+	| Event<LPBorrowLendDepositRecord>
+	| Event<CuUsage>;
 
 export interface EventSubscriberEvents {
 	newEvent: (event: WrappedEvent<EventType>) => void;
@@ -213,3 +214,24 @@ export type LogProviderConfig =
 	| WebSocketLogProviderConfig
 	| PollingLogProviderConfig
 	| EventsServerLogProviderConfig;
+
+export type CuUsageEvent = {
+	name: 'CuUsage';
+	fields: [
+		{
+			name: 'instruction';
+			type: 'string';
+			index: false;
+		},
+		{
+			name: 'cuUsage';
+			type: 'u32';
+			index: false;
+		},
+	];
+};
+
+export type CuUsage = {
+	instruction: string;
+	cuUsage: number;
+};

package/tests/events/parseLogsForCuUsage.ts

@@ -0,0 +1,139 @@
+import { expect } from 'chai';
+import { parseLogsForCuUsage } from '../../src/events/parse';
+
+// if you used the '@types/mocha' method to install mocha type definitions, uncomment the following line
+// import 'mocha';
+
+describe('parseLogsForCuUsage Tests', () => {
+	it('can parse single ix', () => {
+		const logs = [
+			'Program ComputeBudget111111111111111111111111111111 invoke [1]',
+			'Program ComputeBudget111111111111111111111111111111 success',
+			'Program ComputeBudget111111111111111111111111111111 invoke [1]',
+			'Program ComputeBudget111111111111111111111111111111 success',
+			'Program dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH invoke [1]',
+			'Program log: Instruction: UpdateFundingRate',
+			'Program log: correcting mark twap update (oracle previously invalid for 1625 seconds)',
+			'Program data: Ze4o5EYuPXWjSrNoAAAAADkUAAAAAAAAZTIKAAAAAAAAAAAAAAAAAGwIAGYvdqgAAAAAAAAAAAAxpQahVMKdAAAAAAAAAAAAK0cfnMcFowAAAAAAAAAAAGUyCgAAAAAAAAAAAAAAAAAbXpy4n6WoAAAAAAAAAAAAGAAXbsHunQAAAAAAAAAAAObum9evM6MAAAAAAAAAAAAA9PA5+UYKAAAAAAAAAAAAAKhuDZ0RCgAAAAAAAAAAAABMgixcNQAAAAAAAAAAAAA9NqYKSgAAAAAAAAAAAAAA4nylcy0AAAAAAAAAAAAAAMvCAAAAAAAAAAAAAAAAAACOjAkAAAAAAET3AgAAAAAAAAAAAAAAAAAMAQAAHgA=',
+			'Program data: RAP/GoVbk/6jSrNoAAAAAA0rAAAAAAAAHgBxcgEAAAAAAHFyAQAAAAAAAAAAAAAAAABxcgEAAAAAAAAAAAAAAAAAZRuYAQAAAAAAAAAAAAAAAJMNmAEAAAAAAAAAAAAAAAC0eAkAAAAAAByBCQAAAAAAWUbv4v////8ATIIsXDUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==',
+			'Program dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH consumed 102636 of 143817 compute units',
+			'Program dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH success',
+		];
+		const cuUsage = parseLogsForCuUsage(logs);
+		expect(cuUsage).to.deep.equal([
+			{
+				name: 'CuUsage',
+				data: {
+					instruction: 'UpdateFundingRate',
+					cuUsage: 102636,
+				}
+			},
+		]);
+	});
+
+	it('can parse multiple ixs', () => {
+		const logs = [
+			'Program ComputeBudget111111111111111111111111111111 invoke [1]',
+			'Program ComputeBudget111111111111111111111111111111 success',
+			'Program ComputeBudget111111111111111111111111111111 invoke [1]',
+			'Program ComputeBudget111111111111111111111111111111 success',
+			'Program dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH invoke [1]',
+			'Program log: Instruction: PostPythLazerOracleUpdate',
+			'Program log: Skipping new lazer update. current ts 1756622092550000 >= next ts 1756622092000000',
+			'Program log: Skipping new lazer update. current ts 1756622092550000 >= next ts 1756622092000000',
+			'Program log: Skipping new lazer update. current ts 1756622092550000 >= next ts 1756622092000000',
+			'Program log: Price updated to 433158894',
+			'Program log: Posting new lazer update. current ts 1756622079000000 < next ts 1756622092000000',
+			'Program dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH consumed 29242 of 199700 compute units',
+			'Program dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH success',
+			'Program dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH invoke [1]',
+			'Program log: Instruction: UpdatePerpBidAskTwap',
+			'Program log: estimated_bid = None estimated_ask = None',
+			'Program log: after amm bid twap = 204332308 -> 204328128 \n        ask twap = 204350474 -> 204347149 \n        ts = 1756622080 -> 1756622092',
+			'Program dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH consumed 71006 of 170458 compute units',
+			'Program dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH success',
+		];
+		const cuUsage = parseLogsForCuUsage(logs);
+		expect(cuUsage).to.deep.equal([
+			{
+				name: 'CuUsage',
+				data: {
+					instruction: 'PostPythLazerOracleUpdate',
+					cuUsage: 29242,
+				}
+			},
+			{
+				name: 'CuUsage',
+				data: {
+					instruction: 'UpdatePerpBidAskTwap',
+					cuUsage: 71006,
+				}
+			},
+		]);
+	});
+
+	it('can parse ixs with CPI (swaps)', () => {
+		const logs = [
+			'Program ComputeBudget111111111111111111111111111111 invoke [1]',
+			'Program ComputeBudget111111111111111111111111111111 success',
+			'Program ComputeBudget111111111111111111111111111111 invoke [1]',
+			'Program ComputeBudget111111111111111111111111111111 success',
+			'Program dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH invoke [1]',
+			'Program log: Instruction: BeginSwap',
+			'Program data: t7rLuuG7X4K7X+loAAAAAAAAoDz72UK0JwQAAAAAAAAAAMS7r8ACAAAAAAAAAAAAAAB36Aiv26cZAwAAAAAAAAAArDDOLAMAAAAAAAAAAAAAAAA1DAAUzQAAoLsNAA==',
+			'Program data: t7rLuuG7X4K7X+loAAAAAAEASQcRhBUVAQAAAAAAAAAAAG3WGn8CAAAAAAAAAAAAAADBBakRTIoAAAAAAAAAAAAAFfFDwgIAAAAAAAAAAAAAAAA1DACghgEAYOMWAA==',
+			'Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA invoke [2]',
+			'Program log: Instruction: Transfer',
+			'Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA consumed 4645 of 1336324 compute units',
+			'Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA success',
+			'Program dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH consumed 79071 of 1399700 compute units',
+			'Program dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH success',
+			'Program JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4 invoke [1]',
+			'Program log: Instruction: Route',
+			'Program SV2EYYJyRz2YhfXwXnhNAevDEui5Q6yrfyo13WtupPF invoke [2]',
+			'Program data: S3VCwUhV8CXSyrcV3EtPUNCsQJvXpBqCGUobEJZVRnl5bVAAAAAAAFUFNBYAAAAAAAAAAAAAAAAAAAAAAAAAAA==',
+			'Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA invoke [3]',
+			'Program log: Instruction: Transfer',
+			'Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA consumed 4645 of 1255262 compute units',
+			'Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA success',
+			'Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA invoke [3]',
+			'Program log: Instruction: Transfer',
+			'Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA consumed 4736 of 1249195 compute units',
+			'Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA success',
+			'Program SV2EYYJyRz2YhfXwXnhNAevDEui5Q6yrfyo13WtupPF consumed 69257 of 1311915 compute units',
+			'Program SV2EYYJyRz2YhfXwXnhNAevDEui5Q6yrfyo13WtupPF success',
+			'Program JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4 invoke [2]',
+			'Program JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4 consumed 199 of 1241147 compute units',
+			'Program JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4 success',
+			'Program JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4 consumed 81059 of 1320629 compute units',
+			'Program return: JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4 Z/tXxXEAAAA=',
+			'Program JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4 success',
+			'Program dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH invoke [1]',
+			'Program log: Instruction: EndSwap',
+			'Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA invoke [2]',
+			'Program log: Instruction: Transfer',
+			'Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA consumed 4736 of 1187840 compute units',
+			'Program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA success',
+			'Program data: ort7woo4+vG7X+loAAAAAJ1Bg8Gp9WhWrw9VRm1UiC0KW6LRC2am2mjhfd3lzm6WZ/tXxXEAAAAA6HZIFwAAAAEAAAAJdDEMAAAAANFBDwAAAAAAAAAAAAAAAAA=',
+			'Program dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH consumed 156076 of 1239570 compute units',
+			'Program dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH success',
+		];
+		const cuUsage = parseLogsForCuUsage(logs);
+		expect(cuUsage).to.deep.equal([
+			{
+				name: 'CuUsage',
+				data: {
+					instruction: 'BeginSwap',
+					cuUsage: 79071,
+				}
+			},
+			{
+				name: 'CuUsage',
+				data: {
+					instruction: 'EndSwap',
+					cuUsage: 156076,
+				}
+			},
+		]);
+	});
+});