@drift-labs/sdk 2.95.0-beta.7 → 2.95.0-beta.9

package/VERSION

@@ -1 +1 @@
-2.95.0-beta.7
+2.95.0-beta.9

package/lib/events/parse.d.ts

@@ -1,2 +1,6 @@
 import { Program, Event } from '@coral-xyz/anchor';
 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[];
+};

package/lib/events/parse.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseLogs = void 0;
+exports.parseLogsWithRaw = exports.parseLogs = void 0;
 const driftProgramId = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
 const PROGRAM_LOG = 'Program log: ';
 const PROGRAM_DATA = 'Program data: ';
@@ -27,6 +27,29 @@ function parseLogs(program, logs, programId = driftProgramId) {
     return events;
 }
 exports.parseLogs = parseLogs;
+function parseLogsWithRaw(program, logs, programId = driftProgramId) {
+    const events = [];
+    const rawLogs = [];
+    const execution = new ExecutionContext();
+    for (const log of logs) {
+        if (log.startsWith('Log truncated')) {
+            break;
+        }
+        const [event, newProgram, didPop] = handleLog(execution, log, program, programId);
+        if (event) {
+            events.push(event);
+            rawLogs.push(log);
+        }
+        if (newProgram) {
+            execution.push(newProgram);
+        }
+        if (didPop) {
+            execution.pop();
+        }
+    }
+    return { events, rawLogs };
+}
+exports.parseLogsWithRaw = parseLogsWithRaw;
 function handleLog(execution, log, program, programId = driftProgramId) {
     // Executing program is drift program.
     if (execution.stack.length > 0 && execution.program() === programId) {

package/lib/math/auction.d.ts

@@ -6,12 +6,16 @@ export declare function isFallbackAvailableLiquiditySource(order: Order, minAuct
 export declare function getAuctionPrice(order: Order, slot: number, oraclePrice: BN): BN;
 export declare function getAuctionPriceForFixedAuction(order: Order, slot: number): BN;
 export declare function getAuctionPriceForOracleOffsetAuction(order: Order, slot: number, oraclePrice: BN): BN;
-export declare function deriveOracleAuctionParams({ direction, oraclePrice, auctionStartPrice, auctionEndPrice, limitPrice, }: {
+export declare function deriveOracleAuctionParams({ direction, oraclePrice, auctionStartPrice, auctionEndPrice, limitPrice, auctionPriceCaps, }: {
     direction: PositionDirection;
     oraclePrice: BN;
     auctionStartPrice: BN;
     auctionEndPrice: BN;
     limitPrice: BN;
+    auctionPriceCaps?: {
+        min: BN;
+        max: BN;
+    };
 }): {
     auctionStartPrice: BN;
     auctionEndPrice: BN;

package/lib/math/auction.js

@@ -94,7 +94,7 @@ function getAuctionPriceForOracleOffsetAuction(order, slot, oraclePrice) {
     return _1.BN.max(oraclePrice.add(priceOffset), _1.ONE);
 }
 exports.getAuctionPriceForOracleOffsetAuction = getAuctionPriceForOracleOffsetAuction;
-function deriveOracleAuctionParams({ direction, oraclePrice, auctionStartPrice, auctionEndPrice, limitPrice, }) {
+function deriveOracleAuctionParams({ direction, oraclePrice, auctionStartPrice, auctionEndPrice, limitPrice, auctionPriceCaps, }) {
     let oraclePriceOffset;
     if (limitPrice.eq(_1.ZERO) || oraclePrice.eq(_1.ZERO)) {
         oraclePriceOffset = _1.ZERO;
@@ -114,6 +114,10 @@ function deriveOracleAuctionParams({ direction, oraclePrice, auctionStartPrice,
     catch (e) {
         oraclePriceOffsetNum = 0;
     }
+    if (auctionPriceCaps) {
+        auctionStartPrice = _1.BN.min(_1.BN.max(auctionStartPrice, auctionPriceCaps.min), auctionPriceCaps.max);
+        auctionEndPrice = _1.BN.min(_1.BN.max(auctionEndPrice, auctionPriceCaps.min), auctionPriceCaps.max);
+    }
     return {
         auctionStartPrice: auctionStartPrice.sub(oraclePrice),
         auctionEndPrice: auctionEndPrice.sub(oraclePrice),

package/package.json

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

package/src/events/parse.ts

@@ -37,6 +37,39 @@ export function parseLogs(
 	return events;
 }
 
+export function parseLogsWithRaw(
+	program: Program,
+	logs: string[],
+	programId = driftProgramId
+): { events: Event[]; rawLogs: string[] } {
+	const events = [];
+	const rawLogs = [];
+	const execution = new ExecutionContext();
+	for (const log of logs) {
+		if (log.startsWith('Log truncated')) {
+			break;
+		}
+
+		const [event, newProgram, didPop] = handleLog(
+			execution,
+			log,
+			program,
+			programId
+		);
+		if (event) {
+			events.push(event);
+			rawLogs.push(log);
+		}
+		if (newProgram) {
+			execution.push(newProgram);
+		}
+		if (didPop) {
+			execution.pop();
+		}
+	}
+	return { events, rawLogs };
+}
+
 function handleLog(
 	execution: ExecutionContext,
 	log: string,

package/src/math/auction.ts

@@ -120,12 +120,17 @@ export function deriveOracleAuctionParams({
 	auctionStartPrice,
 	auctionEndPrice,
 	limitPrice,
+	auctionPriceCaps,
 }: {
 	direction: PositionDirection;
 	oraclePrice: BN;
 	auctionStartPrice: BN;
 	auctionEndPrice: BN;
 	limitPrice: BN;
+	auctionPriceCaps?: {
+		min: BN;
+		max: BN;
+	};
 }): { auctionStartPrice: BN; auctionEndPrice: BN; oraclePriceOffset: number } {
 	let oraclePriceOffset;
 
@@ -148,6 +153,17 @@ export function deriveOracleAuctionParams({
 		oraclePriceOffsetNum = 0;
 	}
 
+	if (auctionPriceCaps) {
+		auctionStartPrice = BN.min(
+			BN.max(auctionStartPrice, auctionPriceCaps.min),
+			auctionPriceCaps.max
+		);
+		auctionEndPrice = BN.min(
+			BN.max(auctionEndPrice, auctionPriceCaps.min),
+			auctionPriceCaps.max
+		);
+	}
+
 	return {
 		auctionStartPrice: auctionStartPrice.sub(oraclePrice),
 		auctionEndPrice: auctionEndPrice.sub(oraclePrice),