@drift-labs/sdk 2.77.0-beta.1 → 2.77.0-beta.3

package/VERSION

@@ -1 +1 @@
-2.77.0-beta.1
+2.77.0-beta.3

package/lib/priorityFee/driftPriorityFeeMethod.js

@@ -6,7 +6,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchDriftPriorityFee = void 0;
 const node_fetch_1 = __importDefault(require("node-fetch"));
 async function fetchDriftPriorityFee(url, marketTypes, marketIndexs) {
-    const response = await (0, node_fetch_1.default)(`${url}/batchPriorityFees?marketType=${marketTypes.join(',')}&marketIndex=${marketIndexs.join(',')}`);
-    return await response.json();
+    try {
+        const response = await (0, node_fetch_1.default)(`${url}/batchPriorityFees?marketType=${marketTypes.join(',')}&marketIndex=${marketIndexs.join(',')}`);
+        if (!response.ok) {
+            throw new Error(`HTTP error! status: ${response.status}`);
+        }
+        return await response.json();
+    }
+    catch (err) {
+        if (err instanceof Error) {
+            console.error('Error fetching priority fees:', err.message);
+        }
+        else {
+            console.error('Unknown error fetching priority fees:', err);
+        }
+    }
+    return [];
 }
 exports.fetchDriftPriorityFee = fetchDriftPriorityFee;

package/lib/priorityFee/heliusPriorityFeeMethod.js

@@ -17,24 +17,30 @@ var HeliusPriorityLevel;
 /// Fetches the priority fee from the Helius API
 /// https://docs.helius.dev/solana-rpc-nodes/alpha-priority-fee-api
 async function fetchHeliusPriorityFee(heliusRpcUrl, lookbackDistance, addresses) {
-    const response = await (0, node_fetch_1.default)(heliusRpcUrl, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({
-            jsonrpc: '2.0',
-            id: '1',
-            method: 'getPriorityFeeEstimate',
-            params: [
-                {
-                    accountKeys: addresses,
-                    options: {
-                        includeAllPriorityFeeLevels: true,
-                        lookbackSlots: lookbackDistance,
+    try {
+        const response = await (0, node_fetch_1.default)(heliusRpcUrl, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                jsonrpc: '2.0',
+                id: '1',
+                method: 'getPriorityFeeEstimate',
+                params: [
+                    {
+                        accountKeys: addresses,
+                        options: {
+                            includeAllPriorityFeeLevels: true,
+                            lookbackSlots: lookbackDistance,
+                        },
                     },
-                },
-            ],
-        }),
-    });
-    return await response.json();
+                ],
+            }),
+        });
+        return await response.json();
+    }
+    catch (err) {
+        console.error(err);
+    }
+    return undefined;
 }
 exports.fetchHeliusPriorityFee = fetchHeliusPriorityFee;

package/lib/priorityFee/priorityFeeSubscriber.js

@@ -67,12 +67,14 @@ class PriorityFeeSubscriber {
     }
     async loadForSolana() {
         const samples = await (0, solanaPriorityFeeMethod_1.fetchSolanaPriorityFee)(this.connection, this.lookbackDistance, this.addresses);
-        this.latestPriorityFee = samples[0].prioritizationFee;
-        this.lastSlotSeen = samples[0].slot;
-        this.lastAvgStrategyResult = this.averageStrategy.calculate(samples);
-        this.lastMaxStrategyResult = this.maxStrategy.calculate(samples);
-        if (this.customStrategy) {
-            this.lastCustomStrategyResult = this.customStrategy.calculate(samples);
+        if (samples.length > 0) {
+            this.latestPriorityFee = samples[0].prioritizationFee;
+            this.lastSlotSeen = samples[0].slot;
+            this.lastAvgStrategyResult = this.averageStrategy.calculate(samples);
+            this.lastMaxStrategyResult = this.maxStrategy.calculate(samples);
+            if (this.customStrategy) {
+                this.lastCustomStrategyResult = this.customStrategy.calculate(samples);
+            }
         }
     }
     async loadForHelius() {

package/lib/priorityFee/solanaPriorityFeeMethod.js

@@ -2,14 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchSolanaPriorityFee = void 0;
 async function fetchSolanaPriorityFee(connection, lookbackDistance, addresses) {
-    // @ts-ignore
-    const rpcJSONResponse = await connection._rpcRequest('getRecentPrioritizationFees', [addresses]);
-    const results = rpcJSONResponse === null || rpcJSONResponse === void 0 ? void 0 : rpcJSONResponse.result;
-    if (!results.length)
-        return;
-    // Sort and filter results based on the slot lookback setting
-    const descResults = results.sort((a, b) => b.slot - a.slot);
-    const cutoffSlot = descResults[0].slot - lookbackDistance;
-    return descResults.filter((result) => result.slot >= cutoffSlot);
+    try {
+        // @ts-ignore
+        const rpcJSONResponse = await connection._rpcRequest('getRecentPrioritizationFees', [addresses]);
+        const results = rpcJSONResponse === null || rpcJSONResponse === void 0 ? void 0 : rpcJSONResponse.result;
+        if (!results.length)
+            return;
+        // Sort and filter results based on the slot lookback setting
+        const descResults = results.sort((a, b) => b.slot - a.slot);
+        const cutoffSlot = descResults[0].slot - lookbackDistance;
+        return descResults.filter((result) => result.slot >= cutoffSlot);
+    }
+    catch (err) {
+        console.error(err);
+    }
+    return [];
 }
 exports.fetchSolanaPriorityFee = fetchSolanaPriorityFee;

package/lib/tx/whileValidTxSender.d.ts

@@ -28,7 +28,7 @@ export declare class WhileValidTxSender extends BaseTxSender {
     });
     sleep(reference: ResolveReference): Promise<void>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions, preSigned?: boolean): Promise<Transaction>;
-    getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], _additionalSigners?: Array<Signer>, _opts?: ConfirmOptions): Promise<VersionedTransaction>;
+    getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], _additionalSigners?: Array<Signer>, _opts?: ConfirmOptions, blockhash?: string): Promise<VersionedTransaction>;
     sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean, extraConfirmationOptions?: ExtraConfirmationOptions): Promise<TxSigAndSlot>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
 }

package/lib/tx/whileValidTxSender.js

@@ -9,6 +9,7 @@ const anchor_1 = require("@coral-xyz/anchor");
 const baseTxSender_1 = require("./baseTxSender");
 const bs58_1 = __importDefault(require("bs58"));
 const DEFAULT_RETRY = 2000;
+const PLACEHOLDER_BLOCKHASH = 'Fdum64WVeej6DeL85REV9NvfSxEJNPZ74DBk7A8kTrKP';
 class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
     constructor({ connection, wallet, opts = { ...anchor_1.AnchorProvider.defaultOptions(), maxRetries: 0 }, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), additionalTxSenderCallbacks = [], }) {
         super({
@@ -48,10 +49,10 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
         this.untilValid.set(txSig, latestBlockhash);
         return signedTx;
     }
-    async getVersionedTransaction(ixs, lookupTableAccounts, _additionalSigners, _opts) {
+    async getVersionedTransaction(ixs, lookupTableAccounts, _additionalSigners, _opts, blockhash) {
         const message = new web3_js_1.TransactionMessage({
             payerKey: this.wallet.publicKey,
-            recentBlockhash: '',
+            recentBlockhash: blockhash !== null && blockhash !== void 0 ? blockhash : PLACEHOLDER_BLOCKHASH,
             instructions: ixs,
         }).compileToV0Message(lookupTableAccounts);
         const tx = new web3_js_1.VersionedTransaction(message);

package/package.json

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

package/src/priorityFee/driftPriorityFeeMethod.ts

@@ -8,10 +8,23 @@ export async function fetchDriftPriorityFee(
 	marketTypes: string[],
 	marketIndexs: number[]
 ): Promise<DriftPriorityFeeResponse> {
-	const response = await fetch(
-		`${url}/batchPriorityFees?marketType=${marketTypes.join(
-			','
-		)}&marketIndex=${marketIndexs.join(',')}`
-	);
-	return await response.json();
+	try {
+		const response = await fetch(
+			`${url}/batchPriorityFees?marketType=${marketTypes.join(
+				','
+			)}&marketIndex=${marketIndexs.join(',')}`
+		);
+		if (!response.ok) {
+			throw new Error(`HTTP error! status: ${response.status}`);
+		}
+		return await response.json();
+	} catch (err) {
+		if (err instanceof Error) {
+			console.error('Error fetching priority fees:', err.message);
+		} else {
+			console.error('Unknown error fetching priority fees:', err);
+		}
+	}
+
+	return [];
 }

package/src/priorityFee/heliusPriorityFeeMethod.ts

@@ -29,23 +29,29 @@ export async function fetchHeliusPriorityFee(
 	lookbackDistance: number,
 	addresses: string[]
 ): Promise<HeliusPriorityFeeResponse> {
-	const response = await fetch(heliusRpcUrl, {
-		method: 'POST',
-		headers: { 'Content-Type': 'application/json' },
-		body: JSON.stringify({
-			jsonrpc: '2.0',
-			id: '1',
-			method: 'getPriorityFeeEstimate',
-			params: [
-				{
-					accountKeys: addresses,
-					options: {
-						includeAllPriorityFeeLevels: true,
-						lookbackSlots: lookbackDistance,
+	try {
+		const response = await fetch(heliusRpcUrl, {
+			method: 'POST',
+			headers: { 'Content-Type': 'application/json' },
+			body: JSON.stringify({
+				jsonrpc: '2.0',
+				id: '1',
+				method: 'getPriorityFeeEstimate',
+				params: [
+					{
+						accountKeys: addresses,
+						options: {
+							includeAllPriorityFeeLevels: true,
+							lookbackSlots: lookbackDistance,
+						},
 					},
-				},
-			],
-		}),
-	});
-	return await response.json();
+				],
+			}),
+		});
+		return await response.json();
+	} catch (err) {
+		console.error(err);
+	}
+
+	return undefined;
 }

package/src/priorityFee/priorityFeeSubscriber.ts

@@ -106,13 +106,15 @@ export class PriorityFeeSubscriber {
 			this.lookbackDistance,
 			this.addresses
 		);
-		this.latestPriorityFee = samples[0].prioritizationFee;
-		this.lastSlotSeen = samples[0].slot;
+		if (samples.length > 0) {
+			this.latestPriorityFee = samples[0].prioritizationFee;
+			this.lastSlotSeen = samples[0].slot;
 
-		this.lastAvgStrategyResult = this.averageStrategy.calculate(samples);
-		this.lastMaxStrategyResult = this.maxStrategy.calculate(samples);
-		if (this.customStrategy) {
-			this.lastCustomStrategyResult = this.customStrategy.calculate(samples);
+			this.lastAvgStrategyResult = this.averageStrategy.calculate(samples);
+			this.lastMaxStrategyResult = this.maxStrategy.calculate(samples);
+			if (this.customStrategy) {
+				this.lastCustomStrategyResult = this.customStrategy.calculate(samples);
+			}
 		}
 	}
 

package/src/priorityFee/solanaPriorityFeeMethod.ts

@@ -10,19 +10,25 @@ export async function fetchSolanaPriorityFee(
 	lookbackDistance: number,
 	addresses: string[]
 ): Promise<SolanaPriorityFeeResponse[]> {
-	// @ts-ignore
-	const rpcJSONResponse: any = await connection._rpcRequest(
-		'getRecentPrioritizationFees',
-		[addresses]
-	);
+	try {
+		// @ts-ignore
+		const rpcJSONResponse: any = await connection._rpcRequest(
+			'getRecentPrioritizationFees',
+			[addresses]
+		);
 
-	const results: SolanaPriorityFeeResponse[] = rpcJSONResponse?.result;
+		const results: SolanaPriorityFeeResponse[] = rpcJSONResponse?.result;
 
-	if (!results.length) return;
+		if (!results.length) return;
 
-	// Sort and filter results based on the slot lookback setting
-	const descResults = results.sort((a, b) => b.slot - a.slot);
-	const cutoffSlot = descResults[0].slot - lookbackDistance;
+		// Sort and filter results based on the slot lookback setting
+		const descResults = results.sort((a, b) => b.slot - a.slot);
+		const cutoffSlot = descResults[0].slot - lookbackDistance;
 
-	return descResults.filter((result) => result.slot >= cutoffSlot);
+		return descResults.filter((result) => result.slot >= cutoffSlot);
+	} catch (err) {
+		console.error(err);
+	}
+
+	return [];
 }

package/src/tx/whileValidTxSender.ts

@@ -15,6 +15,7 @@ import { BaseTxSender } from './baseTxSender';
 import bs58 from 'bs58';
 
 const DEFAULT_RETRY = 2000;
+const PLACEHOLDER_BLOCKHASH = 'Fdum64WVeej6DeL85REV9NvfSxEJNPZ74DBk7A8kTrKP';
 
 type ResolveReference = {
 	resolve?: () => void;
@@ -103,11 +104,12 @@ export class WhileValidTxSender extends BaseTxSender {
 		ixs: TransactionInstruction[],
 		lookupTableAccounts: AddressLookupTableAccount[],
 		_additionalSigners?: Array<Signer>,
-		_opts?: ConfirmOptions
+		_opts?: ConfirmOptions,
+		blockhash?: string
 	): Promise<VersionedTransaction> {
 		const message = new TransactionMessage({
 			payerKey: this.wallet.publicKey,
-			recentBlockhash: '', // set blank and reset in sendVersionTransaction
+			recentBlockhash: blockhash ?? PLACEHOLDER_BLOCKHASH, // set blank and reset in sendVersionTransaction
 			instructions: ixs,
 		}).compileToV0Message(lookupTableAccounts);