@drift-labs/sdk 2.95.0-beta.0 → 2.95.0-beta.10

package/VERSION

@@ -1 +1 @@
-2.95.0-beta.0
+2.95.0-beta.10

package/lib/constants/perpMarkets.js

@@ -65,10 +65,10 @@ exports.DevnetPerpMarkets = [
         symbol: 'MATIC-PERP',
         baseAssetSymbol: 'MATIC',
         marketIndex: 5,
-        oracle: new web3_js_1.PublicKey('5Wf1WrXLeNJghU8WRo5odvwAjpjSSF4THbjdxbKmwVsi'),
+        oracle: new web3_js_1.PublicKey('BrzyDgwELy4jjjsqLQpBeUxzrsueYyMhuWpYBaUYcXvi'),
         launchTs: 1677690149000,
         oracleSource: __1.OracleSource.PYTH_PULL,
-        pythFeedId: '0x5de33a9112c2b700b8d30b8a3402c103578ccfa2765696471cc672bd5cf6ac52',
+        pythFeedId: '0xffd11c5a1cfd42f80afb2df4d9f264c15f956d68153335374ec10722edd70472',
     },
     {
         fullName: 'Arbitrum',
@@ -373,10 +373,10 @@ exports.MainnetPerpMarkets = [
         symbol: 'MATIC-PERP',
         baseAssetSymbol: 'MATIC',
         marketIndex: 5,
-        oracle: new web3_js_1.PublicKey('5Wf1WrXLeNJghU8WRo5odvwAjpjSSF4THbjdxbKmwVsi'),
+        oracle: new web3_js_1.PublicKey('BrzyDgwELy4jjjsqLQpBeUxzrsueYyMhuWpYBaUYcXvi'),
         launchTs: 1677690149000,
         oracleSource: __1.OracleSource.PYTH_PULL,
-        pythFeedId: '0x5de33a9112c2b700b8d30b8a3402c103578ccfa2765696471cc672bd5cf6ac52',
+        pythFeedId: '0xffd11c5a1cfd42f80afb2df4d9f264c15f956d68153335374ec10722edd70472',
     },
     {
         fullName: 'Arbitrum',
@@ -757,6 +757,27 @@ exports.MainnetPerpMarkets = [
         launchTs: 1724250126000,
         oracleSource: __1.OracleSource.Prelaunch,
     },
+    {
+        fullName: 'DEMOCRATS-WIN-MICHIGAN-BET',
+        category: ['Prediction', 'Election'],
+        symbol: 'DEMOCRATS-WIN-MICHIGAN-BET',
+        baseAssetSymbol: 'DEMOCRATS-WIN-MICHIGAN',
+        marketIndex: 41,
+        oracle: new web3_js_1.PublicKey('8HTDLjhb2esGU5mu11v3pq3eWeFqmvKPkQNCnTTwKAyB'),
+        launchTs: 1725551484000,
+        oracleSource: __1.OracleSource.Prelaunch,
+    },
+    {
+        fullName: 'TON',
+        category: ['L1'],
+        symbol: 'TON-PERP',
+        baseAssetSymbol: 'TON',
+        marketIndex: 42,
+        oracle: new web3_js_1.PublicKey('BNjCXrpEqjdBnuRy2SAUgm5Pq8B73wGFwsf6RYFJiLPY'),
+        launchTs: 1725551484000,
+        oracleSource: __1.OracleSource.PYTH_PULL,
+        pythFeedId: '0x8963217838ab4cf5cadc172203c1f0b763fbaa45f346d8ee50ba994bbcac3026',
+    },
 ];
 exports.PerpMarkets = {
     devnet: exports.DevnetPerpMarkets,

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,13 +1,19 @@
 "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: ';
 const PROGRAM_LOG_START_INDEX = PROGRAM_LOG.length;
 const PROGRAM_DATA_START_INDEX = PROGRAM_DATA.length;
 function parseLogs(program, logs, programId = driftProgramId) {
+    const { events } = parseLogsWithRaw(program, logs, programId);
+    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')) {
@@ -16,6 +22,7 @@ function parseLogs(program, logs, programId = driftProgramId) {
         const [event, newProgram, didPop] = handleLog(execution, log, program, programId);
         if (event) {
             events.push(event);
+            rawLogs.push(log);
         }
         if (newProgram) {
             execution.push(newProgram);
@@ -24,9 +31,9 @@ function parseLogs(program, logs, programId = driftProgramId) {
             execution.pop();
         }
     }
-    return events;
+    return { events, rawLogs };
 }
-exports.parseLogs = parseLogs;
+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/lib/tx/baseTxSender.js

@@ -16,8 +16,7 @@ const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_TX_LAND_RATE_LOOKBACK_WINDOW_MINUTES = 10;
 const NOT_CONFIRMED_ERROR_CODE = -1001;
 class BaseTxSender {
-    constructor({ connection, wallet, opts = anchor_1.AnchorProvider.defaultOptions(), timeout = DEFAULT_TIMEOUT, additionalConnections = new Array(), confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks, trackTxLandRate, txHandler, txLandRateLookbackWindowMinutes = DEFAULT_TX_LAND_RATE_LOOKBACK_WINDOW_MINUTES *
-        60, landRateToFeeFunc, }) {
+    constructor({ connection, wallet, opts = anchor_1.AnchorProvider.defaultOptions(), timeout = DEFAULT_TIMEOUT, additionalConnections = new Array(), confirmationStrategy = types_1.ConfirmationStrategy.Combo, additionalTxSenderCallbacks, trackTxLandRate, txHandler, txLandRateLookbackWindowMinutes = DEFAULT_TX_LAND_RATE_LOOKBACK_WINDOW_MINUTES, landRateToFeeFunc, }) {
         this.timeoutCount = 0;
         this.txLandRate = 0;
         this.lastPriorityFeeSuggestion = 1;

package/lib/types.d.ts

@@ -286,6 +286,9 @@ export declare class OrderActionExplanation {
     static readonly ORDER_FILLED_WITH_SERUM: {
         orderFillWithSerum: {};
     };
+    static readonly ORDER_FILLED_WITH_OPENBOOK_V2: {
+        orderFilledWithOpenbookV2: {};
+    };
     static readonly ORDER_FILLED_WITH_PHOENIX: {
         orderFillWithPhoenix: {};
     };

package/lib/types.js

@@ -188,6 +188,9 @@ OrderActionExplanation.RISK_INCREASING_ORDER = {
 OrderActionExplanation.ORDER_FILLED_WITH_SERUM = {
     orderFillWithSerum: {},
 };
+OrderActionExplanation.ORDER_FILLED_WITH_OPENBOOK_V2 = {
+    orderFilledWithOpenbookV2: {},
+};
 OrderActionExplanation.ORDER_FILLED_WITH_PHOENIX = {
     orderFillWithPhoenix: {},
 };

package/package.json

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

package/src/constants/perpMarkets.ts

@@ -81,11 +81,11 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'MATIC-PERP',
 		baseAssetSymbol: 'MATIC',
 		marketIndex: 5,
-		oracle: new PublicKey('5Wf1WrXLeNJghU8WRo5odvwAjpjSSF4THbjdxbKmwVsi'),
+		oracle: new PublicKey('BrzyDgwELy4jjjsqLQpBeUxzrsueYyMhuWpYBaUYcXvi'),
 		launchTs: 1677690149000, //todo
 		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
-			'0x5de33a9112c2b700b8d30b8a3402c103578ccfa2765696471cc672bd5cf6ac52',
+			'0xffd11c5a1cfd42f80afb2df4d9f264c15f956d68153335374ec10722edd70472',
 	},
 	{
 		fullName: 'Arbitrum',
@@ -416,11 +416,11 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'MATIC-PERP',
 		baseAssetSymbol: 'MATIC',
 		marketIndex: 5,
-		oracle: new PublicKey('5Wf1WrXLeNJghU8WRo5odvwAjpjSSF4THbjdxbKmwVsi'),
+		oracle: new PublicKey('BrzyDgwELy4jjjsqLQpBeUxzrsueYyMhuWpYBaUYcXvi'),
 		launchTs: 1677690149000, //todo
 		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
-			'0x5de33a9112c2b700b8d30b8a3402c103578ccfa2765696471cc672bd5cf6ac52',
+			'0xffd11c5a1cfd42f80afb2df4d9f264c15f956d68153335374ec10722edd70472',
 	},
 	{
 		fullName: 'Arbitrum',
@@ -830,6 +830,28 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1724250126000,
 		oracleSource: OracleSource.Prelaunch,
 	},
+	{
+		fullName: 'DEMOCRATS-WIN-MICHIGAN-BET',
+		category: ['Prediction', 'Election'],
+		symbol: 'DEMOCRATS-WIN-MICHIGAN-BET',
+		baseAssetSymbol: 'DEMOCRATS-WIN-MICHIGAN',
+		marketIndex: 41,
+		oracle: new PublicKey('8HTDLjhb2esGU5mu11v3pq3eWeFqmvKPkQNCnTTwKAyB'),
+		launchTs: 1725551484000,
+		oracleSource: OracleSource.Prelaunch,
+	},
+	{
+		fullName: 'TON',
+		category: ['L1'],
+		symbol: 'TON-PERP',
+		baseAssetSymbol: 'TON',
+		marketIndex: 42,
+		oracle: new PublicKey('BNjCXrpEqjdBnuRy2SAUgm5Pq8B73wGFwsf6RYFJiLPY'),
+		launchTs: 1725551484000,
+		oracleSource: OracleSource.PYTH_PULL,
+		pythFeedId:
+			'0x8963217838ab4cf5cadc172203c1f0b763fbaa45f346d8ee50ba994bbcac3026',
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

package/src/events/parse.ts

@@ -11,7 +11,17 @@ export function parseLogs(
 	logs: string[],
 	programId = driftProgramId
 ): Event[] {
+	const { events } = parseLogsWithRaw(program, logs, programId);
+	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')) {
@@ -26,6 +36,7 @@ export function parseLogs(
 		);
 		if (event) {
 			events.push(event);
+			rawLogs.push(log);
 		}
 		if (newProgram) {
 			execution.push(newProgram);
@@ -34,7 +45,7 @@ export function parseLogs(
 			execution.pop();
 		}
 	}
-	return events;
+	return { events, rawLogs };
 }
 
 function handleLog(

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),

package/src/tx/baseTxSender.ts

@@ -61,8 +61,7 @@ export abstract class BaseTxSender implements TxSender {
 		additionalTxSenderCallbacks,
 		trackTxLandRate,
 		txHandler,
-		txLandRateLookbackWindowMinutes = DEFAULT_TX_LAND_RATE_LOOKBACK_WINDOW_MINUTES *
-			60,
+		txLandRateLookbackWindowMinutes = DEFAULT_TX_LAND_RATE_LOOKBACK_WINDOW_MINUTES,
 		landRateToFeeFunc,
 	}: {
 		connection: Connection;

package/src/types.ts

@@ -192,6 +192,9 @@ export class OrderActionExplanation {
 	static readonly ORDER_FILLED_WITH_SERUM = {
 		orderFillWithSerum: {},
 	};
+	static readonly ORDER_FILLED_WITH_OPENBOOK_V2 = {
+		orderFilledWithOpenbookV2: {},
+	};
 	static readonly ORDER_FILLED_WITH_PHOENIX = {
 		orderFillWithPhoenix: {},
 	};