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

package/lib/browser/accounts/grpcMultiAccountSubscriber.js

@@ -31,12 +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;
@@ -44,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
@@ -53,9 +69,71 @@ 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 });
+    }
+    getAccountData(accountPubkey) {
+        return this.dataMap.get(accountPubkey);
+    }
+    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;
         }
@@ -63,7 +141,10 @@ class grpcMultiAccountSubscriber {
         for (const pk of accounts) {
             const key = pk.toBase58();
             this.subscribedAccounts.add(key);
-            this.onChangeMap.set(key, (data, ctx, buffer) => onChange(new web3_js_1.PublicKey(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, accountProps);
+            });
         }
         this.stream =
             (await this.client.subscribe());
@@ -85,7 +166,7 @@ class grpcMultiAccountSubscriber {
             transactionsStatus: {},
         };
         this.stream.on('data', (chunk) => {
-            var _a;
+            var _a, _b;
             if (!chunk.account) {
                 return;
             }
@@ -95,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),
@@ -104,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) => {
@@ -127,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/browser/adminClient.d.ts

@@ -246,4 +246,6 @@ 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>;
 }

package/lib/browser/adminClient.js

@@ -2248,5 +2248,22 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async adminDisableUpdatePerpBidAskTwap(authority, disable) {
+        const disableBidAskTwapUpdateIx = await this.getAdminDisableUpdatePerpBidAskTwapIx(authority, disable);
+        const tx = await this.buildTransaction(disableBidAskTwapUpdateIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getAdminDisableUpdatePerpBidAskTwapIx(authority, disable) {
+        return await this.program.instruction.adminDisableUpdatePerpBidAskTwap(disable, {
+            accounts: {
+                admin: this.useHotWalletAdmin
+                    ? this.wallet.publicKey
+                    : this.getStateAccount().admin,
+                state: await this.getStatePublicKey(),
+                userStats: (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, authority),
+            },
+        });
+    }
 }
 exports.AdminClient = AdminClient;

package/lib/browser/constants/spotMarkets.js

@@ -11,8 +11,8 @@ exports.DevnetSpotMarkets = [
         symbol: 'USDC',
         marketIndex: 0,
         poolId: 0,
-        oracle: new web3_js_1.PublicKey('En8hkHLkRe9d9DraYmBTrus518BvmVH448YcvmrFM6Ce'),
-        oracleSource: types_1.OracleSource.PYTH_STABLE_COIN_PULL,
+        oracle: new web3_js_1.PublicKey('9VCioxmni2gDLv11qufWzT3RDERhQE4iY5Gf7NTfYyAV'),
+        oracleSource: types_1.OracleSource.PYTH_LAZER_STABLE_COIN,
         mint: new web3_js_1.PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
         precision: new anchor_1.BN(10).pow(numericConstants_1.SIX),
         precisionExp: numericConstants_1.SIX,
@@ -23,8 +23,8 @@ exports.DevnetSpotMarkets = [
         symbol: 'SOL',
         marketIndex: 1,
         poolId: 0,
-        oracle: new web3_js_1.PublicKey('BAtFj4kQttZRVep3UZS2aZRDixkGYgWsbqTBVDbnSsPF'),
-        oracleSource: types_1.OracleSource.PYTH_PULL,
+        oracle: new web3_js_1.PublicKey('3m6i4RFWEDw2Ft4tFHPJtYgmpPe21k56M3FHeWYrgGBz'),
+        oracleSource: types_1.OracleSource.PYTH_LAZER,
         mint: new web3_js_1.PublicKey(exports.WRAPPED_SOL_MINT),
         precision: numericConstants_1.LAMPORTS_PRECISION,
         precisionExp: numericConstants_1.LAMPORTS_EXP,

package/lib/browser/driftClient.d.ts

@@ -180,7 +180,26 @@ export declare class DriftClient {
     getMigrateReferrerIx(authority: PublicKey): Promise<TransactionInstruction>;
     resizeRevenueShareEscrowOrders(authority: PublicKey, numOrders: number, txParams?: TxParams): Promise<TransactionSignature>;
     getResizeRevenueShareEscrowOrdersIx(authority: PublicKey, numOrders: number): Promise<TransactionInstruction>;
+    /**
+     * Creates the transaction to add or update an approved builder.
+     * This allows the builder to receive revenue share from referrals.
+     *
+     * @param builder - The public key of the builder to add or update.
+     * @param maxFeeTenthBps - The maximum fee tenth bps to set for the builder.
+     * @param add - Whether to add or update the builder. If the builder already exists, `add = true` will update the `maxFeeTenthBps`, otherwise it will add the builder. If `add = false`, the builder's `maxFeeTenthBps` will be set to 0.
+     * @param txParams - The transaction parameters to use for the transaction.
+     * @returns The transaction to add or update an approved builder.
+     */
     changeApprovedBuilder(builder: PublicKey, maxFeeTenthBps: number, add: boolean, txParams?: TxParams): Promise<TransactionSignature>;
+    /**
+     * Creates the transaction instruction to add or update an approved builder.
+     * This allows the builder to receive revenue share from referrals.
+     *
+     * @param builder - The public key of the builder to add or update.
+     * @param maxFeeTenthBps - The maximum fee tenth bps to set for the builder.
+     * @param add - Whether to add or update the builder. If the builder already exists, `add = true` will update the `maxFeeTenthBps`, otherwise it will add the builder. If `add = false`, the builder's `maxFeeTenthBps` will be set to 0.
+     * @returns The transaction instruction to add or update an approved builder.
+     */
     getChangeApprovedBuilderIx(builder: PublicKey, maxFeeTenthBps: number, add: boolean): Promise<TransactionInstruction>;
     addSignedMsgWsDelegate(authority: PublicKey, delegate: PublicKey, txParams?: TxParams): Promise<TransactionSignature>;
     getAddSignedMsgWsDelegateIx(authority: PublicKey, delegate: PublicKey): Promise<TransactionInstruction>;
@@ -482,7 +501,9 @@ export declare class DriftClient {
     preparePlaceOrdersTx(params: OrderParams[], txParams?: TxParams, subAccountId?: number, optionalIxs?: TransactionInstruction[]): Promise<{
         placeOrdersTx: anchor.web3.Transaction | anchor.web3.VersionedTransaction;
     }>;
-    getPlaceOrdersIx(params: OptionalOrderParams[], subAccountId?: number): Promise<TransactionInstruction>;
+    getPlaceOrdersIx(params: OptionalOrderParams[], subAccountId?: number, overrides?: {
+        authority?: PublicKey;
+    }): Promise<TransactionInstruction>;
     getPlaceOrdersAndSetPositionMaxLevIx(params: OptionalOrderParams[], positionMaxLev: number, subAccountId?: number): Promise<TransactionInstruction[]>;
     fillPerpOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Pick<Order, 'marketIndex' | 'orderId'>, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, txParams?: TxParams, fillerSubAccountId?: number, fillerAuthority?: PublicKey, hasBuilderFee?: boolean): Promise<TransactionSignature>;
     getFillPerpOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order: Pick<Order, 'marketIndex' | 'orderId'>, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, fillerSubAccountId?: number, isSignedMsg?: boolean, fillerAuthority?: PublicKey, hasBuilderFee?: boolean): Promise<TransactionInstruction>;
@@ -605,7 +626,9 @@ export declare class DriftClient {
         signedCancelExistingOrdersTx?: Transaction;
         signedSettlePnlTx?: Transaction;
     }>;
-    getPlaceAndTakePerpOrderIx(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, successCondition?: PlaceAndTakeOrderSuccessCondition, auctionDurationPercentage?: number, subAccountId?: number): Promise<TransactionInstruction>;
+    getPlaceAndTakePerpOrderIx(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, successCondition?: PlaceAndTakeOrderSuccessCondition, auctionDurationPercentage?: number, subAccountId?: number, overrides?: {
+        authority?: PublicKey;
+    }): Promise<TransactionInstruction>;
     placeAndMakePerpOrder(orderParams: OptionalOrderParams, takerInfo: TakerInfo, referrerInfo?: ReferrerInfo, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
     getPlaceAndMakePerpOrderIx(orderParams: OptionalOrderParams, takerInfo: TakerInfo, referrerInfo?: ReferrerInfo, subAccountId?: number): Promise<TransactionInstruction>;
     signSignedMsgOrderParamsMessage(orderParamsMessage: SignedMsgOrderParamsMessage | SignedMsgOrderParamsDelegateMessage, delegateSigner?: boolean): SignedMsgOrderParams;

package/lib/browser/driftClient.js

@@ -768,12 +768,31 @@ class DriftClient {
             },
         });
     }
+    /**
+     * Creates the transaction to add or update an approved builder.
+     * This allows the builder to receive revenue share from referrals.
+     *
+     * @param builder - The public key of the builder to add or update.
+     * @param maxFeeTenthBps - The maximum fee tenth bps to set for the builder.
+     * @param add - Whether to add or update the builder. If the builder already exists, `add = true` will update the `maxFeeTenthBps`, otherwise it will add the builder. If `add = false`, the builder's `maxFeeTenthBps` will be set to 0.
+     * @param txParams - The transaction parameters to use for the transaction.
+     * @returns The transaction to add or update an approved builder.
+     */
     async changeApprovedBuilder(builder, maxFeeTenthBps, add, txParams) {
         const ix = await this.getChangeApprovedBuilderIx(builder, maxFeeTenthBps, add);
         const tx = await this.buildTransaction([ix], txParams);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
+    /**
+     * Creates the transaction instruction to add or update an approved builder.
+     * This allows the builder to receive revenue share from referrals.
+     *
+     * @param builder - The public key of the builder to add or update.
+     * @param maxFeeTenthBps - The maximum fee tenth bps to set for the builder.
+     * @param add - Whether to add or update the builder. If the builder already exists, `add = true` will update the `maxFeeTenthBps`, otherwise it will add the builder. If `add = false`, the builder's `maxFeeTenthBps` will be set to 0.
+     * @returns The transaction instruction to add or update an approved builder.
+     */
     async getChangeApprovedBuilderIx(builder, maxFeeTenthBps, add) {
         const authority = this.wallet.publicKey;
         const escrow = (0, pda_1.getRevenueShareEscrowAccountPublicKey)(this.program.programId, authority);
@@ -2536,7 +2555,8 @@ class DriftClient {
             placeOrdersTx: tx,
         };
     }
-    async getPlaceOrdersIx(params, subAccountId) {
+    async getPlaceOrdersIx(params, subAccountId, overrides) {
+        var _a;
         const user = await this.getUserAccountPublicKey(subAccountId);
         const readablePerpMarketIndex = [];
         const readableSpotMarketIndexes = [];
@@ -2567,12 +2587,13 @@ class DriftClient {
             }
         }
         const formattedParams = params.map((item) => (0, orderParams_1.getOrderParams)(item));
+        const authority = (_a = overrides === null || overrides === void 0 ? void 0 : overrides.authority) !== null && _a !== void 0 ? _a : this.wallet.publicKey;
         return await this.program.instruction.placeOrders(formattedParams, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user,
                 userStats: this.getUserStatsAccountPublicKey(),
-                authority: this.wallet.publicKey,
+                authority,
             },
             remainingAccounts,
         });
@@ -3532,7 +3553,8 @@ class DriftClient {
             signedSettlePnlTx: signedTxs.settlePnlTx,
         };
     }
-    async getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo, successCondition, auctionDurationPercentage, subAccountId) {
+    async getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo, successCondition, auctionDurationPercentage, subAccountId, overrides) {
+        var _a;
         orderParams = (0, orderParams_1.getOrderParams)(orderParams, { marketType: types_1.MarketType.PERP });
         const userStatsPublicKey = await this.getUserStatsAccountPublicKey();
         const user = await this.getUserAccountPublicKey(subAccountId);
@@ -3590,12 +3612,13 @@ class DriftClient {
             optionalParams =
                 ((auctionDurationPercentage !== null && auctionDurationPercentage !== void 0 ? auctionDurationPercentage : 100) << 8) | (successCondition !== null && successCondition !== void 0 ? successCondition : 0);
         }
+        const authority = (_a = overrides === null || overrides === void 0 ? void 0 : overrides.authority) !== null && _a !== void 0 ? _a : this.wallet.publicKey;
         return await this.program.instruction.placeAndTakePerpOrder(orderParams, optionalParams, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user,
                 userStats: userStatsPublicKey,
-                authority: this.wallet.publicKey,
+                authority,
             },
             remainingAccounts,
         });

package/lib/browser/events/types.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { Commitment, PublicKey, TransactionSignature } from '@solana/web3.js';
-import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord, LPRecord, InsuranceFundRecord, SpotInterestRecord, InsuranceFundStakeRecord, CurveRecord, SwapRecord, SpotMarketVaultDepositRecord, SignedMsgOrderRecord, DeleteUserRecord, FuelSweepRecord, FuelSeasonRecord, InsuranceFundSwapRecord, TransferProtocolIfSharesToRevenuePoolRecord, LPMintRedeemRecord, LPSettleRecord, LPSwapRecord } from '../types';
+import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord, LPRecord, InsuranceFundRecord, SpotInterestRecord, InsuranceFundStakeRecord, CurveRecord, SwapRecord, SpotMarketVaultDepositRecord, SignedMsgOrderRecord, DeleteUserRecord, FuelSweepRecord, FuelSeasonRecord, InsuranceFundSwapRecord, TransferProtocolIfSharesToRevenuePoolRecord, LPMintRedeemRecord, LPSettleRecord, LPSwapRecord, LPBorrowLendDepositRecord } from '../types';
 import { EventEmitter } from 'events';
 export type EventSubscriptionOptions = {
     address?: PublicKey;
@@ -47,12 +47,12 @@ export type EventMap = {
     FuelSeasonRecord: Event<FuelSeasonRecord>;
     InsuranceFundSwapRecord: Event<InsuranceFundSwapRecord>;
     TransferProtocolIfSharesToRevenuePoolRecord: Event<TransferProtocolIfSharesToRevenuePoolRecord>;
-    LPMintRedeemRecord: Event<LPMintRedeemRecord>;
     LPSettleRecord: Event<LPSettleRecord>;
+    LPMintRedeemRecord: Event<LPMintRedeemRecord>;
     LPSwapRecord: Event<LPSwapRecord>;
 };
 export type EventType = keyof EventMap;
-export type DriftEvent = Event<DepositRecord> | Event<FundingPaymentRecord> | Event<LiquidationRecord> | Event<FundingRateRecord> | Event<OrderRecord> | Event<OrderActionRecord> | Event<SettlePnlRecord> | Event<NewUserRecord> | Event<LPRecord> | Event<InsuranceFundRecord> | Event<SpotInterestRecord> | Event<InsuranceFundStakeRecord> | Event<CurveRecord> | Event<SwapRecord> | Event<SpotMarketVaultDepositRecord> | Event<SignedMsgOrderRecord> | Event<DeleteUserRecord> | Event<FuelSweepRecord> | Event<FuelSeasonRecord> | Event<InsuranceFundSwapRecord> | Event<TransferProtocolIfSharesToRevenuePoolRecord> | Event<LPSettleRecord> | Event<LPSwapRecord> | Event<LPMintRedeemRecord>;
+export type DriftEvent = Event<DepositRecord> | Event<FundingPaymentRecord> | Event<LiquidationRecord> | Event<FundingRateRecord> | Event<OrderRecord> | Event<OrderActionRecord> | Event<SettlePnlRecord> | Event<NewUserRecord> | Event<LPRecord> | Event<InsuranceFundRecord> | Event<SpotInterestRecord> | Event<InsuranceFundStakeRecord> | Event<CurveRecord> | Event<SwapRecord> | Event<SpotMarketVaultDepositRecord> | Event<SignedMsgOrderRecord> | Event<DeleteUserRecord> | Event<FuelSweepRecord> | Event<FuelSeasonRecord> | Event<InsuranceFundSwapRecord> | Event<TransferProtocolIfSharesToRevenuePoolRecord> | Event<LPSettleRecord> | Event<LPMintRedeemRecord> | Event<LPSwapRecord> | Event<LPBorrowLendDepositRecord>;
 export interface EventSubscriberEvents {
     newEvent: (event: WrappedEvent<EventType>) => void;
 }

package/lib/browser/idl/drift.json

@@ -14875,6 +14875,11 @@
                     "name": "lpPrice",
                     "type": "u128",
                     "index": false
+                },
+                {
+                    "name": "lpPool",
+                    "type": "publicKey",
+                    "index": false
                 }
             ]
         },
@@ -14985,6 +14990,11 @@
                     "name": "outSwapId",
                     "type": "u64",
                     "index": false
+                },
+                {
+                    "name": "lpPool",
+                    "type": "publicKey",
+                    "index": false
                 }
             ]
         },
@@ -15080,6 +15090,68 @@
                     "name": "inMarketTargetWeight",
                     "type": "i64",
                     "index": false
+                },
+                {
+                    "name": "lpPool",
+                    "type": "publicKey",
+                    "index": false
+                }
+            ]
+        },
+        {
+            "name": "LPBorrowLendDepositRecord",
+            "fields": [
+                {
+                    "name": "ts",
+                    "type": "i64",
+                    "index": false
+                },
+                {
+                    "name": "slot",
+                    "type": "u64",
+                    "index": false
+                },
+                {
+                    "name": "spotMarketIndex",
+                    "type": "u16",
+                    "index": false
+                },
+                {
+                    "name": "constituentIndex",
+                    "type": "u16",
+                    "index": false
+                },
+                {
+                    "name": "direction",
+                    "type": {
+                        "defined": "DepositDirection"
+                    },
+                    "index": false
+                },
+                {
+                    "name": "tokenBalance",
+                    "type": "i64",
+                    "index": false
+                },
+                {
+                    "name": "lastTokenBalance",
+                    "type": "i64",
+                    "index": false
+                },
+                {
+                    "name": "interestAccruedTokenAmount",
+                    "type": "i64",
+                    "index": false
+                },
+                {
+                    "name": "amountDepositWithdraw",
+                    "type": "u64",
+                    "index": false
+                },
+                {
+                    "name": "lpPool",
+                    "type": "publicKey",
+                    "index": false
                 }
             ]
         }

package/lib/browser/types.d.ts

@@ -866,6 +866,7 @@ export type LPSwapRecord = {
     outMarketTargetWeight: BN;
     inSwapId: BN;
     outSwapId: BN;
+    lpPool: PublicKey;
 };
 export type LPMintRedeemRecord = {
     ts: BN;
@@ -887,6 +888,7 @@ export type LPMintRedeemRecord = {
     lastAumSlot: BN;
     inMarketCurrentWeight: BN;
     inMarketTargetWeight: BN;
+    lpPool: PublicKey;
 };
 export type LPSettleRecord = {
     recordId: BN;
@@ -900,6 +902,19 @@ export type LPSettleRecord = {
     perpAmmExFeeDelta: BN;
     lpAum: BN;
     lpPrice: BN;
+    lpPool: PublicKey;
+};
+export type LPBorrowLendDepositRecord = {
+    ts: BN;
+    slot: BN;
+    spotMarketIndex: number;
+    constituentIndex: number;
+    direction: DepositDirection;
+    tokenBalance: BN;
+    lastTokenBalance: BN;
+    interestAccruedTokenAmount: BN;
+    amountDepositWithdraw: BN;
+    lpPool: PublicKey;
 };
 export type StateAccount = {
     admin: PublicKey;
@@ -971,6 +986,10 @@ export type PerpMarketAccount = {
     protectedMakerLimitPriceDivisor: number;
     protectedMakerDynamicDivisor: number;
     lastFillPrice: BN;
+    lpFeeTransferScalar: number;
+    lpExchangeFeeExcluscionScalar: number;
+    lpStatus: number;
+    lpPausedOperations: number;
 };
 export type HistoricalOracleData = {
     lastOraclePrice: BN;
@@ -1649,12 +1668,14 @@ export type RevenueShareEscrowAccount = {
     approvedBuilders: BuilderInfo[];
 };
 export type RevenueShareOrder = {
-    builderIdx: number;
     feesAccrued: BN;
     orderId: number;
     feeTenthBps: number;
     marketIndex: number;
+    subAccountId: number;
+    builderIdx: number;
     bitFlags: number;
+    userOrderIndex: number;
     marketType: MarketType;
     padding: number[];
 };

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

@@ -1,17 +1,65 @@
-import { WebSocketDriftClientAccountSubscriber } from './webSocketDriftClientAccountSubscriber';
-import { OracleInfo } from '../oracles/types';
+/// <reference types="node" />
+import StrictEventEmitter from 'strict-event-emitter-types';
+import { EventEmitter } from 'events';
+import { OracleInfo, OraclePriceData } from '../oracles/types';
 import { Program } from '@coral-xyz/anchor';
-import { DelistedMarketSetting, GrpcConfigs, ResubOpts } from './types';
-export declare class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAccountSubscriber {
+import { PublicKey } from '@solana/web3.js';
+import { AccountSubscriber, DataAndSlot, DelistedMarketSetting, DriftClientAccountEvents, DriftClientAccountSubscriber, GrpcConfigs, ResubOpts } from './types';
+import { PerpMarketAccount, SpotMarketAccount, StateAccount } from '../types';
+import { OracleClientCache } from '../oracles/oracleClientCache';
+export declare class grpcDriftClientAccountSubscriberV2 implements DriftClientAccountSubscriber {
     private grpcConfigs;
     private perpMarketsSubscriber?;
     private spotMarketsSubscriber?;
     private oracleMultiSubscriber?;
+    private perpMarketIndexToAccountPubkeyMap;
+    private spotMarketIndexToAccountPubkeyMap;
+    private delistedMarketSetting;
+    eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
+    isSubscribed: boolean;
+    isSubscribing: boolean;
+    program: Program;
+    perpMarketIndexes: number[];
+    spotMarketIndexes: number[];
+    shouldFindAllMarketsAndOracles: boolean;
+    oracleInfos: OracleInfo[];
+    initialPerpMarketAccountData: Map<number, PerpMarketAccount>;
+    initialSpotMarketAccountData: Map<number, SpotMarketAccount>;
+    initialOraclePriceData: Map<string, OraclePriceData>;
+    perpOracleMap: Map<number, PublicKey>;
+    perpOracleStringMap: Map<number, string>;
+    spotOracleMap: Map<number, PublicKey>;
+    spotOracleStringMap: Map<number, string>;
+    private oracleIdToOracleDataMap;
+    stateAccountSubscriber?: AccountSubscriber<StateAccount>;
+    oracleClientCache: OracleClientCache;
+    private resubOpts?;
+    private subscriptionPromise;
+    protected subscriptionPromiseResolver: (val: boolean) => void;
     constructor(grpcConfigs: GrpcConfigs, program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting, resubOpts?: ResubOpts);
+    chunks: <T>(array: readonly T[], size: number) => T[][];
+    setInitialData(): Promise<void>;
+    addPerpMarket(_marketIndex: number): Promise<boolean>;
+    addSpotMarket(_marketIndex: number): Promise<boolean>;
+    addOracle(oracleInfo: OracleInfo): Promise<boolean>;
     subscribe(): Promise<boolean>;
+    fetch(): Promise<void>;
+    private assertIsSubscribed;
+    getStateAccountAndSlot(): DataAndSlot<StateAccount>;
+    getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[];
+    getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
+    getMarketAccountAndSlot(marketIndex: number): DataAndSlot<PerpMarketAccount> | undefined;
+    getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
+    getOraclePriceDataAndSlot(oracleId: string): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
+    setPerpOracleMap(): Promise<void>;
+    setSpotOracleMap(): Promise<void>;
     subscribeToPerpMarketAccounts(): Promise<boolean>;
     subscribeToSpotMarketAccounts(): Promise<boolean>;
     subscribeToOracles(): Promise<boolean>;
+    handleDelistedMarkets(): Promise<void>;
+    removeInitialData(): void;
     unsubscribeFromOracles(): Promise<void>;
     unsubscribe(): Promise<void>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"grpcDriftClientAccountSubscriberV2.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcDriftClientAccountSubscriberV2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qCAAqC,EAAE,MAAM,yCAAyC,CAAC;AAChG,OAAO,EAAE,UAAU,EAAmB,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAQ5C,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAMxE,qBAAa,kCAAmC,SAAQ,qCAAqC;IAC5F,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,qBAAqB,CAAC,CAAgD;IAC9E,OAAO,CAAC,qBAAqB,CAAC,CAAgD;IAC9E,OAAO,CAAC,qBAAqB,CAAC,CAA8C;gBAG3E,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,MAAM,EAAE,EAC3B,iBAAiB,EAAE,MAAM,EAAE,EAC3B,WAAW,EAAE,UAAU,EAAE,EACzB,8BAA8B,EAAE,OAAO,EACvC,qBAAqB,EAAE,qBAAqB,EAC5C,SAAS,CAAC,EAAE,SAAS;IAcT,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAiF3B,6BAA6B,IAAI,OAAO,CAAC,OAAO,CAAC;IA0CjD,6BAA6B,IAAI,OAAO,CAAC,OAAO,CAAC;IA0CjD,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;IAoE/C,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAO3C"}
+{"version":3,"file":"grpcDriftClientAccountSubscriberV2.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcDriftClientAccountSubscriberV2.ts"],"names":[],"mappings":"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"}