@drift-labs/sdk 2.85.0-beta.11 → 2.85.0-beta.12

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);
@@ -705,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,11 @@ 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
@@ -3634,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);

package/lib/idl/drift.json

@@ -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/lib/math/oracles.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="bn.js" />
+/// <reference types="node" />
 import { AMM, OracleGuardRails } from '../types';
 import { OraclePriceData } from '../oracles/types';
 import { BN, HistoricalOracleData, PerpMarketAccount } from '../index';
@@ -9,3 +10,4 @@ export declare function isOracleTooDivergent(amm: AMM, oraclePriceData: OraclePr
 export declare function calculateLiveOracleTwap(histOracleData: HistoricalOracleData, oraclePriceData: OraclePriceData, now: BN, period: BN): BN;
 export declare function calculateLiveOracleStd(amm: AMM, oraclePriceData: OraclePriceData, now: BN): BN;
 export declare function getNewOracleConfPct(amm: AMM, oraclePriceData: OraclePriceData, reservePrice: BN, now: BN): BN;
+export declare function trimVaaSignatures(vaa: Buffer, n?: number): Buffer;

package/lib/math/oracles.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNewOracleConfPct = exports.calculateLiveOracleStd = exports.calculateLiveOracleTwap = exports.isOracleTooDivergent = exports.isOracleValid = exports.getMaxConfidenceIntervalMultiplier = exports.oraclePriceBands = void 0;
+exports.trimVaaSignatures = exports.getNewOracleConfPct = exports.calculateLiveOracleStd = exports.calculateLiveOracleTwap = exports.isOracleTooDivergent = exports.isOracleValid = exports.getMaxConfidenceIntervalMultiplier = exports.oraclePriceBands = void 0;
 const types_1 = require("../types");
 const numericConstants_1 = require("../constants/numericConstants");
 const index_1 = require("../index");
@@ -119,3 +119,16 @@ function getNewOracleConfPct(amm, oraclePriceData, reservePrice, now) {
     return confIntervalPctResult;
 }
 exports.getNewOracleConfPct = getNewOracleConfPct;
+function trimVaaSignatures(vaa, n = 3) {
+    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;
+}
+exports.trimVaaSignatures = trimVaaSignatures;

package/lib/oracles/pythPullClient.js

@@ -16,7 +16,7 @@ class PythPullClient {
         new __1.Wallet(new web3_js_1.Keypair()), {
             commitment: connection.commitment,
         });
-        this.receiver = new anchor_1.Program(pyth_solana_receiver_1.pythSolanaReceiverIdl, pyth_solana_receiver_1.DEFAULT_RECEIVER_PROGRAM_ID, provider);
+        this.receiver = new anchor_1.Program(pyth_solana_receiver_1.pythSolanaReceiverIdl, __1.DRIFT_ORACLE_RECEIVER_ID, provider);
         this.decodeFunc =
             this.receiver.account.priceUpdateV2.coder.accounts.decodeUnchecked.bind(this.receiver.account.priceUpdateV2.coder.accounts);
     }

package/lib/tx/baseTxSender.js

@@ -238,6 +238,7 @@ class BaseTxSender {
         const logs = transactionResult.meta.logMessages;
         const lastLog = logs[logs.length - 1];
         const friendlyMessage = (_b = lastLog === null || lastLog === void 0 ? void 0 : lastLog.match(/(failed:) (.+)/)) === null || _b === void 0 ? void 0 : _b[2];
+        // @ts-ignore
         throw new web3_js_1.SendTransactionError({
             action: 'send',
             signature: txSig,

package/lib/util/pythPullOracleUtils.d.ts

@@ -0,0 +1,2 @@
+export declare function trimFeedId(feedId: string): string;
+export declare function getFeedIdUint8Array(feedId: string): Uint8Array;

package/lib/util/pythPullOracleUtils.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFeedIdUint8Array = exports.trimFeedId = void 0;
+function trimFeedId(feedId) {
+    if (feedId.startsWith('0x')) {
+        return feedId.slice(2);
+    }
+    return feedId;
+}
+exports.trimFeedId = trimFeedId;
+function getFeedIdUint8Array(feedId) {
+    const trimmedFeedId = trimFeedId(feedId);
+    return Uint8Array.from(Buffer.from(trimmedFeedId, 'hex'));
+}
+exports.getFeedIdUint8Array = getFeedIdUint8Array;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.85.0-beta.11",
+	"version": "2.85.0-beta.12",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -38,6 +38,7 @@
 		"@ellipsis-labs/phoenix-sdk": "^1.4.2",
 		"@project-serum/serum": "^0.13.38",
 		"@pythnetwork/client": "2.5.3",
+		"@pythnetwork/price-service-sdk": "^1.7.1",
 		"@pythnetwork/pyth-solana-receiver": "^0.7.0",
 		"@solana/spl-token": "0.3.7",
 		"@solana/web3.js": "1.92.3",

package/src/addresses/pda.ts

@@ -236,3 +236,16 @@ export function getPrelaunchOraclePublicKey(
 		programId
 	)[0];
 }
+
+export function getPythPullOraclePublicKey(
+	progarmId: PublicKey,
+	feedId: Uint8Array
+): PublicKey {
+	return PublicKey.findProgramAddressSync(
+		[
+			Buffer.from(anchor.utils.bytes.utf8.encode('pyth_pull')),
+			Buffer.from(feedId),
+		],
+		progarmId
+	)[0];
+}