Merge branch 'master' into wphan/whitelist-titan-swap-program

Author: wphan

sdk/VERSION

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

sdk/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.142.0-beta.20",
+	"version": "2.142.0-beta.23",
 	"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'",

sdk/src/constants/perpMarkets.ts

@@ -1351,6 +1351,43 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 			'0xf2b3ab1c49e35e881003c3c0482d18b181a1560b697b844c24c8f85aba1cab95',
 		pythLazerId: 2316,
 	},
+	{
+		fullName: 'ZCash',
+		category: ['Privacy'],
+		symbol: 'ZEC-PERP',
+		baseAssetSymbol: 'ZEC',
+		marketIndex: 79,
+		oracle: new PublicKey('BXunfRSyiQWJHv88qMvE42mpMpksWEC8Bf13p2msnRms'),
+		launchTs: 1760366017000,
+		oracleSource: OracleSource.PYTH_LAZER,
+		pythFeedId:
+			'0xbe9b59d178f0d6a97ab4c343bff2aa69caa1eaae3e9048a65788c529b125bb24',
+		pythLazerId: 66,
+	},
+	{
+		fullName: 'Mantle',
+		category: ['L1'],
+		symbol: 'MNT-PERP',
+		baseAssetSymbol: 'MNT',
+		marketIndex: 80,
+		oracle: new PublicKey('Gy7cJ4U1nxMA44XXC3hwqkpcxEB1mZTYiwJVkaqZfU7u'),
+		launchTs: 1760366017000,
+		oracleSource: OracleSource.PYTH_LAZER,
+		pythFeedId:
+			'0x4e3037c822d852d79af3ac80e35eb420ee3b870dca49f9344a38ef4773fb0585',
+		pythLazerId: 199,
+	},
+	{
+		fullName: '1KPUMP',
+		category: ['Launchpad'],
+		symbol: '1KPUMP-PERP',
+		baseAssetSymbol: '1KPUMP',
+		marketIndex: 81,
+		oracle: new PublicKey('5r8RWTaRiMgr9Lph3FTUE3sGb1vymhpCrm83Bovjfcps'),
+		launchTs: 1760366017000,
+		oracleSource: OracleSource.PYTH_LAZER_1K,
+		pythLazerId: 1578,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

sdk/src/driftClient.ts

@@ -4761,11 +4761,19 @@ export class DriftClient {
 		orderIds?: number[],
 		txParams?: TxParams,
 		subAccountId?: number,
-		user?: User
+		user?: User,
+		overrides?: {
+			authority?: PublicKey;
+		}
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
 			await this.buildTransaction(
-				await this.getCancelOrdersByIdsIx(orderIds, subAccountId, user),
+				await this.getCancelOrdersByIdsIx(
+					orderIds,
+					subAccountId,
+					user,
+					overrides
+				),
 				txParams
 			),
 			[],
@@ -4785,7 +4793,10 @@ export class DriftClient {
 	public async getCancelOrdersByIdsIx(
 		orderIds?: number[],
 		subAccountId?: number,
-		user?: User
+		user?: User,
+		overrides?: {
+			authority?: PublicKey;
+		}
 	): Promise<TransactionInstruction> {
 		const userAccountPubKey =
 			user?.userAccountPublicKey ??
@@ -4798,11 +4809,13 @@ export class DriftClient {
 			useMarketLastSlotCache: true,
 		});
 
+		const authority = overrides?.authority ?? this.wallet.publicKey;
+
 		return await this.program.instruction.cancelOrdersByIds(orderIds, {
 			accounts: {
 				state: await this.getStatePublicKey(),
 				user: userAccountPubKey,
-				authority: this.wallet.publicKey,
+				authority,
 			},
 			remainingAccounts,
 		});
@@ -4943,7 +4956,10 @@ export class DriftClient {
 
 	public async getPlaceOrdersIx(
 		params: OptionalOrderParams[],
-		subAccountId?: number
+		subAccountId?: number,
+		overrides?: {
+			authority?: PublicKey;
+		}
 	): Promise<TransactionInstruction> {
 		const user = await this.getUserAccountPublicKey(subAccountId);
 
@@ -4978,13 +4994,14 @@ export class DriftClient {
 		}
 
 		const formattedParams = params.map((item) => getOrderParams(item));
+		const authority = overrides?.authority ?? this.wallet.publicKey;
 
 		return await this.program.instruction.placeOrders(formattedParams, {
 			accounts: {
 				state: await this.getStatePublicKey(),
 				user,
 				userStats: this.getUserStatsAccountPublicKey(),
-				authority: this.wallet.publicKey,
+				authority,
 			},
 			remainingAccounts,
 		});
@@ -6688,7 +6705,10 @@ export class DriftClient {
 		referrerInfo?: ReferrerInfo,
 		successCondition?: PlaceAndTakeOrderSuccessCondition,
 		auctionDurationPercentage?: number,
-		subAccountId?: number
+		subAccountId?: number,
+		overrides?: {
+			authority?: PublicKey;
+		}
 	): Promise<TransactionInstruction> {
 		orderParams = getOrderParams(orderParams, { marketType: MarketType.PERP });
 		const userStatsPublicKey = await this.getUserStatsAccountPublicKey();
@@ -6756,6 +6776,8 @@ export class DriftClient {
 				((auctionDurationPercentage ?? 100) << 8) | (successCondition ?? 0);
 		}
 
+		const authority = overrides?.authority ?? this.wallet.publicKey;
+
 		return await this.program.instruction.placeAndTakePerpOrder(
 			orderParams,
 			optionalParams,
@@ -6764,7 +6786,7 @@ export class DriftClient {
 					state: await this.getStatePublicKey(),
 					user,
 					userStats: userStatsPublicKey,
-					authority: this.wallet.publicKey,
+					authority,
 				},
 				remainingAccounts,
 			}

sdk/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];
+	}
 }

sdk/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;
+};