@drift-labs/sdk 2.86.0-beta.22 → 2.86.0-beta.24

package/VERSION

@@ -1 +1 @@
-2.86.0-beta.22
+2.86.0-beta.24

package/lib/driftClient.d.ts

@@ -4,7 +4,7 @@
 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, Keypair, Signer, AddressLookupTableAccount, TransactionVersion, VersionedTransaction, BlockhashWithExpiryBlockHeight } from '@solana/web3.js';
+import { Connection, PublicKey, TransactionSignature, ConfirmOptions, Transaction, TransactionInstruction, AccountMeta, Signer, AddressLookupTableAccount, TransactionVersion, VersionedTransaction, BlockhashWithExpiryBlockHeight } from '@solana/web3.js';
 import { TokenFaucet } from './tokenFaucet';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
@@ -712,14 +712,9 @@ export declare class DriftClient {
     } | 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>;
+    postMultiPythPullOracleUpdatesAtomic(vaaString: string, feedIds: string[]): Promise<TransactionSignature>;
+    getPostPythPullOracleUpdateAtomicIxs(vaaString: string, feedIds: string | string[], numSignatures?: number): Promise<TransactionInstruction[]>;
+    private getSinglePostPythPullOracleAtomicIx;
     updatePythPullOracle(vaaString: string, feedId: string): Promise<TransactionSignature>;
     getUpdatePythPullOracleIxs(params: {
         merklePriceUpdate: {
@@ -727,7 +722,7 @@ export declare class DriftClient {
             proof: number[][];
         };
     }, feedId: string, encodedVaaAddress: PublicKey): Promise<TransactionInstruction>;
-    getBuildEncodedVaaIxs(vaa: Buffer, guardianSet: PublicKey): Promise<[TransactionInstruction[], Keypair]>;
+    private getBuildEncodedVaaIxs;
     private handleSignedTransaction;
     private handlePreSignedTransaction;
     private isVersionedTransaction;

package/lib/driftClient.js

@@ -64,6 +64,7 @@ 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");
+const pyth_solana_receiver_json_1 = __importDefault(require("./idl/pyth_solana_receiver.json"));
 /**
  * # 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.
@@ -3641,7 +3642,7 @@ class DriftClient {
     }
     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);
+            this.receiverProgram = new anchor_1.Program(pyth_solana_receiver_json_1.default, pyth_solana_receiver_1.DEFAULT_RECEIVER_PROGRAM_ID, this.provider);
         }
         return this.receiverProgram;
     }
@@ -3651,18 +3652,50 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getPostPythPullOracleUpdateAtomicIxs(vaaString, feedId, numSignatures = 2) {
-        feedId = (0, pythPullOracleUtils_1.trimFeedId)(feedId);
+    async postMultiPythPullOracleUpdatesAtomic(vaaString, feedIds) {
+        const postIxs = await this.getPostPythPullOracleUpdateAtomicIxs(vaaString, feedIds);
+        const tx = await this.buildTransaction(postIxs);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getPostPythPullOracleUpdateAtomicIxs(vaaString, feedIds, numSignatures = 2) {
         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) {
+        if (accumulatorUpdateData.updates.length > 1) {
+            const encodedParams = this.getReceiverProgram().coder.types.encode('PostMultiUpdatesAtomicParams', {
+                vaa: trimmedVaa,
+                merklePriceUpdates: accumulatorUpdateData.updates,
+            });
+            const feedIdsToUse = typeof feedIds === 'string' ? [feedIds] : feedIds;
+            const pubkeys = feedIdsToUse.map((feedId) => {
+                return (0, pda_1.getPythPullOraclePublicKey)(this.program.programId, (0, pythPullOracleUtils_1.getFeedIdUint8Array)(feedId));
+            });
+            const remainingAccounts = pubkeys.map((pubkey) => {
+                return {
+                    pubkey,
+                    isSigner: false,
+                    isWritable: true,
+                };
+            });
+            postIxs.push(this.program.instruction.postMultiPythPullOracleUpdatesAtomic(encodedParams, {
+                accounts: {
+                    keeper: this.wallet.publicKey,
+                    pythSolanaReceiver: config_2.DRIFT_ORACLE_RECEIVER_ID,
+                    guardianSet,
+                },
+                remainingAccounts,
+            }));
+        }
+        else {
+            let feedIdToUse = typeof feedIds === 'string' ? feedIds : feedIds[0];
+            feedIdToUse = (0, pythPullOracleUtils_1.trimFeedId)(feedIdToUse);
             postIxs.push(await this.getSinglePostPythPullOracleAtomicIx({
                 vaa: trimmedVaa,
-                merklePriceUpdate: update,
-            }, feedId, guardianSet));
+                merklePriceUpdate: accumulatorUpdateData.updates[0],
+            }, feedIdToUse, guardianSet));
         }
         return postIxs;
     }

package/lib/idl/drift.json

@@ -2663,6 +2663,32 @@
                 }
             ]
         },
+        {
+            "name": "postMultiPythPullOracleUpdatesAtomic",
+            "accounts": [
+                {
+                    "name": "keeper",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "pythSolanaReceiver",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "guardianSet",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "params",
+                    "type": "bytes"
+                }
+            ]
+        },
         {
             "name": "initialize",
             "accounts": [
@@ -12512,6 +12538,21 @@
             "code": 6275,
             "name": "OracleWrongVaaOwner",
             "msg": "Oracle vaa owner must be wormhole program"
+        },
+        {
+            "code": 6276,
+            "name": "OracleTooManyPriceAccountUpdates",
+            "msg": "Multi updates must have 2 or fewer accounts passed in remaining accounts"
+        },
+        {
+            "code": 6277,
+            "name": "OracleMismatchedVaaAndPriceUpdates",
+            "msg": "Don't have the same remaining accounts number and merkle price updates left"
+        },
+        {
+            "code": 6278,
+            "name": "OracleBadRemainingAccountPublicKey",
+            "msg": "Remaining account passed is not a valid pda"
         }
     ],
     "metadata": {