@drift-labs/sdk 2.34.1-beta.4 → 2.34.1-beta.6

package/VERSION

@@ -1 +1 @@
-2.34.1-beta.4
+2.34.1-beta.6

package/lib/driftClient.js

@@ -1041,7 +1041,10 @@ class DriftClient {
             }));
         }
         const authority = this.wallet.publicKey;
-        const createWSOLTokenAccount = isSolMarket && userTokenAccount.equals(authority);
+        const isFromSubaccount = fromSubAccountId !== null &&
+            fromSubAccountId !== undefined &&
+            !isNaN(fromSubAccountId);
+        const createWSOLTokenAccount = isSolMarket && userTokenAccount.equals(authority) && !isFromSubaccount;
         if (createWSOLTokenAccount) {
             const { ixs: startIxs, signers, pubkey, } = await this.getWrappedSolAccountCreationIxs(amount, true);
             userTokenAccount = pubkey;
@@ -1050,7 +1053,7 @@ class DriftClient {
             });
             signers.forEach((signer) => additionalSigners.push(signer));
         }
-        const depositCollateralIx = fromSubAccountId != null
+        const depositCollateralIx = isFromSubaccount
             ? await this.getTransferDepositIx(amount, marketIndex, fromSubAccountId, subAccountId)
             : await this.getDepositInstruction(amount, marketIndex, userTokenAccount, subAccountId, false, false);
         if (subAccountId === 0) {

package/lib/events/eventSubscriber.js

@@ -9,6 +9,7 @@ const fetchLogs_1 = require("./fetchLogs");
 const webSocketLogProvider_1 = require("./webSocketLogProvider");
 const events_1 = require("events");
 const sort_1 = require("./sort");
+const parse_1 = require("./parse");
 class EventSubscriber {
     constructor(connection, program, options = types_1.DefaultEventSubscriptionOptions) {
         var _a;
@@ -99,8 +100,9 @@ class EventSubscriber {
     parseEventsFromLogs(txSig, slot, logs) {
         const records = [];
         // @ts-ignore
-        const eventGenerator = this.program._events._eventParser.parseLogs(logs, false);
-        for (const event of eventGenerator) {
+        const events = (0, parse_1.parseLogs)(this.program, slot, logs);
+        for (const event of events) {
+            // @ts-ignore
             const expectRecordType = this.eventListMap.has(event.name);
             if (expectRecordType) {
                 event.data.txSig = txSig;

package/lib/events/fetchLogs.d.ts

@@ -15,6 +15,7 @@ type FetchLogsResponse = {
     mostRecentBlockTime: number | undefined;
 };
 export declare function fetchLogs(connection: Connection, address: PublicKey, finality: Finality, beforeTx?: TransactionSignature, untilTx?: TransactionSignature, limit?: number): Promise<FetchLogsResponse>;
+export declare function fetchTransactionLogs(connection: Connection, signatures: TransactionSignature[], finality: Finality): Promise<Log[]>;
 export declare class LogParser {
     private program;
     constructor(program: Program);

package/lib/events/fetchLogs.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogParser = exports.fetchLogs = void 0;
+exports.LogParser = exports.fetchTransactionLogs = exports.fetchLogs = void 0;
+const promiseTimeout_1 = require("../util/promiseTimeout");
 function mapTransactionResponseToLog(transaction) {
     return {
         txSig: transaction.transaction.signatures[0],
@@ -20,17 +21,8 @@ async function fetchLogs(connection, address, finality, beforeTx, untilTx, limit
         return undefined;
     }
     const chunkedSignatures = chunk(filteredSignatures, 100);
-    const config = { commitment: finality, maxSupportedTransactionVersion: 0 };
     const transactionLogs = (await Promise.all(chunkedSignatures.map(async (chunk) => {
-        const transactions = await connection.getTransactions(chunk.map((confirmedSignature) => confirmedSignature.signature), 
-        //@ts-ignore
-        config);
-        return transactions.reduce((logs, transaction) => {
-            if (transaction) {
-                logs.push(mapTransactionResponseToLog(transaction));
-            }
-            return logs;
-        }, new Array());
+        return await fetchTransactionLogs(connection, chunk.map((confirmedSignature) => confirmedSignature.signature), finality);
     }))).flat();
     const earliest = filteredSignatures[0];
     const mostRecent = filteredSignatures[filteredSignatures.length - 1];
@@ -44,6 +36,36 @@ async function fetchLogs(connection, address, finality, beforeTx, untilTx, limit
     };
 }
 exports.fetchLogs = fetchLogs;
+async function fetchTransactionLogs(connection, signatures, finality) {
+    const requests = new Array();
+    for (const signature of signatures) {
+        const args = [
+            signature,
+            { commitment: finality, maxSupportedTransactionVersion: 0 },
+        ];
+        requests.push({
+            methodName: 'getTransaction',
+            args,
+        });
+    }
+    console.log(requests);
+    const rpcResponses = await (0, promiseTimeout_1.promiseTimeout)(
+    // @ts-ignore
+    connection._rpcBatchRequest(requests), 10 * 1000 // 10 second timeout
+    );
+    if (rpcResponses === null) {
+        return Promise.reject('RPC request timed out fetching transactions');
+    }
+    const logs = new Array();
+    for (const i in rpcResponses) {
+        const rpcResponse = rpcResponses[i];
+        if (rpcResponse.result) {
+            logs.push(mapTransactionResponseToLog(rpcResponse.result));
+        }
+    }
+    return logs;
+}
+exports.fetchTransactionLogs = fetchTransactionLogs;
 function chunk(array, size) {
     return new Array(Math.ceil(array.length / size))
         .fill(null)

package/lib/events/parse.d.ts

@@ -0,0 +1,2 @@
+import { Program, Event } from '@coral-xyz/anchor';
+export declare function parseLogs(program: Program, slot: number, logs: string[]): Event[];

package/lib/events/parse.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseLogs = void 0;
+const driftProgramId = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
+const driftProgramStart = `Program ${driftProgramId} invoke`;
+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, slot, logs) {
+    const events = [];
+    const execution = new ExecutionContext();
+    for (const log of logs) {
+        const [event, newProgram, didPop] = handleLog(execution, log, program);
+        if (event) {
+            events.push(event);
+        }
+        if (newProgram) {
+            execution.push(newProgram);
+        }
+        if (didPop) {
+            execution.pop();
+        }
+    }
+    return events;
+}
+exports.parseLogs = parseLogs;
+function handleLog(execution, log, program) {
+    // Executing program is drift program.
+    if (execution.stack.length > 0 && execution.program() === driftProgramId) {
+        return handleProgramLog(log, program);
+    }
+    // Executing program is not drift program.
+    else {
+        return [null, ...handleSystemLog(log)];
+    }
+}
+// Handles logs from *drift* program.
+function handleProgramLog(log, program) {
+    // This is a `msg!` log or a `sol_log_data` log.
+    if (log.startsWith(PROGRAM_LOG)) {
+        const logStr = log.slice(PROGRAM_LOG_START_INDEX);
+        const event = program.coder.events.decode(logStr);
+        return [event, null, false];
+    }
+    else if (log.startsWith(PROGRAM_DATA)) {
+        const logStr = log.slice(PROGRAM_DATA_START_INDEX);
+        const event = program.coder.events.decode(logStr);
+        return [event, null, false];
+    }
+    else {
+        return [null, ...handleSystemLog(log)];
+    }
+}
+// Handles logs when the current program being executing is *not* drift.
+function handleSystemLog(log) {
+    // System component.
+    const logStart = log.split(':')[0];
+    // Did the program finish executing?
+    if (logStart.match(/^Program (.*) success/g) !== null) {
+        return [null, true];
+        // Recursive call.
+    }
+    else if (logStart.startsWith(driftProgramStart)) {
+        return [driftProgramId, false];
+    }
+    // CPI call.
+    else if (logStart.includes('invoke')) {
+        return ['cpi', false]; // Any string will do.
+    }
+    else {
+        return [null, false];
+    }
+}
+// Stack frame execution context, allowing one to track what program is
+// executing for a given log.
+class ExecutionContext {
+    constructor() {
+        this.stack = [];
+    }
+    program() {
+        if (!this.stack.length) {
+            throw new Error('Expected the stack to have elements');
+        }
+        return this.stack[this.stack.length - 1];
+    }
+    push(newProgram) {
+        this.stack.push(newProgram);
+    }
+    pop() {
+        if (!this.stack.length) {
+            throw new Error('Expected the stack to have elements');
+        }
+        this.stack.pop();
+    }
+}

package/package.json

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

package/src/driftClient.ts

@@ -1782,8 +1782,13 @@ export class DriftClient {
 
 		const authority = this.wallet.publicKey;
 
+		const isFromSubaccount =
+			fromSubAccountId !== null &&
+			fromSubAccountId !== undefined &&
+			!isNaN(fromSubAccountId);
+
 		const createWSOLTokenAccount =
-			isSolMarket && userTokenAccount.equals(authority);
+			isSolMarket && userTokenAccount.equals(authority) && !isFromSubaccount;
 
 		if (createWSOLTokenAccount) {
 			const {
@@ -1801,22 +1806,21 @@ export class DriftClient {
 			signers.forEach((signer) => additionalSigners.push(signer));
 		}
 
-		const depositCollateralIx =
-			fromSubAccountId != null
-				? await this.getTransferDepositIx(
-						amount,
-						marketIndex,
-						fromSubAccountId,
-						subAccountId
-				  )
-				: await this.getDepositInstruction(
-						amount,
-						marketIndex,
-						userTokenAccount,
-						subAccountId,
-						false,
-						false
-				  );
+		const depositCollateralIx = isFromSubaccount
+			? await this.getTransferDepositIx(
+					amount,
+					marketIndex,
+					fromSubAccountId,
+					subAccountId
+			  )
+			: await this.getDepositInstruction(
+					amount,
+					marketIndex,
+					userTokenAccount,
+					subAccountId,
+					false,
+					false
+			  );
 
 		if (subAccountId === 0) {
 			if (

package/src/events/eventSubscriber.ts

@@ -17,6 +17,7 @@ import { WebSocketLogProvider } from './webSocketLogProvider';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { getSortFn } from './sort';
+import { parseLogs } from './parse';
 
 export class EventSubscriber {
 	private address: PublicKey;
@@ -166,11 +167,9 @@ export class EventSubscriber {
 	): WrappedEvents {
 		const records = [];
 		// @ts-ignore
-		const eventGenerator = this.program._events._eventParser.parseLogs(
-			logs,
-			false
-		);
-		for (const event of eventGenerator) {
+		const events = parseLogs(this.program, slot, logs);
+		for (const event of events) {
+			// @ts-ignore
 			const expectRecordType = this.eventListMap.has(event.name);
 			if (expectRecordType) {
 				event.data.txSig = txSig;

package/src/events/fetchLogs.ts

@@ -8,6 +8,7 @@ import {
 	VersionedTransactionResponse,
 } from '@solana/web3.js';
 import { WrappedEvents } from './types';
+import { promiseTimeout } from '../util/promiseTimeout';
 
 type Log = { txSig: TransactionSignature; slot: number; logs: string[] };
 type FetchLogsResponse = {
@@ -61,23 +62,14 @@ export async function fetchLogs(
 
 	const chunkedSignatures = chunk(filteredSignatures, 100);
 
-	const config = { commitment: finality, maxSupportedTransactionVersion: 0 };
-
 	const transactionLogs = (
 		await Promise.all(
 			chunkedSignatures.map(async (chunk) => {
-				const transactions = await connection.getTransactions(
+				return await fetchTransactionLogs(
+					connection,
 					chunk.map((confirmedSignature) => confirmedSignature.signature),
-					//@ts-ignore
-					config
+					finality
 				);
-
-				return transactions.reduce((logs, transaction) => {
-					if (transaction) {
-						logs.push(mapTransactionResponseToLog(transaction));
-					}
-					return logs;
-				}, new Array<Log>());
 			})
 		)
 	).flat();
@@ -95,6 +87,46 @@ export async function fetchLogs(
 	};
 }
 
+export async function fetchTransactionLogs(
+	connection: Connection,
+	signatures: TransactionSignature[],
+	finality: Finality
+): Promise<Log[]> {
+	const requests = new Array<{ methodName: string; args: any }>();
+	for (const signature of signatures) {
+		const args = [
+			signature,
+			{ commitment: finality, maxSupportedTransactionVersion: 0 },
+		];
+
+		requests.push({
+			methodName: 'getTransaction',
+			args,
+		});
+	}
+	console.log(requests);
+
+	const rpcResponses: any | null = await promiseTimeout(
+		// @ts-ignore
+		connection._rpcBatchRequest(requests),
+		10 * 1000 // 10 second timeout
+	);
+
+	if (rpcResponses === null) {
+		return Promise.reject('RPC request timed out fetching transactions');
+	}
+
+	const logs = new Array<Log>();
+	for (const i in rpcResponses) {
+		const rpcResponse = rpcResponses[i];
+		if (rpcResponse.result) {
+			logs.push(mapTransactionResponseToLog(rpcResponse.result));
+		}
+	}
+
+	return logs;
+}
+
 function chunk<T>(array: readonly T[], size: number): T[][] {
 	return new Array(Math.ceil(array.length / size))
 		.fill(null)

package/src/events/parse.ts

@@ -0,0 +1,108 @@
+import { Program, Event } from '@coral-xyz/anchor';
+
+const driftProgramId = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
+const driftProgramStart = `Program ${driftProgramId} invoke`;
+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;
+
+export function parseLogs(
+	program: Program,
+	slot: number,
+	logs: string[]
+): Event[] {
+	const events = [];
+	const execution = new ExecutionContext();
+	for (const log of logs) {
+		const [event, newProgram, didPop] = handleLog(execution, log, program);
+		if (event) {
+			events.push(event);
+		}
+		if (newProgram) {
+			execution.push(newProgram);
+		}
+		if (didPop) {
+			execution.pop();
+		}
+	}
+	return events;
+}
+
+function handleLog(
+	execution: ExecutionContext,
+	log: string,
+	program: Program
+): [Event | null, string | null, boolean] {
+	// Executing program is drift program.
+	if (execution.stack.length > 0 && execution.program() === driftProgramId) {
+		return handleProgramLog(log, program);
+	}
+	// Executing program is not drift program.
+	else {
+		return [null, ...handleSystemLog(log)];
+	}
+}
+
+// Handles logs from *drift* program.
+function handleProgramLog(
+	log: string,
+	program: Program
+): [Event | null, string | null, boolean] {
+	// This is a `msg!` log or a `sol_log_data` log.
+	if (log.startsWith(PROGRAM_LOG)) {
+		const logStr = log.slice(PROGRAM_LOG_START_INDEX);
+		const event = program.coder.events.decode(logStr);
+		return [event, null, false];
+	} else if (log.startsWith(PROGRAM_DATA)) {
+		const logStr = log.slice(PROGRAM_DATA_START_INDEX);
+		const event = program.coder.events.decode(logStr);
+		return [event, null, false];
+	} else {
+		return [null, ...handleSystemLog(log)];
+	}
+}
+
+// Handles logs when the current program being executing is *not* drift.
+function handleSystemLog(log: string): [string | null, boolean] {
+	// System component.
+	const logStart = log.split(':')[0];
+
+	// Did the program finish executing?
+	if (logStart.match(/^Program (.*) success/g) !== null) {
+		return [null, true];
+		// Recursive call.
+	} else if (logStart.startsWith(driftProgramStart)) {
+		return [driftProgramId, false];
+	}
+	// CPI call.
+	else if (logStart.includes('invoke')) {
+		return ['cpi', false]; // Any string will do.
+	} else {
+		return [null, false];
+	}
+}
+
+// Stack frame execution context, allowing one to track what program is
+// executing for a given log.
+class ExecutionContext {
+	stack: string[] = [];
+
+	program(): string {
+		if (!this.stack.length) {
+			throw new Error('Expected the stack to have elements');
+		}
+		return this.stack[this.stack.length - 1];
+	}
+
+	push(newProgram: string) {
+		this.stack.push(newProgram);
+	}
+
+	pop() {
+		if (!this.stack.length) {
+			throw new Error('Expected the stack to have elements');
+		}
+		this.stack.pop();
+	}
+}