@drift-labs/sdk 2.95.0-beta.17 → 2.95.0-beta.19

package/VERSION

@@ -1 +1 @@
-2.95.0-beta.17
+2.95.0-beta.19

package/lib/accounts/webSocketDriftClientAccountSubscriber.js

@@ -82,7 +82,9 @@ class WebSocketDriftClientAccountSubscriber {
         if (!this.initialPerpMarketAccountData) {
             const perpMarketPublicKeys = this.perpMarketIndexes.map((marketIndex) => (0, pda_1.getPerpMarketPublicKeySync)(this.program.programId, marketIndex));
             const perpMarketAccountInfos = await connection.getMultipleAccountsInfo(perpMarketPublicKeys);
-            this.initialPerpMarketAccountData = new Map(perpMarketAccountInfos.map((accountInfo) => {
+            this.initialPerpMarketAccountData = new Map(perpMarketAccountInfos
+                .filter((accountInfo) => !!accountInfo.data)
+                .map((accountInfo) => {
                 const perpMarket = this.program.coder.accounts.decode('PerpMarket', accountInfo.data);
                 return [perpMarket.marketIndex, perpMarket];
             }));
@@ -90,13 +92,17 @@ class WebSocketDriftClientAccountSubscriber {
         if (!this.initialSpotMarketAccountData) {
             const spotMarketPublicKeys = this.spotMarketIndexes.map((marketIndex) => (0, pda_1.getSpotMarketPublicKeySync)(this.program.programId, marketIndex));
             const spotMarketAccountInfos = await connection.getMultipleAccountsInfo(spotMarketPublicKeys);
-            this.initialSpotMarketAccountData = new Map(spotMarketAccountInfos.map((accountInfo) => {
+            this.initialSpotMarketAccountData = new Map(spotMarketAccountInfos
+                .filter((accountInfo) => !!accountInfo.data)
+                .map((accountInfo) => {
                 const spotMarket = this.program.coder.accounts.decode('SpotMarket', accountInfo.data);
                 return [spotMarket.marketIndex, spotMarket];
             }));
         }
         const oracleAccountInfos = await connection.getMultipleAccountsInfo(this.oracleInfos.map((oracleInfo) => oracleInfo.publicKey));
-        this.initialOraclePriceData = new Map(this.oracleInfos.map((oracleInfo, i) => {
+        this.initialOraclePriceData = new Map(this.oracleInfos
+            .filter((_, i) => !!oracleAccountInfos[i])
+            .map((oracleInfo, i) => {
             const oracleClient = this.oracleClientCache.get(oracleInfo.source, connection, this.program);
             const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(oracleAccountInfos[i].data);
             return [oracleInfo.publicKey.toString(), oraclePriceData];

package/lib/driftClient.js

@@ -1725,10 +1725,14 @@ class DriftClient {
             writablePerpMarketIndexes: [marketIndex],
             writableSpotMarketIndexes: [numericConstants_1.QUOTE_SPOT_MARKET_INDEX],
         });
+        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex);
         return await this.program.instruction.settleExpiredMarket(marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
-                authority: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                perpMarket: perpMarketPublicKey,
             },
             remainingAccounts,
         });

package/lib/idl/drift.json

@@ -1606,15 +1606,20 @@
         {
             "name": "settleExpiredMarket",
             "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
                 {
                     "name": "state",
                     "isMut": false,
                     "isSigner": false
                 },
                 {
-                    "name": "authority",
-                    "isMut": false,
-                    "isSigner": true
+                    "name": "perpMarket",
+                    "isMut": true,
+                    "isSigner": false
                 }
             ],
             "args": [

package/package.json

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

package/src/accounts/webSocketDriftClientAccountSubscriber.ts

@@ -174,13 +174,15 @@ export class WebSocketDriftClientAccountSubscriber
 				perpMarketPublicKeys
 			);
 			this.initialPerpMarketAccountData = new Map(
-				perpMarketAccountInfos.map((accountInfo) => {
-					const perpMarket = this.program.coder.accounts.decode(
-						'PerpMarket',
-						accountInfo.data
-					);
-					return [perpMarket.marketIndex, perpMarket];
-				})
+				perpMarketAccountInfos
+					.filter((accountInfo) => !!accountInfo.data)
+					.map((accountInfo) => {
+						const perpMarket = this.program.coder.accounts.decode(
+							'PerpMarket',
+							accountInfo.data
+						);
+						return [perpMarket.marketIndex, perpMarket];
+					})
 			);
 		}
 
@@ -192,13 +194,15 @@ export class WebSocketDriftClientAccountSubscriber
 				spotMarketPublicKeys
 			);
 			this.initialSpotMarketAccountData = new Map(
-				spotMarketAccountInfos.map((accountInfo) => {
-					const spotMarket = this.program.coder.accounts.decode(
-						'SpotMarket',
-						accountInfo.data
-					);
-					return [spotMarket.marketIndex, spotMarket];
-				})
+				spotMarketAccountInfos
+					.filter((accountInfo) => !!accountInfo.data)
+					.map((accountInfo) => {
+						const spotMarket = this.program.coder.accounts.decode(
+							'SpotMarket',
+							accountInfo.data
+						);
+						return [spotMarket.marketIndex, spotMarket];
+					})
 			);
 		}
 
@@ -206,17 +210,19 @@ export class WebSocketDriftClientAccountSubscriber
 			this.oracleInfos.map((oracleInfo) => oracleInfo.publicKey)
 		);
 		this.initialOraclePriceData = new Map(
-			this.oracleInfos.map((oracleInfo, i) => {
-				const oracleClient = this.oracleClientCache.get(
-					oracleInfo.source,
-					connection,
-					this.program
-				);
-				const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(
-					oracleAccountInfos[i].data
-				);
-				return [oracleInfo.publicKey.toString(), oraclePriceData];
-			})
+			this.oracleInfos
+				.filter((_, i) => !!oracleAccountInfos[i])
+				.map((oracleInfo, i) => {
+					const oracleClient = this.oracleClientCache.get(
+						oracleInfo.source,
+						connection,
+						this.program
+					);
+					const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(
+						oracleAccountInfos[i].data
+					);
+					return [oracleInfo.publicKey.toString(), oraclePriceData];
+				})
 		);
 	}
 

package/src/driftClient.ts

@@ -3223,11 +3223,18 @@ export class DriftClient {
 			writablePerpMarketIndexes: [marketIndex],
 			writableSpotMarketIndexes: [QUOTE_SPOT_MARKET_INDEX],
 		});
+		const perpMarketPublicKey = await getPerpMarketPublicKey(
+			this.program.programId,
+			marketIndex
+		);
 
 		return await this.program.instruction.settleExpiredMarket(marketIndex, {
 			accounts: {
 				state: await this.getStatePublicKey(),
-				authority: this.wallet.publicKey,
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				perpMarket: perpMarketPublicKey,
 			},
 			remainingAccounts,
 		});

package/src/idl/drift.json

@@ -1606,15 +1606,20 @@
     {
       "name": "settleExpiredMarket",
       "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
         {
           "name": "state",
           "isMut": false,
           "isSigner": false
         },
         {
-          "name": "authority",
-          "isMut": false,
-          "isSigner": true
+          "name": "perpMarket",
+          "isMut": true,
+          "isSigner": false
         }
       ],
       "args": [