@drift-labs/sdk 2.85.0-beta.9 → 2.86.0-beta.1

package/src/driftClient.ts

@@ -76,6 +76,7 @@ import {
 	getInsuranceFundStakeAccountPublicKey,
 	getPerpMarketPublicKey,
 	getPhoenixFulfillmentConfigPublicKey,
+	getPythPullOraclePublicKey,
 	getReferrerNamePublicKeySync,
 	getSerumFulfillmentConfigPublicKey,
 	getSerumSignerPublicKey,
@@ -127,8 +128,23 @@ import { getMarinadeDepositIx, getMarinadeFinanceProgram } from './marinade';
 import { getOrderParams } from './orderParams';
 import { numberToSafeBN } from './math/utils';
 import { TransactionParamProcessor } from './tx/txParamProcessor';
-import { isOracleValid } from './math/oracles';
+import { isOracleValid, trimVaaSignatures } from './math/oracles';
 import { TxHandler } from './tx/txHandler';
+import {
+	wormholeCoreBridgeIdl,
+	pythSolanaReceiverIdl,
+	DEFAULT_RECEIVER_PROGRAM_ID,
+} from '@pythnetwork/pyth-solana-receiver';
+import { parseAccumulatorUpdateData } from '@pythnetwork/price-service-sdk';
+import {
+	DEFAULT_WORMHOLE_PROGRAM_ID,
+	getGuardianSetPda,
+} from '@pythnetwork/pyth-solana-receiver/lib/address';
+import { DRIFT_ORACLE_RECEIVER_ID } from './config';
+import { WormholeCoreBridgeSolana } from '@pythnetwork/pyth-solana-receiver/lib/idl/wormhole_core_bridge_solana';
+import { PythSolanaReceiver } from '@pythnetwork/pyth-solana-receiver/lib/idl/pyth_solana_receiver';
+import { getFeedIdUint8Array, trimFeedId } from './util/pythPullOracleUtils';
+import { isVersionedTransaction } from './tx/utils';
 
 type RemainingAccountParams = {
 	userAccounts: UserAccount[];
@@ -178,6 +194,9 @@ export class DriftClient {
 
 	txHandler: TxHandler;
 
+	receiverProgram?: Program<PythSolanaReceiver>;
+	wormholeProgram?: Program<WormholeCoreBridgeSolana>;
+
 	public get isSubscribed() {
 		return this._isSubscribed && this.accountSubscriber.isSubscribed;
 	}
@@ -227,6 +246,7 @@ export class DriftClient {
 					onSignedCb: this.handleSignedTransaction.bind(this),
 					preSignedCb: this.handlePreSignedTransaction.bind(this),
 				},
+				config: config.txHandlerConfig,
 			});
 
 		if (config.includeDelegates && config.subAccountIds) {
@@ -1800,25 +1820,14 @@ export class DriftClient {
 		});
 	}
 
-	/**
-	 * Deposit funds into the given spot market
-	 *
-	 * @param amount to deposit
-	 * @param marketIndex spot market index to deposit into
-	 * @param associatedTokenAccount can be the wallet public key if using native sol
-	 * @param subAccountId subaccountId to deposit
-	 * @param reduceOnly if true, deposit must not increase account risk
-	 */
-	public async deposit(
+	public async createDepositTxn(
 		amount: BN,
 		marketIndex: number,
 		associatedTokenAccount: PublicKey,
 		subAccountId?: number,
 		reduceOnly = false,
 		txParams?: TxParams
-	): Promise<TransactionSignature> {
-		const additionalSigners: Array<Signer> = [];
-
+	): Promise<ReturnType<typeof this.buildTransaction>> {
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
 
 		const isSolMarket = spotMarketAccount.mint.equals(WRAPPED_SOL_MINT);
@@ -1868,11 +1877,36 @@ export class DriftClient {
 
 		const tx = await this.buildTransaction(instructions, txParams);
 
-		const { txSig, slot } = await this.sendTransaction(
-			tx,
-			additionalSigners,
-			this.opts
+		return tx;
+	}
+
+	/**
+	 * Deposit funds into the given spot market
+	 *
+	 * @param amount to deposit
+	 * @param marketIndex spot market index to deposit into
+	 * @param associatedTokenAccount can be the wallet public key if using native sol
+	 * @param subAccountId subaccountId to deposit
+	 * @param reduceOnly if true, deposit must not increase account risk
+	 */
+	public async deposit(
+		amount: BN,
+		marketIndex: number,
+		associatedTokenAccount: PublicKey,
+		subAccountId?: number,
+		reduceOnly = false,
+		txParams?: TxParams
+	): Promise<TransactionSignature> {
+		const tx = await this.createDepositTxn(
+			amount,
+			marketIndex,
+			associatedTokenAccount,
+			subAccountId,
+			reduceOnly,
+			txParams
 		);
+
+		const { txSig, slot } = await this.sendTransaction(tx, [], this.opts);
 		this.spotMarketLastSlotCache.set(marketIndex, slot);
 		return txSig;
 	}
@@ -2005,20 +2039,7 @@ export class DriftClient {
 		);
 	}
 
-	/**
-	 * Creates the User account for a user, and deposits some initial collateral
-	 * @param amount
-	 * @param userTokenAccount
-	 * @param marketIndex
-	 * @param subAccountId
-	 * @param name
-	 * @param fromSubAccountId
-	 * @param referrerInfo
-	 * @param donateAmount
-	 * @param txParams
-	 * @returns
-	 */
-	public async initializeUserAccountAndDepositCollateral(
+	public async createInitializeUserAccountAndDepositCollateral(
 		amount: BN,
 		userTokenAccount: PublicKey,
 		marketIndex = 0,
@@ -2029,7 +2050,7 @@ export class DriftClient {
 		donateAmount?: BN,
 		txParams?: TxParams,
 		customMaxMarginRatio?: number
-	): Promise<[TransactionSignature, PublicKey]> {
+	): Promise<[Transaction | VersionedTransaction, PublicKey]> {
 		const ixs = [];
 
 		const [userAccountPublicKey, initializeUserAccountIx] =
@@ -2039,8 +2060,6 @@ export class DriftClient {
 				referrerInfo
 			);
 
-		const additionalSigners: Array<Signer> = [];
-
 		const spotMarket = this.getSpotMarketAccount(marketIndex);
 
 		const isSolMarket = spotMarket.mint.equals(WRAPPED_SOL_MINT);
@@ -2134,6 +2153,49 @@ export class DriftClient {
 
 		const tx = await this.buildTransaction(ixs, txParams);
 
+		return [tx, userAccountPublicKey];
+	}
+
+	/**
+	 * Creates the User account for a user, and deposits some initial collateral
+	 * @param amount
+	 * @param userTokenAccount
+	 * @param marketIndex
+	 * @param subAccountId
+	 * @param name
+	 * @param fromSubAccountId
+	 * @param referrerInfo
+	 * @param donateAmount
+	 * @param txParams
+	 * @returns
+	 */
+	public async initializeUserAccountAndDepositCollateral(
+		amount: BN,
+		userTokenAccount: PublicKey,
+		marketIndex = 0,
+		subAccountId = 0,
+		name?: string,
+		fromSubAccountId?: number,
+		referrerInfo?: ReferrerInfo,
+		donateAmount?: BN,
+		txParams?: TxParams,
+		customMaxMarginRatio?: number
+	): Promise<[TransactionSignature, PublicKey]> {
+		const [tx, userAccountPublicKey] =
+			await this.createInitializeUserAccountAndDepositCollateral(
+				amount,
+				userTokenAccount,
+				marketIndex,
+				subAccountId,
+				name,
+				fromSubAccountId,
+				referrerInfo,
+				donateAmount,
+				txParams,
+				customMaxMarginRatio
+			);
+		const additionalSigners: Array<Signer> = [];
+
 		const { txSig, slot } = await this.sendTransaction(
 			tx,
 			additionalSigners,
@@ -4118,6 +4180,10 @@ export class DriftClient {
 		const outMarket = this.getSpotMarketAccount(outMarketIndex);
 		const inMarket = this.getSpotMarketAccount(inMarketIndex);
 
+		const isExactOut = swapMode === 'ExactOut' || quote.swapMode === 'ExactOut';
+		const amountIn = new BN(quote.inAmount);
+		const exactOutBufferedAmountIn = amountIn.muln(1001).divn(1000); // Add 10bp buffer
+
 		if (!quote) {
 			const fetchedQuote = await jupiterClient.getQuote({
 				inputMint: inMarket.mint,
@@ -4198,7 +4264,7 @@ export class DriftClient {
 		const { beginSwapIx, endSwapIx } = await this.getSwapIx({
 			outMarketIndex,
 			inMarketIndex,
-			amountIn: new BN(quote.inAmount),
+			amountIn: isExactOut ? exactOutBufferedAmountIn : amountIn,
 			inTokenAccount: inAssociatedTokenAccount,
 			outTokenAccount: outAssociatedTokenAccount,
 			reduceOnly,
@@ -6844,6 +6910,250 @@ export class DriftClient {
 		return undefined;
 	}
 
+	public getReceiverProgram(): Program<PythSolanaReceiver> {
+		if (this.receiverProgram === undefined) {
+			this.receiverProgram = new Program(
+				pythSolanaReceiverIdl,
+				DEFAULT_RECEIVER_PROGRAM_ID,
+				this.provider
+			);
+		}
+		return this.receiverProgram;
+	}
+
+	public async postPythPullOracleUpdateAtomic(
+		vaaString: string,
+		feedId: string
+	): Promise<TransactionSignature> {
+		const postIxs = await this.getPostPythPullOracleUpdateAtomicIxs(
+			vaaString,
+			feedId
+		);
+		const tx = await this.buildTransaction(postIxs);
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
+
+	public async getPostPythPullOracleUpdateAtomicIxs(
+		vaaString: string,
+		feedId: string,
+		numSignatures = 2
+	): Promise<TransactionInstruction[]> {
+		feedId = trimFeedId(feedId);
+		const accumulatorUpdateData = parseAccumulatorUpdateData(
+			Buffer.from(vaaString, 'base64')
+		);
+		const guardianSetIndex = accumulatorUpdateData.vaa.readUInt32BE(1);
+		const guardianSet = getGuardianSetPda(
+			guardianSetIndex,
+			DEFAULT_WORMHOLE_PROGRAM_ID
+		);
+		const trimmedVaa = trimVaaSignatures(
+			accumulatorUpdateData.vaa,
+			numSignatures
+		);
+
+		const postIxs: TransactionInstruction[] = [];
+		for (const update of accumulatorUpdateData.updates) {
+			postIxs.push(
+				await this.getSinglePostPythPullOracleAtomicIx(
+					{
+						vaa: trimmedVaa,
+						merklePriceUpdate: update,
+					},
+					feedId,
+					guardianSet
+				)
+			);
+		}
+
+		return postIxs;
+	}
+
+	public async getSinglePostPythPullOracleAtomicIx(
+		params: {
+			vaa: Buffer;
+			merklePriceUpdate: {
+				message: Buffer;
+				proof: number[][];
+			};
+		},
+		feedId: string,
+		guardianSet: PublicKey
+	): Promise<TransactionInstruction> {
+		const feedIdBuffer = getFeedIdUint8Array(feedId);
+		const receiverProgram = this.getReceiverProgram();
+
+		const encodedParams = receiverProgram.coder.types.encode(
+			'PostUpdateAtomicParams',
+			params
+		);
+
+		return this.program.instruction.postPythPullOracleUpdateAtomic(
+			feedIdBuffer,
+			encodedParams,
+			{
+				accounts: {
+					keeper: this.wallet.publicKey,
+					pythSolanaReceiver: DRIFT_ORACLE_RECEIVER_ID,
+					guardianSet,
+					priceFeed: getPythPullOraclePublicKey(
+						this.program.programId,
+						feedIdBuffer
+					),
+				},
+			}
+		);
+	}
+
+	public async updatePythPullOracle(
+		vaaString: string,
+		feedId: string
+	): Promise<TransactionSignature> {
+		feedId = trimFeedId(feedId);
+		const accumulatorUpdateData = parseAccumulatorUpdateData(
+			Buffer.from(vaaString, 'base64')
+		);
+		const guardianSetIndex = accumulatorUpdateData.vaa.readUInt32BE(1);
+		const guardianSet = getGuardianSetPda(
+			guardianSetIndex,
+			DEFAULT_WORMHOLE_PROGRAM_ID
+		);
+
+		const [postIxs, encodedVaaAddress] = await this.getBuildEncodedVaaIxs(
+			accumulatorUpdateData.vaa,
+			guardianSet
+		);
+
+		for (const update of accumulatorUpdateData.updates) {
+			postIxs.push(
+				await this.getUpdatePythPullOracleIxs(
+					{
+						merklePriceUpdate: update,
+					},
+					feedId,
+					encodedVaaAddress.publicKey
+				)
+			);
+		}
+
+		const tx = await this.buildTransaction(postIxs);
+		const { txSig } = await this.sendTransaction(
+			tx,
+			[encodedVaaAddress],
+			this.opts
+		);
+
+		return txSig;
+	}
+
+	public async getUpdatePythPullOracleIxs(
+		params: {
+			merklePriceUpdate: {
+				message: Buffer;
+				proof: number[][];
+			};
+		},
+		feedId: string,
+		encodedVaaAddress: PublicKey
+	): Promise<TransactionInstruction> {
+		const feedIdBuffer = getFeedIdUint8Array(feedId);
+		const receiverProgram = this.getReceiverProgram();
+
+		const encodedParams = receiverProgram.coder.types.encode(
+			'PostUpdateParams',
+			params
+		);
+
+		return this.program.instruction.updatePythPullOracle(
+			feedIdBuffer,
+			encodedParams,
+			{
+				accounts: {
+					keeper: this.wallet.publicKey,
+					pythSolanaReceiver: DRIFT_ORACLE_RECEIVER_ID,
+					encodedVaa: encodedVaaAddress,
+					priceFeed: getPythPullOraclePublicKey(
+						this.program.programId,
+						feedIdBuffer
+					),
+				},
+			}
+		);
+	}
+
+	public async getBuildEncodedVaaIxs(
+		vaa: Buffer,
+		guardianSet: PublicKey
+	): Promise<[TransactionInstruction[], Keypair]> {
+		const postIxs: TransactionInstruction[] = [];
+
+		if (this.wormholeProgram === undefined) {
+			this.wormholeProgram = new Program(
+				wormholeCoreBridgeIdl,
+				DEFAULT_WORMHOLE_PROGRAM_ID,
+				this.provider
+			);
+		}
+
+		const encodedVaaKeypair = new Keypair();
+		postIxs.push(
+			await this.wormholeProgram.account.encodedVaa.createInstruction(
+				encodedVaaKeypair,
+				vaa.length + 46
+			)
+		);
+
+		// Why do we need this too?
+		postIxs.push(
+			await this.wormholeProgram.methods
+				.initEncodedVaa()
+				.accounts({
+					encodedVaa: encodedVaaKeypair.publicKey,
+				})
+				.instruction()
+		);
+
+		// Split the write into two ixs
+		postIxs.push(
+			await this.wormholeProgram.methods
+				.writeEncodedVaa({
+					index: 0,
+					data: vaa.subarray(0, 755),
+				})
+				.accounts({
+					draftVaa: encodedVaaKeypair.publicKey,
+				})
+				.instruction()
+		);
+
+		postIxs.push(
+			await this.wormholeProgram.methods
+				.writeEncodedVaa({
+					index: 755,
+					data: vaa.subarray(755),
+				})
+				.accounts({
+					draftVaa: encodedVaaKeypair.publicKey,
+				})
+				.instruction()
+		);
+
+		// Verify
+		postIxs.push(
+			await this.wormholeProgram.methods
+				.verifyEncodedVaaV1()
+				.accounts({
+					guardianSet,
+					draftVaa: encodedVaaKeypair.publicKey,
+				})
+				.instruction()
+		);
+
+		return [postIxs, encodedVaaKeypair];
+	}
+
 	private handleSignedTransaction(signedTxs: SignedTxData[]) {
 		if (this.enableMetricsEvents && this.metricsEventEmitter) {
 			this.metricsEventEmitter.emit('txSigned', signedTxs);
@@ -6859,11 +7169,7 @@ export class DriftClient {
 	private isVersionedTransaction(
 		tx: Transaction | VersionedTransaction
 	): boolean {
-		const version = (tx as VersionedTransaction)?.version;
-		const isVersionedTx =
-			tx instanceof VersionedTransaction || version !== undefined;
-
-		return isVersionedTx;
+		return isVersionedTransaction(tx);
 	}
 
 	sendTransaction(

package/src/driftClientConfig.ts

@@ -10,7 +10,7 @@ import { OracleInfo } from './oracles/types';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
 import { TxSender } from './tx/types';
-import { TxHandler } from './tx/txHandler';
+import { TxHandler, TxHandlerConfig } from './tx/txHandler';
 
 export type DriftClientConfig = {
 	connection: Connection;
@@ -35,6 +35,7 @@ export type DriftClientConfig = {
 	txVersion?: TransactionVersion; // which tx version to use
 	txParams?: TxParams; // default tx params to use
 	enableMetricsEvents?: boolean;
+	txHandlerConfig?: TxHandlerConfig;
 };
 
 export type DriftClientSubscriptionConfig =

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.84.0",
+  "version": "2.85.0",
   "name": "drift",
   "instructions": [
     {
@@ -2547,6 +2547,86 @@
         }
       ]
     },
+    {
+      "name": "updatePythPullOracle",
+      "accounts": [
+        {
+          "name": "keeper",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "pythSolanaReceiver",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "encodedVaa",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "priceFeed",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "feedId",
+          "type": {
+            "array": [
+              "u8",
+              32
+            ]
+          }
+        },
+        {
+          "name": "params",
+          "type": "bytes"
+        }
+      ]
+    },
+    {
+      "name": "postPythPullOracleUpdateAtomic",
+      "accounts": [
+        {
+          "name": "keeper",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "pythSolanaReceiver",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "guardianSet",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "priceFeed",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "feedId",
+          "type": {
+            "array": [
+              "u8",
+              32
+            ]
+          }
+        },
+        {
+          "name": "params",
+          "type": "bytes"
+        }
+      ]
+    },
     {
       "name": "initialize",
       "accounts": [
@@ -5296,6 +5376,47 @@
           "type": "u16"
         }
       ]
+    },
+    {
+      "name": "initializePythPullOracle",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "pythSolanaReceiver",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "priceFeed",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "feedId",
+          "type": {
+            "array": [
+              "u8",
+              32
+            ]
+          }
+        }
+      ]
     }
   ],
   "accounts": [
@@ -12029,6 +12150,44 @@
       "code": 6268,
       "name": "MaxBorrows",
       "msg": "Can not borow more than max borrows"
+    },
+    {
+      "code": 6269,
+      "name": "OracleUpdatesNotMonotonic",
+      "msg": "Updates must be monotonically increasing"
+    },
+    {
+      "code": 6270,
+      "name": "OraclePriceFeedMessageMismatch",
+      "msg": "Trying to update price feed with the wrong feed id"
+    },
+    {
+      "code": 6271,
+      "name": "OracleUnsupportedMessageType",
+      "msg": "The message in the update must be a PriceFeedMessage"
+    },
+    {
+      "code": 6272,
+      "name": "OracleDeserializeMessageFailed",
+      "msg": "Could not deserialize the message in the update"
+    },
+    {
+      "code": 6273,
+      "name": "OracleWrongGuardianSetOwner",
+      "msg": "Wrong guardian set owner in update price atomic"
+    },
+    {
+      "code": 6274,
+      "name": "OracleWrongWriteAuthority",
+      "msg": "Oracle post update atomic price feed account must be drift program"
+    },
+    {
+      "code": 6275,
+      "name": "OracleWrongVaaOwner",
+      "msg": "Oracle vaa owner must be wormhole program"
     }
-  ]
+  ],
+  "metadata": {
+    "address": "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
+  }
 }

package/src/math/oracles.ts

@@ -209,3 +209,20 @@ export function getNewOracleConfPct(
 
 	return confIntervalPctResult;
 }
+
+export function trimVaaSignatures(vaa: Buffer, n = 3): Buffer {
+	const currentNumSignatures = vaa[5];
+	if (n > currentNumSignatures) {
+		throw new Error(
+			"Resulting VAA can't have more signatures than the original VAA"
+		);
+	}
+
+	const trimmedVaa = Buffer.concat([
+		vaa.subarray(0, 6 + n * 66),
+		vaa.subarray(6 + currentNumSignatures * 66),
+	]);
+
+	trimmedVaa[5] = n;
+	return trimmedVaa;
+}