@drift-labs/vaults-sdk 0.1.569 → 0.1.571

package/lib/vaultClient.d.ts

@@ -1,4 +1,4 @@
-import { BN, DriftClient, UserMap } from '@drift-labs/sdk';
+import { BN, DriftClient, UserMap, OracleSource } from '@drift-labs/sdk';
 import { Program, ProgramAccount } from '@coral-xyz/anchor';
 import { DriftVaults } from './types/drift_vaults';
 import { AddressLookupTableAccount, PublicKey, TransactionInstruction, TransactionSignature, VersionedTransaction } from '@solana/web3.js';
@@ -10,6 +10,10 @@ export type TxParams = {
     cuPriceMicroLamports?: number;
     simulateTransaction?: boolean;
     lookupTables?: AddressLookupTableAccount[];
+    oracleFeedsToCrank?: {
+        feed: PublicKey;
+        oracleSource: OracleSource;
+    }[];
 };
 export declare class VaultClient {
     driftClient: DriftClient;
@@ -294,4 +298,5 @@ export declare class VaultClient {
     protocolRequestWithdraw(vault: PublicKey, amount: BN, withdrawUnit: WithdrawUnit): Promise<TransactionSignature>;
     protocolCancelWithdrawRequest(vault: PublicKey): Promise<TransactionSignature>;
     protocolWithdraw(vault: PublicKey): Promise<TransactionSignature>;
+    private getOracleFeedsToCrank;
 }

package/lib/vaultClient.js

@@ -963,6 +963,7 @@ class VaultClient {
                 .rpc();
         }
         else {
+            const oracleFeedsToCrankIxs = await this.getOracleFeedsToCrank(txParams === null || txParams === void 0 ? void 0 : txParams.oracleFeedsToCrank);
             const requestWithdrawIx = this.program.instruction.requestWithdraw(
             // @ts-ignore
             amount, withdrawUnit, {
@@ -972,7 +973,7 @@ class VaultClient {
                 },
                 remainingAccounts,
             });
-            return await this.createAndSendTxn([requestWithdrawIx], txParams);
+            return await this.createAndSendTxn([...oracleFeedsToCrankIxs, requestWithdrawIx], txParams);
         }
     }
     async withdraw(vaultDepositor, txParams) {
@@ -1035,7 +1036,9 @@ class VaultClient {
             }
         }
         else {
+            const oracleFeedsToCrankIxs = await this.getOracleFeedsToCrank(txParams === null || txParams === void 0 ? void 0 : txParams.oracleFeedsToCrank);
             const ixs = [
+                ...oracleFeedsToCrankIxs,
                 await this.program.methods
                     .withdraw()
                     .accounts({
@@ -1141,6 +1144,7 @@ class VaultClient {
                 .rpc();
         }
         else {
+            const oracleFeedsToCrankIxs = await this.getOracleFeedsToCrank(txParams === null || txParams === void 0 ? void 0 : txParams.oracleFeedsToCrank);
             const cancelRequestWithdrawIx = this.program.instruction.cancelRequestWithdraw({
                 accounts: {
                     authority: this.driftClient.wallet.publicKey,
@@ -1148,7 +1152,7 @@ class VaultClient {
                 },
                 remainingAccounts,
             });
-            return await this.createAndSendTxn([cancelRequestWithdrawIx], txParams);
+            return await this.createAndSendTxn([...oracleFeedsToCrankIxs, cancelRequestWithdrawIx], txParams);
         }
     }
     /**
@@ -1521,5 +1525,17 @@ class VaultClient {
             cuLimit: 1000000,
         });
     }
+    async getOracleFeedsToCrank(oracleFeedsToCrank) {
+        const oracleFeedsToCrankIxs = oracleFeedsToCrank
+            ? (await Promise.all(oracleFeedsToCrank.map(async (feedConfig) => {
+                if (JSON.stringify(feedConfig.oracleSource) !==
+                    JSON.stringify(sdk_1.OracleSource.SWITCHBOARD_ON_DEMAND)) {
+                    throw new Error('Only SWITCHBOARD_ON_DEMAND oracle feeds are supported for cranking');
+                }
+                return this.driftClient.getPostSwitchboardOnDemandUpdateAtomicIx(feedConfig.feed);
+            })))
+            : [];
+        return oracleFeedsToCrankIxs;
+    }
 }
 exports.VaultClient = VaultClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drift-labs/vaults-sdk",
-  "version": "0.1.569",
+  "version": "0.1.571",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "directories": {
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@coral-xyz/anchor": "0.28.0",
-    "@drift-labs/sdk": "2.102.0-beta.1",
+    "@drift-labs/sdk": "2.102.0-beta.2",
     "@ledgerhq/hw-app-solana": "^7.1.1",
     "@ledgerhq/hw-transport": "^6.30.1",
     "@ledgerhq/hw-transport-node-hid": "^6.28.1",

package/src/vaultClient.ts

@@ -10,6 +10,7 @@ import {
 	unstakeSharesToAmount as depositSharesToVaultAmount,
 	ZERO,
 	getInsuranceFundVaultPublicKey,
+	OracleSource,
 } from '@drift-labs/sdk';
 import { BorshAccountsCoder, Program, ProgramAccount } from '@coral-xyz/anchor';
 import { DriftVaults } from './types/drift_vaults';
@@ -58,6 +59,7 @@ export type TxParams = {
 	cuPriceMicroLamports?: number;
 	simulateTransaction?: boolean;
 	lookupTables?: AddressLookupTableAccount[];
+	oracleFeedsToCrank?: { feed: PublicKey; oracleSource: OracleSource }[];
 };
 
 export class VaultClient {
@@ -1553,6 +1555,10 @@ export class VaultClient {
 				.remainingAccounts(remainingAccounts)
 				.rpc();
 		} else {
+			const oracleFeedsToCrankIxs = await this.getOracleFeedsToCrank(
+				txParams?.oracleFeedsToCrank
+			);
+
 			const requestWithdrawIx = this.program.instruction.requestWithdraw(
 				// @ts-ignore
 				amount,
@@ -1566,7 +1572,10 @@ export class VaultClient {
 				}
 			);
 
-			return await this.createAndSendTxn([requestWithdrawIx], txParams);
+			return await this.createAndSendTxn(
+				[...oracleFeedsToCrankIxs, requestWithdrawIx],
+				txParams
+			);
 		}
 	}
 
@@ -1661,7 +1670,12 @@ export class VaultClient {
 					.rpc();
 			}
 		} else {
+			const oracleFeedsToCrankIxs = await this.getOracleFeedsToCrank(
+				txParams?.oracleFeedsToCrank
+			);
+
 			const ixs = [
+				...oracleFeedsToCrankIxs,
 				await this.program.methods
 					.withdraw()
 					.accounts({
@@ -1823,6 +1837,10 @@ export class VaultClient {
 				.remainingAccounts(remainingAccounts)
 				.rpc();
 		} else {
+			const oracleFeedsToCrankIxs = await this.getOracleFeedsToCrank(
+				txParams?.oracleFeedsToCrank
+			);
+
 			const cancelRequestWithdrawIx =
 				this.program.instruction.cancelRequestWithdraw({
 					accounts: {
@@ -1832,7 +1850,10 @@ export class VaultClient {
 					remainingAccounts,
 				});
 
-			return await this.createAndSendTxn([cancelRequestWithdrawIx], txParams);
+			return await this.createAndSendTxn(
+				[...oracleFeedsToCrankIxs, cancelRequestWithdrawIx],
+				txParams
+			);
 		}
 	}
 
@@ -2398,4 +2419,29 @@ export class VaultClient {
 			cuLimit: 1_000_000,
 		});
 	}
+
+	private async getOracleFeedsToCrank(
+		oracleFeedsToCrank: TxParams['oracleFeedsToCrank']
+	) {
+		const oracleFeedsToCrankIxs: TransactionInstruction[] = oracleFeedsToCrank
+			? ((await Promise.all(
+					oracleFeedsToCrank.map(async (feedConfig) => {
+						if (
+							JSON.stringify(feedConfig.oracleSource) !==
+							JSON.stringify(OracleSource.SWITCHBOARD_ON_DEMAND)
+						) {
+							throw new Error(
+								'Only SWITCHBOARD_ON_DEMAND oracle feeds are supported for cranking'
+							);
+						}
+
+						return this.driftClient.getPostSwitchboardOnDemandUpdateAtomicIx(
+							feedConfig.feed
+						);
+					})
+			  )) as TransactionInstruction[])
+			: [];
+
+		return oracleFeedsToCrankIxs;
+	}
 }