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

package/lib/browser/events/parse.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseLogsWithRaw = exports.parseLogs = void 0;
+exports.parseLogsForCuUsage = exports.parseLogsWithRaw = exports.parseLogs = void 0;
 const driftProgramId = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
 const PROGRAM_LOG = 'Program log: ';
+const PROGRAM_INSTRUCTION = 'Program log: Instruction: ';
 const PROGRAM_DATA = 'Program data: ';
 const PROGRAM_LOG_START_INDEX = PROGRAM_LOG.length;
 const PROGRAM_DATA_START_INDEX = PROGRAM_DATA.length;
+const PROGRAM_INSTRUCTION_START_INDEX = PROGRAM_INSTRUCTION.length;
 function parseLogs(program, logs, programId = driftProgramId) {
     const { events } = parseLogsWithRaw(program, logs, programId);
     return events;
@@ -87,6 +89,7 @@ function handleSystemLog(log, programId = driftProgramId) {
 class ExecutionContext {
     constructor() {
         this.stack = [];
+        this.ixStack = [];
     }
     program() {
         if (!this.stack.length) {
@@ -103,4 +106,94 @@ class ExecutionContext {
         }
         this.stack.pop();
     }
+    ix() {
+        if (!this.ixStack.length) {
+            throw new Error('Expected the ix stack to have elements');
+        }
+        return this.ixStack[this.ixStack.length - 1];
+    }
+    pushIx(newIx) {
+        this.ixStack.push(newIx);
+    }
+    popIx() {
+        this.ixStack.pop();
+    }
+}
+function parseLogsForCuUsage(logs, programId = driftProgramId) {
+    const cuUsageEvents = [];
+    const execution = new ExecutionContext();
+    for (const log of logs) {
+        if (log.startsWith('Log truncated')) {
+            break;
+        }
+        const [newProgram, newIx, didPopProgram, didPopIx] = handleLogForCuUsage(execution, log, programId);
+        if (newProgram) {
+            execution.push(newProgram);
+        }
+        if (newIx) {
+            execution.pushIx(newIx);
+        }
+        if (didPopProgram) {
+            execution.pop();
+        }
+        if (didPopIx !== null) {
+            cuUsageEvents.push({
+                name: 'CuUsage',
+                data: {
+                    instruction: execution.ix(),
+                    cuUsage: didPopIx,
+                },
+            });
+            execution.popIx();
+        }
+    }
+    return cuUsageEvents;
+}
+exports.parseLogsForCuUsage = parseLogsForCuUsage;
+function handleLogForCuUsage(execution, log, programId = driftProgramId) {
+    if (execution.stack.length > 0 && execution.program() === programId) {
+        return handleProgramLogForCuUsage(log, programId);
+    }
+    else {
+        return handleSystemLogForCuUsage(log, programId);
+    }
+}
+function handleProgramLogForCuUsage(log, programId = driftProgramId) {
+    if (log.startsWith(PROGRAM_INSTRUCTION)) {
+        const ixStr = log.slice(PROGRAM_INSTRUCTION_START_INDEX);
+        return [null, ixStr, false, null];
+    }
+    else {
+        return handleSystemLogForCuUsage(log, programId);
+    }
+}
+function handleSystemLogForCuUsage(log, programId = driftProgramId) {
+    // System component.
+    const logStart = log.split(':')[0];
+    const programStart = `Program ${programId} invoke`;
+    // Did the program finish executing?
+    if (logStart.match(/^Program (.*) success/g) !== null) {
+        return [null, null, true, null];
+        // Recursive call.
+    }
+    else if (logStart.startsWith(programStart)) {
+        return [programId, null, false, null];
+        // Consumed CU log.
+    }
+    else if (log.startsWith(`Program ${programId} consumed `)) {
+        // Extract CU usage, e.g. 'Program ... consumed 29242 of 199700 compute units'
+        // We need to extract the consumed value (29242)
+        const matches = log.match(/consumed (\d+) of \d+ compute units/);
+        if (matches) {
+            return [null, null, false, Number(matches[1])];
+        }
+        return [null, null, false, null];
+    }
+    // CPI call.
+    else if (logStart.includes('invoke')) {
+        return ['cpi', null, false, null]; // Any string will do.
+    }
+    else {
+        return [null, null, false, null];
+    }
 }

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> | Event<CuUsage>;
 export interface EventSubscriberEvents {
     newEvent: (event: WrappedEvent<EventType>) => void;
 }
@@ -84,3 +84,22 @@ export type EventsServerLogProviderConfig = StreamingLogProviderConfig & {
     url: string;
 };
 export type LogProviderConfig = WebSocketLogProviderConfig | PollingLogProviderConfig | EventsServerLogProviderConfig;
+export type CuUsageEvent = {
+    name: 'CuUsage';
+    fields: [
+        {
+            name: 'instruction';
+            type: 'string';
+            index: false;
+        },
+        {
+            name: 'cuUsage';
+            type: 'u32';
+            index: false;
+        }
+    ];
+};
+export type CuUsage = {
+    instruction: string;
+    cuUsage: number;
+};

package/lib/browser/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.141.0",
+    "version": "2.142.0",
     "name": "drift",
     "instructions": [
         {
@@ -5874,6 +5874,32 @@
                 }
             ]
         },
+        {
+            "name": "updatePerpMarketReferencePriceOffsetDeadbandPct",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "perpMarket",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "referencePriceOffsetDeadbandPct",
+                    "type": "u8"
+                }
+            ]
+        },
         {
             "name": "updateLpCooldownTime",
             "accounts": [
@@ -11209,12 +11235,16 @@
                         ],
                         "type": "i8"
                     },
+                    {
+                        "name": "referencePriceOffsetDeadbandPct",
+                        "type": "u8"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                3
+                                2
                             ]
                         }
                     },
@@ -14875,6 +14905,11 @@
                     "name": "lpPrice",
                     "type": "u128",
                     "index": false
+                },
+                {
+                    "name": "lpPool",
+                    "type": "publicKey",
+                    "index": false
                 }
             ]
         },
@@ -14985,6 +15020,11 @@
                     "name": "outSwapId",
                     "type": "u64",
                     "index": false
+                },
+                {
+                    "name": "lpPool",
+                    "type": "publicKey",
+                    "index": false
                 }
             ]
         },
@@ -15080,6 +15120,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
                 }
             ]
         }
@@ -16710,8 +16812,5 @@
             "name": "UnableToLoadRevenueShareAccount",
             "msg": "Unable to load builder account"
         }
-    ],
-    "metadata": {
-        "address": "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
-    }
+    ]
 }

package/lib/browser/math/amm.d.ts

@@ -35,6 +35,7 @@ export type AssetType = 'quote' | 'base';
 export declare function calculateAmmReservesAfterSwap(amm: Pick<AMM, 'pegMultiplier' | 'quoteAssetReserve' | 'sqrtK' | 'baseAssetReserve'>, inputAssetType: AssetType, swapAmount: BN, swapDirection: SwapDirection): [BN, BN];
 export declare function calculateMarketOpenBidAsk(baseAssetReserve: BN, minBaseAssetReserve: BN, maxBaseAssetReserve: BN, stepSize?: BN): [BN, BN];
 export declare function calculateInventoryLiquidityRatio(baseAssetAmountWithAmm: BN, baseAssetReserve: BN, minBaseAssetReserve: BN, maxBaseAssetReserve: BN): BN;
+export declare function calculateInventoryLiquidityRatioForReferencePriceOffset(baseAssetAmountWithAmm: BN, baseAssetReserve: BN, minBaseAssetReserve: BN, maxBaseAssetReserve: BN): BN;
 export declare function calculateInventoryScale(baseAssetAmountWithAmm: BN, baseAssetReserve: BN, minBaseAssetReserve: BN, maxBaseAssetReserve: BN, directionalSpread: number, maxSpread: number): number;
 export declare function calculateReferencePriceOffset(reservePrice: BN, last24hAvgFundingRate: BN, liquidityFraction: BN, oracleTwapFast: BN, markTwapFast: BN, oracleTwapSlow: BN, markTwapSlow: BN, maxOffsetPct: number): BN;
 export declare function calculateEffectiveLeverage(baseSpread: number, quoteAssetReserve: BN, terminalQuoteAssetReserve: BN, pegMultiplier: BN, netBaseAssetAmount: BN, reservePrice: BN, totalFeeMinusDistributions: BN): number;

package/lib/browser/math/amm.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateMaxBaseAssetAmountFillable = exports.calculateQuoteAssetAmountSwapped = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateSpreadReserves = exports.getQuoteAssetReservePredictionMarketBounds = exports.calculateSpread = exports.calculateSpreadBN = exports.calculateVolSpreadBN = exports.calculateMaxSpread = exports.calculateEffectiveLeverage = exports.calculateReferencePriceOffset = exports.calculateInventoryScale = exports.calculateInventoryLiquidityRatio = exports.calculateMarketOpenBidAsk = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = exports.calculateBidAskPrice = exports.calculateUpdatedAMMSpreadReserves = exports.calculateUpdatedAMM = exports.calculateNewAmm = exports.calculateOptimalPegAndBudget = exports.calculatePegFromTargetPrice = void 0;
+exports.calculateMaxBaseAssetAmountFillable = exports.calculateQuoteAssetAmountSwapped = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateSpreadReserves = exports.getQuoteAssetReservePredictionMarketBounds = exports.calculateSpread = exports.calculateSpreadBN = exports.calculateVolSpreadBN = exports.calculateMaxSpread = exports.calculateEffectiveLeverage = exports.calculateReferencePriceOffset = exports.calculateInventoryScale = exports.calculateInventoryLiquidityRatioForReferencePriceOffset = exports.calculateInventoryLiquidityRatio = exports.calculateMarketOpenBidAsk = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = exports.calculateBidAskPrice = exports.calculateUpdatedAMMSpreadReserves = exports.calculateUpdatedAMM = exports.calculateNewAmm = exports.calculateOptimalPegAndBudget = exports.calculatePegFromTargetPrice = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const types_1 = require("../types");
@@ -213,6 +213,17 @@ function calculateInventoryLiquidityRatio(baseAssetAmountWithAmm, baseAssetReser
     return inventoryScaleBN;
 }
 exports.calculateInventoryLiquidityRatio = calculateInventoryLiquidityRatio;
+function calculateInventoryLiquidityRatioForReferencePriceOffset(baseAssetAmountWithAmm, baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve) {
+    // inventory skew
+    const [openBids, openAsks] = calculateMarketOpenBidAsk(baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve);
+    const avgSideLiquidity = openBids.abs().add(openAsks.abs()).div(numericConstants_1.TWO);
+    const inventoryScaleBN = anchor_1.BN.min(baseAssetAmountWithAmm
+        .mul(numericConstants_1.PERCENTAGE_PRECISION)
+        .div(anchor_1.BN.max(avgSideLiquidity, numericConstants_1.ONE))
+        .abs(), numericConstants_1.PERCENTAGE_PRECISION);
+    return inventoryScaleBN;
+}
+exports.calculateInventoryLiquidityRatioForReferencePriceOffset = calculateInventoryLiquidityRatioForReferencePriceOffset;
 function calculateInventoryScale(baseAssetAmountWithAmm, baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve, directionalSpread, maxSpread) {
     if (baseAssetAmountWithAmm.eq(numericConstants_1.ZERO)) {
         return 1;
@@ -227,7 +238,7 @@ function calculateInventoryScale(baseAssetAmountWithAmm, baseAssetReserve, minBa
 }
 exports.calculateInventoryScale = calculateInventoryScale;
 function calculateReferencePriceOffset(reservePrice, last24hAvgFundingRate, liquidityFraction, oracleTwapFast, markTwapFast, oracleTwapSlow, markTwapSlow, maxOffsetPct) {
-    if (last24hAvgFundingRate.eq(numericConstants_1.ZERO)) {
+    if (last24hAvgFundingRate.eq(numericConstants_1.ZERO) || liquidityFraction.eq(numericConstants_1.ZERO)) {
         return numericConstants_1.ZERO;
     }
     const maxOffsetInPrice = new anchor_1.BN(maxOffsetPct)
@@ -526,9 +537,22 @@ function calculateSpreadReserves(amm, mmOraclePriceData, now, isPrediction = fal
     if (amm.curveUpdateIntensity > 100) {
         maxOffset = Math.max(amm.maxSpread / 2, (numericConstants_1.PERCENTAGE_PRECISION.toNumber() / 10000) *
             (amm.curveUpdateIntensity - 100));
-        const liquidityFraction = calculateInventoryLiquidityRatio(amm.baseAssetAmountWithAmm, amm.baseAssetReserve, amm.minBaseAssetReserve, amm.maxBaseAssetReserve);
+        const liquidityFraction = calculateInventoryLiquidityRatioForReferencePriceOffset(amm.baseAssetAmountWithAmm, amm.baseAssetReserve, amm.minBaseAssetReserve, amm.maxBaseAssetReserve);
         const liquidityFractionSigned = liquidityFraction.mul((0, utils_1.sigNum)(amm.baseAssetAmountWithAmm.add(amm.baseAssetAmountWithUnsettledLp)));
-        referencePriceOffset = calculateReferencePriceOffset(reservePrice, amm.last24HAvgFundingRate, liquidityFractionSigned, amm.historicalOracleData.lastOraclePriceTwap5Min, amm.lastMarkPriceTwap5Min, amm.historicalOracleData.lastOraclePriceTwap, amm.lastMarkPriceTwap, maxOffset).toNumber();
+        let liquidityFractionAfterDeadband = liquidityFractionSigned;
+        const deadbandPct = amm.referencePriceOffsetDeadbandPct
+            ? numericConstants_1.PERCENTAGE_PRECISION.mul(new anchor_1.BN(amm.referencePriceOffsetDeadbandPct)).divn(100)
+            : numericConstants_1.ZERO;
+        if (!liquidityFractionAfterDeadband.eq(numericConstants_1.ZERO) && deadbandPct.gt(numericConstants_1.ZERO)) {
+            const abs = liquidityFractionAfterDeadband.abs();
+            if (abs.lte(deadbandPct)) {
+                liquidityFractionAfterDeadband = numericConstants_1.ZERO;
+            }
+            else {
+                liquidityFractionAfterDeadband = liquidityFractionAfterDeadband.sub(deadbandPct.mul((0, utils_1.sigNum)(liquidityFractionAfterDeadband)));
+            }
+        }
+        referencePriceOffset = calculateReferencePriceOffset(reservePrice, amm.last24HAvgFundingRate, liquidityFractionAfterDeadband, amm.historicalOracleData.lastOraclePriceTwap5Min, amm.lastMarkPriceTwap5Min, amm.historicalOracleData.lastOraclePriceTwap, amm.lastMarkPriceTwap, maxOffset).toNumber();
     }
     let [longSpread, shortSpread] = calculateSpread(amm, mmOraclePriceData, now, reservePrice);
     const doReferencePricOffsetSmooth = Math.sign(referencePriceOffset) !== Math.sign(amm.referencePriceOffset) &&

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;
@@ -1150,6 +1169,7 @@ export type AMM = {
     ammSpreadAdjustment: number;
     ammInventorySpreadAdjustment: number;
     lastFundingOracleTwap: BN;
+    referencePriceOffsetDeadbandPct: number;
 };
 export type PerpPosition = {
     baseAssetAmount: BN;

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

@@ -1,24 +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 { DataAndSlot, DelistedMarketSetting, GrpcConfigs, ResubOpts } from './types';
-import { PerpMarketAccount, SpotMarketAccount } 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,EACN,WAAW,EACX,qBAAqB,EACrB,WAAW,EACX,SAAS,EACT,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAgB,MAAM,UAAU,CAAC;AAM9E,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;IAC5E,OAAO,CAAC,iCAAiC,CAA6B;IACtE,OAAO,CAAC,iCAAiC,CAA6B;gBAGrE,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;IAiFjC,uBAAuB,CAC/B,WAAW,EAAE,MAAM,GACjB,WAAW,CAAC,iBAAiB,CAAC,GAAG,SAAS;IAMpC,2BAA2B,CACnC,WAAW,EAAE,MAAM,GACjB,WAAW,CAAC,iBAAiB,CAAC,GAAG,SAAS;IAM9B,gBAAgB;IA0BhB,gBAAgB;IA0BhB,6BAA6B,IAAI,OAAO,CAAC,OAAO,CAAC;IA8DjD,6BAA6B,IAAI,OAAO,CAAC,OAAO,CAAC;IA8DjD,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC;IAyE/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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"}