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

package/lib/browser/math/orders.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSignedMsgOrder = exports.isTakingOrder = exports.isRestingLimitOrder = exports.isTriggered = exports.mustBeTriggered = exports.isLimitOrder = exports.isMarketOrder = exports.isOrderExpired = exports.calculateBaseAssetAmountToFillUpToLimitPrice = exports.calculateBaseAssetAmountForAmmToFulfill = exports.isFillableByVAMM = exports.hasAuctionPrice = exports.hasLimitPrice = exports.applyProtectedMakerParams = exports.getLimitPrice = exports.standardizePrice = exports.standardizeBaseAssetAmount = exports.isOrderReduceOnly = exports.isOrderRiskIncreasingInSameDirection = exports.isOrderRiskIncreasing = void 0;
+exports.calculateOrderBaseAssetAmount = exports.isSignedMsgOrder = exports.isTakingOrder = exports.isRestingLimitOrder = exports.isTriggered = exports.mustBeTriggered = exports.isLimitOrder = exports.isMarketOrder = exports.isOrderExpired = exports.calculateBaseAssetAmountToFillUpToLimitPrice = exports.calculateBaseAssetAmountForAmmToFulfill = exports.isFillableByVAMM = exports.hasAuctionPrice = exports.hasLimitPrice = exports.applyProtectedMakerParams = exports.getLimitPrice = exports.standardizePrice = exports.standardizeBaseAssetAmount = exports.isOrderReduceOnly = exports.isOrderRiskIncreasingInSameDirection = exports.isOrderRiskIncreasing = void 0;
 const types_1 = require("../types");
 const numericConstants_1 = require("../constants/numericConstants");
 const anchor_1 = require("@coral-xyz/anchor");
@@ -240,3 +240,15 @@ function isSignedMsgOrder(order) {
     return (order.bitFlags & FLAG_IS_SIGNED_MSG) !== 0;
 }
 exports.isSignedMsgOrder = isSignedMsgOrder;
+function calculateOrderBaseAssetAmount(order, existingBaseAssetAmount) {
+    if (!order.reduceOnly) {
+        return order.baseAssetAmount;
+    }
+    if ((0, types_1.isVariant)(order.direction, 'long')) {
+        return anchor_1.BN.min(anchor_1.BN.min(existingBaseAssetAmount, numericConstants_1.ZERO).abs(), order.baseAssetAmount);
+    }
+    else {
+        return anchor_1.BN.min(anchor_1.BN.max(existingBaseAssetAmount, numericConstants_1.ZERO), order.baseAssetAmount);
+    }
+}
+exports.calculateOrderBaseAssetAmount = calculateOrderBaseAssetAmount;

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

@@ -3,3 +3,4 @@ import { BN } from '@coral-xyz/anchor';
 import { StateAccount } from '../types';
 export declare function calculateInitUserFee(stateAccount: StateAccount): BN;
 export declare function getMaxNumberOfSubAccounts(stateAccount: StateAccount): BN;
+export declare function useMedianTriggerPrice(stateAccount: StateAccount): boolean;

package/lib/browser/math/state.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMaxNumberOfSubAccounts = exports.calculateInitUserFee = void 0;
+exports.useMedianTriggerPrice = exports.getMaxNumberOfSubAccounts = exports.calculateInitUserFee = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
+const types_1 = require("../types");
 function calculateInitUserFee(stateAccount) {
     const maxInitFee = new anchor_1.BN(stateAccount.maxInitializeUserFee)
         .mul(numericConstants_1.LAMPORTS_PRECISION)
@@ -29,3 +30,7 @@ function getMaxNumberOfSubAccounts(stateAccount) {
     return new anchor_1.BN(stateAccount.maxNumberOfSubAccounts).muln(100);
 }
 exports.getMaxNumberOfSubAccounts = getMaxNumberOfSubAccounts;
+function useMedianTriggerPrice(stateAccount) {
+    return ((stateAccount.featureBitFlags & types_1.FeatureBitFlags.MEDIAN_TRIGGER_PRICE) > 0);
+}
+exports.useMedianTriggerPrice = useMedianTriggerPrice;

package/lib/browser/openbook/openbookV2Subscriber.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="bn.js" />
 import { Connection, PublicKey } from '@solana/web3.js';
-import { BulkAccountLoader } from '../accounts/bulkAccountLoader/bulkAccountLoader';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 import { BN } from '@coral-xyz/anchor';
 import { L2Level, L2OrderBookGenerator } from '../dlob/orderBookLevels';
 import { Market, OpenBookV2Client } from '@openbook-dex/openbook-v2';

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

@@ -18,6 +18,7 @@ export type OraclePriceData = {
     twapConfidence?: BN;
     maxPrice?: BN;
     fetchedWithMMOracle?: boolean;
+    isMMOracleActive?: boolean;
 };
 export type OracleInfo = {
     publicKey: PublicKey;

package/lib/browser/oracles/utils.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOracleConfidenceFromMMOracleData = void 0;
-const numericConstants_1 = require("../constants/numericConstants");
 function getOracleConfidenceFromMMOracleData(mmOracleData) {
     const mmOracleDiffPremium = mmOracleData.mmOraclePrice
         .sub(mmOracleData.oraclePriceData.price)
-        .abs()
-        .div(numericConstants_1.FIVE);
+        .abs();
     return mmOracleData.oraclePriceData.confidence.add(mmOracleDiffPremium);
 }
 exports.getOracleConfidenceFromMMOracleData = getOracleConfidenceFromMMOracleData;

package/lib/browser/orderSubscriber/OrderSubscriber.d.ts

@@ -11,7 +11,7 @@ import { PollingSubscription } from './PollingSubscription';
 import { WebsocketSubscription } from './WebsocketSubscription';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-import { ProtectMakerParamsMap } from '../index';
+import { ProtectMakerParamsMap } from '../dlob/types';
 import { grpcSubscription } from './grpcSubscription';
 export declare class OrderSubscriber {
     driftClient: DriftClient;

package/lib/browser/orderSubscriber/OrderSubscriber.js

@@ -9,6 +9,7 @@ const PollingSubscription_1 = require("./PollingSubscription");
 const WebsocketSubscription_1 = require("./WebsocketSubscription");
 const events_1 = require("events");
 const index_1 = require("../index");
+const anchor_1 = require("@coral-xyz/anchor");
 const user_1 = require("../decode/user");
 const grpcSubscription_1 = require("./grpcSubscription");
 const userStatus_1 = require("../math/userStatus");
@@ -115,7 +116,7 @@ class OrderSubscriber {
             if (dataType === 'raw') {
                 // @ts-ignore
                 const buffer = buffer_1.Buffer.from(data[0], data[1]);
-                const newLastActiveSlot = new index_1.BN(buffer.subarray(4328, 4328 + 8), undefined, 'le');
+                const newLastActiveSlot = new anchor_1.BN(buffer.subarray(4328, 4328 + 8), undefined, 'le');
                 if (slotAndUserAccount &&
                     slotAndUserAccount.userAccount.lastActiveSlot.gt(newLastActiveSlot)) {
                     return;
@@ -124,7 +125,7 @@ class OrderSubscriber {
             }
             else if (dataType === 'buffer') {
                 const buffer = data;
-                const newLastActiveSlot = new index_1.BN(buffer.subarray(4328, 4328 + 8), undefined, 'le');
+                const newLastActiveSlot = new anchor_1.BN(buffer.subarray(4328, 4328 + 8), undefined, 'le');
                 if (slotAndUserAccount &&
                     slotAndUserAccount.userAccount.lastActiveSlot.gt(newLastActiveSlot)) {
                     return;
@@ -155,11 +156,17 @@ class OrderSubscriber {
         return new DLOB_1.DLOB(protectedMakerParamsMap);
     }
     async getDLOB(slot, protectedMakerParamsMap) {
+        var _a;
         const dlob = this.createDLOB(protectedMakerParamsMap);
         for (const [key, { userAccount }] of this.usersAccounts.entries()) {
             const protectedMaker = (0, userStatus_1.isUserProtectedMaker)(userAccount);
             for (const order of userAccount.orders) {
-                dlob.insertOrder(order, key, slot, protectedMaker);
+                let baseAssetAmount = order.baseAssetAmount;
+                if (order.reduceOnly) {
+                    const existingBaseAmount = ((_a = userAccount.perpPositions.find((pos) => pos.marketIndex === order.marketIndex && pos.openOrders > 0)) === null || _a === void 0 ? void 0 : _a.baseAssetAmount) || index_1.ZERO;
+                    baseAssetAmount = (0, index_1.calculateOrderBaseAssetAmount)(order, existingBaseAmount);
+                }
+                dlob.insertOrder(order, key, slot, protectedMaker, baseAssetAmount);
             }
         }
         return dlob;

package/lib/browser/orderSubscriber/WebsocketSubscription.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebsocketSubscription = void 0;
 const memcmp_1 = require("../memcmp");
-const webSocketProgramAccountSubscriber_1 = require("../accounts/programAccount/webSocketProgramAccountSubscriber");
+const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 class WebsocketSubscription {
     constructor({ orderSubscriber, commitment, skipInitialLoad = false, resubOpts, resyncIntervalMs, decoded = true, }) {
         this.orderSubscriber = orderSubscriber;

package/lib/browser/orderSubscriber/grpcSubscription.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.grpcSubscription = void 0;
-const grpcProgramAccountSubscriber_1 = require("../accounts/programAccount/grpcProgramAccountSubscriber");
+const grpcProgramAccountSubscriber_1 = require("../accounts/grpcProgramAccountSubscriber");
 const memcmp_1 = require("../memcmp");
 class grpcSubscription {
     constructor({ grpcConfigs, orderSubscriber, skipInitialLoad = false, resubOpts, resyncIntervalMs, decoded = true, }) {

package/lib/browser/phoenix/phoenixSubscriber.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="bn.js" />
 import { Connection, PublicKey } from '@solana/web3.js';
-import { BulkAccountLoader } from '../accounts/bulkAccountLoader/bulkAccountLoader';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 import { Client, Market } from '@ellipsis-labs/phoenix-sdk';
 import { BN } from '@coral-xyz/anchor';
 import { L2Level, L2OrderBookGenerator } from '../dlob/orderBookLevels';

package/lib/browser/serum/serumSubscriber.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="bn.js" />
 import { Connection, PublicKey } from '@solana/web3.js';
-import { BulkAccountLoader } from '../accounts/bulkAccountLoader/bulkAccountLoader';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 import { Market, Orderbook } from '@project-serum/serum';
 import { SerumMarketSubscriberConfig } from './types';
 import { BN } from '@coral-xyz/anchor';

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

@@ -1,5 +1,5 @@
 import { Connection, PublicKey } from '@solana/web3.js';
-import { BulkAccountLoader } from '../accounts/bulkAccountLoader/bulkAccountLoader';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 export type SerumMarketSubscriberConfig = {
     connection: Connection;
     programId: PublicKey;

package/lib/browser/swift/grpcSignedMsgUserAccountSubscriber.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { Commitment } from '@solana/web3.js';
-import { grpcProgramAccountSubscriber } from '../accounts/programAccount/grpcProgramAccountSubscriber';
+import { grpcProgramAccountSubscriber } from '../accounts/grpcProgramAccountSubscriber';
 import { GrpcConfigs, ResubOpts } from '../accounts/types';
 import { SignedMsgUserOrdersAccount } from '../types';
 import { SignedMsgUserOrdersAccountSubscriber } from './signedMsgUserAccountSubscriber';

package/lib/browser/swift/grpcSignedMsgUserAccountSubscriber.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.grpcSignedMsgUserOrdersAccountSubscriber = void 0;
-const grpcProgramAccountSubscriber_1 = require("../accounts/programAccount/grpcProgramAccountSubscriber");
+const grpcProgramAccountSubscriber_1 = require("../accounts/grpcProgramAccountSubscriber");
 const memcmp_1 = require("../memcmp");
 const signedMsgUserAccountSubscriber_1 = require("./signedMsgUserAccountSubscriber");
 class grpcSignedMsgUserOrdersAccountSubscriber extends signedMsgUserAccountSubscriber_1.SignedMsgUserOrdersAccountSubscriber {

package/lib/browser/swift/signedMsgUserAccountSubscriber.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-import { WebSocketProgramAccountSubscriber } from '../accounts/programAccount/webSocketProgramAccountSubscriber';
+import { WebSocketProgramAccountSubscriber } from '../accounts/webSocketProgramAccountSubscriber';
 import { SignedMsgOrderId, SignedMsgUserOrdersAccount } from '../types';
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { ResubOpts } from '../accounts/types';

package/lib/browser/swift/signedMsgUserAccountSubscriber.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SignedMsgUserOrdersAccountSubscriber = void 0;
 const memcmp_1 = require("../memcmp");
-const webSocketProgramAccountSubscriber_1 = require("../accounts/programAccount/webSocketProgramAccountSubscriber");
+const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 const events_1 = require("events");
 class SignedMsgUserOrdersAccountSubscriber {
     constructor({ driftClient, commitment, resubOpts, decodeFn, resyncIntervalMs, }) {

package/lib/browser/swift/swiftOrderSubscriber.d.ts

@@ -1,5 +1,5 @@
 import { DriftClient } from '../driftClient';
-import { DriftEnv } from '../config/types';
+import { DriftEnv } from '../config';
 import { OptionalOrderParams, SignedMsgOrderParamsDelegateMessage, SignedMsgOrderParamsMessage, UserAccount } from '../types';
 import { Keypair, TransactionInstruction } from '@solana/web3.js';
 export interface AccountGetter {

package/lib/browser/types.d.ts

@@ -18,6 +18,10 @@ export declare enum ExchangeStatus {
     AMM_IMMEDIATE_FILL_PAUSED = 128,
     PAUSED = 255
 }
+export declare enum FeatureBitFlags {
+    MM_ORACLE_UPDATE = 1,
+    MEDIAN_TRIGGER_PRICE = 2
+}
 export declare class MarketStatus {
     static readonly INITIALIZED: {
         initialized: {};
@@ -860,6 +864,7 @@ export type StateAccount = {
     initialPctToLiquidate: number;
     liquidationDuration: number;
     maxInitializeUserFee: number;
+    featureBitFlags: number;
 };
 export type PerpMarketAccount = {
     status: MarketStatus;
@@ -903,6 +908,7 @@ export type PerpMarketAccount = {
     highLeverageMarginRatioMaintenance: number;
     protectedMakerLimitPriceDivisor: number;
     protectedMakerDynamicDivisor: number;
+    lastFillPrice: BN;
 };
 export type HistoricalOracleData = {
     lastOraclePrice: BN;
@@ -1081,6 +1087,7 @@ export type AMM = {
     takerSpeedBumpOverride: number;
     ammSpreadAdjustment: number;
     ammInventorySpreadAdjustment: number;
+    lastFundingOracleTwap: BN;
 };
 export type PerpPosition = {
     baseAssetAmount: BN;

package/lib/browser/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SwapReduceOnly = exports.PlaceAndTakeOrderSuccessCondition = exports.FuelOverflowStatus = exports.ReferrerStatus = exports.DefaultOrderParams = exports.ModifyOrderPolicy = exports.OrderParamsBitFlag = exports.PostOnlyParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.getVariant = exports.isOneOfVariant = exports.isVariant = exports.SettlePnlMode = exports.StakeAction = exports.SpotFulfillmentConfigStatus = exports.SettlePnlExplanation = exports.DepositExplanation = exports.SpotFulfillmentStatus = exports.SpotFulfillmentType = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderBitFlag = exports.OrderStatus = exports.MarketType = exports.OrderType = exports.OracleSourceNum = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.SpotBalanceType = exports.SwapDirection = exports.TokenProgramFlag = exports.AssetTier = exports.ContractTier = exports.ContractType = exports.MarginMode = exports.UserStatus = exports.InsuranceFundOperation = exports.SpotOperation = exports.PerpOperation = exports.MarketStatus = exports.ExchangeStatus = void 0;
+exports.SwapReduceOnly = exports.PlaceAndTakeOrderSuccessCondition = exports.FuelOverflowStatus = exports.ReferrerStatus = exports.DefaultOrderParams = exports.ModifyOrderPolicy = exports.OrderParamsBitFlag = exports.PostOnlyParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.getVariant = exports.isOneOfVariant = exports.isVariant = exports.SettlePnlMode = exports.StakeAction = exports.SpotFulfillmentConfigStatus = exports.SettlePnlExplanation = exports.DepositExplanation = exports.SpotFulfillmentStatus = exports.SpotFulfillmentType = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderBitFlag = exports.OrderStatus = exports.MarketType = exports.OrderType = exports.OracleSourceNum = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.SpotBalanceType = exports.SwapDirection = exports.TokenProgramFlag = exports.AssetTier = exports.ContractTier = exports.ContractType = exports.MarginMode = exports.UserStatus = exports.InsuranceFundOperation = exports.SpotOperation = exports.PerpOperation = exports.MarketStatus = exports.FeatureBitFlags = exports.ExchangeStatus = void 0;
 const numericConstants_1 = require("./constants/numericConstants");
 // # Utility Types / Enums / Constants
 var ExchangeStatus;
@@ -16,6 +16,11 @@ var ExchangeStatus;
     ExchangeStatus[ExchangeStatus["AMM_IMMEDIATE_FILL_PAUSED"] = 128] = "AMM_IMMEDIATE_FILL_PAUSED";
     ExchangeStatus[ExchangeStatus["PAUSED"] = 255] = "PAUSED";
 })(ExchangeStatus || (exports.ExchangeStatus = ExchangeStatus = {}));
+var FeatureBitFlags;
+(function (FeatureBitFlags) {
+    FeatureBitFlags[FeatureBitFlags["MM_ORACLE_UPDATE"] = 1] = "MM_ORACLE_UPDATE";
+    FeatureBitFlags[FeatureBitFlags["MEDIAN_TRIGGER_PRICE"] = 2] = "MEDIAN_TRIGGER_PRICE";
+})(FeatureBitFlags || (exports.FeatureBitFlags = FeatureBitFlags = {}));
 class MarketStatus {
 }
 exports.MarketStatus = MarketStatus;

package/lib/browser/user.js

@@ -18,14 +18,14 @@ const orders_1 = require("./math/orders");
 const spotBalance_2 = require("./math/spotBalance");
 const amm_1 = require("./math/amm");
 const margin_2 = require("./math/margin");
-const pollingUserAccountSubscriber_1 = require("./accounts/userAccount/pollingUserAccountSubscriber");
-const webSocketUserAccountSubscriber_1 = require("./accounts/userAccount/webSocketUserAccountSubscriber");
+const pollingUserAccountSubscriber_1 = require("./accounts/pollingUserAccountSubscriber");
+const webSocketUserAccountSubscriber_1 = require("./accounts/webSocketUserAccountSubscriber");
 const spotPosition_1 = require("./math/spotPosition");
 const oracles_1 = require("./math/oracles");
 const tiers_1 = require("./math/tiers");
 const strictOraclePrice_1 = require("./oracles/strictOraclePrice");
 const fuel_1 = require("./math/fuel");
-const grpcUserAccountSubscriber_1 = require("./accounts/userAccount/grpcUserAccountSubscriber");
+const grpcUserAccountSubscriber_1 = require("./accounts/grpcUserAccountSubscriber");
 class User {
     get isSubscribed() {
         return this._isSubscribed && this.accountSubscriber.isSubscribed;

package/lib/browser/userConfig.d.ts

@@ -1,6 +1,6 @@
 import { DriftClient } from './driftClient';
 import { Commitment, PublicKey } from '@solana/web3.js';
-import { BulkAccountLoader } from './accounts/bulkAccountLoader/bulkAccountLoader';
+import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { GrpcConfigs, UserAccountSubscriber } from './accounts/types';
 export type UserConfig = {
     accountSubscription?: UserSubscriptionConfig;

package/lib/browser/userMap/PollingSubscription.d.ts

@@ -1,11 +1,11 @@
-import { UserMapInterface } from './types';
+import { UserMap } from './userMap';
 export declare class PollingSubscription {
     private userMap;
     private frequency;
     private skipInitialLoad;
     intervalId?: ReturnType<typeof setTimeout>;
     constructor({ userMap, frequency, skipInitialLoad, }: {
-        userMap: UserMapInterface;
+        userMap: UserMap;
         frequency: number;
         skipInitialLoad?: boolean;
         includeIdle?: boolean;

package/lib/browser/userMap/WebsocketSubscription.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 /// <reference types="node" />
+import { UserMap } from './userMap';
 import { UserAccount } from '../types';
 import { Commitment, MemcmpFilter } from '@solana/web3.js';
 import { ResubOpts } from '../accounts/types';
-import { UserMapInterface } from './types';
 export declare class WebsocketSubscription {
     private userMap;
     private commitment;
@@ -14,7 +14,7 @@ export declare class WebsocketSubscription {
     private decodeFn;
     private subscriber;
     constructor({ userMap, commitment, skipInitialLoad, resubOpts, includeIdle, decodeFn, additionalFilters, }: {
-        userMap: UserMapInterface;
+        userMap: UserMap;
         commitment: Commitment;
         skipInitialLoad?: boolean;
         resubOpts?: ResubOpts;

package/lib/browser/userMap/WebsocketSubscription.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebsocketSubscription = void 0;
 const memcmp_1 = require("../memcmp");
-const webSocketProgramAccountSubscriber_1 = require("../accounts/programAccount/webSocketProgramAccountSubscriber");
+const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 class WebsocketSubscription {
     constructor({ userMap, commitment, skipInitialLoad = false, resubOpts, includeIdle = false, decodeFn, additionalFilters = undefined, }) {
         this.userMap = userMap;

package/lib/browser/userMap/grpcSubscription.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 /// <reference types="node" />
+import { UserMap } from './userMap';
 import { UserAccount } from '../types';
 import { MemcmpFilter } from '@solana/web3.js';
 import { GrpcConfigs, ResubOpts } from '../accounts/types';
-import { UserMapInterface } from './types';
 export declare class grpcSubscription {
     private grpcConfigs;
     private userMap;
@@ -15,7 +15,7 @@ export declare class grpcSubscription {
     private subscriber;
     constructor({ grpcConfigs, userMap, skipInitialLoad, resubOpts, includeIdle, decodeFn, additionalFilters, }: {
         grpcConfigs: GrpcConfigs;
-        userMap: UserMapInterface;
+        userMap: UserMap;
         skipInitialLoad?: boolean;
         resubOpts?: ResubOpts;
         includeIdle?: boolean;

package/lib/browser/userMap/grpcSubscription.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.grpcSubscription = void 0;
 const memcmp_1 = require("../memcmp");
-const grpcProgramAccountSubscriber_1 = require("../accounts/programAccount/grpcProgramAccountSubscriber");
+const grpcProgramAccountSubscriber_1 = require("../accounts/grpcProgramAccountSubscriber");
 class grpcSubscription {
     constructor({ grpcConfigs, userMap, skipInitialLoad = false, resubOpts, includeIdle = false, decodeFn, additionalFilters = undefined, }) {
         this.userMap = userMap;

package/lib/browser/userMap/userMap.d.ts

@@ -5,14 +5,29 @@ import { UserAccount, OrderRecord } from '../types';
 import { WrappedEvent } from '../events/types';
 import { DLOB } from '../dlob/DLOB';
 import { UserSubscriptionConfig } from '../userConfig';
-import { DataAndSlot } from '../accounts/types';
+import { DataAndSlot, UserEvents } from '../accounts/types';
 import { ProtectMakerParamsMap } from '../dlob/types';
 import { PublicKey } from '@solana/web3.js';
 import { UserAccountFilterCriteria as UserFilterCriteria, UserMapConfig } from './userMapConfig';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-import { UserEvents } from './events';
-import { UserMapInterface } from './types';
+export interface UserMapInterface {
+    eventEmitter: StrictEventEmitter<EventEmitter, UserEvents>;
+    subscribe(): Promise<void>;
+    unsubscribe(): Promise<void>;
+    addPubkey(userAccountPublicKey: PublicKey, userAccount?: UserAccount, slot?: number, accountSubscription?: UserSubscriptionConfig): Promise<void>;
+    has(key: string): boolean;
+    get(key: string): User | undefined;
+    getWithSlot(key: string): DataAndSlot<User> | undefined;
+    mustGet(key: string, accountSubscription?: UserSubscriptionConfig): Promise<User>;
+    mustGetWithSlot(key: string, accountSubscription?: UserSubscriptionConfig): Promise<DataAndSlot<User>>;
+    getUserAuthority(key: string): PublicKey | undefined;
+    updateWithOrderRecord(record: OrderRecord): Promise<void>;
+    values(): IterableIterator<User>;
+    valuesWithSlot(): IterableIterator<DataAndSlot<User>>;
+    entries(): IterableIterator<[string, User]>;
+    entriesWithSlot(): IterableIterator<[string, DataAndSlot<User>]>;
+}
 export declare class UserMap implements UserMapInterface {
     private userMap;
     driftClient: DriftClient;

package/lib/browser/userMap/userMap.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserMap = void 0;
 const user_1 = require("../user");
 const DLOB_1 = require("../dlob/DLOB");
-const oneShotUserAccountSubscriber_1 = require("../accounts/userAccount/oneShotUserAccountSubscriber");
+const oneShotUserAccountSubscriber_1 = require("../accounts/oneShotUserAccountSubscriber");
 const web3_js_1 = require("@solana/web3.js");
 const buffer_1 = require("buffer");
 const zstddec_1 = require("zstddec");

package/lib/browser/userMap/userStatsMap.d.ts

@@ -2,7 +2,7 @@ import { DriftClient } from '../driftClient';
 import { OrderRecord, UserStatsAccount } from '../types';
 import { UserStats } from '../userStats';
 import { WrappedEvent } from '../events/types';
-import { BulkAccountLoader } from '../accounts/bulkAccountLoader/bulkAccountLoader';
+import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 import { SyncConfig } from './userMapConfig';
 import { PublicKey } from '@solana/web3.js';
 import { UserMap } from './userMap';

package/lib/browser/userMap/userStatsMap.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserStatsMap = void 0;
 const pda_1 = require("../addresses/pda");
 const userStats_1 = require("../userStats");
-const bulkAccountLoader_1 = require("../accounts/bulkAccountLoader/bulkAccountLoader");
+const bulkAccountLoader_1 = require("../accounts/bulkAccountLoader");
 const memcmp_1 = require("../memcmp");
 const web3_js_1 = require("@solana/web3.js");
 class UserStatsMap {

package/lib/browser/userStats.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserStats = void 0;
 const web3_js_1 = require("@solana/web3.js");
-const pollingUserStatsAccountSubscriber_1 = require("./accounts/userStatsAccount/pollingUserStatsAccountSubscriber");
-const webSocketUserStatsAccountSubsriber_1 = require("./accounts/userStatsAccount/webSocketUserStatsAccountSubsriber");
+const pollingUserStatsAccountSubscriber_1 = require("./accounts/pollingUserStatsAccountSubscriber");
+const webSocketUserStatsAccountSubsriber_1 = require("./accounts/webSocketUserStatsAccountSubsriber");
 const pda_1 = require("./addresses/pda");
-const grpcUserStatsAccountSubscriber_1 = require("./accounts/userStatsAccount/grpcUserStatsAccountSubscriber");
+const grpcUserStatsAccountSubscriber_1 = require("./accounts/grpcUserStatsAccountSubscriber");
 const numericConstants_1 = require("./constants/numericConstants");
 const numericConstants_2 = require("./constants/numericConstants");
 const numericConstants_3 = require("./constants/numericConstants");

package/lib/browser/userStatsConfig.d.ts

@@ -1,6 +1,6 @@
 import { DriftClient } from './driftClient';
 import { Commitment, PublicKey } from '@solana/web3.js';
-import { BulkAccountLoader } from './accounts/bulkAccountLoader/bulkAccountLoader';
+import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { GrpcConfigs } from './accounts/types';
 export type UserStatsConfig = {
     accountSubscription?: UserStatsSubscriptionConfig;

package/lib/node/accounts/{userAccount/basicUserAccountSubscriber.d.ts → basicUserAccountSubscriber.d.ts}

@@ -1,9 +1,9 @@
 /// <reference types="node" />
-import { DataAndSlot, UserAccountEvents, UserAccountSubscriber } from '../types';
+import { DataAndSlot, UserAccountEvents, UserAccountSubscriber } from './types';
 import { PublicKey } from '@solana/web3.js';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-import { UserAccount } from '../../types';
+import { UserAccount } from '../types';
 /**
  * Basic implementation of UserAccountSubscriber. It will only take in UserAccount
  * data during initialization and will not fetch or subscribe to updates.

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

@@ -0,0 +1 @@
+{"version":3,"file":"basicUserAccountSubscriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/basicUserAccountSubscriber.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC;;;GAGG;AACH,qBAAa,0BAA2B,YAAW,qBAAqB;IACvE,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;IAClE,oBAAoB,EAAE,SAAS,CAAC;IAEhC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,IAAI,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;gBAG9B,oBAAoB,EAAE,SAAS,EAC/B,IAAI,CAAC,EAAE,WAAW,EAClB,IAAI,CAAC,EAAE,MAAM;IAQR,SAAS,CAAC,YAAY,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvD,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAEnC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAE5B,gBAAgB,IAAI,OAAO;IAIrB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAElC,kBAAkB,IAAI,IAAI;IAEnB,qBAAqB,IAAI,WAAW,CAAC,WAAW,CAAC;IAIjD,UAAU,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;CAO/D"}

package/lib/node/accounts/{bulkAccountLoader/bulkAccountLoader.d.ts → bulkAccountLoader.d.ts}

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { Commitment, PublicKey } from '@solana/web3.js';
-import { BufferAndSlot } from '../types';
-import { Connection } from '../../bankrun/bankrunConnection';
+import { BufferAndSlot } from './types';
+import { Connection } from '../bankrun/bankrunConnection';
 export type AccountToLoad = {
     publicKey: PublicKey;
     callbacks: Map<string, (buffer: Buffer, slot: number) => void>;

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

@@ -0,0 +1 @@
+{"version":3,"file":"bulkAccountLoader.d.ts","sourceRoot":"","sources":["../../../src/accounts/bulkAccountLoader.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAG1D,MAAM,MAAM,aAAa,GAAG;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC;CAC/D,CAAC;AAIF,qBAAa,iBAAiB;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,6BAAoC;IAClD,gBAAgB,6BAAoC;IACpD,cAAc,0BAA0B,IAAI,EAAI;IAChD,UAAU,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAE3C,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,mBAAmB,EAAE,MAAM,IAAI,CAAC;IAChC,6BAA6B,SAAc;IAC3C,cAAc,SAAK;gBAGlB,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,MAAM;IAOZ,UAAU,CACtB,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,GAC9C,OAAO,CAAC,MAAM,CAAC;IAkCX,aAAa,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAe7D,iBAAiB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,MAAM;IAM3D,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIrD,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,EAAE,EAAE;IAOtC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAyC5B,SAAS,CAAC,oBAAoB,EAAE,aAAa,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsFvE,sBAAsB,CACrB,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,GACV,IAAI;IAgBA,gBAAgB,CAAC,SAAS,EAAE,SAAS,GAAG,aAAa,GAAG,SAAS;IAIjE,OAAO,IAAI,MAAM;IAIjB,YAAY,IAAI,IAAI;IAYpB,WAAW,IAAI,IAAI;IAOnB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAItB,sBAAsB,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI;CAO7D"}

package/lib/node/accounts/{bulkAccountLoader/bulkAccountLoader.js → bulkAccountLoader.js}

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BulkAccountLoader = void 0;
 const uuid_1 = require("uuid");
-const promiseTimeout_1 = require("../../util/promiseTimeout");
-const numericConstants_1 = require("../../constants/numericConstants");
+const promiseTimeout_1 = require("../util/promiseTimeout");
+const numericConstants_1 = require("../constants/numericConstants");
 const oneMinute = 60 * 1000;
 class BulkAccountLoader {
     constructor(connection, commitment, pollingFrequency) {

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

@@ -1,5 +1,5 @@
 import { UserStats } from '../userStats';
-import { BulkAccountLoader } from './bulkAccountLoader/bulkAccountLoader';
+import { BulkAccountLoader } from './bulkAccountLoader';
 /**
  * @param userStats
  * @param accountLoader

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

@@ -1 +1 @@
-{"version":3,"file":"bulkUserStatsSubscription.d.ts","sourceRoot":"","sources":["../../../src/accounts/bulkUserStatsSubscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAG1E;;;GAGG;AACH,wBAAsB,6BAA6B,CAClD,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,iBAAiB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAqBf"}
+{"version":3,"file":"bulkUserStatsSubscription.d.ts","sourceRoot":"","sources":["../../../src/accounts/bulkUserStatsSubscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGxD;;;GAGG;AACH,wBAAsB,6BAA6B,CAClD,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,iBAAiB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAqBf"}

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

@@ -1,5 +1,5 @@
 import { User } from '../user';
-import { BulkAccountLoader } from './bulkAccountLoader/bulkAccountLoader';
+import { BulkAccountLoader } from './bulkAccountLoader';
 /**
  * @param users
  * @param accountLoader

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

@@ -1 +1 @@
-{"version":3,"file":"bulkUserSubscription.d.ts","sourceRoot":"","sources":["../../../src/accounts/bulkUserSubscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAG1E;;;GAGG;AACH,wBAAsB,wBAAwB,CAC7C,KAAK,EAAE,IAAI,EAAE,EACb,aAAa,EAAE,iBAAiB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAqBf"}
+{"version":3,"file":"bulkUserSubscription.d.ts","sourceRoot":"","sources":["../../../src/accounts/bulkUserSubscription.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGxD;;;GAGG;AACH,wBAAsB,wBAAwB,CAC7C,KAAK,EAAE,IAAI,EAAE,EACb,aAAa,EAAE,iBAAiB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAqBf"}

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

@@ -0,0 +1 @@
+{"version":3,"file":"customizedCadenceBulkAccountLoader.d.ts","sourceRoot":"","sources":["../../../src/accounts/customizedCadenceBulkAccountLoader.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGpE,qBAAa,kCAAmC,SAAQ,iBAAiB;IACxE,OAAO,CAAC,gBAAgB,CAAwB;IAChD,OAAO,CAAC,uBAAuB,CAAgB;IAC/C,OAAO,CAAC,kBAAkB,CAAsB;IAChD,OAAO,CAAC,gBAAgB,CAAsB;IAC9C,OAAO,CAAC,uBAAuB,CAAS;gBAGvC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU,EACtB,uBAAuB,EAAE,MAAM;IAUhC,OAAO,CAAC,iBAAiB;IAwBZ,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAIpB,oBAAoB;IAiBlC;;;;;OAKG;IACI,yBAAyB,CAC/B,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,MAAM,GAClB,IAAI;IAOP,OAAO,CAAC,sBAAsB;IAW9B;;;;;;;;;;;;;;OAcG;IACU,UAAU,CACtB,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,EAChD,sBAAsB,CAAC,EAAE,MAAM,GAC7B,OAAO,CAAC,MAAM,CAAC;IAmCX,aAAa,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAuB7D,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI;IAKtD,YAAY,IAAI,IAAI;IAmBpB,WAAW,IAAI,IAAI;IAWnB,uBAAuB,IAAI,IAAI;CAGtC"}

package/lib/node/accounts/{bulkAccountLoader/customizedCadenceBulkAccountLoader.js → customizedCadenceBulkAccountLoader.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomizedCadenceBulkAccountLoader = void 0;
-const numericConstants_1 = require("../../constants/numericConstants");
+const numericConstants_1 = require("../constants/numericConstants");
 const bulkAccountLoader_1 = require("./bulkAccountLoader");
 const uuid_1 = require("uuid");
 class CustomizedCadenceBulkAccountLoader extends bulkAccountLoader_1.BulkAccountLoader {

package/lib/node/accounts/{baseSubscribers/grpcAccountSubscriber.d.ts → grpcAccountSubscriber.d.ts}

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { ResubOpts, GrpcConfigs } from '../types';
+import { ResubOpts, GrpcConfigs } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
@@ -9,6 +9,7 @@ export declare class grpcAccountSubscriber<T> extends WebSocketAccountSubscriber
     private stream;
     private commitmentLevel;
     listenerId?: number;
+    private enableReconnect;
     private constructor();
     static create<U>(grpcConfigs: GrpcConfigs, accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => U, resubOpts?: ResubOpts): Promise<grpcAccountSubscriber<U>>;
     subscribe(onChange: (data: T) => void): Promise<void>;

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

@@ -0,0 +1 @@
+{"version":3,"file":"grpcAccountSubscriber.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcAccountSubscriber.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAU1E,qBAAa,qBAAqB,CAAC,CAAC,CAAE,SAAQ,0BAA0B,CAAC,CAAC,CAAC;IAC1E,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,MAAM,CAAwD;IACtE,OAAO,CAAC,eAAe,CAAkB;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,CAAC,eAAe,CAAU;IAEjC,OAAO;WAgBa,MAAM,CAAC,CAAC,EAC3B,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,SAAS,EAC3B,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,CAAC,EACpC,SAAS,CAAC,EAAE,SAAS,GACnB,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAsBrB,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAsGrD,WAAW,CAAC,OAAO,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CAwC1D"}