@drift-labs/sdk 2.65.0-beta.9 → 2.66.0-beta.1

package/src/constants/spotMarkets.ts

@@ -203,6 +203,17 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		),
 		launchTs: 1706731200000,
 	},
+	{
+		symbol: 'RNDR',
+		marketIndex: 12,
+		oracle: new PublicKey('CYGfrBJB9HgLf9iZyN4aH5HvUAi2htQ4MjPxeXMf4Egn'),
+		oracleSource: OracleSource.PYTH,
+		mint: new PublicKey('rndrizKT3MK1iimdxRdWabcF7Zg7AR5T4nud4EkHBof'),
+		precision: new BN(10).pow(EIGHT),
+		precisionExp: EIGHT,
+		serumMarket: new PublicKey('2m7ZLEKtxWF29727DSb5D91erpXPUY1bqhRWRC3wQX7u'),
+		launchTs: 1708964021000,
+	},
 ];
 
 export const SpotMarkets: { [key in DriftEnv]: SpotMarketConfig[] } = {

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

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.64.0",
+  "version": "2.65.0",
   "name": "drift",
   "instructions": [
     {

package/tests/amm/test.ts

@@ -614,8 +614,14 @@ describe('AMM Tests', () => {
 		// console.log(termsSuiExample);
 		assert(termsSuiExample.effectiveLeverageCapped <= 1.000001);
 		assert(termsSuiExample.inventorySpreadScale == 1.00007);
-		assert(termsSuiExample.longSpread == 259073);
-		assert(termsSuiExample.shortSpread == 3712);
+		assert(
+			termsSuiExample.longSpread == 259073,
+			`SUI long spread got ${termsSuiExample.longSpread}`
+		);
+		assert(
+			termsSuiExample.shortSpread == 3712,
+			`SUI short spread got ${termsSuiExample.shortSpread}`
+		);
 
 		// reset amm reserves/peg to balanced values s.t. liquidity/price is the same
 		// to avoid error prone int math

package/tests/dlob/helpers.ts

@@ -24,6 +24,7 @@ import {
 	SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION,
 	SPOT_MARKET_WEIGHT_PRECISION,
 	PRICE_PRECISION,
+	DataAndSlot,
 } from '../../src';
 
 export const mockPerpPosition: PerpPosition = {
@@ -639,6 +640,10 @@ export class MockUserMap implements UserMapInterface {
 		return undefined;
 	}
 
+	public getWithSlot(_key: string): DataAndSlot<User> | undefined {
+		return undefined;
+	}
+
 	public async mustGet(_key: string): Promise<User> {
 		return new User({
 			driftClient: this.driftClient,
@@ -646,6 +651,16 @@ export class MockUserMap implements UserMapInterface {
 		});
 	}
 
+	public async mustGetWithSlot(_key: string): Promise<DataAndSlot<User>> {
+		return {
+			data: new User({
+				driftClient: this.driftClient,
+				userAccountPublicKey: PublicKey.default,
+			}),
+			slot: 0,
+		};
+	}
+
 	public getUserAuthority(key: string): PublicKey | undefined {
 		return new PublicKey(
 			this.userAccountToAuthority.get(key) || PublicKey.default.toBase58()
@@ -657,4 +672,29 @@ export class MockUserMap implements UserMapInterface {
 	public values(): IterableIterator<User> {
 		return this.userMap.values();
 	}
+
+	public *valuesWithSlot(): IterableIterator<DataAndSlot<User>> {
+		for (const user of this.userMap.values()) {
+			yield {
+				data: user,
+				slot: 0,
+			};
+		}
+	}
+
+	public entries(): IterableIterator<[string, User]> {
+		return this.userMap.entries();
+	}
+
+	public *entriesWithSlot(): IterableIterator<[string, DataAndSlot<User>]> {
+		for (const [key, user] of this.userMap.entries()) {
+			yield [
+				key,
+				{
+					data: user,
+					slot: 0,
+				},
+			];
+		}
+	}
 }