@drift-labs/sdk 2.142.0-beta.9 → 2.142.0

package/lib/node/accounts/grpcDriftClientAccountSubscriberV2.js

@@ -1,19 +1,116 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.grpcDriftClientAccountSubscriberV2 = void 0;
-const webSocketDriftClientAccountSubscriber_1 = require("./webSocketDriftClientAccountSubscriber");
+const events_1 = require("events");
 const web3_js_1 = require("@solana/web3.js");
 const config_1 = require("../config");
 const pda_1 = require("../addresses/pda");
+const types_1 = require("./types");
 const grpcAccountSubscriber_1 = require("./grpcAccountSubscriber");
 const grpcMultiAccountSubscriber_1 = require("./grpcMultiAccountSubscriber");
 const oracleId_1 = require("../oracles/oracleId");
-class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber {
+const oracleClientCache_1 = require("../oracles/oracleClientCache");
+const utils_1 = require("./utils");
+class grpcDriftClientAccountSubscriberV2 {
     constructor(grpcConfigs, program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, delistedMarketSetting, resubOpts) {
-        super(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, delistedMarketSetting, resubOpts);
         this.perpMarketIndexToAccountPubkeyMap = new Map();
         this.spotMarketIndexToAccountPubkeyMap = new Map();
+        this.perpOracleMap = new Map();
+        this.perpOracleStringMap = new Map();
+        this.spotOracleMap = new Map();
+        this.spotOracleStringMap = new Map();
+        this.oracleIdToOracleDataMap = new Map();
+        this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
+        this.chunks = (array, size) => {
+            return new Array(Math.ceil(array.length / size))
+                .fill(null)
+                .map((_, index) => index * size)
+                .map((begin) => array.slice(begin, begin + size));
+        };
+        this.eventEmitter = new events_1.EventEmitter();
+        this.isSubscribed = false;
+        this.isSubscribing = false;
+        this.program = program;
+        this.perpMarketIndexes = perpMarketIndexes;
+        this.spotMarketIndexes = spotMarketIndexes;
+        this.shouldFindAllMarketsAndOracles = shouldFindAllMarketsAndOracles;
+        this.oracleInfos = oracleInfos;
+        this.initialPerpMarketAccountData = new Map();
+        this.initialSpotMarketAccountData = new Map();
+        this.initialOraclePriceData = new Map();
+        this.perpOracleMap = new Map();
+        this.perpOracleStringMap = new Map();
+        this.spotOracleMap = new Map();
+        this.spotOracleStringMap = new Map();
         this.grpcConfigs = grpcConfigs;
+        this.resubOpts = resubOpts;
+        this.delistedMarketSetting = delistedMarketSetting;
+    }
+    async setInitialData() {
+        const connection = this.program.provider.connection;
+        if (!this.initialPerpMarketAccountData ||
+            this.initialPerpMarketAccountData.size === 0) {
+            const perpMarketPublicKeys = this.perpMarketIndexes.map((marketIndex) => (0, pda_1.getPerpMarketPublicKeySync)(this.program.programId, marketIndex));
+            const perpMarketPublicKeysChunks = this.chunks(perpMarketPublicKeys, 75);
+            const perpMarketAccountInfos = (await Promise.all(perpMarketPublicKeysChunks.map((perpMarketPublicKeysChunk) => connection.getMultipleAccountsInfo(perpMarketPublicKeysChunk)))).flat();
+            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 ||
+            this.initialSpotMarketAccountData.size === 0) {
+            const spotMarketPublicKeys = this.spotMarketIndexes.map((marketIndex) => (0, pda_1.getSpotMarketPublicKeySync)(this.program.programId, marketIndex));
+            const spotMarketPublicKeysChunks = this.chunks(spotMarketPublicKeys, 75);
+            const spotMarketAccountInfos = (await Promise.all(spotMarketPublicKeysChunks.map((spotMarketPublicKeysChunk) => connection.getMultipleAccountsInfo(spotMarketPublicKeysChunk)))).flat();
+            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 oracleAccountPubkeyChunks = this.chunks(this.oracleInfos.map((oracleInfo) => oracleInfo.publicKey), 75);
+        const oracleAccountInfos = (await Promise.all(oracleAccountPubkeyChunks.map((oracleAccountPublicKeysChunk) => connection.getMultipleAccountsInfo(oracleAccountPublicKeysChunk)))).flat();
+        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([
+                (0, oracleId_1.getOracleId)(oracleInfo.publicKey, oracleInfo.source),
+                oraclePriceData,
+            ]);
+            return result;
+        }, []));
+    }
+    async addPerpMarket(_marketIndex) {
+        if (!this.perpMarketIndexes.includes(_marketIndex)) {
+            this.perpMarketIndexes = this.perpMarketIndexes.concat(_marketIndex);
+        }
+        return true;
+    }
+    async addSpotMarket(_marketIndex) {
+        return true;
+    }
+    async addOracle(oracleInfo) {
+        var _a, _c;
+        if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+            console.log('[grpcDriftClientAccountSubscriberV2] addOracle');
+        }
+        if (oracleInfo.publicKey.equals(web3_js_1.PublicKey.default)) {
+            return true;
+        }
+        const exists = this.oracleInfos.some((o) => o.source === oracleInfo.source &&
+            o.publicKey.equals(oracleInfo.publicKey));
+        if (!exists) {
+            this.oracleInfos = this.oracleInfos.concat(oracleInfo);
+        }
+        (_c = this.oracleMultiSubscriber) === null || _c === void 0 ? void 0 : _c.addAccounts([oracleInfo.publicKey]);
+        return true;
     }
     async subscribe() {
         if (this.isSubscribed) {
@@ -61,6 +158,32 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
         this.removeInitialData();
         return true;
     }
+    async fetch() {
+        var _a, _c, _d, _e;
+        await ((_a = this.stateAccountSubscriber) === null || _a === void 0 ? void 0 : _a.fetch());
+        await ((_c = this.perpMarketsSubscriber) === null || _c === void 0 ? void 0 : _c.fetch());
+        await ((_d = this.spotMarketsSubscriber) === null || _d === void 0 ? void 0 : _d.fetch());
+        await ((_e = this.oracleMultiSubscriber) === null || _e === void 0 ? void 0 : _e.fetch());
+    }
+    assertIsSubscribed() {
+        if (!this.isSubscribed) {
+            throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
+        }
+    }
+    getStateAccountAndSlot() {
+        this.assertIsSubscribed();
+        return this.stateAccountSubscriber.dataAndSlot;
+    }
+    getMarketAccountsAndSlots() {
+        var _a, _c;
+        const map = (_a = this.perpMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountDataMap();
+        return Array.from((_c = map === null || map === void 0 ? void 0 : map.values()) !== null && _c !== void 0 ? _c : []);
+    }
+    getSpotMarketAccountsAndSlots() {
+        var _a, _c;
+        const map = (_a = this.spotMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountDataMap();
+        return Array.from((_c = map === null || map === void 0 ? void 0 : map.values()) !== null && _c !== void 0 ? _c : []);
+    }
     getMarketAccountAndSlot(marketIndex) {
         var _a;
         return (_a = this.perpMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountData(this.perpMarketIndexToAccountPubkeyMap.get(marketIndex));
@@ -69,8 +192,40 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
         var _a;
         return (_a = this.spotMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountData(this.spotMarketIndexToAccountPubkeyMap.get(marketIndex));
     }
+    getOraclePriceDataAndSlot(oracleId) {
+        this.assertIsSubscribed();
+        // we need to rely on a map we store in this class because the grpcMultiAccountSubscriber does not track a mapping or oracle ID.
+        // DO NOT call getAccountData on the oracleMultiSubscriber, it will not return the correct data in certain cases(BONK spot and perp market subscribed too at once).
+        return this.oracleIdToOracleDataMap.get(oracleId);
+    }
+    getOraclePriceDataAndSlotForPerpMarket(marketIndex) {
+        const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
+        const oracle = this.perpOracleMap.get(marketIndex);
+        const oracleId = this.perpOracleStringMap.get(marketIndex);
+        if (!perpMarketAccount || !oracleId) {
+            return undefined;
+        }
+        if (!perpMarketAccount.data.amm.oracle.equals(oracle)) {
+            // If the oracle has changed, we need to update the oracle map in background
+            this.setPerpOracleMap();
+        }
+        return this.getOraclePriceDataAndSlot(oracleId);
+    }
+    getOraclePriceDataAndSlotForSpotMarket(marketIndex) {
+        const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
+        const oracle = this.spotOracleMap.get(marketIndex);
+        const oracleId = this.spotOracleStringMap.get(marketIndex);
+        if (!spotMarketAccount || !oracleId) {
+            return undefined;
+        }
+        if (!spotMarketAccount.data.oracle.equals(oracle)) {
+            // If the oracle has changed, we need to update the oracle map in background
+            this.setSpotOracleMap();
+        }
+        return this.getOraclePriceDataAndSlot(oracleId);
+    }
     async setPerpOracleMap() {
-        var _a;
+        var _a, _c;
         const perpMarketsMap = (_a = this.perpMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountDataMap();
         const perpMarkets = Array.from(perpMarketsMap.values());
         const addOraclePromises = [];
@@ -82,7 +237,7 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
             const perpMarketIndex = perpMarketAccount.marketIndex;
             const oracle = perpMarketAccount.amm.oracle;
             const oracleId = (0, oracleId_1.getOracleId)(oracle, perpMarket.data.amm.oracleSource);
-            if (!this.oracleSubscribers.has(oracleId)) {
+            if (!((_c = this.oracleMultiSubscriber) === null || _c === void 0 ? void 0 : _c.getAccountDataMap().has(oracleId))) {
                 addOraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: perpMarket.data.amm.oracleSource,
@@ -94,7 +249,7 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
         await Promise.all(addOraclePromises);
     }
     async setSpotOracleMap() {
-        var _a;
+        var _a, _c;
         const spotMarketsMap = (_a = this.spotMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountDataMap();
         const spotMarkets = Array.from(spotMarketsMap.values());
         const addOraclePromises = [];
@@ -106,7 +261,7 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
             const spotMarketIndex = spotMarketAccount.marketIndex;
             const oracle = spotMarketAccount.oracle;
             const oracleId = (0, oracleId_1.getOracleId)(oracle, spotMarketAccount.oracleSource);
-            if (!this.oracleSubscribers.has(oracleId)) {
+            if (!((_c = this.oracleMultiSubscriber) === null || _c === void 0 ? void 0 : _c.getAccountDataMap().has(oracleId))) {
                 addOraclePromises.push(this.addOracle({
                     publicKey: oracle,
                     source: spotMarketAccount.oracleSource,
@@ -118,6 +273,10 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
         await Promise.all(addOraclePromises);
     }
     async subscribeToPerpMarketAccounts() {
+        var _a;
+        if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+            console.log('[grpcDriftClientAccountSubscriberV2] subscribeToPerpMarketAccounts');
+        }
         const perpMarketIndexToAccountPubkeys = await Promise.all(this.perpMarketIndexes.map(async (marketIndex) => [
             marketIndex,
             await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex),
@@ -149,6 +308,10 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
         return true;
     }
     async subscribeToSpotMarketAccounts() {
+        var _a;
+        if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+            console.log('[grpcDriftClientAccountSubscriberV2] subscribeToSpotMarketAccounts');
+        }
         const spotMarketIndexToAccountPubkeys = await Promise.all(this.spotMarketIndexes.map(async (marketIndex) => [
             marketIndex,
             await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex),
@@ -180,64 +343,102 @@ class grpcDriftClientAccountSubscriberV2 extends webSocketDriftClientAccountSubs
         return true;
     }
     async subscribeToOracles() {
-        // Build list of unique oracle pubkeys and a lookup for sources
-        const uniqueOraclePubkeys = new Map();
+        var _a;
+        if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+            console.log('grpcDriftClientAccountSubscriberV2 subscribeToOracles');
+        }
+        const oraclePubkeyToInfosMap = new Map();
         for (const info of this.oracleInfos) {
-            const id = (0, oracleId_1.getOracleId)(info.publicKey, info.source);
-            if (!uniqueOraclePubkeys.has(id) &&
-                !info.publicKey.equals(web3_js_1.PublicKey.default)) {
-                uniqueOraclePubkeys.set(id, info);
+            const pubkey = info.publicKey.toBase58();
+            if (!oraclePubkeyToInfosMap.has(pubkey)) {
+                oraclePubkeyToInfosMap.set(pubkey, []);
             }
+            oraclePubkeyToInfosMap.get(pubkey).push(info);
         }
-        const oraclePubkeys = Array.from(uniqueOraclePubkeys.values()).map((i) => i.publicKey);
-        const pubkeyToSource = new Map(Array.from(uniqueOraclePubkeys.values()).map((i) => [
-            i.publicKey.toBase58(),
-            i.source,
-        ]));
-        this.oracleMultiSubscriber =
-            await grpcMultiAccountSubscriber_1.grpcMultiAccountSubscriber.create(this.grpcConfigs, 'oracle', this.program, (buffer, pubkey) => {
-                if (!pubkey) {
-                    throw new Error('Oracle pubkey missing in decode');
-                }
-                const source = pubkeyToSource.get(pubkey);
-                const client = this.oracleClientCache.get(source, this.program.provider.connection, this.program);
-                return client.getOraclePriceDataFromBuffer(buffer);
-            }, this.resubOpts, undefined, async () => {
-                var _a;
-                try {
-                    if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
-                        console.log('[grpcDriftClientAccountSubscriberV2] oracle subscriber unsubscribed; resubscribing');
-                    }
-                    await this.subscribeToOracles();
-                }
-                catch (e) {
-                    console.error('Oracle resubscribe failed:', e);
+        const oraclePubkeys = Array.from(new Set(this.oracleInfos.map((info) => info.publicKey)));
+        this.oracleMultiSubscriber = await grpcMultiAccountSubscriber_1.grpcMultiAccountSubscriber.create(this.grpcConfigs, 'oracle', this.program, (buffer, pubkey, accountProps) => {
+            if (!pubkey) {
+                throw new Error('Oracle pubkey missing in decode');
+            }
+            const client = this.oracleClientCache.get(accountProps.source, this.program.provider.connection, this.program);
+            const price = client.getOraclePriceDataFromBuffer(buffer);
+            return price;
+        }, this.resubOpts, undefined, async () => {
+            var _a;
+            try {
+                if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+                    console.log('[grpcDriftClientAccountSubscriberV2] oracle subscriber unsubscribed; resubscribing');
                 }
-            });
+                await this.subscribeToOracles();
+            }
+            catch (e) {
+                console.error('Oracle resubscribe failed:', e);
+            }
+        }, oraclePubkeyToInfosMap);
         for (const data of this.initialOraclePriceData.entries()) {
             const { publicKey } = (0, oracleId_1.getPublicKeyAndSourceFromOracleId)(data[0]);
             this.oracleMultiSubscriber.setAccountData(publicKey.toBase58(), data[1]);
+            this.oracleIdToOracleDataMap.set(data[0], {
+                data: data[1],
+                slot: 0,
+            });
         }
-        await this.oracleMultiSubscriber.subscribe(oraclePubkeys, (accountId, data) => {
-            const source = pubkeyToSource.get(accountId.toBase58());
-            this.eventEmitter.emit('oraclePriceUpdate', accountId, source, data);
+        await this.oracleMultiSubscriber.subscribe(oraclePubkeys, (accountId, data, context, _b, accountProps) => {
+            const oracleId = (0, oracleId_1.getOracleId)(accountId, accountProps.source);
+            this.oracleIdToOracleDataMap.set(oracleId, {
+                data,
+                slot: context.slot,
+            });
+            this.eventEmitter.emit('oraclePriceUpdate', accountId, accountProps.source, data);
             this.eventEmitter.emit('update');
         });
         return true;
     }
+    async handleDelistedMarkets() {
+        var _a, _c;
+        if (this.delistedMarketSetting === types_1.DelistedMarketSetting.Subscribe) {
+            return;
+        }
+        const { perpMarketIndexes, oracles } = (0, utils_1.findDelistedPerpMarketsAndOracles)(Array.from(((_a = this.perpMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.getAccountDataMap().values()) || []), Array.from(((_c = this.spotMarketsSubscriber) === null || _c === void 0 ? void 0 : _c.getAccountDataMap().values()) || []));
+        // Build array of perp market pubkeys to remove
+        const perpMarketPubkeysToRemove = perpMarketIndexes
+            .map((marketIndex) => {
+            const pubkeyString = this.perpMarketIndexToAccountPubkeyMap.get(marketIndex);
+            return pubkeyString ? new web3_js_1.PublicKey(pubkeyString) : null;
+        })
+            .filter((pubkey) => pubkey !== null);
+        // Build array of oracle pubkeys to remove
+        const oraclePubkeysToRemove = oracles.map((oracle) => oracle.publicKey);
+        // Remove accounts in batches - perp markets
+        if (perpMarketPubkeysToRemove.length > 0) {
+            await this.perpMarketsSubscriber.removeAccounts(perpMarketPubkeysToRemove);
+        }
+        // Remove accounts in batches - oracles
+        if (oraclePubkeysToRemove.length > 0) {
+            await this.oracleMultiSubscriber.removeAccounts(oraclePubkeysToRemove);
+        }
+    }
+    removeInitialData() {
+        this.initialPerpMarketAccountData = new Map();
+        this.initialSpotMarketAccountData = new Map();
+        this.initialOraclePriceData = new Map();
+    }
     async unsubscribeFromOracles() {
         if (this.oracleMultiSubscriber) {
             await this.oracleMultiSubscriber.unsubscribe();
             this.oracleMultiSubscriber = undefined;
             return;
         }
-        await super.unsubscribeFromOracles();
     }
     async unsubscribe() {
+        var _a, _c;
         if (this.isSubscribed) {
             return;
         }
         await this.stateAccountSubscriber.unsubscribe();
+        await this.unsubscribeFromOracles();
+        await ((_a = this.perpMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.unsubscribe());
+        await ((_c = this.spotMarketsSubscriber) === null || _c === void 0 ? void 0 : _c.unsubscribe());
     }
 }
 exports.grpcDriftClientAccountSubscriberV2 = grpcDriftClientAccountSubscriberV2;

package/lib/node/accounts/grpcMultiAccountSubscriber.d.ts

@@ -4,7 +4,7 @@ import { Program } from '@coral-xyz/anchor';
 import { Context, PublicKey } from '@solana/web3.js';
 import { Client } from '../isomorphic/grpc';
 import { DataAndSlot, GrpcConfigs, ResubOpts } from './types';
-export declare class grpcMultiAccountSubscriber<T> {
+export declare class grpcMultiAccountSubscriber<T, U = undefined> {
     private client;
     private stream;
     private commitmentLevel;
@@ -20,12 +20,15 @@ export declare class grpcMultiAccountSubscriber<T> {
     private subscribedAccounts;
     private onChangeMap;
     private dataMap;
+    private accountPropsMap;
+    private bufferMap;
     private constructor();
-    static create<U>(grpcConfigs: GrpcConfigs, accountName: string, program: Program, decodeBuffer?: (buffer: Buffer, pubkey?: string) => U, resubOpts?: ResubOpts, clientProp?: Client, onUnsubscribe?: () => Promise<void>): Promise<grpcMultiAccountSubscriber<U>>;
+    static create<T, U = undefined>(grpcConfigs: GrpcConfigs, accountName: string, program: Program, decodeBuffer?: (buffer: Buffer, pubkey?: string, accountProps?: U) => T, resubOpts?: ResubOpts, clientProp?: Client, onUnsubscribe?: () => Promise<void>, accountPropsMap?: Map<string, U | Array<U>>): Promise<grpcMultiAccountSubscriber<T, U>>;
     setAccountData(accountPubkey: string, data: T, slot?: number): void;
     getAccountData(accountPubkey: string): DataAndSlot<T> | undefined;
     getAccountDataMap(): Map<string, DataAndSlot<T>>;
-    subscribe(accounts: PublicKey[], onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void): Promise<void>;
+    fetch(): Promise<void>;
+    subscribe(accounts: PublicKey[], onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer, accountProps: U) => void): Promise<void>;
     addAccounts(accounts: PublicKey[]): Promise<void>;
     removeAccounts(accounts: PublicKey[]): Promise<void>;
     unsubscribe(): Promise<void>;

package/lib/node/accounts/grpcMultiAccountSubscriber.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grpcMultiAccountSubscriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcMultiAccountSubscriber.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAIrD,OAAO,EACN,MAAM,EAMN,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAU9D,qBAAa,0BAA0B,CAAC,CAAC;IACxC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAwD;IACtE,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,cAAc,CAAC,CAAyC;IAChE,OAAO,CAAC,SAAS,CAAC,CAAY;IAC9B,OAAO,CAAC,aAAa,CAAC,CAAsB;IAErC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,UAAS;IAC/B,OAAO,CAAC,SAAS,CAAC,CAAgC;IAClD,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,WAAW,CAGf;IAEJ,OAAO,CAAC,OAAO,CAAqC;IAEpD,OAAO;WAkBa,MAAM,CAAC,CAAC,EAC3B,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,EAChB,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,CAAC,EACrD,SAAS,CAAC,EAAE,SAAS,EACrB,UAAU,CAAC,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACjC,OAAO,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC;IAuBzC,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAInE,cAAc,CAAC,aAAa,EAAE,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS;IAIjE,iBAAiB,IAAI,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAI1C,SAAS,CACd,QAAQ,EAAE,SAAS,EAAE,EACrB,QAAQ,EAAE,CACT,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,KACV,IAAI,GACP,OAAO,CAAC,IAAI,CAAC;IAgGV,WAAW,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiCjD,cAAc,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmCpD,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IA4ClC,OAAO,CAAC,UAAU;IAelB,OAAO,CAAC,UAAU;CAIlB"}
+{"version":3,"file":"grpcMultiAccountSubscriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcMultiAccountSubscriber.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAc,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAIjE,OAAO,EACN,MAAM,EAMN,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAiB,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAyB7E,qBAAa,0BAA0B,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS;IACvD,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAwD;IACtE,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,cAAc,CAAC,CAIhB;IACP,OAAO,CAAC,SAAS,CAAC,CAAY;IAC9B,OAAO,CAAC,aAAa,CAAC,CAAsB;IAErC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,UAAS;IAC/B,OAAO,CAAC,SAAS,CAAC,CAAgC;IAClD,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,WAAW,CAGf;IAEJ,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,eAAe,CAAmC;IAC1D,OAAO,CAAC,SAAS,CAAoC;IAErD,OAAO;WAoBa,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,EAC1C,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,EAChB,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,KAAK,CAAC,EACvE,SAAS,CAAC,EAAE,SAAS,EACrB,UAAU,CAAC,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EACnC,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GACzC,OAAO,CAAC,0BAA0B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAwB5C,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAInE,cAAc,CAAC,aAAa,EAAE,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS;IAIjE,iBAAiB,IAAI,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAI1C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAoEtB,SAAS,CACd,QAAQ,EAAE,SAAS,EAAE,EACrB,QAAQ,EAAE,CACT,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,CAAC,KACX,IAAI,GACP,OAAO,CAAC,IAAI,CAAC;IAsIV,WAAW,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiCjD,cAAc,CAAC,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmCpD,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IA4ClC,OAAO,CAAC,UAAU;IAelB,OAAO,CAAC,UAAU;CAIlB"}

package/lib/node/accounts/grpcMultiAccountSubscriber.js

@@ -31,13 +31,27 @@ const web3_js_1 = require("@solana/web3.js");
 const Buffer = __importStar(require("buffer"));
 const bs58_1 = __importDefault(require("bs58"));
 const grpc_1 = require("../isomorphic/grpc");
+function commitmentLevelToCommitment(commitmentLevel) {
+    switch (commitmentLevel) {
+        case grpc_1.CommitmentLevel.PROCESSED:
+            return 'processed';
+        case grpc_1.CommitmentLevel.CONFIRMED:
+            return 'confirmed';
+        case grpc_1.CommitmentLevel.FINALIZED:
+            return 'finalized';
+        default:
+            return 'confirmed';
+    }
+}
 class grpcMultiAccountSubscriber {
-    constructor(client, commitmentLevel, accountName, program, decodeBuffer, resubOpts, onUnsubscribe) {
+    constructor(client, commitmentLevel, accountName, program, decodeBuffer, resubOpts, onUnsubscribe, accountPropsMap) {
         this.isUnsubscribing = false;
         this.receivingData = false;
         this.subscribedAccounts = new Set();
         this.onChangeMap = new Map();
         this.dataMap = new Map();
+        this.accountPropsMap = new Map();
+        this.bufferMap = new Map();
         this.client = client;
         this.commitmentLevel = commitmentLevel;
         this.accountName = accountName;
@@ -45,8 +59,9 @@ class grpcMultiAccountSubscriber {
         this.decodeBufferFn = decodeBuffer;
         this.resubOpts = resubOpts;
         this.onUnsubscribe = onUnsubscribe;
+        this.accountPropsMap = accountPropsMap;
     }
-    static async create(grpcConfigs, accountName, program, decodeBuffer, resubOpts, clientProp, onUnsubscribe) {
+    static async create(grpcConfigs, accountName, program, decodeBuffer, resubOpts, clientProp, onUnsubscribe, accountPropsMap) {
         var _a, _b;
         const client = clientProp
             ? clientProp
@@ -54,7 +69,7 @@ class grpcMultiAccountSubscriber {
         const commitmentLevel = 
         // @ts-ignore :: isomorphic exported enum fails typescript but will work at runtime
         (_b = grpcConfigs.commitmentLevel) !== null && _b !== void 0 ? _b : grpc_1.CommitmentLevel.CONFIRMED;
-        return new grpcMultiAccountSubscriber(client, commitmentLevel, accountName, program, decodeBuffer, resubOpts, onUnsubscribe);
+        return new grpcMultiAccountSubscriber(client, commitmentLevel, accountName, program, decodeBuffer, resubOpts, onUnsubscribe, accountPropsMap);
     }
     setAccountData(accountPubkey, data, slot) {
         this.dataMap.set(accountPubkey, { data, slot });
@@ -65,7 +80,60 @@ class grpcMultiAccountSubscriber {
     getAccountDataMap() {
         return this.dataMap;
     }
+    async fetch() {
+        var _a;
+        try {
+            // Chunk account IDs into groups of 100 (getMultipleAccounts limit)
+            const chunkSize = 100;
+            const chunks = [];
+            const accountIds = Array.from(this.subscribedAccounts.values());
+            for (let i = 0; i < accountIds.length; i += chunkSize) {
+                chunks.push(accountIds.slice(i, i + chunkSize));
+            }
+            // Process all chunks concurrently
+            await Promise.all(chunks.map(async (chunk) => {
+                const accountAddresses = chunk.map((accountId) => new web3_js_1.PublicKey(accountId));
+                const rpcResponseAndContext = await this.program.provider.connection.getMultipleAccountsInfoAndContext(accountAddresses, {
+                    commitment: commitmentLevelToCommitment(this.commitmentLevel),
+                });
+                const rpcResponse = rpcResponseAndContext.value;
+                const currentSlot = rpcResponseAndContext.context.slot;
+                for (let i = 0; i < chunk.length; i++) {
+                    const accountId = chunk[i];
+                    const accountInfo = rpcResponse[i];
+                    if (accountInfo) {
+                        const prev = this.bufferMap.get(accountId);
+                        const newBuffer = accountInfo.data;
+                        if (prev && currentSlot < prev.slot) {
+                            continue;
+                        }
+                        if (prev &&
+                            prev.buffer &&
+                            newBuffer &&
+                            newBuffer.equals(prev.buffer)) {
+                            continue;
+                        }
+                        this.bufferMap.set(accountId, {
+                            buffer: newBuffer,
+                            slot: currentSlot,
+                        });
+                        const accountDecoded = this.program.coder.accounts.decode(this.capitalize(this.accountName), newBuffer);
+                        this.setAccountData(accountId, accountDecoded, currentSlot);
+                    }
+                }
+            }));
+        }
+        catch (error) {
+            if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+                console.log(`[${this.accountName}] grpcMultiAccountSubscriber error fetching accounts:`, error);
+            }
+        }
+    }
     async subscribe(accounts, onChange) {
+        var _a;
+        if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+            console.log(`[${this.accountName}] grpcMultiAccountSubscriber subscribe`);
+        }
         if (this.listenerId != null || this.isUnsubscribing) {
             return;
         }
@@ -73,9 +141,9 @@ class grpcMultiAccountSubscriber {
         for (const pk of accounts) {
             const key = pk.toBase58();
             this.subscribedAccounts.add(key);
-            this.onChangeMap.set(key, (data, ctx, buffer) => {
+            this.onChangeMap.set(key, (data, ctx, buffer, accountProps) => {
                 this.setAccountData(key, data, ctx.slot);
-                onChange(new web3_js_1.PublicKey(key), data, ctx, buffer);
+                onChange(new web3_js_1.PublicKey(key), data, ctx, buffer, accountProps);
             });
         }
         this.stream =
@@ -98,7 +166,7 @@ class grpcMultiAccountSubscriber {
             transactionsStatus: {},
         };
         this.stream.on('data', (chunk) => {
-            var _a;
+            var _a, _b;
             if (!chunk.account) {
                 return;
             }
@@ -108,6 +176,17 @@ class grpcMultiAccountSubscriber {
             if (!accountPubkey || !this.subscribedAccounts.has(accountPubkey)) {
                 return;
             }
+            // Touch resub timer on any incoming account update for subscribed keys
+            if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) {
+                this.receivingData = true;
+                clearTimeout(this.timeoutId);
+                this.setTimeout();
+            }
+            // Skip processing if we already have data for this account at a newer slot
+            const existing = this.dataMap.get(accountPubkey);
+            if ((existing === null || existing === void 0 ? void 0 : existing.slot) !== undefined && existing.slot > slot) {
+                return;
+            }
             const accountInfo = {
                 owner: new web3_js_1.PublicKey(chunk.account.account.owner),
                 lamports: Number(chunk.account.account.lamports),
@@ -117,21 +196,36 @@ class grpcMultiAccountSubscriber {
             };
             const context = { slot };
             const buffer = accountInfo.data;
-            const data = this.decodeBufferFn
-                ? this.decodeBufferFn(buffer, accountPubkey)
-                : this.program.account[this.accountName].coder.accounts.decode(this.capitalize(this.accountName), buffer);
-            const handler = this.onChangeMap.get(accountPubkey);
-            if (handler) {
-                if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) {
-                    this.receivingData = true;
-                    clearTimeout(this.timeoutId);
-                    handler(data, context, buffer);
-                    this.setTimeout();
+            // Check existing buffer for this account and skip if unchanged or slot regressed
+            const prevBuffer = this.bufferMap.get(accountPubkey);
+            if (prevBuffer && slot < prevBuffer.slot) {
+                return;
+            }
+            if (prevBuffer &&
+                prevBuffer.buffer &&
+                buffer &&
+                buffer.equals(prevBuffer.buffer)) {
+                return;
+            }
+            this.bufferMap.set(accountPubkey, { buffer, slot });
+            const accountProps = (_b = this.accountPropsMap) === null || _b === void 0 ? void 0 : _b.get(accountPubkey);
+            const handleDataBuffer = (context, buffer, accountProps) => {
+                const data = this.decodeBufferFn
+                    ? this.decodeBufferFn(buffer, accountPubkey, accountProps)
+                    : this.program.account[this.accountName].coder.accounts.decode(this.capitalize(this.accountName), buffer);
+                const handler = this.onChangeMap.get(accountPubkey);
+                if (handler) {
+                    handler(data, context, buffer, accountProps);
                 }
-                else {
-                    handler(data, context, buffer);
+            };
+            if (Array.isArray(accountProps)) {
+                for (const props of accountProps) {
+                    handleDataBuffer(context, buffer, props);
                 }
             }
+            else {
+                handleDataBuffer(context, buffer, accountProps);
+            }
         });
         return new Promise((resolve, reject) => {
             this.stream.write(request, (err) => {
@@ -140,7 +234,6 @@ class grpcMultiAccountSubscriber {
                     this.listenerId = 1;
                     if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) {
                         this.receivingData = true;
-                        this.setTimeout();
                     }
                     resolve();
                 }

package/lib/node/adminClient.d.ts

@@ -53,6 +53,8 @@ export declare class AdminClient extends DriftClient {
     getUpdateAdminIx(admin: PublicKey): Promise<TransactionInstruction>;
     updatePerpMarketCurveUpdateIntensity(perpMarketIndex: number, curveUpdateIntensity: number): Promise<TransactionSignature>;
     getUpdatePerpMarketCurveUpdateIntensityIx(perpMarketIndex: number, curveUpdateIntensity: number): Promise<TransactionInstruction>;
+    updatePerpMarketReferencePriceOffsetDeadbandPct(perpMarketIndex: number, referencePriceOffsetDeadbandPct: number): Promise<TransactionSignature>;
+    getUpdatePerpMarketReferencePriceOffsetDeadbandPctIx(perpMarketIndex: number, referencePriceOffsetDeadbandPct: number): Promise<TransactionInstruction>;
     updatePerpMarketTargetBaseAssetAmountPerLp(perpMarketIndex: number, targetBaseAssetAmountPerLP: number): Promise<TransactionSignature>;
     updatePerpMarketAmmSummaryStats(perpMarketIndex: number, updateAmmSummaryStats?: boolean, quoteAssetAmountWithUnsettledLp?: BN, netUnsettledFundingPnl?: BN, excludeTotalLiqFee?: boolean): Promise<TransactionSignature>;
     getUpdatePerpMarketAmmSummaryStatsIx(perpMarketIndex: number, updateAmmSummaryStats?: boolean, quoteAssetAmountWithUnsettledLp?: BN, netUnsettledFundingPnl?: BN, excludeTotalLiqFee?: boolean): Promise<TransactionInstruction>;
@@ -246,5 +248,7 @@ export declare class AdminClient extends DriftClient {
     getUpdateFeatureBitFlagsBuilderCodesIx(enable: boolean): Promise<TransactionInstruction>;
     updateFeatureBitFlagsBuilderReferral(enable: boolean): Promise<TransactionSignature>;
     getUpdateFeatureBitFlagsBuilderReferralIx(enable: boolean): Promise<TransactionInstruction>;
+    adminDisableUpdatePerpBidAskTwap(authority: PublicKey, disable: boolean): Promise<TransactionSignature>;
+    getAdminDisableUpdatePerpBidAskTwapIx(authority: PublicKey, disable: boolean): Promise<TransactionInstruction>;
 }
 //# sourceMappingURL=adminClient.d.ts.map