@drift-labs/sdk 2.94.0-beta.4 → 2.94.0-beta.6

package/VERSION

@@ -1 +1 @@
-2.94.0-beta.4
+2.94.0-beta.6

package/lib/constants/spotMarkets.js

@@ -71,6 +71,7 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.LAMPORTS_EXP,
         serumMarket: new web3_js_1.PublicKey('8BnEgHoWFysVcuFFX7QztDmzuH8r5ZFvyP3sYwn1XTh6'),
         phoenixMarket: new web3_js_1.PublicKey('4DoNfFBfF7UokCC2FQzriy7yHK6DY6NVdYpuekQ5pRgg'),
+        openbookMarket: new web3_js_1.PublicKey('AFgkED1FUVfBe2trPUDqSqK9QKd4stJrfzq5q1RwAFTa'),
         pythFeedId: '0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d',
     },
     {

package/lib/driftClient.js

@@ -1720,28 +1720,11 @@ class DriftClient {
         return txSig;
     }
     async getSettleExpiredMarketIx(marketIndex) {
-        const marketAccountInfos = [];
-        const oracleAccountInfos = [];
-        const spotMarketAccountInfos = [];
-        const market = this.getPerpMarketAccount(marketIndex);
-        marketAccountInfos.push({
-            pubkey: market.pubkey,
-            isWritable: true,
-            isSigner: false,
-        });
-        oracleAccountInfos.push({
-            pubkey: market.amm.oracle,
-            isWritable: false,
-            isSigner: false,
-        });
-        spotMarketAccountInfos.push({
-            pubkey: this.getSpotMarketAccount(numericConstants_1.QUOTE_SPOT_MARKET_INDEX).pubkey,
-            isSigner: false,
-            isWritable: true,
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [],
+            writablePerpMarketIndexes: [marketIndex],
+            writableSpotMarketIndexes: [numericConstants_1.QUOTE_SPOT_MARKET_INDEX],
         });
-        const remainingAccounts = oracleAccountInfos
-            .concat(spotMarketAccountInfos)
-            .concat(marketAccountInfos);
         return await this.program.instruction.settleExpiredMarket(marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),

package/package.json

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

package/src/constants/spotMarkets.ts

@@ -105,6 +105,9 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		phoenixMarket: new PublicKey(
 			'4DoNfFBfF7UokCC2FQzriy7yHK6DY6NVdYpuekQ5pRgg'
 		),
+		openbookMarket: new PublicKey(
+			'AFgkED1FUVfBe2trPUDqSqK9QKd4stJrfzq5q1RwAFTa'
+		),
 		pythFeedId:
 			'0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d',
 	},

package/src/driftClient.ts

@@ -3216,31 +3216,12 @@ export class DriftClient {
 	public async getSettleExpiredMarketIx(
 		marketIndex: number
 	): Promise<TransactionInstruction> {
-		const marketAccountInfos = [];
-		const oracleAccountInfos = [];
-		const spotMarketAccountInfos = [];
-		const market = this.getPerpMarketAccount(marketIndex);
-		marketAccountInfos.push({
-			pubkey: market.pubkey,
-			isWritable: true,
-			isSigner: false,
-		});
-		oracleAccountInfos.push({
-			pubkey: market.amm.oracle,
-			isWritable: false,
-			isSigner: false,
-		});
-
-		spotMarketAccountInfos.push({
-			pubkey: this.getSpotMarketAccount(QUOTE_SPOT_MARKET_INDEX).pubkey,
-			isSigner: false,
-			isWritable: true,
+		const remainingAccounts = this.getRemainingAccounts({
+			userAccounts: [],
+			writablePerpMarketIndexes: [marketIndex],
+			writableSpotMarketIndexes: [QUOTE_SPOT_MARKET_INDEX],
 		});
 
-		const remainingAccounts = oracleAccountInfos
-			.concat(spotMarketAccountInfos)
-			.concat(marketAccountInfos);
-
 		return await this.program.instruction.settleExpiredMarket(marketIndex, {
 			accounts: {
 				state: await this.getStatePublicKey(),