@drift-labs/sdk 2.85.0-beta.8 → 2.86.0-beta.0

package/lib/constants/spotMarkets.js

@@ -14,6 +14,7 @@ exports.DevnetSpotMarkets = [
         mint: new web3_js_1.PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
         precision: new __1.BN(10).pow(numericConstants_1.SIX),
         precisionExp: numericConstants_1.SIX,
+        pythFeedId: '0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
     },
     {
         symbol: 'SOL',
@@ -25,6 +26,7 @@ exports.DevnetSpotMarkets = [
         precisionExp: numericConstants_1.LAMPORTS_EXP,
         serumMarket: new web3_js_1.PublicKey('8N37SsnTu8RYxtjrV9SStjkkwVhmU8aCWhLvwduAPEKW'),
         phoenixMarket: new web3_js_1.PublicKey('78ehDnHgbkFxqXZwdFxa8HK7saX58GymeX2wNGdkqYLp'),
+        pythFeedId: '0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d',
     },
     {
         symbol: 'BTC',
@@ -35,6 +37,7 @@ exports.DevnetSpotMarkets = [
         precision: new __1.BN(10).pow(numericConstants_1.SIX),
         precisionExp: numericConstants_1.SIX,
         serumMarket: new web3_js_1.PublicKey('AGsmbVu3MS9u68GEYABWosQQCZwmLcBHu4pWEuBYH7Za'),
+        pythFeedId: '0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
     },
 ];
 exports.MainnetSpotMarkets = [
@@ -46,6 +49,7 @@ exports.MainnetSpotMarkets = [
         mint: new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v'),
         precision: numericConstants_1.QUOTE_PRECISION,
         precisionExp: numericConstants_1.QUOTE_PRECISION_EXP,
+        pythFeedId: '0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
     },
     {
         symbol: 'SOL',
@@ -57,6 +61,7 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.LAMPORTS_EXP,
         serumMarket: new web3_js_1.PublicKey('8BnEgHoWFysVcuFFX7QztDmzuH8r5ZFvyP3sYwn1XTh6'),
         phoenixMarket: new web3_js_1.PublicKey('4DoNfFBfF7UokCC2FQzriy7yHK6DY6NVdYpuekQ5pRgg'),
+        pythFeedId: '0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d',
     },
     {
         symbol: 'mSOL',
@@ -67,6 +72,7 @@ exports.MainnetSpotMarkets = [
         precision: new __1.BN(10).pow(numericConstants_1.NINE),
         precisionExp: numericConstants_1.NINE,
         serumMarket: new web3_js_1.PublicKey('9Lyhks5bQQxb9EyyX55NtgKQzpM4WK7JCmeaWuQ5MoXD'),
+        pythFeedId: '0xc2289a6a43d2ce91c6f55caec370f4acc38a2ed477f58813334c6d03749ff2a4',
     },
     {
         symbol: 'wBTC',
@@ -77,6 +83,7 @@ exports.MainnetSpotMarkets = [
         precision: new __1.BN(10).pow(numericConstants_1.EIGHT),
         precisionExp: numericConstants_1.EIGHT,
         serumMarket: new web3_js_1.PublicKey('3BAKsQd3RuhZKES2DGysMhjBdwjZYKYmxRqnSMtZ4KSN'),
+        pythFeedId: '0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
     },
     {
         symbol: 'wETH',
@@ -88,6 +95,7 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.EIGHT,
         serumMarket: new web3_js_1.PublicKey('BbJgE7HZMaDp5NTYvRh5jZSkQPVDTU8ubPFtpogUkEj4'),
         phoenixMarket: new web3_js_1.PublicKey('Ew3vFDdtdGrknJAVVfraxCA37uNJtimXYPY4QjnfhFHH'),
+        pythFeedId: '0xff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace',
     },
     {
         symbol: 'USDT',
@@ -98,6 +106,7 @@ exports.MainnetSpotMarkets = [
         precision: numericConstants_1.QUOTE_PRECISION,
         precisionExp: numericConstants_1.QUOTE_PRECISION_EXP,
         serumMarket: new web3_js_1.PublicKey('B2na8Awyd7cpC59iEU43FagJAPLigr3AP3s38KM982bu'),
+        pythFeedId: '0x2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b',
     },
     {
         symbol: 'jitoSOL',
@@ -109,6 +118,7 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.NINE,
         serumMarket: new web3_js_1.PublicKey('DkbVbMhFxswS32xnn1K2UY4aoBugXooBTxdzkWWDWRkH'),
         phoenixMarket: new web3_js_1.PublicKey('5LQLfGtqcC5rm2WuGxJf4tjqYmDjsQAbKo2AMLQ8KB7p'),
+        pythFeedId: '0x67be9f519b95cf24338801051f9a808eff0a578ccb388db73b7f6fe1de019ffb',
     },
     {
         symbol: 'PYTH',
@@ -120,6 +130,7 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.SIX,
         serumMarket: new web3_js_1.PublicKey('4E17F3BxtNVqzVsirxguuqkpYLtFgCR6NfTpccPh82WE'),
         phoenixMarket: new web3_js_1.PublicKey('2sTMN9A1D1qeZLF95XQgJCUPiKe5DiV52jLfZGqMP46m'),
+        pythFeedId: '0x0bbf28e9a841a1cc788f6a361b17ca072d0ea3098a1e5df1c3922d06719579ff',
     },
     {
         symbol: 'bSOL',
@@ -130,6 +141,7 @@ exports.MainnetSpotMarkets = [
         precision: new __1.BN(10).pow(numericConstants_1.NINE),
         precisionExp: numericConstants_1.NINE,
         serumMarket: new web3_js_1.PublicKey('ARjaHVxGCQfTvvKjLd7U7srvk6orthZSE6uqWchCczZc'),
+        pythFeedId: '0x89875379e70f8fbadc17aef315adf3a8d5d160b811435537e03c97e8aac97d9c',
     },
     {
         symbol: 'JTO',
@@ -141,6 +153,7 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.NINE,
         serumMarket: new web3_js_1.PublicKey('H87FfmHABiZLRGrDsXRZtqq25YpARzaokCzL1vMYGiep'),
         phoenixMarket: new web3_js_1.PublicKey('BRLLmdtPGuuFn3BU6orYw4KHaohAEptBToi3dwRUnHQZ'),
+        pythFeedId: '0xb43660a5f790c69354b0729a5ef9d50d68f1df92107540210b9cccba1f947cc2',
     },
     {
         symbol: 'WIF',
@@ -152,6 +165,7 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.SIX,
         serumMarket: new web3_js_1.PublicKey('2BtDHBTCTUxvdur498ZEcMgimasaFrY5GzLv8wS8XgCb'),
         phoenixMarket: new web3_js_1.PublicKey('6ojSigXF7nDPyhFRgmn3V9ywhYseKF9J32ZrranMGVSX'),
+        pythFeedId: '0x4ca4beeca86f0d164160323817a4e42b10010a724c2217c6ee41b54cd4cc61fc',
     },
     {
         symbol: 'JUP',
@@ -163,6 +177,7 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.SIX,
         phoenixMarket: new web3_js_1.PublicKey('2pspvjWWaf3dNgt3jsgSzFCNvMGPb7t8FrEYvLGjvcCe'),
         launchTs: 1706731200000,
+        pythFeedId: '0x0a0408d619e9380abad35060f9192039ed5042fa6f82301d0e48bb52be830996',
     },
     {
         symbol: 'RNDR',
@@ -174,6 +189,7 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.EIGHT,
         serumMarket: new web3_js_1.PublicKey('2m7ZLEKtxWF29727DSb5D91erpXPUY1bqhRWRC3wQX7u'),
         launchTs: 1708964021000,
+        pythFeedId: '0xab7347771135fc733f8f38db462ba085ed3309955f42554a14fa13e855ac0e2f',
     },
     {
         symbol: 'W',
@@ -185,6 +201,7 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.SIX,
         phoenixMarket: new web3_js_1.PublicKey('8dFTCTAbtGuHsdDL8WEPrTU6pXFDrU1QSjBTutw8fwZk'),
         launchTs: 1712149014000,
+        pythFeedId: '0xeff7446475e218517566ea99e72a4abec2e1bd8498b43b7d8331e29dcb059389',
     },
     {
         symbol: 'TNSR',
@@ -196,6 +213,7 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.NINE,
         phoenixMarket: new web3_js_1.PublicKey('AbJCZ9TAJiby5AY3cHcXS2gUdENC6mtsm6m7XpC2ZMvE'),
         launchTs: 1712593532000,
+        pythFeedId: '0x05ecd4597cd48fe13d6cc3596c62af4f9675aee06e2e0b94c06d8bee2b659e05',
     },
     {
         symbol: 'DRIFT',
@@ -207,6 +225,7 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.SIX,
         phoenixMarket: new web3_js_1.PublicKey('8BV6rrWsUabnTDA3dE6A69oUDJAj3hMhtBHTJyXB7czp'),
         launchTs: 1715860800000,
+        pythFeedId: '0x5c1690b27bb02446db17cdda13ccc2c1d609ad6d2ef5bf4983a85ea8b6f19d07',
     },
     {
         symbol: 'INF',
@@ -217,6 +236,7 @@ exports.MainnetSpotMarkets = [
         precision: new __1.BN(10).pow(numericConstants_1.NINE),
         precisionExp: numericConstants_1.NINE,
         launchTs: 1716595200000,
+        pythFeedId: '0xf51570985c642c49c2d6e50156390fdba80bb6d5f7fa389d2f012ced4f7d208f',
     },
     {
         symbol: 'dSOL',

package/lib/driftClient.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="node" />
 /// <reference types="bn.js" />
+/// <reference types="node" />
 import { AnchorProvider, BN, Program, ProgramAccount } from '@coral-xyz/anchor';
 import { StateAccount, IWallet, PositionDirection, UserAccount, PerpMarketAccount, OrderParams, Order, SpotMarketAccount, SpotPosition, MakerInfo, TakerInfo, OptionalOrderParams, ReferrerInfo, MarketType, TxParams, SerumV3FulfillmentConfigAccount, ReferrerNameAccount, OrderTriggerCondition, PerpMarketExtendedInfo, UserStatsAccount, PhoenixV1FulfillmentConfigAccount, ModifyOrderPolicy, SwapReduceOnly, SettlePnlMode, SignedTxData, MappedRecord } from './types';
 import * as anchor from '@coral-xyz/anchor';
-import { Connection, PublicKey, TransactionSignature, ConfirmOptions, Transaction, TransactionInstruction, AccountMeta, Signer, AddressLookupTableAccount, TransactionVersion, VersionedTransaction, BlockhashWithExpiryBlockHeight } from '@solana/web3.js';
+import { Connection, PublicKey, TransactionSignature, ConfirmOptions, Transaction, TransactionInstruction, AccountMeta, Keypair, Signer, AddressLookupTableAccount, TransactionVersion, VersionedTransaction, BlockhashWithExpiryBlockHeight } from '@solana/web3.js';
 import { TokenFaucet } from './tokenFaucet';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
@@ -18,6 +19,8 @@ import { UserStats } from './userStats';
 import { JupiterClient, QuoteResponse, Route, SwapMode } from './jupiter/jupiterClient';
 import { UserStatsSubscriptionConfig } from './userStatsConfig';
 import { TxHandler } from './tx/txHandler';
+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';
 type RemainingAccountParams = {
     userAccounts: UserAccount[];
     writablePerpMarketIndexes?: number[];
@@ -60,6 +63,8 @@ export declare class DriftClient {
     txParams: TxParams;
     enableMetricsEvents?: boolean;
     txHandler: TxHandler;
+    receiverProgram?: Program<PythSolanaReceiver>;
+    wormholeProgram?: Program<WormholeCoreBridgeSolana>;
     get isSubscribed(): boolean;
     set isSubscribed(val: boolean);
     constructor(config: DriftClientConfig);
@@ -221,6 +226,7 @@ export declare class DriftClient {
      */
     getAssociatedTokenAccount(marketIndex: number, useNative?: boolean): Promise<PublicKey>;
     createAssociatedTokenAccountIdempotentInstruction(account: PublicKey, payer: PublicKey, owner: PublicKey, mint: PublicKey): TransactionInstruction;
+    createDepositTxn(amount: BN, marketIndex: number, associatedTokenAccount: PublicKey, subAccountId?: number, reduceOnly?: boolean, txParams?: TxParams): Promise<ReturnType<typeof this.buildTransaction>>;
     /**
      * Deposit funds into the given spot market
      *
@@ -240,6 +246,7 @@ export declare class DriftClient {
         pubkey: PublicKey;
     }>;
     getAssociatedTokenAccountCreationIx(tokenMintAddress: PublicKey, associatedTokenAddress: PublicKey): anchor.web3.TransactionInstruction;
+    createInitializeUserAccountAndDepositCollateral(amount: BN, userTokenAccount: PublicKey, marketIndex?: number, subAccountId?: number, name?: string, fromSubAccountId?: number, referrerInfo?: ReferrerInfo, donateAmount?: BN, txParams?: TxParams, customMaxMarginRatio?: number): Promise<[Transaction | VersionedTransaction, PublicKey]>;
     /**
      * Creates the User account for a user, and deposits some initial collateral
      * @param amount
@@ -703,6 +710,24 @@ export declare class DriftClient {
         marketIndex: number;
         marketType: MarketType;
     } | undefined;
+    getReceiverProgram(): Program<PythSolanaReceiver>;
+    postPythPullOracleUpdateAtomic(vaaString: string, feedId: string): Promise<TransactionSignature>;
+    getPostPythPullOracleUpdateAtomicIxs(vaaString: string, feedId: string, numSignatures?: number): Promise<TransactionInstruction[]>;
+    getSinglePostPythPullOracleAtomicIx(params: {
+        vaa: Buffer;
+        merklePriceUpdate: {
+            message: Buffer;
+            proof: number[][];
+        };
+    }, feedId: string, guardianSet: PublicKey): Promise<TransactionInstruction>;
+    updatePythPullOracle(vaaString: string, feedId: string): Promise<TransactionSignature>;
+    getUpdatePythPullOracleIxs(params: {
+        merklePriceUpdate: {
+            message: Buffer;
+            proof: number[][];
+        };
+    }, feedId: string, encodedVaaAddress: PublicKey): Promise<TransactionInstruction>;
+    getBuildEncodedVaaIxs(vaa: Buffer, guardianSet: PublicKey): Promise<[TransactionInstruction[], Keypair]>;
     private handleSignedTransaction;
     private handlePreSignedTransaction;
     private isVersionedTransaction;

package/lib/driftClient.js

@@ -58,6 +58,12 @@ const utils_1 = require("./math/utils");
 const txParamProcessor_1 = require("./tx/txParamProcessor");
 const oracles_1 = require("./math/oracles");
 const txHandler_1 = require("./tx/txHandler");
+const pyth_solana_receiver_1 = require("@pythnetwork/pyth-solana-receiver");
+const price_service_sdk_1 = require("@pythnetwork/price-service-sdk");
+const address_1 = require("@pythnetwork/pyth-solana-receiver/lib/address");
+const config_2 = require("./config");
+const pythPullOracleUtils_1 = require("./util/pythPullOracleUtils");
+const utils_2 = require("./tx/utils");
 /**
  * # DriftClient
  * This class is the main way to interact with Drift Protocol. It allows you to subscribe to the various accounts where the Market's state is stored, as well as: opening positions, liquidating, settling funding, depositing & withdrawing, and more.
@@ -106,6 +112,7 @@ class DriftClient {
                     onSignedCb: this.handleSignedTransaction.bind(this),
                     preSignedCb: this.handlePreSignedTransaction.bind(this),
                 },
+                config: config.txHandlerConfig,
             });
         if (config.includeDelegates && config.subAccountIds) {
             throw new Error('Can only pass one of includeDelegates or subAccountIds. If you want to specify subaccount ids for multiple authorities, pass authoritySubaccountMap instead');
@@ -1061,17 +1068,7 @@ class DriftClient {
             data: Buffer.from([0x1]),
         });
     }
-    /**
-     * 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
-     */
-    async deposit(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly = false, txParams) {
-        const additionalSigners = [];
+    async createDepositTxn(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly = false, txParams) {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         const signerAuthority = this.wallet.publicKey;
@@ -1090,7 +1087,20 @@ class DriftClient {
         }
         txParams = { ...(txParams !== null && txParams !== void 0 ? txParams : this.txParams), computeUnits: 600000 };
         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
+     */
+    async deposit(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly = false, txParams) {
+        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;
     }
@@ -1165,23 +1175,9 @@ class DriftClient {
     getAssociatedTokenAccountCreationIx(tokenMintAddress, associatedTokenAddress) {
         return (0, spl_token_1.createAssociatedTokenAccountInstruction)(this.wallet.publicKey, associatedTokenAddress, this.wallet.publicKey, tokenMintAddress);
     }
-    /**
-     * 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
-     */
-    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, donateAmount, txParams, customMaxMarginRatio) {
+    async createInitializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, donateAmount, txParams, customMaxMarginRatio) {
         const ixs = [];
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
-        const additionalSigners = [];
         const spotMarket = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarket.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         const authority = this.wallet.publicKey;
@@ -1226,6 +1222,24 @@ class DriftClient {
             ixs.push((0, spl_token_1.createCloseAccountInstruction)(wsolTokenAccount, authority, authority, []));
         }
         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
+     */
+    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, donateAmount, txParams, customMaxMarginRatio) {
+        const [tx, userAccountPublicKey] = await this.createInitializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex, subAccountId, name, fromSubAccountId, referrerInfo, donateAmount, txParams, customMaxMarginRatio);
+        const additionalSigners = [];
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);
         await this.addUser(subAccountId);
@@ -2267,6 +2281,9 @@ class DriftClient {
     async getJupiterSwapIxV6({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, quote, reduceOnly, userAccountPublicKey, }) {
         const outMarket = this.getSpotMarketAccount(outMarketIndex);
         const inMarket = this.getSpotMarketAccount(inMarketIndex);
+        const isExactOut = swapMode === 'ExactOut' || quote.swapMode === 'ExactOut';
+        const amountIn = new anchor_1.BN(quote.inAmount);
+        const exactOutBufferedAmountIn = amountIn.muln(1001).divn(1000); // Add 10bp buffer
         if (!quote) {
             const fetchedQuote = await jupiterClient.getQuote({
                 inputMint: inMarket.mint,
@@ -2312,7 +2329,7 @@ class DriftClient {
         const { beginSwapIx, endSwapIx } = await this.getSwapIx({
             outMarketIndex,
             inMarketIndex,
-            amountIn: new anchor_1.BN(quote.inAmount),
+            amountIn: isExactOut ? exactOutBufferedAmountIn : amountIn,
             inTokenAccount: inAssociatedTokenAccount,
             outTokenAccount: outAssociatedTokenAccount,
             reduceOnly,
@@ -3622,6 +3639,117 @@ class DriftClient {
         }
         return undefined;
     }
+    getReceiverProgram() {
+        if (this.receiverProgram === undefined) {
+            this.receiverProgram = new anchor_1.Program(pyth_solana_receiver_1.pythSolanaReceiverIdl, pyth_solana_receiver_1.DEFAULT_RECEIVER_PROGRAM_ID, this.provider);
+        }
+        return this.receiverProgram;
+    }
+    async postPythPullOracleUpdateAtomic(vaaString, feedId) {
+        const postIxs = await this.getPostPythPullOracleUpdateAtomicIxs(vaaString, feedId);
+        const tx = await this.buildTransaction(postIxs);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getPostPythPullOracleUpdateAtomicIxs(vaaString, feedId, numSignatures = 2) {
+        feedId = (0, pythPullOracleUtils_1.trimFeedId)(feedId);
+        const accumulatorUpdateData = (0, price_service_sdk_1.parseAccumulatorUpdateData)(Buffer.from(vaaString, 'base64'));
+        const guardianSetIndex = accumulatorUpdateData.vaa.readUInt32BE(1);
+        const guardianSet = (0, address_1.getGuardianSetPda)(guardianSetIndex, address_1.DEFAULT_WORMHOLE_PROGRAM_ID);
+        const trimmedVaa = (0, oracles_1.trimVaaSignatures)(accumulatorUpdateData.vaa, numSignatures);
+        const postIxs = [];
+        for (const update of accumulatorUpdateData.updates) {
+            postIxs.push(await this.getSinglePostPythPullOracleAtomicIx({
+                vaa: trimmedVaa,
+                merklePriceUpdate: update,
+            }, feedId, guardianSet));
+        }
+        return postIxs;
+    }
+    async getSinglePostPythPullOracleAtomicIx(params, feedId, guardianSet) {
+        const feedIdBuffer = (0, pythPullOracleUtils_1.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: config_2.DRIFT_ORACLE_RECEIVER_ID,
+                guardianSet,
+                priceFeed: (0, pda_1.getPythPullOraclePublicKey)(this.program.programId, feedIdBuffer),
+            },
+        });
+    }
+    async updatePythPullOracle(vaaString, feedId) {
+        feedId = (0, pythPullOracleUtils_1.trimFeedId)(feedId);
+        const accumulatorUpdateData = (0, price_service_sdk_1.parseAccumulatorUpdateData)(Buffer.from(vaaString, 'base64'));
+        const guardianSetIndex = accumulatorUpdateData.vaa.readUInt32BE(1);
+        const guardianSet = (0, address_1.getGuardianSetPda)(guardianSetIndex, address_1.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;
+    }
+    async getUpdatePythPullOracleIxs(params, feedId, encodedVaaAddress) {
+        const feedIdBuffer = (0, pythPullOracleUtils_1.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: config_2.DRIFT_ORACLE_RECEIVER_ID,
+                encodedVaa: encodedVaaAddress,
+                priceFeed: (0, pda_1.getPythPullOraclePublicKey)(this.program.programId, feedIdBuffer),
+            },
+        });
+    }
+    async getBuildEncodedVaaIxs(vaa, guardianSet) {
+        const postIxs = [];
+        if (this.wormholeProgram === undefined) {
+            this.wormholeProgram = new anchor_1.Program(pyth_solana_receiver_1.wormholeCoreBridgeIdl, address_1.DEFAULT_WORMHOLE_PROGRAM_ID, this.provider);
+        }
+        const encodedVaaKeypair = new web3_js_1.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];
+    }
     handleSignedTransaction(signedTxs) {
         if (this.enableMetricsEvents && this.metricsEventEmitter) {
             this.metricsEventEmitter.emit('txSigned', signedTxs);
@@ -3633,9 +3761,7 @@ class DriftClient {
         }
     }
     isVersionedTransaction(tx) {
-        const version = tx === null || tx === void 0 ? void 0 : tx.version;
-        const isVersionedTx = tx instanceof web3_js_1.VersionedTransaction || version !== undefined;
-        return isVersionedTx;
+        return (0, utils_2.isVersionedTransaction)(tx);
     }
     sendTransaction(tx, additionalSigners, opts, preSigned) {
         const isVersionedTx = this.isVersionedTransaction(tx);

package/lib/driftClientConfig.d.ts

@@ -4,7 +4,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;
     wallet: IWallet;
@@ -28,6 +28,7 @@ export type DriftClientConfig = {
     txVersion?: TransactionVersion;
     txParams?: TxParams;
     enableMetricsEvents?: boolean;
+    txHandlerConfig?: TxHandlerConfig;
 };
 export type DriftClientSubscriptionConfig = {
     type: 'websocket';