@drift-labs/sdk 2.87.0-beta.2 → 2.87.0-beta.4

package/VERSION

@@ -1 +1 @@
-2.87.0-beta.2
+2.87.0-beta.4

package/lib/adminClient.js

@@ -484,9 +484,7 @@ class AdminClient extends driftClient_1.DriftClient {
             netUnsettledFundingPnl: netUnsettledFundingPnl !== null && netUnsettledFundingPnl !== void 0 ? netUnsettledFundingPnl : null,
         }, {
             accounts: {
-                admin: this.isSubscribed
-                    ? this.getStateAccount().admin
-                    : this.wallet.publicKey,
+                admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, numericConstants_1.QUOTE_SPOT_MARKET_INDEX),

package/lib/driftClient.d.ts

@@ -2,6 +2,7 @@
 /// <reference types="bn.js" />
 /// <reference types="node" />
 import { AnchorProvider, BN, Program, ProgramAccount } from '@coral-xyz/anchor';
+import { Idl as Idl30, Program as Program30 } from '@coral-xyz/anchor-30';
 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, OpenbookV2FulfillmentConfigAccount } 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';
@@ -65,6 +66,8 @@ export declare class DriftClient {
     txHandler: TxHandler;
     receiverProgram?: Program<PythSolanaReceiver>;
     wormholeProgram?: Program<WormholeCoreBridgeSolana>;
+    sbOnDemandProgram?: Program30<Idl30>;
+    sbProgramFeedConfigs?: Map<string, any>;
     get isSubscribed(): boolean;
     set isSubscribed(val: boolean);
     constructor(config: DriftClientConfig);
@@ -714,6 +717,7 @@ export declare class DriftClient {
         marketType: MarketType;
     } | undefined;
     getReceiverProgram(): Program<PythSolanaReceiver>;
+    getSwitchboardOnDemandProgram(): Program30<Idl30>;
     postPythPullOracleUpdateAtomic(vaaString: string, feedId: string): Promise<TransactionSignature>;
     postMultiPythPullOracleUpdatesAtomic(vaaString: string, feedIds: string[]): Promise<TransactionSignature>;
     getPostPythPullOracleUpdateAtomicIxs(vaaString: string, feedIds: string | string[], numSignatures?: number): Promise<TransactionInstruction[]>;
@@ -725,6 +729,8 @@ export declare class DriftClient {
             proof: number[][];
         };
     }, feedId: string, encodedVaaAddress: PublicKey): Promise<TransactionInstruction>;
+    getPostSwitchboardOnDemandUpdateAtomicIx(feed: PublicKey, numSignatures?: number): Promise<TransactionInstruction | undefined>;
+    postSwitchboardOnDemandUpdate(feed: PublicKey, numSignatures?: number): Promise<TransactionSignature>;
     private getBuildEncodedVaaIxs;
     private handleSignedTransaction;
     private handlePreSignedTransaction;

package/lib/driftClient.js

@@ -28,6 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DriftClient = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
+const anchor_30_1 = require("@coral-xyz/anchor-30");
 const bs58_1 = __importDefault(require("bs58"));
 const spl_token_1 = require("@solana/spl-token");
 const types_1 = require("./types");
@@ -65,6 +66,8 @@ 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"));
+const on_demand_1 = require("@switchboard-xyz/on-demand");
+const switchboard_on_demand_30_json_1 = __importDefault(require("./idl/switchboard_on_demand_30.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.
@@ -3751,6 +3754,12 @@ class DriftClient {
         }
         return this.receiverProgram;
     }
+    getSwitchboardOnDemandProgram() {
+        if (this.sbOnDemandProgram === undefined) {
+            this.sbOnDemandProgram = new anchor_30_1.Program(switchboard_on_demand_30_json_1.default, this.provider);
+        }
+        return this.sbOnDemandProgram;
+    }
     async postPythPullOracleUpdateAtomic(vaaString, feedId) {
         const postIxs = await this.getPostPythPullOracleUpdateAtomicIxs(vaaString, feedId);
         const tx = await this.buildTransaction(postIxs);
@@ -3845,6 +3854,36 @@ class DriftClient {
             },
         });
     }
+    async getPostSwitchboardOnDemandUpdateAtomicIx(feed, numSignatures = 3) {
+        const program = this.getSwitchboardOnDemandProgram();
+        const feedAccount = new on_demand_1.PullFeed(program, feed);
+        if (!this.sbProgramFeedConfigs) {
+            this.sbProgramFeedConfigs = new Map();
+        }
+        if (!this.sbProgramFeedConfigs.has(feedAccount.pubkey.toString())) {
+            const feedConfig = await feedAccount.loadConfigs();
+            this.sbProgramFeedConfigs.set(feed.toString(), feedConfig);
+        }
+        const [pullIx, _responses, success] = await feedAccount.fetchUpdateIx({
+            numSignatures,
+            feedConfigs: this.sbProgramFeedConfigs.get(feed.toString()),
+        });
+        if (!success) {
+            return undefined;
+        }
+        return pullIx;
+    }
+    async postSwitchboardOnDemandUpdate(feed, numSignatures = 3) {
+        const pullIx = await this.getPostSwitchboardOnDemandUpdateAtomicIx(feed, numSignatures);
+        if (!pullIx) {
+            return undefined;
+        }
+        const tx = await this.buildTransaction(pullIx, undefined, 0, [
+            await this.fetchMarketLookupTableAccount(),
+        ]);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
     async getBuildEncodedVaaIxs(vaa, guardianSet) {
         const postIxs = [];
         if (this.wormholeProgram === undefined) {

package/lib/factory/oracleClient.js

@@ -9,6 +9,7 @@ const anchor_1 = require("@coral-xyz/anchor");
 const prelaunchOracleClient_1 = require("../oracles/prelaunchOracleClient");
 const switchboardClient_1 = require("../oracles/switchboardClient");
 const pythPullClient_1 = require("../oracles/pythPullClient");
+const switchboardOnDemandClient_1 = require("../oracles/switchboardOnDemandClient");
 function getOracleClient(oracleSource, connection, program) {
     if ((0, types_1.isVariant)(oracleSource, 'pyth')) {
         return new pythClient_1.PythClient(connection);
@@ -43,6 +44,9 @@ function getOracleClient(oracleSource, connection, program) {
     if ((0, types_1.isVariant)(oracleSource, 'quoteAsset')) {
         return new quoteAssetOracleClient_1.QuoteAssetOracleClient();
     }
+    if ((0, types_1.isVariant)(oracleSource, 'switchboardOnDemand')) {
+        return new switchboardOnDemandClient_1.SwitchboardOnDemandClient(connection);
+    }
     throw new Error(`Unknown oracle source ${oracleSource}`);
 }
 exports.getOracleClient = getOracleClient;

package/lib/idl/drift.json

@@ -9945,6 +9945,9 @@
                     },
                     {
                         "name": "PythStableCoinPull"
+                    },
+                    {
+                        "name": "SwitchboardOnDemand"
                     }
                 ]
             }