@drift-labs/sdk 2.95.0-beta.2 → 2.95.0-beta.21

package/VERSION

@@ -1 +1 @@
-2.95.0-beta.2
+2.95.0-beta.21

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,14 +22,21 @@ 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>;
+    initialOraclePriceData: Map<string, OraclePriceData>;
     private isSubscribing;
     private subscriptionPromise;
     private subscriptionPromiseResolver;
     constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(): Promise<boolean>;
+    setInitialData(): Promise<void>;
+    removeInitialData(): void;
     subscribeToPerpMarketAccounts(): Promise<boolean>;
     subscribeToPerpMarketAccount(marketIndex: number): Promise<boolean>;
     subscribeToSpotMarketAccounts(): Promise<boolean>;
@@ -52,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;
@@ -40,10 +43,13 @@ class WebSocketDriftClientAccountSubscriber {
             this.subscriptionPromiseResolver = res;
         });
         if (this.shouldFindAllMarketsAndOracles) {
-            const { perpMarketIndexes, spotMarketIndexes, oracleInfos } = await (0, config_1.findAllMarketAndOracles)(this.program);
+            const { perpMarketIndexes, perpMarketAccounts, spotMarketIndexes, spotMarketAccounts, oracleInfos, } = await (0, config_1.findAllMarketAndOracles)(this.program);
             this.perpMarketIndexes = perpMarketIndexes;
             this.spotMarketIndexes = spotMarketIndexes;
             this.oracleInfos = oracleInfos;
+            // front run and set the initial data here to save extra gma call in set initial data
+            this.initialPerpMarketAccountData = new Map(perpMarketAccounts.map((market) => [market.marketIndex, market]));
+            this.initialSpotMarketAccountData = new Map(spotMarketAccounts.map((market) => [market.marketIndex, market]));
         }
         const statePublicKey = await (0, pda_1.getDriftStateAccountPublicKey)(this.program.programId);
         // create and activate main state account subscription
@@ -52,6 +58,8 @@ class WebSocketDriftClientAccountSubscriber {
             this.eventEmitter.emit('stateAccountUpdate', data);
             this.eventEmitter.emit('update');
         });
+        // set initial data to avoid spamming getAccountInfo calls in webSocketAccountSubscriber
+        await this.setInitialData();
         await Promise.all([
             // subscribe to market accounts
             this.subscribeToPerpMarketAccounts(),
@@ -65,8 +73,48 @@ class WebSocketDriftClientAccountSubscriber {
         this.isSubscribing = false;
         this.isSubscribed = true;
         this.subscriptionPromiseResolver(true);
+        // delete initial data
+        this.removeInitialData();
         return true;
     }
+    async setInitialData() {
+        const connection = this.program.provider.connection;
+        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
+                .filter((accountInfo) => !!accountInfo)
+                .map((accountInfo) => {
+                const perpMarket = this.program.coder.accounts.decode('PerpMarket', accountInfo.data);
+                return [perpMarket.marketIndex, perpMarket];
+            }));
+        }
+        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
+                .filter((accountInfo) => !!accountInfo)
+                .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.reduce((result, oracleInfo, i) => {
+            if (!oracleAccountInfos[i]) {
+                return result;
+            }
+            const oracleClient = this.oracleClientCache.get(oracleInfo.source, connection, this.program);
+            const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(oracleAccountInfos[i].data);
+            result.push([oracleInfo.publicKey.toString(), oraclePriceData]);
+            return result;
+        }, []));
+    }
+    removeInitialData() {
+        this.initialPerpMarketAccountData = new Map();
+        this.initialSpotMarketAccountData = new Map();
+        this.initialOraclePriceData = new Map();
+    }
     async subscribeToPerpMarketAccounts() {
         await Promise.all(this.perpMarketIndexes.map((marketIndex) => this.subscribeToPerpMarketAccount(marketIndex)));
         return true;
@@ -74,6 +122,7 @@ class WebSocketDriftClientAccountSubscriber {
     async subscribeToPerpMarketAccount(marketIndex) {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex);
         const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('perpMarket', this.program, perpMarketPublicKey, undefined, this.resubOpts, this.commitment);
+        accountSubscriber.setData(this.initialPerpMarketAccountData.get(marketIndex));
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('perpMarketAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -88,6 +137,7 @@ class WebSocketDriftClientAccountSubscriber {
     async subscribeToSpotMarketAccount(marketIndex) {
         const marketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex);
         const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('spotMarket', this.program, marketPublicKey, undefined, this.resubOpts, this.commitment);
+        accountSubscriber.setData(this.initialSpotMarketAccountData.get(marketIndex));
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('spotMarketAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -102,15 +152,20 @@ class WebSocketDriftClientAccountSubscriber {
         return true;
     }
     async subscribeToOracle(oracleInfo) {
+        const oracleString = oracleInfo.publicKey.toString();
         const client = this.oracleClientCache.get(oracleInfo.source, this.program.provider.connection, this.program);
         const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('oracle', this.program, oracleInfo.publicKey, (buffer) => {
             return client.getOraclePriceDataFromBuffer(buffer);
         }, this.resubOpts, this.commitment);
+        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');
         });
-        this.oracleSubscribers.set(oracleInfo.publicKey.toString(), accountSubscriber);
+        this.oracleSubscribers.set(oracleString, accountSubscriber);
         return true;
     }
     async unsubscribeFromMarketAccounts() {
@@ -170,7 +225,7 @@ class WebSocketDriftClientAccountSubscriber {
         const perpMarkets = this.getMarketAccountsAndSlots();
         const addOraclePromises = [];
         for (const perpMarket of perpMarkets) {
-            if (!perpMarket) {
+            if (!perpMarket || !perpMarket.data) {
                 continue;
             }
             const perpMarketAccount = perpMarket.data;
@@ -183,6 +238,7 @@ class WebSocketDriftClientAccountSubscriber {
                 }));
             }
             this.perpOracleMap.set(perpMarketIndex, oracle);
+            this.perpOracleStringMap.set(perpMarketIndex, oracle.toBase58());
         }
         await Promise.all(addOraclePromises);
     }
@@ -190,7 +246,7 @@ class WebSocketDriftClientAccountSubscriber {
         const spotMarkets = this.getSpotMarketAccountsAndSlots();
         const addOraclePromises = [];
         for (const spotMarket of spotMarkets) {
-            if (!spotMarket) {
+            if (!spotMarket || !spotMarket.data) {
                 continue;
             }
             const spotMarketAccount = spotMarket.data;
@@ -203,6 +259,7 @@ class WebSocketDriftClientAccountSubscriber {
                 }));
             }
             this.spotOracleMap.set(spotMarketIndex, oracle);
+            this.spotOracleStringMap.set(spotMarketIndex, oracle.toBase58());
         }
         await Promise.all(addOraclePromises);
     }
@@ -231,17 +288,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;
         }
@@ -249,11 +310,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;
         }
@@ -261,7 +323,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/addresses/pda.d.ts

@@ -9,7 +9,9 @@ export declare function getUserAccountPublicKey(programId: PublicKey, authority:
 export declare function getUserAccountPublicKeySync(programId: PublicKey, authority: PublicKey, subAccountId?: number): PublicKey;
 export declare function getUserStatsAccountPublicKey(programId: PublicKey, authority: PublicKey): PublicKey;
 export declare function getPerpMarketPublicKey(programId: PublicKey, marketIndex: number): Promise<PublicKey>;
+export declare function getPerpMarketPublicKeySync(programId: PublicKey, marketIndex: number): PublicKey;
 export declare function getSpotMarketPublicKey(programId: PublicKey, marketIndex: number): Promise<PublicKey>;
+export declare function getSpotMarketPublicKeySync(programId: PublicKey, marketIndex: number): PublicKey;
 export declare function getSpotMarketVaultPublicKey(programId: PublicKey, marketIndex: number): Promise<PublicKey>;
 export declare function getInsuranceFundVaultPublicKey(programId: PublicKey, marketIndex: number): Promise<PublicKey>;
 export declare function getInsuranceFundStakeAccountPublicKey(programId: PublicKey, authority: 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.getTokenProgramForSpotMarket = 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;
+exports.getTokenProgramForSpotMarket = 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.getSpotMarketPublicKeySync = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKeySync = 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"));
 const spl_token_1 = require("@solana/spl-token");
@@ -69,6 +69,13 @@ async function getPerpMarketPublicKey(programId, marketIndex) {
     ], programId))[0];
 }
 exports.getPerpMarketPublicKey = getPerpMarketPublicKey;
+function getPerpMarketPublicKeySync(programId, marketIndex) {
+    return web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('perp_market')),
+        new anchor.BN(marketIndex).toArrayLike(Buffer, 'le', 2),
+    ], programId)[0];
+}
+exports.getPerpMarketPublicKeySync = getPerpMarketPublicKeySync;
 async function getSpotMarketPublicKey(programId, marketIndex) {
     return (await web3_js_1.PublicKey.findProgramAddress([
         Buffer.from(anchor.utils.bytes.utf8.encode('spot_market')),
@@ -76,6 +83,13 @@ async function getSpotMarketPublicKey(programId, marketIndex) {
     ], programId))[0];
 }
 exports.getSpotMarketPublicKey = getSpotMarketPublicKey;
+function getSpotMarketPublicKeySync(programId, marketIndex) {
+    return web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('spot_market')),
+        new anchor.BN(marketIndex).toArrayLike(Buffer, 'le', 2),
+    ], programId)[0];
+}
+exports.getSpotMarketPublicKeySync = getSpotMarketPublicKeySync;
 async function getSpotMarketVaultPublicKey(programId, marketIndex) {
     return (await web3_js_1.PublicKey.findProgramAddress([
         Buffer.from(anchor.utils.bytes.utf8.encode('spot_market_vault')),

package/lib/config.d.ts

@@ -1,3 +1,4 @@
+import { PerpMarketAccount, SpotMarketAccount } from '.';
 import { PerpMarketConfig } from './constants/perpMarkets';
 import { SpotMarketConfig } from './constants/spotMarkets';
 import { OracleInfo } from './oracles/types';
@@ -44,7 +45,9 @@ export declare function getMarketsAndOraclesForSubscription(env: DriftEnv): {
 };
 export declare function findAllMarketAndOracles(program: Program): Promise<{
     perpMarketIndexes: number[];
+    perpMarketAccounts: PerpMarketAccount[];
     spotMarketIndexes: number[];
     oracleInfos: OracleInfo[];
+    spotMarketAccounts: SpotMarketAccount[];
 }>;
 export {};

package/lib/config.js

@@ -106,7 +106,9 @@ async function findAllMarketAndOracles(program) {
     }
     return {
         perpMarketIndexes,
+        perpMarketAccounts: perpMarketProgramAccounts.map((account) => account.account),
         spotMarketIndexes,
+        spotMarketAccounts: spotMarketProgramAccounts.map((account) => account.account),
         oracleInfos: Array.from(oracleInfos.values()),
     };
 }

package/lib/constants/perpMarkets.js

@@ -65,10 +65,10 @@ exports.DevnetPerpMarkets = [
         symbol: 'MATIC-PERP',
         baseAssetSymbol: 'MATIC',
         marketIndex: 5,
-        oracle: new web3_js_1.PublicKey('5Wf1WrXLeNJghU8WRo5odvwAjpjSSF4THbjdxbKmwVsi'),
+        oracle: new web3_js_1.PublicKey('BrzyDgwELy4jjjsqLQpBeUxzrsueYyMhuWpYBaUYcXvi'),
         launchTs: 1677690149000,
         oracleSource: __1.OracleSource.PYTH_PULL,
-        pythFeedId: '0x5de33a9112c2b700b8d30b8a3402c103578ccfa2765696471cc672bd5cf6ac52',
+        pythFeedId: '0xffd11c5a1cfd42f80afb2df4d9f264c15f956d68153335374ec10722edd70472',
     },
     {
         fullName: 'Arbitrum',
@@ -373,10 +373,10 @@ exports.MainnetPerpMarkets = [
         symbol: 'MATIC-PERP',
         baseAssetSymbol: 'MATIC',
         marketIndex: 5,
-        oracle: new web3_js_1.PublicKey('5Wf1WrXLeNJghU8WRo5odvwAjpjSSF4THbjdxbKmwVsi'),
+        oracle: new web3_js_1.PublicKey('BrzyDgwELy4jjjsqLQpBeUxzrsueYyMhuWpYBaUYcXvi'),
         launchTs: 1677690149000,
         oracleSource: __1.OracleSource.PYTH_PULL,
-        pythFeedId: '0x5de33a9112c2b700b8d30b8a3402c103578ccfa2765696471cc672bd5cf6ac52',
+        pythFeedId: '0xffd11c5a1cfd42f80afb2df4d9f264c15f956d68153335374ec10722edd70472',
     },
     {
         fullName: 'Arbitrum',
@@ -757,6 +757,27 @@ exports.MainnetPerpMarkets = [
         launchTs: 1724250126000,
         oracleSource: __1.OracleSource.Prelaunch,
     },
+    {
+        fullName: 'DEMOCRATS-WIN-MICHIGAN-BET',
+        category: ['Prediction', 'Election'],
+        symbol: 'DEMOCRATS-WIN-MICHIGAN-BET',
+        baseAssetSymbol: 'DEMOCRATS-WIN-MICHIGAN',
+        marketIndex: 41,
+        oracle: new web3_js_1.PublicKey('8HTDLjhb2esGU5mu11v3pq3eWeFqmvKPkQNCnTTwKAyB'),
+        launchTs: 1725551484000,
+        oracleSource: __1.OracleSource.Prelaunch,
+    },
+    {
+        fullName: 'TON',
+        category: ['L1'],
+        symbol: 'TON-PERP',
+        baseAssetSymbol: 'TON',
+        marketIndex: 42,
+        oracle: new web3_js_1.PublicKey('BNjCXrpEqjdBnuRy2SAUgm5Pq8B73wGFwsf6RYFJiLPY'),
+        launchTs: 1725551484000,
+        oracleSource: __1.OracleSource.PYTH_PULL,
+        pythFeedId: '0x8963217838ab4cf5cadc172203c1f0b763fbaa45f346d8ee50ba994bbcac3026',
+    },
 ];
 exports.PerpMarkets = {
     devnet: exports.DevnetPerpMarkets,

package/lib/constants/spotMarkets.js

@@ -333,6 +333,16 @@ exports.MainnetSpotMarkets = [
         precisionExp: numericConstants_1.NINE,
         pythFeedId: '0xca3ba9a619a4b3755c10ac7d5e760275aa95e9823d38a84fedd416856cdba37c',
     },
+    {
+        symbol: 'BNSOL',
+        marketIndex: 25,
+        oracle: new web3_js_1.PublicKey('BAtFj4kQttZRVep3UZS2aZRDixkGYgWsbqTBVDbnSsPF'),
+        oracleSource: __1.OracleSource.PYTH_PULL,
+        mint: new web3_js_1.PublicKey('BNso1VUJnh4zcfpZa6986Ea66P6TCp59hvtNJ8b1X85'),
+        precision: numericConstants_1.LAMPORTS_PRECISION,
+        precisionExp: numericConstants_1.LAMPORTS_EXP,
+        pythFeedId: '0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d',
+    },
 ];
 exports.SpotMarkets = {
     devnet: exports.DevnetSpotMarkets,

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/events/parse.d.ts

@@ -1,2 +1,6 @@
 import { Program, Event } from '@coral-xyz/anchor';
 export declare function parseLogs(program: Program, logs: string[], programId?: string): Event[];
+export declare function parseLogsWithRaw(program: Program, logs: string[], programId?: string): {
+    events: Event[];
+    rawLogs: string[];
+};

package/lib/events/parse.js

@@ -1,13 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseLogs = void 0;
+exports.parseLogsWithRaw = exports.parseLogs = void 0;
 const driftProgramId = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
 const PROGRAM_LOG = 'Program log: ';
 const PROGRAM_DATA = 'Program data: ';
 const PROGRAM_LOG_START_INDEX = PROGRAM_LOG.length;
 const PROGRAM_DATA_START_INDEX = PROGRAM_DATA.length;
 function parseLogs(program, logs, programId = driftProgramId) {
+    const { events } = parseLogsWithRaw(program, logs, programId);
+    return events;
+}
+exports.parseLogs = parseLogs;
+function parseLogsWithRaw(program, logs, programId = driftProgramId) {
     const events = [];
+    const rawLogs = [];
     const execution = new ExecutionContext();
     for (const log of logs) {
         if (log.startsWith('Log truncated')) {
@@ -16,6 +22,7 @@ function parseLogs(program, logs, programId = driftProgramId) {
         const [event, newProgram, didPop] = handleLog(execution, log, program, programId);
         if (event) {
             events.push(event);
+            rawLogs.push(log);
         }
         if (newProgram) {
             execution.push(newProgram);
@@ -24,9 +31,9 @@ function parseLogs(program, logs, programId = driftProgramId) {
             execution.pop();
         }
     }
-    return events;
+    return { events, rawLogs };
 }
-exports.parseLogs = parseLogs;
+exports.parseLogsWithRaw = parseLogsWithRaw;
 function handleLog(execution, log, program, programId = driftProgramId) {
     // Executing program is drift program.
     if (execution.stack.length > 0 && execution.program() === programId) {

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/lib/math/auction.d.ts

@@ -6,12 +6,16 @@ export declare function isFallbackAvailableLiquiditySource(order: Order, minAuct
 export declare function getAuctionPrice(order: Order, slot: number, oraclePrice: BN): BN;
 export declare function getAuctionPriceForFixedAuction(order: Order, slot: number): BN;
 export declare function getAuctionPriceForOracleOffsetAuction(order: Order, slot: number, oraclePrice: BN): BN;
-export declare function deriveOracleAuctionParams({ direction, oraclePrice, auctionStartPrice, auctionEndPrice, limitPrice, }: {
+export declare function deriveOracleAuctionParams({ direction, oraclePrice, auctionStartPrice, auctionEndPrice, limitPrice, auctionPriceCaps, }: {
     direction: PositionDirection;
     oraclePrice: BN;
     auctionStartPrice: BN;
     auctionEndPrice: BN;
     limitPrice: BN;
+    auctionPriceCaps?: {
+        min: BN;
+        max: BN;
+    };
 }): {
     auctionStartPrice: BN;
     auctionEndPrice: BN;

package/lib/math/auction.js

@@ -94,7 +94,7 @@ function getAuctionPriceForOracleOffsetAuction(order, slot, oraclePrice) {
     return _1.BN.max(oraclePrice.add(priceOffset), _1.ONE);
 }
 exports.getAuctionPriceForOracleOffsetAuction = getAuctionPriceForOracleOffsetAuction;
-function deriveOracleAuctionParams({ direction, oraclePrice, auctionStartPrice, auctionEndPrice, limitPrice, }) {
+function deriveOracleAuctionParams({ direction, oraclePrice, auctionStartPrice, auctionEndPrice, limitPrice, auctionPriceCaps, }) {
     let oraclePriceOffset;
     if (limitPrice.eq(_1.ZERO) || oraclePrice.eq(_1.ZERO)) {
         oraclePriceOffset = _1.ZERO;
@@ -114,6 +114,10 @@ function deriveOracleAuctionParams({ direction, oraclePrice, auctionStartPrice,
     catch (e) {
         oraclePriceOffsetNum = 0;
     }
+    if (auctionPriceCaps) {
+        auctionStartPrice = _1.BN.min(_1.BN.max(auctionStartPrice, auctionPriceCaps.min), auctionPriceCaps.max);
+        auctionEndPrice = _1.BN.min(_1.BN.max(auctionEndPrice, auctionPriceCaps.min), auctionPriceCaps.max);
+    }
     return {
         auctionStartPrice: auctionStartPrice.sub(oraclePrice),
         auctionEndPrice: auctionEndPrice.sub(oraclePrice),

package/lib/math/insurance.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="bn.js" />
-import { BN } from '../index';
+import { BN, SpotMarketAccount } from '../index';
+export declare function nextRevenuePoolSettleApr(spotMarket: SpotMarketAccount, vaultBalance: BN, // vault token amount
+amount?: BN): number;
 export declare function stakeAmountToShares(amount: BN, totalIfShares: BN, insuranceFundVaultBalance: BN): BN;
 export declare function unstakeSharesToAmount(nShares: BN, totalIfShares: BN, insuranceFundVaultBalance: BN): BN;
 export declare function unstakeSharesToAmountWithOpenRequest(nShares: BN, withdrawRequestShares: BN, withdrawRequestAmount: BN, totalIfShares: BN, insuranceFundVaultBalance: BN): BN;