@drift-labs/sdk 2.31.1-beta.2 → 2.31.1-beta.4

package/VERSION

@@ -1 +1 @@
-2.31.1-beta.2
+2.31.1-beta.4

package/lib/accounts/mockUserAccountSubscriber.d.ts

@@ -0,0 +1,23 @@
+/// <reference types="node" />
+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';
+export declare class MockUserAccountSubscriber implements UserAccountSubscriber {
+    isSubscribed: boolean;
+    eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
+    userAccountPublicKey: PublicKey;
+    callbackId?: string;
+    errorCallbackId?: string;
+    user: DataAndSlot<UserAccount>;
+    constructor(userAccountPublicKey: PublicKey, data: UserAccount, slot: number);
+    subscribe(_userAccount?: UserAccount): Promise<boolean>;
+    addToAccountLoader(): Promise<void>;
+    fetch(): Promise<void>;
+    doesAccountExist(): boolean;
+    unsubscribe(): Promise<void>;
+    assertIsSubscribed(): void;
+    getUserAccountAndSlot(): DataAndSlot<UserAccount>;
+    updateData(userAccount: UserAccount, slot: number): void;
+}

package/lib/accounts/mockUserAccountSubscriber.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MockUserAccountSubscriber = void 0;
+const events_1 = require("events");
+class MockUserAccountSubscriber {
+    constructor(userAccountPublicKey, data, slot) {
+        this.isSubscribed = true;
+        this.eventEmitter = new events_1.EventEmitter();
+        this.userAccountPublicKey = userAccountPublicKey;
+        this.user = { data, slot };
+    }
+    async subscribe(_userAccount) {
+        return true;
+    }
+    async addToAccountLoader() { }
+    async fetch() { }
+    doesAccountExist() {
+        return this.user !== undefined;
+    }
+    async unsubscribe() { }
+    assertIsSubscribed() { }
+    getUserAccountAndSlot() {
+        return this.user;
+    }
+    updateData(userAccount, slot) {
+        this.user = { data: userAccount, slot };
+        this.eventEmitter.emit('userAccountUpdate', userAccount);
+        this.eventEmitter.emit('update');
+    }
+}
+exports.MockUserAccountSubscriber = MockUserAccountSubscriber;

package/lib/driftClient.d.ts

@@ -14,6 +14,7 @@ import { User } from './user';
 import { UserSubscriptionConfig } from './userConfig';
 import { UserStats } from './userStats';
 import { JupiterClient, Route, SwapMode } from './jupiter/jupiterClient';
+import { UserStatsSubscriptionConfig } from './userStatsConfig';
 type RemainingAccountParams = {
     userAccounts: UserAccount[];
     writablePerpMarketIndexes?: number[];
@@ -36,6 +37,7 @@ export declare class DriftClient {
     userStats?: UserStats;
     activeSubAccountId: number;
     userAccountSubscriptionConfig: UserSubscriptionConfig;
+    userStatsAccountSubscriptionConfig: UserStatsSubscriptionConfig;
     accountSubscriber: DriftClientAccountSubscriber;
     eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
     _isSubscribed: boolean;

package/lib/driftClient.js

@@ -93,15 +93,24 @@ class DriftClient {
                 ? new Map([[this.authority.toString(), config.subAccountIds]])
                 : new Map();
         this.includeDelegates = (_f = config.includeDelegates) !== null && _f !== void 0 ? _f : false;
-        this.userAccountSubscriptionConfig =
-            ((_g = config.accountSubscription) === null || _g === void 0 ? void 0 : _g.type) === 'polling'
-                ? {
-                    type: 'polling',
-                    accountLoader: config.accountSubscription.accountLoader,
-                }
-                : {
-                    type: 'websocket',
-                };
+        if (((_g = config.accountSubscription) === null || _g === void 0 ? void 0 : _g.type) === 'polling') {
+            this.userAccountSubscriptionConfig = {
+                type: 'polling',
+                accountLoader: config.accountSubscription.accountLoader,
+            };
+            this.userStatsAccountSubscriptionConfig = {
+                type: 'polling',
+                accountLoader: config.accountSubscription.accountLoader,
+            };
+        }
+        else {
+            this.userAccountSubscriptionConfig = {
+                type: 'websocket',
+            };
+            this.userStatsAccountSubscriptionConfig = {
+                type: 'websocket',
+            };
+        }
         if (config.userStats) {
             this.userStats = new userStats_1.UserStats({
                 driftClient: this,
@@ -304,7 +313,7 @@ class DriftClient {
                 this.userStats = new userStats_1.UserStats({
                     driftClient: this,
                     userStatsAccountPublicKey: this.getUserStatsAccountPublicKey(),
-                    accountSubscription: this.userAccountSubscriptionConfig,
+                    accountSubscription: this.userStatsAccountSubscriptionConfig,
                 });
                 await this.userStats.subscribe();
             }

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.31.1-beta.1",
+    "version": "2.31.1-beta.3",
     "name": "drift",
     "instructions": [
         {

package/lib/math/tiers.d.ts

@@ -0,0 +1,4 @@
+import { PerpMarketAccount, SpotMarketAccount } from '../types';
+export declare function getPerpMarketTierNumber(perpMarket: PerpMarketAccount): number;
+export declare function getSpotMarketTierNumber(spotMarket: SpotMarketAccount): number;
+export declare function perpTierIsAsSafeAs(perpTier: number, otherPerpTier: number, otherSpotTier: number): boolean;

package/lib/math/tiers.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.perpTierIsAsSafeAs = exports.getSpotMarketTierNumber = exports.getPerpMarketTierNumber = void 0;
+const types_1 = require("../types");
+function getPerpMarketTierNumber(perpMarket) {
+    if ((0, types_1.isVariant)(perpMarket.contractTier, 'a')) {
+        return 0;
+    }
+    else if ((0, types_1.isVariant)(perpMarket.contractTier, 'b')) {
+        return 1;
+    }
+    else if ((0, types_1.isVariant)(perpMarket.contractTier, 'c')) {
+        return 2;
+    }
+    else if ((0, types_1.isVariant)(perpMarket.contractTier, 'speculative')) {
+        return 3;
+    }
+    else if ((0, types_1.isVariant)(perpMarket.contractTier, 'isolated')) {
+        return 4;
+    }
+    else {
+        return 5;
+    }
+}
+exports.getPerpMarketTierNumber = getPerpMarketTierNumber;
+function getSpotMarketTierNumber(spotMarket) {
+    if ((0, types_1.isVariant)(spotMarket.assetTier, 'collateral')) {
+        return 0;
+    }
+    else if ((0, types_1.isVariant)(spotMarket.assetTier, 'protected')) {
+        return 1;
+    }
+    else if ((0, types_1.isVariant)(spotMarket.assetTier, 'cross')) {
+        return 2;
+    }
+    else if ((0, types_1.isVariant)(spotMarket.assetTier, 'isolated')) {
+        return 3;
+    }
+    else if ((0, types_1.isVariant)(spotMarket.assetTier, 'unlisted')) {
+        return 4;
+    }
+    else {
+        return 5;
+    }
+}
+exports.getSpotMarketTierNumber = getSpotMarketTierNumber;
+function perpTierIsAsSafeAs(perpTier, otherPerpTier, otherSpotTier) {
+    const asSafeAsPerp = perpTier <= otherPerpTier;
+    const asSafeAsSpot = otherSpotTier === 4 || (otherSpotTier >= 2 && perpTier <= 2);
+    return asSafeAsSpot && asSafeAsPerp;
+}
+exports.perpTierIsAsSafeAs = perpTierIsAsSafeAs;

package/lib/user.d.ts

@@ -107,6 +107,7 @@ export declare class User {
      */
     getMaintenanceMarginRequirement(liquidationBuffer?: BN): BN;
     getActivePerpPositions(): PerpPosition[];
+    getActiveSpotPositions(): SpotPosition[];
     /**
      * calculates unrealized position price pnl
      * @returns : Precision QUOTE_PRECISION
@@ -185,7 +186,11 @@ export declare class User {
      * @returns : Precision TEN_THOUSAND
      */
     getMarginRatio(): BN;
-    canBeLiquidated(): boolean;
+    canBeLiquidated(): {
+        canBeLiquidated: boolean;
+        marginRequirement: BN;
+        totalCollateral: BN;
+    };
     isBeingLiquidated(): boolean;
     isBankrupt(): boolean;
     /**
@@ -277,6 +282,10 @@ export declare class User {
         maxDepositAmount: BN;
     };
     canMakeIdle(slot: BN, slotsBeforeIdle: BN): boolean;
+    getSafestTiers(): {
+        perpTier: number;
+        spotTier: number;
+    };
     /**
      * Get the total position value, excluding any position coming from the given target market
      * @param marketToIgnore

package/lib/user.js

@@ -12,6 +12,7 @@ const pollingUserAccountSubscriber_1 = require("./accounts/pollingUserAccountSub
 const webSocketUserAccountSubscriber_1 = require("./accounts/webSocketUserAccountSubscriber");
 const spotPosition_1 = require("./math/spotPosition");
 const oracles_1 = require("./math/oracles");
+const tiers_1 = require("./math/tiers");
 class User {
     get isSubscribed() {
         return this._isSubscribed && this.accountSubscriber.isSubscribed;
@@ -20,13 +21,16 @@ class User {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a;
+        var _a, _b;
         this._isSubscribed = false;
         this.driftClient = config.driftClient;
         this.userAccountPublicKey = config.userAccountPublicKey;
         if (((_a = config.accountSubscription) === null || _a === void 0 ? void 0 : _a.type) === 'polling') {
             this.accountSubscriber = new pollingUserAccountSubscriber_1.PollingUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey, config.accountSubscription.accountLoader);
         }
+        else if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'custom') {
+            this.accountSubscriber = config.accountSubscription.userAccountSubscriber;
+        }
         else {
             this.accountSubscriber = new webSocketUserAccountSubscriber_1.WebSocketUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey);
         }
@@ -305,6 +309,9 @@ class User {
             !(pos.openOrders == 0) ||
             !pos.lpShares.eq(numericConstants_1.ZERO));
     }
+    getActiveSpotPositions() {
+        return this.getUserAccount().spotPositions.filter((pos) => !(0, spotPosition_1.isSpotPositionAvailable)(pos));
+    }
     /**
      * calculates unrealized position price pnl
      * @returns : Precision QUOTE_PRECISION
@@ -775,12 +782,16 @@ class User {
         const totalCollateral = this.getTotalCollateral('Maintenance');
         // if user being liq'd, can continue to be liq'd until total collateral above the margin requirement plus buffer
         let liquidationBuffer = undefined;
-        const isBeingLiquidated = (0, types_1.isVariant)(this.getUserAccount().status, 'beingLiquidated');
-        if (isBeingLiquidated) {
+        if (this.isBeingLiquidated()) {
             liquidationBuffer = new _1.BN(this.driftClient.getStateAccount().liquidationMarginBufferRatio);
         }
-        const maintenanceRequirement = this.getMaintenanceMarginRequirement(liquidationBuffer);
-        return totalCollateral.lt(maintenanceRequirement);
+        const marginRequirement = this.getMaintenanceMarginRequirement(liquidationBuffer);
+        const canBeLiquidated = totalCollateral.lt(marginRequirement);
+        return {
+            canBeLiquidated,
+            marginRequirement,
+            totalCollateral,
+        };
     }
     isBeingLiquidated() {
         return (0, types_1.isOneOfVariant)(this.getUserAccount().status, [
@@ -1281,6 +1292,23 @@ class User {
         }
         return true;
     }
+    getSafestTiers() {
+        let safestPerpTier = 4;
+        let safestSpotTier = 4;
+        for (const perpPosition of this.getActivePerpPositions()) {
+            safestPerpTier = Math.min(safestPerpTier, (0, tiers_1.getPerpMarketTierNumber)(this.driftClient.getPerpMarketAccount(perpPosition.marketIndex)));
+        }
+        for (const spotPosition of this.getActiveSpotPositions()) {
+            if ((0, types_1.isVariant)(spotPosition.balanceType, 'deposit')) {
+                continue;
+            }
+            safestSpotTier = Math.min(safestSpotTier, (0, tiers_1.getSpotMarketTierNumber)(this.driftClient.getSpotMarketAccount(spotPosition.marketIndex)));
+        }
+        return {
+            perpTier: safestPerpTier,
+            spotTier: safestSpotTier,
+        };
+    }
     /**
      * Get the total position value, excluding any position coming from the given target market
      * @param marketToIgnore

package/lib/userConfig.d.ts

@@ -1,6 +1,7 @@
 import { DriftClient } from './driftClient';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
+import { UserAccountSubscriber } from './accounts/types';
 export type UserConfig = {
     accountSubscription?: UserSubscriptionConfig;
     driftClient: DriftClient;
@@ -11,4 +12,7 @@ export type UserSubscriptionConfig = {
 } | {
     type: 'polling';
     accountLoader: BulkAccountLoader;
+} | {
+    type: 'custom';
+    userAccountSubscriber: UserAccountSubscriber;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.31.1-beta.2",
+	"version": "2.31.1-beta.4",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/accounts/mockUserAccountSubscriber.ts

@@ -0,0 +1,53 @@
+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';
+
+export class MockUserAccountSubscriber implements UserAccountSubscriber {
+	isSubscribed: boolean;
+	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
+	userAccountPublicKey: PublicKey;
+
+	callbackId?: string;
+	errorCallbackId?: string;
+
+	user: DataAndSlot<UserAccount>;
+
+	public constructor(
+		userAccountPublicKey: PublicKey,
+		data: UserAccount,
+		slot: number
+	) {
+		this.isSubscribed = true;
+		this.eventEmitter = new EventEmitter();
+		this.userAccountPublicKey = userAccountPublicKey;
+		this.user = { data, slot };
+	}
+
+	async subscribe(_userAccount?: UserAccount): Promise<boolean> {
+		return true;
+	}
+
+	async addToAccountLoader(): Promise<void> {}
+
+	async fetch(): Promise<void> {}
+
+	doesAccountExist(): boolean {
+		return this.user !== undefined;
+	}
+
+	async unsubscribe(): Promise<void> {}
+
+	assertIsSubscribed(): void {}
+
+	public getUserAccountAndSlot(): DataAndSlot<UserAccount> {
+		return this.user;
+	}
+
+	public updateData(userAccount: UserAccount, slot: number): void {
+		this.user = { data: userAccount, slot };
+		this.eventEmitter.emit('userAccountUpdate', userAccount);
+		this.eventEmitter.emit('update');
+	}
+}

package/src/driftClient.ts

@@ -115,6 +115,7 @@ import { fetchUserStatsAccount } from './accounts/fetch';
 import { castNumberToSpotPrecision } from './math/spotMarket';
 import { JupiterClient, Route, SwapMode } from './jupiter/jupiterClient';
 import { getNonIdleUserFilter } from './memcmp';
+import { UserStatsSubscriptionConfig } from './userStatsConfig';
 
 type RemainingAccountParams = {
 	userAccounts: UserAccount[];
@@ -139,6 +140,7 @@ export class DriftClient {
 	userStats?: UserStats;
 	activeSubAccountId: number;
 	userAccountSubscriptionConfig: UserSubscriptionConfig;
+	userStatsAccountSubscriptionConfig: UserStatsSubscriptionConfig;
 	accountSubscriber: DriftClientAccountSubscriber;
 	eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
 	_isSubscribed = false;
@@ -206,15 +208,23 @@ export class DriftClient {
 			: new Map<string, number[]>();
 
 		this.includeDelegates = config.includeDelegates ?? false;
-		this.userAccountSubscriptionConfig =
-			config.accountSubscription?.type === 'polling'
-				? {
-						type: 'polling',
-						accountLoader: config.accountSubscription.accountLoader,
-				  }
-				: {
-						type: 'websocket',
-				  };
+		if (config.accountSubscription?.type === 'polling') {
+			this.userAccountSubscriptionConfig = {
+				type: 'polling',
+				accountLoader: config.accountSubscription.accountLoader,
+			};
+			this.userStatsAccountSubscriptionConfig = {
+				type: 'polling',
+				accountLoader: config.accountSubscription.accountLoader,
+			};
+		} else {
+			this.userAccountSubscriptionConfig = {
+				type: 'websocket',
+			};
+			this.userStatsAccountSubscriptionConfig = {
+				type: 'websocket',
+			};
+		}
 
 		if (config.userStats) {
 			this.userStats = new UserStats({
@@ -542,7 +552,7 @@ export class DriftClient {
 				this.userStats = new UserStats({
 					driftClient: this,
 					userStatsAccountPublicKey: this.getUserStatsAccountPublicKey(),
-					accountSubscription: this.userAccountSubscriptionConfig,
+					accountSubscription: this.userStatsAccountSubscriptionConfig,
 				});
 
 				await this.userStats.subscribe();

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.31.1-beta.2",
+  "version": "2.31.1-beta.4",
   "name": "drift",
   "instructions": [
     {

package/src/math/tiers.ts

@@ -0,0 +1,44 @@
+import { isVariant, PerpMarketAccount, SpotMarketAccount } from '../types';
+
+export function getPerpMarketTierNumber(perpMarket: PerpMarketAccount): number {
+	if (isVariant(perpMarket.contractTier, 'a')) {
+		return 0;
+	} else if (isVariant(perpMarket.contractTier, 'b')) {
+		return 1;
+	} else if (isVariant(perpMarket.contractTier, 'c')) {
+		return 2;
+	} else if (isVariant(perpMarket.contractTier, 'speculative')) {
+		return 3;
+	} else if (isVariant(perpMarket.contractTier, 'isolated')) {
+		return 4;
+	} else {
+		return 5;
+	}
+}
+
+export function getSpotMarketTierNumber(spotMarket: SpotMarketAccount): number {
+	if (isVariant(spotMarket.assetTier, 'collateral')) {
+		return 0;
+	} else if (isVariant(spotMarket.assetTier, 'protected')) {
+		return 1;
+	} else if (isVariant(spotMarket.assetTier, 'cross')) {
+		return 2;
+	} else if (isVariant(spotMarket.assetTier, 'isolated')) {
+		return 3;
+	} else if (isVariant(spotMarket.assetTier, 'unlisted')) {
+		return 4;
+	} else {
+		return 5;
+	}
+}
+
+export function perpTierIsAsSafeAs(
+	perpTier: number,
+	otherPerpTier: number,
+	otherSpotTier: number
+): boolean {
+	const asSafeAsPerp = perpTier <= otherPerpTier;
+	const asSafeAsSpot =
+		otherSpotTier === 4 || (otherSpotTier >= 2 && perpTier <= 2);
+	return asSafeAsSpot && asSafeAsPerp;
+}

package/src/user.ts

@@ -72,6 +72,7 @@ import {
 } from './math/spotPosition';
 
 import { calculateLiveOracleTwap } from './math/oracles';
+import { getPerpMarketTierNumber, getSpotMarketTierNumber } from './math/tiers';
 
 export class User {
 	driftClient: DriftClient;
@@ -97,6 +98,8 @@ export class User {
 				config.userAccountPublicKey,
 				config.accountSubscription.accountLoader
 			);
+		} else if (config.accountSubscription?.type === 'custom') {
+			this.accountSubscriber = config.accountSubscription.userAccountSubscriber;
 		} else {
 			this.accountSubscriber = new WebSocketUserAccountSubscriber(
 				config.driftClient.program,
@@ -490,6 +493,12 @@ export class User {
 		);
 	}
 
+	public getActiveSpotPositions(): SpotPosition[] {
+		return this.getUserAccount().spotPositions.filter(
+			(pos) => !isSpotPositionAvailable(pos)
+		);
+	}
+
 	/**
 	 * calculates unrealized position price pnl
 	 * @returns : Precision QUOTE_PRECISION
@@ -1435,24 +1444,29 @@ export class User {
 		return netAssetValue.mul(TEN_THOUSAND).div(totalLiabilityValue);
 	}
 
-	public canBeLiquidated(): boolean {
+	public canBeLiquidated(): {
+		canBeLiquidated: boolean;
+		marginRequirement: BN;
+		totalCollateral: BN;
+	} {
 		const totalCollateral = this.getTotalCollateral('Maintenance');
 
 		// if user being liq'd, can continue to be liq'd until total collateral above the margin requirement plus buffer
 		let liquidationBuffer = undefined;
-		const isBeingLiquidated = isVariant(
-			this.getUserAccount().status,
-			'beingLiquidated'
-		);
-
-		if (isBeingLiquidated) {
+		if (this.isBeingLiquidated()) {
 			liquidationBuffer = new BN(
 				this.driftClient.getStateAccount().liquidationMarginBufferRatio
 			);
 		}
-		const maintenanceRequirement =
+		const marginRequirement =
 			this.getMaintenanceMarginRequirement(liquidationBuffer);
-		return totalCollateral.lt(maintenanceRequirement);
+		const canBeLiquidated = totalCollateral.lt(marginRequirement);
+
+		return {
+			canBeLiquidated,
+			marginRequirement,
+			totalCollateral,
+		};
 	}
 
 	public isBeingLiquidated(): boolean {
@@ -2304,6 +2318,38 @@ export class User {
 		return true;
 	}
 
+	public getSafestTiers(): { perpTier: number; spotTier: number } {
+		let safestPerpTier = 4;
+		let safestSpotTier = 4;
+
+		for (const perpPosition of this.getActivePerpPositions()) {
+			safestPerpTier = Math.min(
+				safestPerpTier,
+				getPerpMarketTierNumber(
+					this.driftClient.getPerpMarketAccount(perpPosition.marketIndex)
+				)
+			);
+		}
+
+		for (const spotPosition of this.getActiveSpotPositions()) {
+			if (isVariant(spotPosition.balanceType, 'deposit')) {
+				continue;
+			}
+
+			safestSpotTier = Math.min(
+				safestSpotTier,
+				getSpotMarketTierNumber(
+					this.driftClient.getSpotMarketAccount(spotPosition.marketIndex)
+				)
+			);
+		}
+
+		return {
+			perpTier: safestPerpTier,
+			spotTier: safestSpotTier,
+		};
+	}
+
 	/**
 	 * Get the total position value, excluding any position coming from the given target market
 	 * @param marketToIgnore
@@ -2345,6 +2391,7 @@ export class User {
 
 		return oracleData;
 	}
+
 	private getOracleDataForSpotMarket(marketIndex: number): OraclePriceData {
 		const oracleKey = this.driftClient.getSpotMarketAccount(marketIndex).oracle;
 

package/src/userConfig.ts

@@ -1,6 +1,7 @@
 import { DriftClient } from './driftClient';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
+import { UserAccountSubscriber } from './accounts/types';
 
 export type UserConfig = {
 	accountSubscription?: UserSubscriptionConfig;
@@ -15,4 +16,8 @@ export type UserSubscriptionConfig =
 	| {
 			type: 'polling';
 			accountLoader: BulkAccountLoader;
+	  }
+	| {
+			type: 'custom';
+			userAccountSubscriber: UserAccountSubscriber;
 	  };