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

package/VERSION

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

package/lib/addresses/pda.d.ts

@@ -17,6 +17,7 @@ export declare function getSerumOpenOrdersPublicKey(programId: PublicKey, market
 export declare function getSerumSignerPublicKey(programId: PublicKey, market: PublicKey, nonce: BN): PublicKey;
 export declare function getSerumFulfillmentConfigPublicKey(programId: PublicKey, market: PublicKey): PublicKey;
 export declare function getPhoenixFulfillmentConfigPublicKey(programId: PublicKey, market: PublicKey): PublicKey;
+export declare function getOpenbookV2FulfillmentConfigPublicKey(programId: PublicKey, market: PublicKey): PublicKey;
 export declare function getReferrerNamePublicKeySync(programId: PublicKey, nameBuffer: number[]): PublicKey;
 export declare function getProtocolIfSharesTransferConfigPublicKey(programId: PublicKey): PublicKey;
 export declare function getPrelaunchOraclePublicKey(programId: PublicKey, marketIndex: number): PublicKey;

package/lib/addresses/pda.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPythPullOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
+exports.getPythPullOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getOpenbookV2FulfillmentConfigPublicKey = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const anchor = __importStar(require("@coral-xyz/anchor"));
 async function getDriftStateAccountPublicKeyAndNonce(programId) {
@@ -126,6 +126,13 @@ function getPhoenixFulfillmentConfigPublicKey(programId, market) {
     ], programId)[0];
 }
 exports.getPhoenixFulfillmentConfigPublicKey = getPhoenixFulfillmentConfigPublicKey;
+function getOpenbookV2FulfillmentConfigPublicKey(programId, market) {
+    return web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('openbook_v2_fulfillment_config')),
+        market.toBuffer(),
+    ], programId)[0];
+}
+exports.getOpenbookV2FulfillmentConfigPublicKey = getOpenbookV2FulfillmentConfigPublicKey;
 function getReferrerNamePublicKeySync(programId, nameBuffer) {
     return web3_js_1.PublicKey.findProgramAddressSync([
         Buffer.from(anchor.utils.bytes.utf8.encode('referrer_name')),

package/lib/adminClient.d.ts

@@ -17,6 +17,8 @@ export declare class AdminClient extends DriftClient {
     getInitializeSerumFulfillmentConfigIx(marketIndex: number, serumMarket: PublicKey, serumProgram: PublicKey): Promise<TransactionInstruction>;
     initializePhoenixFulfillmentConfig(marketIndex: number, phoenixMarket: PublicKey): Promise<TransactionSignature>;
     getInitializePhoenixFulfillmentConfigIx(marketIndex: number, phoenixMarket: PublicKey): Promise<TransactionInstruction>;
+    initializeOpenbookV2FulfillmentConfig(marketIndex: number, openbookMarket: PublicKey): Promise<TransactionSignature>;
+    getInitializeOpenbookV2FulfillmentConfigIx(marketIndex: number, openbookMarket: PublicKey): Promise<TransactionInstruction>;
     initializePerpMarket(marketIndex: number, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, contractTier?: ContractTier, marginRatioInitial?: number, marginRatioMaintenance?: number, liquidatorFee?: number, ifLiquidatorFee?: number, imfFactor?: number, activeStatus?: boolean, baseSpread?: number, maxSpread?: number, maxOpenInterest?: BN, maxRevenueWithdrawPerPeriod?: BN, quoteMaxInsurance?: BN, orderStepSize?: BN, orderTickSize?: BN, minOrderSize?: BN, concentrationCoefScale?: BN, curveUpdateIntensity?: number, ammJitIntensity?: number, name?: string): Promise<TransactionSignature>;
     getInitializePerpMarketIx(marketIndex: number, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, contractTier?: ContractTier, marginRatioInitial?: number, marginRatioMaintenance?: number, liquidatorFee?: number, ifLiquidatorFee?: number, imfFactor?: number, activeStatus?: boolean, baseSpread?: number, maxSpread?: number, maxOpenInterest?: BN, maxRevenueWithdrawPerPeriod?: BN, quoteMaxInsurance?: BN, orderStepSize?: BN, orderTickSize?: BN, minOrderSize?: BN, concentrationCoefScale?: BN, curveUpdateIntensity?: number, ammJitIntensity?: number, name?: string): Promise<TransactionInstruction>;
     deleteInitializedPerpMarket(marketIndex: number): Promise<TransactionSignature>;

package/lib/adminClient.js

@@ -39,6 +39,7 @@ const amm_1 = require("./math/amm");
 const phoenix_sdk_1 = require("@ellipsis-labs/phoenix-sdk");
 const config_1 = require("./config");
 const pythPullOracleUtils_1 = require("./util/pythPullOracleUtils");
+const OPENBOOK_PROGRAM_ID = new web3_js_1.PublicKey('opnb2LAfJYbRMAHHvqjCwQxanZn7ReEHp1k81EohpZb');
 class AdminClient extends driftClient_1.DriftClient {
     async initialize(usdcMint, _adminControlsPrices) {
         const stateAccountRPCResponse = await this.connection.getParsedAccountInfo(await this.getStatePublicKey());
@@ -177,6 +178,31 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async initializeOpenbookV2FulfillmentConfig(marketIndex, openbookMarket) {
+        const initializeIx = await this.getInitializeOpenbookV2FulfillmentConfigIx(marketIndex, openbookMarket);
+        const tx = await this.buildTransaction(initializeIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getInitializeOpenbookV2FulfillmentConfigIx(marketIndex, openbookMarket) {
+        const openbookFulfillmentConfig = (0, pda_1.getOpenbookV2FulfillmentConfigPublicKey)(this.program.programId, openbookMarket);
+        return this.program.instruction.initializeOpenbookV2FulfillmentConfig(marketIndex, {
+            accounts: {
+                baseSpotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
+                quoteSpotMarket: this.getQuoteSpotMarketAccount().pubkey,
+                state: await this.getStatePublicKey(),
+                openbookV2Program: OPENBOOK_PROGRAM_ID,
+                openbookV2Market: openbookMarket,
+                driftSigner: this.getSignerPublicKey(),
+                openbookV2FulfillmentConfig: openbookFulfillmentConfig,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                systemProgram: anchor.web3.SystemProgram.programId,
+            },
+        });
+    }
     async initializePerpMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, contractTier = types_1.ContractTier.SPECULATIVE, marginRatioInitial = 2000, marginRatioMaintenance = 500, liquidatorFee = 0, ifLiquidatorFee = 10000, imfFactor = 0, activeStatus = true, baseSpread = 0, maxSpread = 142500, maxOpenInterest = numericConstants_1.ZERO, maxRevenueWithdrawPerPeriod = numericConstants_1.ZERO, quoteMaxInsurance = numericConstants_1.ZERO, orderStepSize = numericConstants_1.BASE_PRECISION.divn(10000), orderTickSize = numericConstants_1.PRICE_PRECISION.divn(100000), minOrderSize = numericConstants_1.BASE_PRECISION.divn(10000), concentrationCoefScale = numericConstants_1.ONE, curveUpdateIntensity = 0, ammJitIntensity = 0, name = userName_1.DEFAULT_MARKET_NAME) {
         const currentPerpMarketIndex = this.getStateAccount().numberOfMarkets;
         const initializeMarketIx = await this.getInitializePerpMarketIx(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, contractTier, marginRatioInitial, marginRatioMaintenance, liquidatorFee, ifLiquidatorFee, imfFactor, activeStatus, baseSpread, maxSpread, maxOpenInterest, maxRevenueWithdrawPerPeriod, quoteMaxInsurance, orderStepSize, orderTickSize, minOrderSize, concentrationCoefScale, curveUpdateIntensity, ammJitIntensity, name);

package/lib/constants/perpMarkets.js

@@ -496,9 +496,9 @@ exports.MainnetPerpMarkets = [
         symbol: 'PYTH-PERP',
         baseAssetSymbol: 'PYTH',
         marketIndex: 18,
-        oracle: new web3_js_1.PublicKey('nrYkQQQur7z8rYTST3G9GqATviK5SxTDkrqd21MW6Ue'),
+        oracle: new web3_js_1.PublicKey('GqkCu7CbsPVz1H6W6AAHuReqbJckYG59TXz7Y5HDV7hr'),
         launchTs: 1700542800000,
-        oracleSource: __1.OracleSource.PYTH,
+        oracleSource: __1.OracleSource.PYTH_PULL,
         pythFeedId: '0x0bbf28e9a841a1cc788f6a361b17ca072d0ea3098a1e5df1c3922d06719579ff',
     },
     {
@@ -507,9 +507,9 @@ exports.MainnetPerpMarkets = [
         symbol: 'TIA-PERP',
         baseAssetSymbol: 'TIA',
         marketIndex: 19,
-        oracle: new web3_js_1.PublicKey('funeUsHgi2QKkLdUPASRLuYkaK8JaazCEz3HikbkhVt'),
+        oracle: new web3_js_1.PublicKey('C6LHPUrgjrgo5eNUitC8raNEdEttfoRhmqdJ3BHVBJhi'),
         launchTs: 1701880540000,
-        oracleSource: __1.OracleSource.PYTH,
+        oracleSource: __1.OracleSource.PYTH_PULL,
         pythFeedId: '0x09f7c1d7dfbb7df2b8fe3d3d87ee94a2259d212da4f30c1f0540d066dfa44723',
     },
     {
@@ -551,9 +551,9 @@ exports.MainnetPerpMarkets = [
         symbol: 'WIF-PERP',
         baseAssetSymbol: 'WIF',
         marketIndex: 23,
-        oracle: new web3_js_1.PublicKey('6ABgrEZk8urs6kJ1JNdC1sspH5zKXRqxy8sg3ZG2cQps'),
+        oracle: new web3_js_1.PublicKey('6x6KfE7nY2xoLCRSMPT1u83wQ5fpGXoKNBqFjrCwzsCQ'),
         launchTs: 1706219971000,
-        oracleSource: __1.OracleSource.PYTH,
+        oracleSource: __1.OracleSource.PYTH_PULL,
         pythFeedId: '0x4ca4beeca86f0d164160323817a4e42b10010a724c2217c6ee41b54cd4cc61fc',
     },
     {
@@ -562,9 +562,9 @@ exports.MainnetPerpMarkets = [
         symbol: 'JUP-PERP',
         baseAssetSymbol: 'JUP',
         marketIndex: 24,
-        oracle: new web3_js_1.PublicKey('g6eRCbboSwK4tSWngn773RCMexr1APQr4uA9bGZBYfo'),
+        oracle: new web3_js_1.PublicKey('AwqRpfJ36jnSZQykyL1jYY35mhMteeEAjh7o8LveRQin'),
         launchTs: 1706713201000,
-        oracleSource: __1.OracleSource.PYTH,
+        oracleSource: __1.OracleSource.PYTH_PULL,
         pythFeedId: '0x0a0408d619e9380abad35060f9192039ed5042fa6f82301d0e48bb52be830996',
     },
     {
@@ -628,9 +628,9 @@ exports.MainnetPerpMarkets = [
         symbol: 'DRIFT-PERP',
         baseAssetSymbol: 'DRIFT',
         marketIndex: 30,
-        oracle: new web3_js_1.PublicKey('PeNpQeGEm9UEFJ6MBCMauY4WW4h3YxoESPWbsqVKucE'),
+        oracle: new web3_js_1.PublicKey('23KmX7SNikmUr2axSCy6Zer7XPBnvmVcASALnDGqBVRR'),
         launchTs: 1716595200000,
-        oracleSource: __1.OracleSource.SWITCHBOARD,
+        oracleSource: __1.OracleSource.PYTH_PULL,
         pythFeedId: '0x5c1690b27bb02446db17cdda13ccc2c1d609ad6d2ef5bf4983a85ea8b6f19d07',
     },
     {
@@ -671,9 +671,9 @@ exports.MainnetPerpMarkets = [
         symbol: 'POPCAT-PERP',
         baseAssetSymbol: 'POPCAT',
         marketIndex: 34,
-        oracle: new web3_js_1.PublicKey('3GjpjC8TWsPqjyFSiR7saGxgzD8zqYJNsBnWpenZPEBy'),
+        oracle: new web3_js_1.PublicKey('H3pn43tkNvsG5z3qzmERguSvKoyHZvvY6VPmNrJqiW5X'),
         launchTs: 1720013054000,
-        oracleSource: __1.OracleSource.SWITCHBOARD,
+        oracleSource: __1.OracleSource.PYTH_PULL,
         pythFeedId: '0xb9312a7ee50e189ef045aa3c7842e099b061bd9bdc99ac645956c3b660dc8cce',
     },
     {

package/lib/constants/spotMarkets.js

@@ -123,8 +123,8 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'PYTH',
         marketIndex: 7,
-        oracle: new web3_js_1.PublicKey('nrYkQQQur7z8rYTST3G9GqATviK5SxTDkrqd21MW6Ue'),
-        oracleSource: __1.OracleSource.PYTH,
+        oracle: new web3_js_1.PublicKey('GqkCu7CbsPVz1H6W6AAHuReqbJckYG59TXz7Y5HDV7hr'),
+        oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('HZ1JovNiVvGrGNiiYvEozEVgZ58xaU3RKwX8eACQBCt3'),
         precision: new __1.BN(10).pow(numericConstants_1.SIX),
         precisionExp: numericConstants_1.SIX,
@@ -158,8 +158,8 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'WIF',
         marketIndex: 10,
-        oracle: new web3_js_1.PublicKey('6ABgrEZk8urs6kJ1JNdC1sspH5zKXRqxy8sg3ZG2cQps'),
-        oracleSource: __1.OracleSource.PYTH,
+        oracle: new web3_js_1.PublicKey('6x6KfE7nY2xoLCRSMPT1u83wQ5fpGXoKNBqFjrCwzsCQ'),
+        oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('EKpQGSJtjMFqKZ9KQanSqYXRcF8fBopzLHYxdM65zcjm'),
         precision: new __1.BN(10).pow(numericConstants_1.SIX),
         precisionExp: numericConstants_1.SIX,
@@ -170,8 +170,8 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'JUP',
         marketIndex: 11,
-        oracle: new web3_js_1.PublicKey('g6eRCbboSwK4tSWngn773RCMexr1APQr4uA9bGZBYfo'),
-        oracleSource: __1.OracleSource.PYTH,
+        oracle: new web3_js_1.PublicKey('AwqRpfJ36jnSZQykyL1jYY35mhMteeEAjh7o8LveRQin'),
+        oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN'),
         precision: new __1.BN(10).pow(numericConstants_1.SIX),
         precisionExp: numericConstants_1.SIX,
@@ -218,8 +218,8 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'DRIFT',
         marketIndex: 15,
-        oracle: new web3_js_1.PublicKey('PeNpQeGEm9UEFJ6MBCMauY4WW4h3YxoESPWbsqVKucE'),
-        oracleSource: __1.OracleSource.SWITCHBOARD,
+        oracle: new web3_js_1.PublicKey('23KmX7SNikmUr2axSCy6Zer7XPBnvmVcASALnDGqBVRR'),
+        oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('DriFtupJYLTosbwoN8koMbEYSx54aFAVLddWsbksjwg7'),
         precision: new __1.BN(10).pow(numericConstants_1.SIX),
         precisionExp: numericConstants_1.SIX,
@@ -272,13 +272,14 @@ exports.MainnetSpotMarkets = [
     {
         symbol: 'POPCAT',
         marketIndex: 20,
-        oracle: new web3_js_1.PublicKey('3GjpjC8TWsPqjyFSiR7saGxgzD8zqYJNsBnWpenZPEBy'),
-        oracleSource: __1.OracleSource.SWITCHBOARD,
+        oracle: new web3_js_1.PublicKey('H3pn43tkNvsG5z3qzmERguSvKoyHZvvY6VPmNrJqiW5X'),
+        oracleSource: __1.OracleSource.PYTH_PULL,
         mint: new web3_js_1.PublicKey('7GCihgDB8fe6KNjn2MYtkzZcRjQy3t9GHdC8uHYmW2hr'),
         precision: new __1.BN(10).pow(numericConstants_1.NINE),
         precisionExp: numericConstants_1.NINE,
         launchTs: 1720013054000,
         phoenixMarket: new web3_js_1.PublicKey('31XgvAQ1HgFQEk31KdszbPkVXKaQqB1bgYZPoDrFpSR2'),
+        pythFeedId: '0xb9312a7ee50e189ef045aa3c7842e099b061bd9bdc99ac645956c3b660dc8cce',
     },
 ];
 exports.SpotMarkets = {

package/lib/driftClient.d.ts

@@ -2,7 +2,7 @@
 /// <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 { 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';
 import { TokenFaucet } from './tokenFaucet';
@@ -107,6 +107,8 @@ export declare class DriftClient {
     getSerumV3FulfillmentConfigs(): Promise<SerumV3FulfillmentConfigAccount[]>;
     getPhoenixV1FulfillmentConfig(phoenixMarket: PublicKey): Promise<PhoenixV1FulfillmentConfigAccount>;
     getPhoenixV1FulfillmentConfigs(): Promise<PhoenixV1FulfillmentConfigAccount[]>;
+    getOpenbookV2FulfillmentConfig(openbookMarket: PublicKey): Promise<OpenbookV2FulfillmentConfigAccount>;
+    getOpenbookV2FulfillmentConfigs(): Promise<OpenbookV2FulfillmentConfigAccount[]>;
     fetchMarketLookupTableAccount(): Promise<AddressLookupTableAccount>;
     /**
      * Update the wallet to use for drift transactions and linked user account
@@ -357,11 +359,12 @@ export declare class DriftClient {
         placeSpotOrderTx: anchor.web3.Transaction | anchor.web3.VersionedTransaction;
     }>;
     getPlaceSpotOrderIx(orderParams: OptionalOrderParams, subAccountId?: number): Promise<TransactionInstruction>;
-    fillSpotOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount | PhoenixV1FulfillmentConfigAccount, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<TransactionSignature>;
-    getFillSpotOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount | PhoenixV1FulfillmentConfigAccount, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, fillerPublicKey?: PublicKey): Promise<TransactionInstruction>;
-    addSpotFulfillmentAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig?: SerumV3FulfillmentConfigAccount | PhoenixV1FulfillmentConfigAccount): void;
+    fillSpotOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount | PhoenixV1FulfillmentConfigAccount | OpenbookV2FulfillmentConfigAccount, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<TransactionSignature>;
+    getFillSpotOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order?: Order, fulfillmentConfig?: SerumV3FulfillmentConfigAccount | PhoenixV1FulfillmentConfigAccount | OpenbookV2FulfillmentConfigAccount, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, fillerPublicKey?: PublicKey): Promise<TransactionInstruction>;
+    addSpotFulfillmentAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig?: SerumV3FulfillmentConfigAccount | PhoenixV1FulfillmentConfigAccount | OpenbookV2FulfillmentConfigAccount): void;
     addSerumRemainingAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig: SerumV3FulfillmentConfigAccount): void;
     addPhoenixRemainingAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig: PhoenixV1FulfillmentConfigAccount): void;
+    addOpenbookRemainingAccounts(marketIndex: number, remainingAccounts: AccountMeta[], fulfillmentConfig: OpenbookV2FulfillmentConfigAccount): void;
     /**
      * Swap tokens in drift account using jupiter
      * @param jupiterClient jupiter client to find routes and jupiter instructions

package/lib/driftClient.js

@@ -324,6 +324,14 @@ class DriftClient {
         const accounts = await this.program.account.phoenixV1FulfillmentConfig.all();
         return accounts.map((account) => account.account);
     }
+    async getOpenbookV2FulfillmentConfig(openbookMarket) {
+        const address = (0, pda_1.getOpenbookV2FulfillmentConfigPublicKey)(this.program.programId, openbookMarket);
+        return (await this.program.account.openbookV2FulfillmentConfig.fetch(address));
+    }
+    async getOpenbookV2FulfillmentConfigs() {
+        const accounts = await this.program.account.openbookV2FulfillmentConfig.all();
+        return accounts.map((account) => account.account);
+    }
     async fetchMarketLookupTableAccount() {
         if (this.lookupTableAccount)
             return this.lookupTableAccount;
@@ -2010,6 +2018,9 @@ class DriftClient {
             else if ('phoenixProgramId' in fulfillmentConfig) {
                 this.addPhoenixRemainingAccounts(marketIndex, remainingAccounts, fulfillmentConfig);
             }
+            else if ('openbookV2ProgramId' in fulfillmentConfig) {
+                this.addOpenbookRemainingAccounts(marketIndex, remainingAccounts, fulfillmentConfig);
+            }
             else {
                 throw Error('Invalid fulfillment config type');
             }
@@ -2161,6 +2172,97 @@ class DriftClient {
             isSigner: false,
         });
     }
+    addOpenbookRemainingAccounts(marketIndex, remainingAccounts, fulfillmentConfig) {
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.pubkey,
+            isWritable: false,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: this.getSignerPublicKey(),
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.openbookV2ProgramId,
+            isWritable: false,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.openbookV2Market,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.openbookV2MarketAuthority,
+            isWritable: false,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.openbookV2EventHeap,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.openbookV2Bids,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.openbookV2Asks,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.openbookV2BaseVault,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: fulfillmentConfig.openbookV2QuoteVault,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: this.getSpotMarketAccount(marketIndex).vault,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: this.getQuoteSpotMarketAccount().vault,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: spl_token_1.TOKEN_PROGRAM_ID,
+            isWritable: false,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: web3_js_1.SystemProgram.programId,
+            isWritable: false,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: this.getSpotMarketAccount(marketIndex).pubkey,
+            isWritable: true,
+            isSigner: false,
+        });
+        remainingAccounts.push({
+            pubkey: this.getQuoteSpotMarketAccount().pubkey,
+            isWritable: true,
+            isSigner: false,
+        });
+        if (fulfillmentConfig.remainingAccounts) {
+            for (const remainingAccount of fulfillmentConfig.remainingAccounts) {
+                remainingAccounts.push({
+                    pubkey: remainingAccount,
+                    isWritable: true,
+                    isSigner: false,
+                });
+            }
+        }
+    }
     /**
      * Swap tokens in drift account using jupiter
      * @param jupiterClient jupiter client to find routes and jupiter instructions

package/lib/idl/drift.json

@@ -3017,6 +3017,95 @@
                 }
             ]
         },
+        {
+            "name": "initializeOpenbookV2FulfillmentConfig",
+            "accounts": [
+                {
+                    "name": "baseSpotMarket",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "quoteSpotMarket",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "state",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "openbookV2Program",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "openbookV2Market",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "driftSigner",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "openbookV2FulfillmentConfig",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "admin",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "rent",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "systemProgram",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "marketIndex",
+                    "type": "u16"
+                }
+            ]
+        },
+        {
+            "name": "openbookV2FulfillmentConfigStatus",
+            "accounts": [
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "openbookV2FulfillmentConfig",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "admin",
+                    "isMut": true,
+                    "isSigner": true
+                }
+            ],
+            "args": [
+                {
+                    "name": "status",
+                    "type": {
+                        "defined": "SpotFulfillmentConfigStatus"
+                    }
+                }
+            ]
+        },
         {
             "name": "initializePhoenixFulfillmentConfig",
             "accounts": [
@@ -5631,6 +5720,75 @@
         }
     ],
     "accounts": [
+        {
+            "name": "OpenbookV2FulfillmentConfig",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "pubkey",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "openbookV2ProgramId",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "openbookV2Market",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "openbookV2MarketAuthority",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "openbookV2EventHeap",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "openbookV2Bids",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "openbookV2Asks",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "openbookV2BaseVault",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "openbookV2QuoteVault",
+                        "type": "publicKey"
+                    },
+                    {
+                        "name": "marketIndex",
+                        "type": "u16"
+                    },
+                    {
+                        "name": "fulfillmentType",
+                        "type": {
+                            "defined": "SpotFulfillmentType"
+                        }
+                    },
+                    {
+                        "name": "status",
+                        "type": {
+                            "defined": "SpotFulfillmentConfigStatus"
+                        }
+                    },
+                    {
+                        "name": "padding",
+                        "type": {
+                            "array": [
+                                "u8",
+                                4
+                            ]
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "PhoenixV1FulfillmentConfig",
             "type": {
@@ -9269,6 +9427,9 @@
                     },
                     {
                         "name": "PhoenixV1"
+                    },
+                    {
+                        "name": "OpenbookV2"
                     }
                 ]
             }
@@ -9540,6 +9701,9 @@
                     },
                     {
                         "name": "DeriskLp"
+                    },
+                    {
+                        "name": "OrderFilledWithOpenbookV2"
                     }
                 ]
             }
@@ -12553,6 +12717,21 @@
             "code": 6278,
             "name": "OracleBadRemainingAccountPublicKey",
             "msg": "Remaining account passed is not a valid pda"
+        },
+        {
+            "code": 6279,
+            "name": "FailedOpenbookV2CPI",
+            "msg": "FailedOpenbookV2CPI"
+        },
+        {
+            "code": 6280,
+            "name": "InvalidOpenbookV2Program",
+            "msg": "InvalidOpenbookV2Program"
+        },
+        {
+            "code": 6281,
+            "name": "InvalidOpenbookV2Market",
+            "msg": "InvalidOpenbookV2Market"
         }
     ],
     "metadata": {

package/lib/types.d.ts

@@ -1202,6 +1202,21 @@ export type PhoenixV1FulfillmentConfigAccount = {
     fulfillmentType: SpotFulfillmentType;
     status: SpotFulfillmentStatus;
 };
+export type OpenbookV2FulfillmentConfigAccount = {
+    pubkey: PublicKey;
+    openbookV2ProgramId: PublicKey;
+    openbookV2Market: PublicKey;
+    openbookV2MarketAuthority: PublicKey;
+    openbookV2EventHeap: PublicKey;
+    openbookV2Bids: PublicKey;
+    openbookV2Asks: PublicKey;
+    openbookV2BaseVault: PublicKey;
+    openbookV2QuoteVault: PublicKey;
+    marketIndex: number;
+    fulfillmentType: SpotFulfillmentType;
+    status: SpotFulfillmentStatus;
+    remainingAccounts?: PublicKey[];
+};
 export type ReferrerNameAccount = {
     name: number[];
     user: PublicKey;

package/lib/user.js

@@ -592,7 +592,7 @@ class User {
             // todo: get real time ifStakedGovTokenAmount using ifStakeAccount
             if (userStats.ifStakedGovTokenAmount.gt(numericConstants_1.ZERO)) {
                 const spotMarketAccount = this.driftClient.getSpotMarketAccount(numericConstants_1.GOV_SPOT_MARKET_INDEX);
-                const fuelBonusNumeratorUserStats = now.sub(_1.BN.max(new _1.BN(userStats.lastFuelIfBonusUpdateTs), numericConstants_1.FUEL_START_TS));
+                const fuelBonusNumeratorUserStats = _1.BN.max(now.sub(_1.BN.max(new _1.BN(userStats.lastFuelIfBonusUpdateTs), numericConstants_1.FUEL_START_TS)), numericConstants_1.ZERO);
                 result.insuranceFuel = result.insuranceFuel.add((0, fuel_1.calculateInsuranceFuelBonus)(spotMarketAccount, userStats.ifStakedGovTokenAmount, fuelBonusNumeratorUserStats));
             }
             if (userStats.ifStakedQuoteAssetAmount.gt(numericConstants_1.ZERO)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.86.0-beta.24",
+	"version": "2.86.0-beta.26",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/addresses/pda.ts

@@ -202,6 +202,21 @@ export function getPhoenixFulfillmentConfigPublicKey(
 	)[0];
 }
 
+export function getOpenbookV2FulfillmentConfigPublicKey(
+	programId: PublicKey,
+	market: PublicKey
+): PublicKey {
+	return PublicKey.findProgramAddressSync(
+		[
+			Buffer.from(
+				anchor.utils.bytes.utf8.encode('openbook_v2_fulfillment_config')
+			),
+			market.toBuffer(),
+		],
+		programId
+	)[0];
+}
+
 export function getReferrerNamePublicKeySync(
 	programId: PublicKey,
 	nameBuffer: number[]