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

package/src/adminClient.ts

@@ -29,6 +29,7 @@ import {
 	getPhoenixFulfillmentConfigPublicKey,
 	getProtocolIfSharesTransferConfigPublicKey,
 	getPrelaunchOraclePublicKey,
+	getOpenbookV2FulfillmentConfigPublicKey,
 	getPythPullOraclePublicKey,
 	getUserStatsAccountPublicKey,
 } from './addresses/pda';
@@ -49,6 +50,10 @@ import { PROGRAM_ID as PHOENIX_PROGRAM_ID } from '@ellipsis-labs/phoenix-sdk';
 import { DRIFT_ORACLE_RECEIVER_ID } from './config';
 import { getFeedIdUint8Array } from './util/pythPullOracleUtils';
 
+const OPENBOOK_PROGRAM_ID = new PublicKey(
+	'opnb2LAfJYbRMAHHvqjCwQxanZn7ReEHp1k81EohpZb'
+);
+
 export class AdminClient extends DriftClient {
 	public async initialize(
 		usdcMint: PublicKey,
@@ -386,6 +391,52 @@ export class AdminClient extends DriftClient {
 		);
 	}
 
+	public async initializeOpenbookV2FulfillmentConfig(
+		marketIndex: number,
+		openbookMarket: PublicKey
+	): Promise<TransactionSignature> {
+		const initializeIx = await this.getInitializeOpenbookV2FulfillmentConfigIx(
+			marketIndex,
+			openbookMarket
+		);
+
+		const tx = await this.buildTransaction(initializeIx);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
+
+	public async getInitializeOpenbookV2FulfillmentConfigIx(
+		marketIndex: number,
+		openbookMarket: PublicKey
+	): Promise<TransactionInstruction> {
+		const openbookFulfillmentConfig = 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: SYSVAR_RENT_PUBKEY,
+					systemProgram: anchor.web3.SystemProgram.programId,
+				},
+			}
+		);
+	}
+
 	public async initializePerpMarket(
 		marketIndex: number,
 		priceOracle: PublicKey,

package/src/constants/perpMarkets.ts

@@ -552,9 +552,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'PYTH-PERP',
 		baseAssetSymbol: 'PYTH',
 		marketIndex: 18,
-		oracle: new PublicKey('nrYkQQQur7z8rYTST3G9GqATviK5SxTDkrqd21MW6Ue'),
+		oracle: new PublicKey('GqkCu7CbsPVz1H6W6AAHuReqbJckYG59TXz7Y5HDV7hr'),
 		launchTs: 1700542800000,
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0x0bbf28e9a841a1cc788f6a361b17ca072d0ea3098a1e5df1c3922d06719579ff',
 	},
@@ -564,9 +564,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'TIA-PERP',
 		baseAssetSymbol: 'TIA',
 		marketIndex: 19,
-		oracle: new PublicKey('funeUsHgi2QKkLdUPASRLuYkaK8JaazCEz3HikbkhVt'),
+		oracle: new PublicKey('C6LHPUrgjrgo5eNUitC8raNEdEttfoRhmqdJ3BHVBJhi'),
 		launchTs: 1701880540000,
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0x09f7c1d7dfbb7df2b8fe3d3d87ee94a2259d212da4f30c1f0540d066dfa44723',
 	},
@@ -612,9 +612,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'WIF-PERP',
 		baseAssetSymbol: 'WIF',
 		marketIndex: 23,
-		oracle: new PublicKey('6ABgrEZk8urs6kJ1JNdC1sspH5zKXRqxy8sg3ZG2cQps'),
+		oracle: new PublicKey('6x6KfE7nY2xoLCRSMPT1u83wQ5fpGXoKNBqFjrCwzsCQ'),
 		launchTs: 1706219971000,
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0x4ca4beeca86f0d164160323817a4e42b10010a724c2217c6ee41b54cd4cc61fc',
 	},
@@ -624,9 +624,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'JUP-PERP',
 		baseAssetSymbol: 'JUP',
 		marketIndex: 24,
-		oracle: new PublicKey('g6eRCbboSwK4tSWngn773RCMexr1APQr4uA9bGZBYfo'),
+		oracle: new PublicKey('AwqRpfJ36jnSZQykyL1jYY35mhMteeEAjh7o8LveRQin'),
 		launchTs: 1706713201000,
-		oracleSource: OracleSource.PYTH,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0x0a0408d619e9380abad35060f9192039ed5042fa6f82301d0e48bb52be830996',
 	},
@@ -696,9 +696,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'DRIFT-PERP',
 		baseAssetSymbol: 'DRIFT',
 		marketIndex: 30,
-		oracle: new PublicKey('PeNpQeGEm9UEFJ6MBCMauY4WW4h3YxoESPWbsqVKucE'),
+		oracle: new PublicKey('23KmX7SNikmUr2axSCy6Zer7XPBnvmVcASALnDGqBVRR'),
 		launchTs: 1716595200000,
-		oracleSource: OracleSource.SWITCHBOARD,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0x5c1690b27bb02446db17cdda13ccc2c1d609ad6d2ef5bf4983a85ea8b6f19d07',
 	},
@@ -742,9 +742,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'POPCAT-PERP',
 		baseAssetSymbol: 'POPCAT',
 		marketIndex: 34,
-		oracle: new PublicKey('3GjpjC8TWsPqjyFSiR7saGxgzD8zqYJNsBnWpenZPEBy'),
+		oracle: new PublicKey('H3pn43tkNvsG5z3qzmERguSvKoyHZvvY6VPmNrJqiW5X'),
 		launchTs: 1720013054000,
-		oracleSource: OracleSource.SWITCHBOARD,
+		oracleSource: OracleSource.PYTH_PULL,
 		pythFeedId:
 			'0xb9312a7ee50e189ef045aa3c7842e099b061bd9bdc99ac645956c3b660dc8cce',
 	},

package/src/constants/spotMarkets.ts

@@ -165,8 +165,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'PYTH',
 		marketIndex: 7,
-		oracle: new PublicKey('nrYkQQQur7z8rYTST3G9GqATviK5SxTDkrqd21MW6Ue'),
-		oracleSource: OracleSource.PYTH,
+		oracle: new PublicKey('GqkCu7CbsPVz1H6W6AAHuReqbJckYG59TXz7Y5HDV7hr'),
+		oracleSource: OracleSource.PYTH_PULL,
 		mint: new PublicKey('HZ1JovNiVvGrGNiiYvEozEVgZ58xaU3RKwX8eACQBCt3'),
 		precision: new BN(10).pow(SIX),
 		precisionExp: SIX,
@@ -207,8 +207,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'WIF',
 		marketIndex: 10,
-		oracle: new PublicKey('6ABgrEZk8urs6kJ1JNdC1sspH5zKXRqxy8sg3ZG2cQps'),
-		oracleSource: OracleSource.PYTH,
+		oracle: new PublicKey('6x6KfE7nY2xoLCRSMPT1u83wQ5fpGXoKNBqFjrCwzsCQ'),
+		oracleSource: OracleSource.PYTH_PULL,
 		mint: new PublicKey('EKpQGSJtjMFqKZ9KQanSqYXRcF8fBopzLHYxdM65zcjm'),
 		precision: new BN(10).pow(SIX),
 		precisionExp: SIX,
@@ -222,8 +222,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'JUP',
 		marketIndex: 11,
-		oracle: new PublicKey('g6eRCbboSwK4tSWngn773RCMexr1APQr4uA9bGZBYfo'),
-		oracleSource: OracleSource.PYTH,
+		oracle: new PublicKey('AwqRpfJ36jnSZQykyL1jYY35mhMteeEAjh7o8LveRQin'),
+		oracleSource: OracleSource.PYTH_PULL,
 		mint: new PublicKey('JUPyiwrYJFskUPiHa7hkeR8VUtAeFoSYbKedZNsDvCN'),
 		precision: new BN(10).pow(SIX),
 		precisionExp: SIX,
@@ -280,8 +280,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'DRIFT',
 		marketIndex: 15,
-		oracle: new PublicKey('PeNpQeGEm9UEFJ6MBCMauY4WW4h3YxoESPWbsqVKucE'),
-		oracleSource: OracleSource.SWITCHBOARD,
+		oracle: new PublicKey('23KmX7SNikmUr2axSCy6Zer7XPBnvmVcASALnDGqBVRR'),
+		oracleSource: OracleSource.PYTH_PULL,
 		mint: new PublicKey('DriFtupJYLTosbwoN8koMbEYSx54aFAVLddWsbksjwg7'),
 		precision: new BN(10).pow(SIX),
 		precisionExp: SIX,
@@ -339,8 +339,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 	{
 		symbol: 'POPCAT',
 		marketIndex: 20,
-		oracle: new PublicKey('3GjpjC8TWsPqjyFSiR7saGxgzD8zqYJNsBnWpenZPEBy'),
-		oracleSource: OracleSource.SWITCHBOARD,
+		oracle: new PublicKey('H3pn43tkNvsG5z3qzmERguSvKoyHZvvY6VPmNrJqiW5X'),
+		oracleSource: OracleSource.PYTH_PULL,
 		mint: new PublicKey('7GCihgDB8fe6KNjn2MYtkzZcRjQy3t9GHdC8uHYmW2hr'),
 		precision: new BN(10).pow(NINE),
 		precisionExp: NINE,
@@ -348,6 +348,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		phoenixMarket: new PublicKey(
 			'31XgvAQ1HgFQEk31KdszbPkVXKaQqB1bgYZPoDrFpSR2'
 		),
+		pythFeedId:
+			'0xb9312a7ee50e189ef045aa3c7842e099b061bd9bdc99ac645956c3b660dc8cce',
 	},
 ];
 

package/src/driftClient.ts

@@ -45,6 +45,7 @@ import {
 	SettlePnlMode,
 	SignedTxData,
 	MappedRecord,
+	OpenbookV2FulfillmentConfigAccount,
 } from './types';
 import * as anchor from '@coral-xyz/anchor';
 import driftIDL from './idl/drift.json';
@@ -74,6 +75,7 @@ import {
 	getDriftSignerPublicKey,
 	getDriftStateAccountPublicKey,
 	getInsuranceFundStakeAccountPublicKey,
+	getOpenbookV2FulfillmentConfigPublicKey,
 	getPerpMarketPublicKey,
 	getPhoenixFulfillmentConfigPublicKey,
 	getPythPullOraclePublicKey,
@@ -575,6 +577,28 @@ export class DriftClient {
 		) as PhoenixV1FulfillmentConfigAccount[];
 	}
 
+	public async getOpenbookV2FulfillmentConfig(
+		openbookMarket: PublicKey
+	): Promise<OpenbookV2FulfillmentConfigAccount> {
+		const address = getOpenbookV2FulfillmentConfigPublicKey(
+			this.program.programId,
+			openbookMarket
+		);
+		return (await this.program.account.openbookV2FulfillmentConfig.fetch(
+			address
+		)) as OpenbookV2FulfillmentConfigAccount;
+	}
+
+	public async getOpenbookV2FulfillmentConfigs(): Promise<
+		OpenbookV2FulfillmentConfigAccount[]
+	> {
+		const accounts =
+			await this.program.account.openbookV2FulfillmentConfig.all();
+		return accounts.map(
+			(account) => account.account
+		) as OpenbookV2FulfillmentConfigAccount[];
+	}
+
 	public async fetchMarketLookupTableAccount(): Promise<AddressLookupTableAccount> {
 		if (this.lookupTableAccount) return this.lookupTableAccount;
 
@@ -3635,7 +3659,8 @@ export class DriftClient {
 		order?: Order,
 		fulfillmentConfig?:
 			| SerumV3FulfillmentConfigAccount
-			| PhoenixV1FulfillmentConfigAccount,
+			| PhoenixV1FulfillmentConfigAccount
+			| OpenbookV2FulfillmentConfigAccount,
 		makerInfo?: MakerInfo | MakerInfo[],
 		referrerInfo?: ReferrerInfo,
 		txParams?: TxParams
@@ -3664,7 +3689,8 @@ export class DriftClient {
 		order?: Order,
 		fulfillmentConfig?:
 			| SerumV3FulfillmentConfigAccount
-			| PhoenixV1FulfillmentConfigAccount,
+			| PhoenixV1FulfillmentConfigAccount
+			| OpenbookV2FulfillmentConfigAccount,
 		makerInfo?: MakerInfo | MakerInfo[],
 		referrerInfo?: ReferrerInfo,
 		fillerPublicKey?: PublicKey
@@ -3743,6 +3769,7 @@ export class DriftClient {
 		fulfillmentConfig?:
 			| SerumV3FulfillmentConfigAccount
 			| PhoenixV1FulfillmentConfigAccount
+			| OpenbookV2FulfillmentConfigAccount
 	): void {
 		if (fulfillmentConfig) {
 			if ('serumProgramId' in fulfillmentConfig) {
@@ -3757,6 +3784,12 @@ export class DriftClient {
 					remainingAccounts,
 					fulfillmentConfig
 				);
+			} else if ('openbookV2ProgramId' in fulfillmentConfig) {
+				this.addOpenbookRemainingAccounts(
+					marketIndex,
+					remainingAccounts,
+					fulfillmentConfig
+				);
 			} else {
 				throw Error('Invalid fulfillment config type');
 			}
@@ -3922,6 +3955,103 @@ export class DriftClient {
 		});
 	}
 
+	addOpenbookRemainingAccounts(
+		marketIndex: number,
+		remainingAccounts: AccountMeta[],
+		fulfillmentConfig: OpenbookV2FulfillmentConfigAccount
+	): void {
+		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: TOKEN_PROGRAM_ID,
+			isWritable: false,
+			isSigner: false,
+		});
+		remainingAccounts.push({
+			pubkey: 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/src/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": {