@drift-labs/sdk 2.95.0-beta.16 → 2.95.0-beta.18

package/VERSION

@@ -1 +1 @@
-2.95.0-beta.16
+2.95.0-beta.18

package/lib/accounts/pollingDriftClientAccountSubscriber.d.ts

@@ -24,8 +24,10 @@ export declare class PollingDriftClientAccountSubscriber implements DriftClientA
     state?: DataAndSlot<StateAccount>;
     perpMarket: Map<number, DataAndSlot<PerpMarketAccount>>;
     perpOracleMap: Map<number, PublicKey>;
+    perpOracleStringMap: Map<number, string>;
     spotMarket: Map<number, DataAndSlot<SpotMarketAccount>>;
     spotOracleMap: Map<number, PublicKey>;
+    spotOracleStringMap: Map<number, string>;
     oracles: Map<string, DataAndSlot<OraclePriceData>>;
     user?: DataAndSlot<UserAccount>;
     private isSubscribing;
@@ -58,7 +60,7 @@ export declare class PollingDriftClientAccountSubscriber implements DriftClientA
     getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[];
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
     getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
-    getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlot(oraclePublicKey: PublicKey | string): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     updateAccountLoaderPollingFrequency(pollingFrequency: number): void;

package/lib/accounts/pollingDriftClientAccountSubscriber.js

@@ -9,6 +9,7 @@ const web3_js_1 = require("@solana/web3.js");
 const oracleClientCache_1 = require("../oracles/oracleClientCache");
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
 const config_1 = require("../config");
+const ORACLE_DEFAULT_KEY = web3_js_1.PublicKey.default.toBase58();
 class PollingDriftClientAccountSubscriber {
     constructor(program, accountLoader, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
@@ -16,8 +17,10 @@ class PollingDriftClientAccountSubscriber {
         this.oraclesToPoll = new Map();
         this.perpMarket = new Map();
         this.perpOracleMap = new Map();
+        this.perpOracleStringMap = new Map();
         this.spotMarket = new Map();
         this.spotOracleMap = new Map();
+        this.spotOracleStringMap = new Map();
         this.oracles = new Map();
         this.isSubscribing = false;
         this.isSubscribed = false;
@@ -300,6 +303,7 @@ class PollingDriftClientAccountSubscriber {
                 }));
             }
             this.perpOracleMap.set(perpMarketIndex, oracle);
+            this.perpOracleStringMap.set(perpMarketIndex, oracle.toBase58());
         }
         await Promise.all(oraclePromises);
     }
@@ -317,6 +321,7 @@ class PollingDriftClientAccountSubscriber {
                 }));
             }
             this.spotOracleMap.set(spotMarketIndex, oracle);
+            this.spotOracleStringMap.set(spotMarketIndex, oracle.toBase58());
         }
         await Promise.all(oraclePromises);
     }
@@ -343,17 +348,21 @@ class PollingDriftClientAccountSubscriber {
     }
     getOraclePriceDataAndSlot(oraclePublicKey) {
         this.assertIsSubscribed();
-        if (oraclePublicKey.equals(web3_js_1.PublicKey.default)) {
+        const oracleString = typeof oraclePublicKey === 'string'
+            ? oraclePublicKey
+            : oraclePublicKey.toBase58();
+        if (oracleString === ORACLE_DEFAULT_KEY) {
             return {
                 data: quoteAssetOracleClient_1.QUOTE_ORACLE_PRICE_DATA,
                 slot: 0,
             };
         }
-        return this.oracles.get(oraclePublicKey.toString());
+        return this.oracles.get(oracleString);
     }
     getOraclePriceDataAndSlotForPerpMarket(marketIndex) {
         const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
         const oracle = this.perpOracleMap.get(marketIndex);
+        const oracleString = this.perpOracleStringMap.get(marketIndex);
         if (!perpMarketAccount || !oracle) {
             return undefined;
         }
@@ -361,11 +370,12 @@ class PollingDriftClientAccountSubscriber {
             // If the oracle has changed, we need to update the oracle map in background
             this.setPerpOracleMap();
         }
-        return this.getOraclePriceDataAndSlot(oracle);
+        return this.getOraclePriceDataAndSlot(oracleString);
     }
     getOraclePriceDataAndSlotForSpotMarket(marketIndex) {
         const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
         const oracle = this.spotOracleMap.get(marketIndex);
+        const oracleString = this.spotOracleStringMap.get(marketIndex);
         if (!spotMarketAccount || !oracle) {
             return undefined;
         }
@@ -373,7 +383,7 @@ class PollingDriftClientAccountSubscriber {
             // If the oracle has changed, we need to update the oracle map in background
             this.setSpotOracleMap();
         }
-        return this.getOraclePriceDataAndSlot(oracle);
+        return this.getOraclePriceDataAndSlot(oracleString);
     }
     updateAccountLoaderPollingFrequency(pollingFrequency) {
         this.accountLoader.updatePollingFrequency(pollingFrequency);

package/lib/accounts/types.d.ts

@@ -45,7 +45,7 @@ export interface DriftClientAccountSubscriber {
     getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[];
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
     getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
-    getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlot(oraclePublicKey: PublicKey | string): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     updateAccountLoaderPollingFrequency?: (pollingFrequency: number) => void;

package/lib/accounts/webSocketDriftClientAccountSubscriber.d.ts

@@ -22,8 +22,10 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     stateAccountSubscriber?: AccountSubscriber<StateAccount>;
     perpMarketAccountSubscribers: Map<number, AccountSubscriber<PerpMarketAccount>>;
     perpOracleMap: Map<number, PublicKey>;
+    perpOracleStringMap: Map<number, string>;
     spotMarketAccountSubscribers: Map<number, AccountSubscriber<SpotMarketAccount>>;
     spotOracleMap: Map<number, PublicKey>;
+    spotOracleStringMap: Map<number, string>;
     oracleSubscribers: Map<string, AccountSubscriber<OraclePriceData>>;
     initialPerpMarketAccountData: Map<number, PerpMarketAccount>;
     initialSpotMarketAccountData: Map<number, SpotMarketAccount>;
@@ -57,7 +59,7 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[];
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
     getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
-    getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlot(oraclePublicKey: PublicKey | string): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
 }

package/lib/accounts/webSocketDriftClientAccountSubscriber.js

@@ -9,13 +9,16 @@ const web3_js_1 = require("@solana/web3.js");
 const oracleClientCache_1 = require("../oracles/oracleClientCache");
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
 const config_1 = require("../config");
+const ORACLE_DEFAULT_KEY = web3_js_1.PublicKey.default.toBase58();
 class WebSocketDriftClientAccountSubscriber {
     constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, resubOpts, commitment) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
         this.perpMarketAccountSubscribers = new Map();
         this.perpOracleMap = new Map();
+        this.perpOracleStringMap = new Map();
         this.spotMarketAccountSubscribers = new Map();
         this.spotOracleMap = new Map();
+        this.spotOracleStringMap = new Map();
         this.oracleSubscribers = new Map();
         this.isSubscribing = false;
         this.isSubscribed = false;
@@ -146,7 +149,10 @@ class WebSocketDriftClientAccountSubscriber {
         const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('oracle', this.program, oracleInfo.publicKey, (buffer) => {
             return client.getOraclePriceDataFromBuffer(buffer);
         }, this.resubOpts, this.commitment);
-        accountSubscriber.setData(this.initialOraclePriceData.get(oracleString));
+        const initialOraclePriceData = this.initialOraclePriceData.get(oracleString);
+        if (initialOraclePriceData) {
+            accountSubscriber.setData(initialOraclePriceData);
+        }
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('oraclePriceUpdate', oracleInfo.publicKey, data);
             this.eventEmitter.emit('update');
@@ -224,6 +230,7 @@ class WebSocketDriftClientAccountSubscriber {
                 }));
             }
             this.perpOracleMap.set(perpMarketIndex, oracle);
+            this.perpOracleStringMap.set(perpMarketIndex, oracle.toBase58());
         }
         await Promise.all(addOraclePromises);
     }
@@ -244,6 +251,7 @@ class WebSocketDriftClientAccountSubscriber {
                 }));
             }
             this.spotOracleMap.set(spotMarketIndex, oracle);
+            this.spotOracleStringMap.set(spotMarketIndex, oracle.toBase58());
         }
         await Promise.all(addOraclePromises);
     }
@@ -272,17 +280,21 @@ class WebSocketDriftClientAccountSubscriber {
     }
     getOraclePriceDataAndSlot(oraclePublicKey) {
         this.assertIsSubscribed();
-        if (oraclePublicKey.equals(web3_js_1.PublicKey.default)) {
+        const oracleString = typeof oraclePublicKey === 'string'
+            ? oraclePublicKey
+            : oraclePublicKey.toBase58();
+        if (oracleString === ORACLE_DEFAULT_KEY) {
             return {
                 data: quoteAssetOracleClient_1.QUOTE_ORACLE_PRICE_DATA,
                 slot: 0,
             };
         }
-        return this.oracleSubscribers.get(oraclePublicKey.toString()).dataAndSlot;
+        return this.oracleSubscribers.get(oracleString).dataAndSlot;
     }
     getOraclePriceDataAndSlotForPerpMarket(marketIndex) {
         const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
         const oracle = this.perpOracleMap.get(marketIndex);
+        const oracleString = this.perpOracleStringMap.get(marketIndex);
         if (!perpMarketAccount || !oracle) {
             return undefined;
         }
@@ -290,11 +302,12 @@ class WebSocketDriftClientAccountSubscriber {
             // If the oracle has changed, we need to update the oracle map in background
             this.setPerpOracleMap();
         }
-        return this.getOraclePriceDataAndSlot(oracle);
+        return this.getOraclePriceDataAndSlot(oracleString);
     }
     getOraclePriceDataAndSlotForSpotMarket(marketIndex) {
         const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
         const oracle = this.spotOracleMap.get(marketIndex);
+        const oracleString = this.spotOracleStringMap.get(marketIndex);
         if (!spotMarketAccount || !oracle) {
             return undefined;
         }
@@ -302,7 +315,7 @@ class WebSocketDriftClientAccountSubscriber {
             // If the oracle has changed, we need to update the oracle map in background
             this.setSpotOracleMap();
         }
-        return this.getOraclePriceDataAndSlot(oracle);
+        return this.getOraclePriceDataAndSlot(oracleString);
     }
 }
 exports.WebSocketDriftClientAccountSubscriber = WebSocketDriftClientAccountSubscriber;

package/lib/driftClient.js

@@ -309,7 +309,7 @@ class DriftClient {
         return this.accountSubscriber.getSpotMarketAccountAndSlot(numericConstants_1.QUOTE_SPOT_MARKET_INDEX).data;
     }
     getOraclePriceDataAndSlot(oraclePublicKey) {
-        return this.accountSubscriber.getOraclePriceDataAndSlot(oraclePublicKey);
+        return this.accountSubscriber.getOraclePriceDataAndSlot(oraclePublicKey.toBase58());
     }
     async getSerumV3FulfillmentConfig(serumMarket) {
         const address = await (0, pda_1.getSerumFulfillmentConfigPublicKey)(this.program.programId, serumMarket);
@@ -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.16",
+	"version": "2.95.0-beta.18",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/accounts/pollingDriftClientAccountSubscriber.ts

@@ -28,6 +28,8 @@ import { OracleClientCache } from '../oracles/oracleClientCache';
 import { QUOTE_ORACLE_PRICE_DATA } from '../oracles/quoteAssetOracleClient';
 import { findAllMarketAndOracles } from '../config';
 
+const ORACLE_DEFAULT_KEY = PublicKey.default.toBase58();
+
 export class PollingDriftClientAccountSubscriber
 	implements DriftClientAccountSubscriber
 {
@@ -50,8 +52,10 @@ export class PollingDriftClientAccountSubscriber
 	state?: DataAndSlot<StateAccount>;
 	perpMarket = new Map<number, DataAndSlot<PerpMarketAccount>>();
 	perpOracleMap = new Map<number, PublicKey>();
+	perpOracleStringMap = new Map<number, string>();
 	spotMarket = new Map<number, DataAndSlot<SpotMarketAccount>>();
 	spotOracleMap = new Map<number, PublicKey>();
+	spotOracleStringMap = new Map<number, string>();
 	oracles = new Map<string, DataAndSlot<OraclePriceData>>();
 	user?: DataAndSlot<UserAccount>;
 
@@ -470,6 +474,7 @@ export class PollingDriftClientAccountSubscriber
 				);
 			}
 			this.perpOracleMap.set(perpMarketIndex, oracle);
+			this.perpOracleStringMap.set(perpMarketIndex, oracle.toBase58());
 		}
 		await Promise.all(oraclePromises);
 	}
@@ -490,6 +495,7 @@ export class PollingDriftClientAccountSubscriber
 				);
 			}
 			this.spotOracleMap.set(spotMarketIndex, oracle);
+			this.spotOracleStringMap.set(spotMarketIndex, oracle.toBase58());
 		}
 		await Promise.all(oraclePromises);
 	}
@@ -528,17 +534,21 @@ export class PollingDriftClientAccountSubscriber
 	}
 
 	public getOraclePriceDataAndSlot(
-		oraclePublicKey: PublicKey
+		oraclePublicKey: PublicKey | string
 	): DataAndSlot<OraclePriceData> | undefined {
 		this.assertIsSubscribed();
-		if (oraclePublicKey.equals(PublicKey.default)) {
+		const oracleString =
+			typeof oraclePublicKey === 'string'
+				? oraclePublicKey
+				: oraclePublicKey.toBase58();
+		if (oracleString === ORACLE_DEFAULT_KEY) {
 			return {
 				data: QUOTE_ORACLE_PRICE_DATA,
 				slot: 0,
 			};
 		}
 
-		return this.oracles.get(oraclePublicKey.toString());
+		return this.oracles.get(oracleString);
 	}
 
 	public getOraclePriceDataAndSlotForPerpMarket(
@@ -546,6 +556,7 @@ export class PollingDriftClientAccountSubscriber
 	): DataAndSlot<OraclePriceData> | undefined {
 		const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
 		const oracle = this.perpOracleMap.get(marketIndex);
+		const oracleString = this.perpOracleStringMap.get(marketIndex);
 
 		if (!perpMarketAccount || !oracle) {
 			return undefined;
@@ -556,7 +567,7 @@ export class PollingDriftClientAccountSubscriber
 			this.setPerpOracleMap();
 		}
 
-		return this.getOraclePriceDataAndSlot(oracle);
+		return this.getOraclePriceDataAndSlot(oracleString);
 	}
 
 	public getOraclePriceDataAndSlotForSpotMarket(
@@ -564,6 +575,7 @@ export class PollingDriftClientAccountSubscriber
 	): DataAndSlot<OraclePriceData> | undefined {
 		const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
 		const oracle = this.spotOracleMap.get(marketIndex);
+		const oracleString = this.spotOracleStringMap.get(marketIndex);
 		if (!spotMarketAccount || !oracle) {
 			return undefined;
 		}
@@ -573,7 +585,7 @@ export class PollingDriftClientAccountSubscriber
 			this.setSpotOracleMap();
 		}
 
-		return this.getOraclePriceDataAndSlot(oracle);
+		return this.getOraclePriceDataAndSlot(oracleString);
 	}
 
 	public updateAccountLoaderPollingFrequency(pollingFrequency: number): void {

package/src/accounts/types.ts

@@ -72,7 +72,7 @@ export interface DriftClientAccountSubscriber {
 	): DataAndSlot<SpotMarketAccount> | undefined;
 	getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
 	getOraclePriceDataAndSlot(
-		oraclePublicKey: PublicKey
+		oraclePublicKey: PublicKey | string
 	): DataAndSlot<OraclePriceData> | undefined;
 	getOraclePriceDataAndSlotForPerpMarket(
 		marketIndex: number

package/src/accounts/webSocketDriftClientAccountSubscriber.ts

@@ -24,6 +24,8 @@ import * as Buffer from 'buffer';
 import { QUOTE_ORACLE_PRICE_DATA } from '../oracles/quoteAssetOracleClient';
 import { findAllMarketAndOracles } from '../config';
 
+const ORACLE_DEFAULT_KEY = PublicKey.default.toBase58();
+
 export class WebSocketDriftClientAccountSubscriber
 	implements DriftClientAccountSubscriber
 {
@@ -45,11 +47,13 @@ export class WebSocketDriftClientAccountSubscriber
 		AccountSubscriber<PerpMarketAccount>
 	>();
 	perpOracleMap = new Map<number, PublicKey>();
+	perpOracleStringMap = new Map<number, string>();
 	spotMarketAccountSubscribers = new Map<
 		number,
 		AccountSubscriber<SpotMarketAccount>
 	>();
 	spotOracleMap = new Map<number, PublicKey>();
+	spotOracleStringMap = new Map<number, string>();
 	oracleSubscribers = new Map<string, AccountSubscriber<OraclePriceData>>();
 
 	initialPerpMarketAccountData: Map<number, PerpMarketAccount>;
@@ -315,7 +319,11 @@ export class WebSocketDriftClientAccountSubscriber
 			this.resubOpts,
 			this.commitment
 		);
-		accountSubscriber.setData(this.initialOraclePriceData.get(oracleString));
+		const initialOraclePriceData =
+			this.initialOraclePriceData.get(oracleString);
+		if (initialOraclePriceData) {
+			accountSubscriber.setData(initialOraclePriceData);
+		}
 		await accountSubscriber.subscribe((data: OraclePriceData) => {
 			this.eventEmitter.emit('oraclePriceUpdate', oracleInfo.publicKey, data);
 			this.eventEmitter.emit('update');
@@ -432,6 +440,7 @@ export class WebSocketDriftClientAccountSubscriber
 				);
 			}
 			this.perpOracleMap.set(perpMarketIndex, oracle);
+			this.perpOracleStringMap.set(perpMarketIndex, oracle.toBase58());
 		}
 		await Promise.all(addOraclePromises);
 	}
@@ -455,6 +464,7 @@ export class WebSocketDriftClientAccountSubscriber
 				);
 			}
 			this.spotOracleMap.set(spotMarketIndex, oracle);
+			this.spotOracleStringMap.set(spotMarketIndex, oracle.toBase58());
 		}
 		await Promise.all(addOraclePromises);
 	}
@@ -499,16 +509,20 @@ export class WebSocketDriftClientAccountSubscriber
 	}
 
 	public getOraclePriceDataAndSlot(
-		oraclePublicKey: PublicKey
+		oraclePublicKey: PublicKey | string
 	): DataAndSlot<OraclePriceData> | undefined {
 		this.assertIsSubscribed();
-		if (oraclePublicKey.equals(PublicKey.default)) {
+		const oracleString =
+			typeof oraclePublicKey === 'string'
+				? oraclePublicKey
+				: oraclePublicKey.toBase58();
+		if (oracleString === ORACLE_DEFAULT_KEY) {
 			return {
 				data: QUOTE_ORACLE_PRICE_DATA,
 				slot: 0,
 			};
 		}
-		return this.oracleSubscribers.get(oraclePublicKey.toString()).dataAndSlot;
+		return this.oracleSubscribers.get(oracleString).dataAndSlot;
 	}
 
 	public getOraclePriceDataAndSlotForPerpMarket(
@@ -516,6 +530,7 @@ export class WebSocketDriftClientAccountSubscriber
 	): DataAndSlot<OraclePriceData> | undefined {
 		const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
 		const oracle = this.perpOracleMap.get(marketIndex);
+		const oracleString = this.perpOracleStringMap.get(marketIndex);
 		if (!perpMarketAccount || !oracle) {
 			return undefined;
 		}
@@ -525,7 +540,7 @@ export class WebSocketDriftClientAccountSubscriber
 			this.setPerpOracleMap();
 		}
 
-		return this.getOraclePriceDataAndSlot(oracle);
+		return this.getOraclePriceDataAndSlot(oracleString);
 	}
 
 	public getOraclePriceDataAndSlotForSpotMarket(
@@ -533,6 +548,7 @@ export class WebSocketDriftClientAccountSubscriber
 	): DataAndSlot<OraclePriceData> | undefined {
 		const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
 		const oracle = this.spotOracleMap.get(marketIndex);
+		const oracleString = this.spotOracleStringMap.get(marketIndex);
 		if (!spotMarketAccount || !oracle) {
 			return undefined;
 		}
@@ -542,6 +558,6 @@ export class WebSocketDriftClientAccountSubscriber
 			this.setSpotOracleMap();
 		}
 
-		return this.getOraclePriceDataAndSlot(oracle);
+		return this.getOraclePriceDataAndSlot(oracleString);
 	}
 }

package/src/driftClient.ts

@@ -538,7 +538,9 @@ export class DriftClient {
 	public getOraclePriceDataAndSlot(
 		oraclePublicKey: PublicKey
 	): DataAndSlot<OraclePriceData> | undefined {
-		return this.accountSubscriber.getOraclePriceDataAndSlot(oraclePublicKey);
+		return this.accountSubscriber.getOraclePriceDataAndSlot(
+			oraclePublicKey.toBase58()
+		);
 	}
 
 	public async getSerumV3FulfillmentConfig(
@@ -3221,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": [