@drift-labs/sdk 2.26.0-beta.2 → 2.26.0

package/lib/config.d.ts

@@ -7,6 +7,7 @@ type DriftConfig = {
     DRIFT_PROGRAM_ID: string;
     USDC_MINT_ADDRESS: string;
     SERUM_V3: string;
+    PHOENIX: string;
     V2_ALPHA_TICKET_MINT_ADDRESS: string;
     PERP_MARKETS: PerpMarketConfig[];
     SPOT_MARKETS: SpotMarketConfig[];

package/lib/config.js

@@ -10,6 +10,7 @@ exports.configs = {
         DRIFT_PROGRAM_ID: 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH',
         USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
         SERUM_V3: 'DESVgJVGajEgKGXhb6XmqDHGz3VjdgP7rEVESBgxmroY',
+        PHOENIX: 'PhoeNiXZ8ByJGLkxNfZRnkUfjvmuYqLR89jjFHGqdXY',
         V2_ALPHA_TICKET_MINT_ADDRESS: 'DeEiGWfCMP9psnLGkxGrBBMEAW5Jv8bBGMN8DCtFRCyB',
         PERP_MARKETS: perpMarkets_1.DevnetPerpMarkets,
         SPOT_MARKETS: spotMarkets_1.DevnetSpotMarkets,
@@ -21,6 +22,7 @@ exports.configs = {
         DRIFT_PROGRAM_ID: 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH',
         USDC_MINT_ADDRESS: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
         SERUM_V3: 'srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX',
+        PHOENIX: 'PhoeNiXZ8ByJGLkxNfZRnkUfjvmuYqLR89jjFHGqdXY',
         V2_ALPHA_TICKET_MINT_ADDRESS: 'Cmvhycb6LQvvzaShGw4iDHRLzeSSryioAsU98DSSkMNa',
         PERP_MARKETS: perpMarkets_1.MainnetPerpMarkets,
         SPOT_MARKETS: spotMarkets_1.MainnetSpotMarkets,

package/lib/constants/spotMarkets.d.ts

@@ -9,6 +9,7 @@ export type SpotMarketConfig = {
     precision: BN;
     precisionExp: BN;
     serumMarket?: PublicKey;
+    phoenixMarket?: PublicKey;
 };
 export declare const WRAPPED_SOL_MINT: PublicKey;
 export declare const DevnetSpotMarkets: SpotMarketConfig[];

package/lib/constants/spotMarkets.js

@@ -24,6 +24,7 @@ exports.DevnetSpotMarkets = [
         precision: numericConstants_1.LAMPORTS_PRECISION,
         precisionExp: numericConstants_1.LAMPORTS_EXP,
         serumMarket: new web3_js_1.PublicKey('8N37SsnTu8RYxtjrV9SStjkkwVhmU8aCWhLvwduAPEKW'),
+        phoenixMarket: new web3_js_1.PublicKey('78ehDnHgbkFxqXZwdFxa8HK7saX58GymeX2wNGdkqYLp'),
     },
     {
         symbol: 'BTC',

package/lib/dlob/orderBookLevels.d.ts

@@ -1,6 +1,6 @@
 import { BN, DLOBNode, OraclePriceData, PerpMarketAccount } from '..';
 import { PublicKey } from '@solana/web3.js';
-type liquiditySource = 'serum' | 'vamm' | 'dlob';
+type liquiditySource = 'serum' | 'vamm' | 'dlob' | 'phoenix';
 export type L2Level = {
     price: BN;
     size: BN;

package/lib/driftClient.d.ts

@@ -34,7 +34,6 @@ export declare class DriftClient {
     users: Map<string, User>;
     userStats?: UserStats;
     activeSubAccountId: number;
-    activeAuthority: PublicKey;
     userAccountSubscriptionConfig: UserSubscriptionConfig;
     accountSubscriber: DriftClientAccountSubscriber;
     eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
@@ -46,7 +45,7 @@ export declare class DriftClient {
     marketLookupTable: PublicKey;
     lookupTableAccount: AddressLookupTableAccount;
     includeDelegates?: boolean;
-    authoritySubaccountMap?: Map<string, number[]>;
+    authoritySubAccountMap?: Map<string, number[]>;
     skipLoadUsers?: boolean;
     get isSubscribed(): boolean;
     set isSubscribed(val: boolean);
@@ -98,7 +97,7 @@ export declare class DriftClient {
      */
     updateWallet(newWallet: IWallet, subAccountIds?: number[], activeSubAccountId?: number, includeDelegates?: boolean, authoritySubaccountMap?: Map<string, number[]>): Promise<boolean>;
     switchActiveUser(subAccountId: number, authority?: PublicKey): void;
-    addUser(subAccountId: number, authority?: PublicKey): Promise<boolean>;
+    addUser(subAccountId: number, authority?: PublicKey, userAccount?: UserAccount): Promise<boolean>;
     /**
      * Adds and subscribes to users based on params set by the constructor or by updateWallet.
      */

package/lib/driftClient.js

@@ -77,19 +77,18 @@ class DriftClient {
         if (config.includeDelegates && config.subAccountIds) {
             throw new Error('Can only pass one of includeDelegates or subAccountIds. If you want to specify subaccount ids for multiple authorities, pass authoritySubaccountMap instead');
         }
-        if (config.authoritySubaccountMap && config.subAccountIds) {
+        if (config.authoritySubAccountMap && config.subAccountIds) {
             throw new Error('Can only pass one of authoritySubaccountMap or subAccountIds');
         }
-        if (config.authoritySubaccountMap && config.includeDelegates) {
+        if (config.authoritySubAccountMap && config.includeDelegates) {
             throw new Error('Can only pass one of authoritySubaccountMap or includeDelegates');
         }
-        this.authoritySubaccountMap = config.authoritySubaccountMap
-            ? config.authoritySubaccountMap
+        this.authoritySubAccountMap = config.authoritySubAccountMap
+            ? config.authoritySubAccountMap
             : config.subAccountIds
                 ? new Map([[this.authority.toString(), config.subAccountIds]])
                 : new Map();
         this.includeDelegates = (_d = config.includeDelegates) !== null && _d !== void 0 ? _d : false;
-        this.activeAuthority = this.authority;
         this.userAccountSubscriptionConfig =
             ((_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.type) === 'polling'
                 ? {
@@ -298,7 +297,7 @@ class DriftClient {
         if (authoritySubaccountMap && includeDelegates) {
             throw new Error('Can only pass one of authoritySubaccountMap or includeDelegates');
         }
-        this.authoritySubaccountMap = authoritySubaccountMap
+        this.authoritySubAccountMap = authoritySubaccountMap
             ? authoritySubaccountMap
             : subAccountIds
                 ? new Map([[this.authority.toString(), subAccountIds]])
@@ -322,16 +321,17 @@ class DriftClient {
     }
     switchActiveUser(subAccountId, authority) {
         this.activeSubAccountId = subAccountId;
-        this.activeAuthority = authority !== null && authority !== void 0 ? authority : this.authority;
+        this.authority = authority !== null && authority !== void 0 ? authority : this.authority;
+        this.userStatsAccountPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.authority);
     }
-    async addUser(subAccountId, authority) {
+    async addUser(subAccountId, authority, userAccount) {
         authority = authority !== null && authority !== void 0 ? authority : this.authority;
         const userKey = this.getUserMapKey(subAccountId, authority);
         if (this.users.has(userKey) && this.users.get(userKey).isSubscribed) {
             return true;
         }
         const user = this.createUser(subAccountId, this.userAccountSubscriptionConfig, authority);
-        const result = await user.subscribe();
+        const result = await user.subscribe(userAccount);
         if (result) {
             this.users.set(userKey, user);
             return true;
@@ -349,28 +349,28 @@ class DriftClient {
         if (this.skipLoadUsers)
             return true;
         let result = true;
-        if (this.authoritySubaccountMap && this.authoritySubaccountMap.size > 0) {
-            this.authoritySubaccountMap.forEach(async (value, key) => {
+        if (this.authoritySubAccountMap && this.authoritySubAccountMap.size > 0) {
+            this.authoritySubAccountMap.forEach(async (value, key) => {
                 for (const subAccountId of value) {
                     result =
                         result && (await this.addUser(subAccountId, new web3_js_1.PublicKey(key)));
                 }
             });
             if (this.activeSubAccountId == undefined) {
-                this.switchActiveUser((_a = [...this.authoritySubaccountMap.values()][0][0]) !== null && _a !== void 0 ? _a : 0, new web3_js_1.PublicKey((_b = [...this.authoritySubaccountMap.keys()][0]) !== null && _b !== void 0 ? _b : this.authority.toString()));
+                this.switchActiveUser((_a = [...this.authoritySubAccountMap.values()][0][0]) !== null && _a !== void 0 ? _a : 0, new web3_js_1.PublicKey((_b = [...this.authoritySubAccountMap.keys()][0]) !== null && _b !== void 0 ? _b : this.authority.toString()));
             }
         }
         else {
-            const userAccounts = (_c = (await this.getUserAccountsForAuthority(this.authority))) !== null && _c !== void 0 ? _c : [];
+            const userAccounts = (_c = (await this.getUserAccountsForAuthority(this.wallet.publicKey))) !== null && _c !== void 0 ? _c : [];
             let delegatedAccounts = [];
             if (this.includeDelegates) {
                 delegatedAccounts =
-                    (_d = (await this.getUserAccountsForDelegate(this.authority))) !== null && _d !== void 0 ? _d : [];
+                    (_d = (await this.getUserAccountsForDelegate(this.wallet.publicKey))) !== null && _d !== void 0 ? _d : [];
             }
             for (const account of userAccounts.concat(delegatedAccounts)) {
                 result =
                     result &&
-                        (await this.addUser(account.subAccountId, account.authority));
+                        (await this.addUser(account.subAccountId, account.authority, account));
             }
             if (this.activeSubAccountId == undefined) {
                 this.switchActiveUser((_f = (_e = userAccounts.concat(delegatedAccounts)[0]) === null || _e === void 0 ? void 0 : _e.subAccountId) !== null && _f !== void 0 ? _f : 0, (_h = (_g = userAccounts.concat(delegatedAccounts)[0]) === null || _g === void 0 ? void 0 : _g.authority) !== null && _h !== void 0 ? _h : this.authority);
@@ -388,6 +388,7 @@ class DriftClient {
         }
         tx.add(initializeUserAccountIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        await this.addUser(subAccountId);
         return [txSig, userAccountPublicKey];
     }
     async getInitializeUserInstructions(subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, referrerInfo) {
@@ -604,18 +605,18 @@ class DriftClient {
     }
     getUser(subAccountId, authority) {
         subAccountId = subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId;
-        authority = authority !== null && authority !== void 0 ? authority : this.activeAuthority;
+        authority = authority !== null && authority !== void 0 ? authority : this.authority;
         const userMapKey = this.getUserMapKey(subAccountId, authority);
         if (!this.users.has(userMapKey)) {
-            throw new Error(`Clearing House has no user for user id ${subAccountId}`);
+            throw new Error(`Clearing House has no user for user id ${userMapKey}`);
         }
         return this.users.get(userMapKey);
     }
     getUsers() {
         // delegate users get added to the end
         return [...this.users.values()]
-            .filter((acct) => acct.getUserAccount().authority.equals(this.authority))
-            .concat([...this.users.values()].filter((acct) => !acct.getUserAccount().authority.equals(this.authority)));
+            .filter((acct) => acct.getUserAccount().authority.equals(this.wallet.publicKey))
+            .concat([...this.users.values()].filter((acct) => !acct.getUserAccount().authority.equals(this.wallet.publicKey)));
     }
     getUserStats() {
         return this.userStats;
@@ -629,7 +630,7 @@ class DriftClient {
         if (this.userStatsAccountPublicKey) {
             return this.userStatsAccountPublicKey;
         }
-        this.userStatsAccountPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.activeAuthority);
+        this.userStatsAccountPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.authority);
         return this.userStatsAccountPublicKey;
     }
     async getUserAccountPublicKey(subAccountId, authority) {
@@ -909,8 +910,8 @@ class DriftClient {
         const additionalSigners = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
-        const authority = this.authority;
-        const createWSOLTokenAccount = isSolMarket && collateralAccountPublicKey.equals(authority);
+        const signerAuthority = this.wallet.publicKey;
+        const createWSOLTokenAccount = isSolMarket && collateralAccountPublicKey.equals(signerAuthority);
         if (createWSOLTokenAccount) {
             const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
             collateralAccountPublicKey = pubkey;
@@ -923,16 +924,14 @@ class DriftClient {
         tx.add(depositCollateralIx);
         // Close the wrapped sol account at the end of the transaction
         if (createWSOLTokenAccount) {
-            tx.add(spl_token_1.Token.createCloseAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, collateralAccountPublicKey, authority, authority, []));
+            tx.add(spl_token_1.Token.createCloseAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, collateralAccountPublicKey, signerAuthority, signerAuthority, []));
         }
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);
         return txSig;
     }
     async getDepositInstruction(amount, marketIndex, userTokenAccount, subAccountId, reduceOnly = false, userInitialized = true) {
-        const userAccountPublicKey = subAccountId
-            ? await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId)
-            : await this.getUserAccountPublicKey();
+        const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId);
         let remainingAccounts = [];
         if (userInitialized) {
             remainingAccounts = this.getRemainingAccounts({
@@ -1049,6 +1048,7 @@ class DriftClient {
         }
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);
+        await this.addUser(subAccountId);
         return [txSig, userAccountPublicKey];
     }
     async initializeUserAccountForDevnet(subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, marketIndex, tokenFaucet, amount, referrerInfo) {
@@ -1063,6 +1063,7 @@ class DriftClient {
         }
         tx.add(initializeUserAccountIx).add(depositCollateralIx);
         const txSig = await this.program.provider.sendAndConfirm(tx, []);
+        await this.addUser(subAccountId);
         return [txSig, userAccountPublicKey];
     }
     async withdraw(amount, marketIndex, userTokenAccount, reduceOnly = false) {

package/lib/driftClientConfig.d.ts

@@ -20,7 +20,7 @@ export type DriftClientConfig = {
     userStats?: boolean;
     authority?: PublicKey;
     includeDelegates?: boolean;
-    authoritySubaccountMap?: Map<string, number[]>;
+    authoritySubAccountMap?: Map<string, number[]>;
     skipLoadUsers?: boolean;
 };
 export type DriftClientSubscriptionConfig = {

package/lib/idl/drift.json

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

package/lib/phoenix/phoenixSubscriber.d.ts

@@ -2,6 +2,7 @@ import { Connection, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 import { MarketData, Client } from '@ellipsis-labs/phoenix-sdk';
 import { BN } from '@coral-xyz/anchor';
+import { L2Level, L2OrderBookGenerator } from '../dlob/orderBookLevels';
 export type PhoenixMarketSubscriberConfig = {
     connection: Connection;
     programId: PublicKey;
@@ -13,7 +14,7 @@ export type PhoenixMarketSubscriberConfig = {
         type: 'websocket';
     };
 };
-export declare class PhoenixSubscriber {
+export declare class PhoenixSubscriber implements L2OrderBookGenerator {
     connection: Connection;
     client: Client;
     programId: PublicKey;
@@ -30,5 +31,8 @@ export declare class PhoenixSubscriber {
     subscribe(): Promise<void>;
     getBestBid(): BN;
     getBestAsk(): BN;
+    getL2Bids(): Generator<L2Level>;
+    getL2Asks(): Generator<L2Level>;
+    getL2Levels(side: 'bids' | 'asks'): Generator<L2Level>;
     unsubscribe(): Promise<void>;
 }

package/lib/phoenix/phoenixSubscriber.js

@@ -60,6 +60,29 @@ class PhoenixSubscriber {
         const ladder = (0, phoenix_sdk_1.getMarketUiLadder)(this.market, this.lastSlot, this.lastUnixTimestamp, 1);
         return new anchor_1.BN(Math.floor(ladder.asks[0][0] * numericConstants_1.PRICE_PRECISION.toNumber()));
     }
+    getL2Bids() {
+        return this.getL2Levels('bids');
+    }
+    getL2Asks() {
+        return this.getL2Levels('asks');
+    }
+    *getL2Levels(side) {
+        // @ts-ignore
+        const basePrecision = Math.pow(10, this.market.header.baseParams.decimals);
+        const pricePrecision = numericConstants_1.PRICE_PRECISION.toNumber();
+        const ladder = (0, phoenix_sdk_1.getMarketUiLadder)(this.market, this.lastSlot, this.lastUnixTimestamp, 20);
+        for (let i = 0; i < ladder[side].length; i++) {
+            const [priceNum, sizeNum] = ladder[side][i];
+            const size = new anchor_1.BN(Math.floor(sizeNum * basePrecision));
+            yield {
+                price: new anchor_1.BN(Math.floor(priceNum * pricePrecision)),
+                size,
+                sources: {
+                    phoenix: size,
+                },
+            };
+        }
+    }
     async unsubscribe() {
         if (!this.subscribed) {
             return;

package/lib/serum/serumSubscriber.js

@@ -76,9 +76,9 @@ class SerumSubscriber {
         // @ts-ignore
         const basePrecision = Math.pow(10, this.market._baseSplTokenDecimals);
         const pricePrecision = numericConstants_1.PRICE_PRECISION.toNumber();
-        for (let { price, size } of this[side].items(side === 'bids')) {
-            price = new anchor_1.BN(price * pricePrecision);
-            size = new anchor_1.BN(size * basePrecision);
+        for (const { price: priceNum, size: sizeNum } of this[side].items(side === 'bids')) {
+            const price = new anchor_1.BN(priceNum * pricePrecision);
+            const size = new anchor_1.BN(sizeNum * basePrecision);
             yield {
                 price,
                 size,

package/lib/wallet.d.ts

@@ -7,3 +7,4 @@ export declare class Wallet implements IWallet {
     signAllTransactions(txs: Transaction[]): Promise<Transaction[]>;
     get publicKey(): PublicKey;
 }
+export declare function loadKeypair(privateKey: string): Keypair;

package/lib/wallet.js

@@ -1,6 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Wallet = void 0;
+exports.loadKeypair = exports.Wallet = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const fs_1 = __importDefault(require("fs"));
+const bs58_1 = __importDefault(require("bs58"));
 class Wallet {
     constructor(payer) {
         this.payer = payer;
@@ -20,3 +26,20 @@ class Wallet {
     }
 }
 exports.Wallet = Wallet;
+function loadKeypair(privateKey) {
+    // try to load privateKey as a filepath
+    let loadedKey;
+    if (fs_1.default.existsSync(privateKey)) {
+        loadedKey = new Uint8Array(JSON.parse(fs_1.default.readFileSync(privateKey).toString()));
+    }
+    else {
+        if (privateKey.includes(',')) {
+            loadedKey = Uint8Array.from(privateKey.split(',').map((val) => Number(val)));
+        }
+        else {
+            loadedKey = new Uint8Array(bs58_1.default.decode(privateKey));
+        }
+    }
+    return web3_js_1.Keypair.fromSecretKey(Uint8Array.from(loadedKey));
+}
+exports.loadKeypair = loadKeypair;

package/package.json

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

package/src/config.ts

@@ -18,6 +18,7 @@ type DriftConfig = {
 	DRIFT_PROGRAM_ID: string;
 	USDC_MINT_ADDRESS: string;
 	SERUM_V3: string;
+	PHOENIX: string;
 	V2_ALPHA_TICKET_MINT_ADDRESS: string;
 	PERP_MARKETS: PerpMarketConfig[];
 	SPOT_MARKETS: SpotMarketConfig[];
@@ -33,6 +34,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 		DRIFT_PROGRAM_ID: 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH',
 		USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
 		SERUM_V3: 'DESVgJVGajEgKGXhb6XmqDHGz3VjdgP7rEVESBgxmroY',
+		PHOENIX: 'PhoeNiXZ8ByJGLkxNfZRnkUfjvmuYqLR89jjFHGqdXY',
 		V2_ALPHA_TICKET_MINT_ADDRESS:
 			'DeEiGWfCMP9psnLGkxGrBBMEAW5Jv8bBGMN8DCtFRCyB',
 		PERP_MARKETS: DevnetPerpMarkets,
@@ -45,6 +47,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 		DRIFT_PROGRAM_ID: 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH',
 		USDC_MINT_ADDRESS: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
 		SERUM_V3: 'srmqPvymJeFKQ4zGQed1GFppgkRHL9kaELCbyksJtPX',
+		PHOENIX: 'PhoeNiXZ8ByJGLkxNfZRnkUfjvmuYqLR89jjFHGqdXY',
 		V2_ALPHA_TICKET_MINT_ADDRESS:
 			'Cmvhycb6LQvvzaShGw4iDHRLzeSSryioAsU98DSSkMNa',
 		PERP_MARKETS: MainnetPerpMarkets,

package/src/constants/spotMarkets.ts

@@ -17,6 +17,7 @@ export type SpotMarketConfig = {
 	precision: BN;
 	precisionExp: BN;
 	serumMarket?: PublicKey;
+	phoenixMarket?: PublicKey;
 };
 
 export const WRAPPED_SOL_MINT = new PublicKey(
@@ -42,6 +43,9 @@ export const DevnetSpotMarkets: SpotMarketConfig[] = [
 		precision: LAMPORTS_PRECISION,
 		precisionExp: LAMPORTS_EXP,
 		serumMarket: new PublicKey('8N37SsnTu8RYxtjrV9SStjkkwVhmU8aCWhLvwduAPEKW'),
+		phoenixMarket: new PublicKey(
+			'78ehDnHgbkFxqXZwdFxa8HK7saX58GymeX2wNGdkqYLp'
+		),
 	},
 	{
 		symbol: 'BTC',

package/src/dlob/orderBookLevels.ts

@@ -13,7 +13,7 @@ import {
 } from '..';
 import { PublicKey } from '@solana/web3.js';
 
-type liquiditySource = 'serum' | 'vamm' | 'dlob';
+type liquiditySource = 'serum' | 'vamm' | 'dlob' | 'phoenix';
 
 export type L2Level = {
 	price: BN;

package/src/driftClient.ts

@@ -121,7 +121,6 @@ export class DriftClient {
 	users = new Map<string, User>();
 	userStats?: UserStats;
 	activeSubAccountId: number;
-	activeAuthority: PublicKey;
 	userAccountSubscriptionConfig: UserSubscriptionConfig;
 	accountSubscriber: DriftClientAccountSubscriber;
 	eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
@@ -133,7 +132,7 @@ export class DriftClient {
 	marketLookupTable: PublicKey;
 	lookupTableAccount: AddressLookupTableAccount;
 	includeDelegates?: boolean;
-	authoritySubaccountMap?: Map<string, number[]>;
+	authoritySubAccountMap?: Map<string, number[]>;
 	skipLoadUsers?: boolean;
 
 	public get isSubscribed() {
@@ -169,26 +168,25 @@ export class DriftClient {
 			);
 		}
 
-		if (config.authoritySubaccountMap && config.subAccountIds) {
+		if (config.authoritySubAccountMap && config.subAccountIds) {
 			throw new Error(
 				'Can only pass one of authoritySubaccountMap or subAccountIds'
 			);
 		}
 
-		if (config.authoritySubaccountMap && config.includeDelegates) {
+		if (config.authoritySubAccountMap && config.includeDelegates) {
 			throw new Error(
 				'Can only pass one of authoritySubaccountMap or includeDelegates'
 			);
 		}
 
-		this.authoritySubaccountMap = config.authoritySubaccountMap
-			? config.authoritySubaccountMap
+		this.authoritySubAccountMap = config.authoritySubAccountMap
+			? config.authoritySubAccountMap
 			: config.subAccountIds
 			? new Map([[this.authority.toString(), config.subAccountIds]])
 			: new Map<string, number[]>();
 
 		this.includeDelegates = config.includeDelegates ?? false;
-		this.activeAuthority = this.authority;
 		this.userAccountSubscriptionConfig =
 			config.accountSubscription?.type === 'polling'
 				? {
@@ -525,7 +523,7 @@ export class DriftClient {
 			);
 		}
 
-		this.authoritySubaccountMap = authoritySubaccountMap
+		this.authoritySubAccountMap = authoritySubaccountMap
 			? authoritySubaccountMap
 			: subAccountIds
 			? new Map([[this.authority.toString(), subAccountIds]])
@@ -557,12 +555,17 @@ export class DriftClient {
 
 	public switchActiveUser(subAccountId: number, authority?: PublicKey) {
 		this.activeSubAccountId = subAccountId;
-		this.activeAuthority = authority ?? this.authority;
+		this.authority = authority ?? this.authority;
+		this.userStatsAccountPublicKey = getUserStatsAccountPublicKey(
+			this.program.programId,
+			this.authority
+		);
 	}
 
 	public async addUser(
 		subAccountId: number,
-		authority?: PublicKey
+		authority?: PublicKey,
+		userAccount?: UserAccount
 	): Promise<boolean> {
 		authority = authority ?? this.authority;
 		const userKey = this.getUserMapKey(subAccountId, authority);
@@ -577,7 +580,7 @@ export class DriftClient {
 			authority
 		);
 
-		const result = await user.subscribe();
+		const result = await user.subscribe(userAccount);
 
 		if (result) {
 			this.users.set(userKey, user);
@@ -596,8 +599,8 @@ export class DriftClient {
 
 		let result = true;
 
-		if (this.authoritySubaccountMap && this.authoritySubaccountMap.size > 0) {
-			this.authoritySubaccountMap.forEach(async (value, key) => {
+		if (this.authoritySubAccountMap && this.authoritySubAccountMap.size > 0) {
+			this.authoritySubAccountMap.forEach(async (value, key) => {
 				for (const subAccountId of value) {
 					result =
 						result && (await this.addUser(subAccountId, new PublicKey(key)));
@@ -606,27 +609,31 @@ export class DriftClient {
 
 			if (this.activeSubAccountId == undefined) {
 				this.switchActiveUser(
-					[...this.authoritySubaccountMap.values()][0][0] ?? 0,
+					[...this.authoritySubAccountMap.values()][0][0] ?? 0,
 					new PublicKey(
-						[...this.authoritySubaccountMap.keys()][0] ??
+						[...this.authoritySubAccountMap.keys()][0] ??
 							this.authority.toString()
 					)
 				);
 			}
 		} else {
 			const userAccounts =
-				(await this.getUserAccountsForAuthority(this.authority)) ?? [];
+				(await this.getUserAccountsForAuthority(this.wallet.publicKey)) ?? [];
 			let delegatedAccounts = [];
 
 			if (this.includeDelegates) {
 				delegatedAccounts =
-					(await this.getUserAccountsForDelegate(this.authority)) ?? [];
+					(await this.getUserAccountsForDelegate(this.wallet.publicKey)) ?? [];
 			}
 
 			for (const account of userAccounts.concat(delegatedAccounts)) {
 				result =
 					result &&
-					(await this.addUser(account.subAccountId, account.authority));
+					(await this.addUser(
+						account.subAccountId,
+						account.authority,
+						account
+					));
 			}
 
 			if (this.activeSubAccountId == undefined) {
@@ -662,6 +669,9 @@ export class DriftClient {
 		}
 		tx.add(initializeUserAccountIx);
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		await this.addUser(subAccountId);
+
 		return [txSig, userAccountPublicKey];
 	}
 
@@ -1006,11 +1016,11 @@ export class DriftClient {
 
 	public getUser(subAccountId?: number, authority?: PublicKey): User {
 		subAccountId = subAccountId ?? this.activeSubAccountId;
-		authority = authority ?? this.activeAuthority;
+		authority = authority ?? this.authority;
 		const userMapKey = this.getUserMapKey(subAccountId, authority);
 
 		if (!this.users.has(userMapKey)) {
-			throw new Error(`Clearing House has no user for user id ${subAccountId}`);
+			throw new Error(`Clearing House has no user for user id ${userMapKey}`);
 		}
 		return this.users.get(userMapKey);
 	}
@@ -1018,10 +1028,13 @@ export class DriftClient {
 	public getUsers(): User[] {
 		// delegate users get added to the end
 		return [...this.users.values()]
-			.filter((acct) => acct.getUserAccount().authority.equals(this.authority))
+			.filter((acct) =>
+				acct.getUserAccount().authority.equals(this.wallet.publicKey)
+			)
 			.concat(
 				[...this.users.values()].filter(
-					(acct) => !acct.getUserAccount().authority.equals(this.authority)
+					(acct) =>
+						!acct.getUserAccount().authority.equals(this.wallet.publicKey)
 				)
 			);
 	}
@@ -1051,7 +1064,7 @@ export class DriftClient {
 
 		this.userStatsAccountPublicKey = getUserStatsAccountPublicKey(
 			this.program.programId,
-			this.activeAuthority
+			this.authority
 		);
 		return this.userStatsAccountPublicKey;
 	}
@@ -1419,10 +1432,10 @@ export class DriftClient {
 
 		const isSolMarket = spotMarketAccount.mint.equals(WRAPPED_SOL_MINT);
 
-		const authority = this.authority;
+		const signerAuthority = this.wallet.publicKey;
 
 		const createWSOLTokenAccount =
-			isSolMarket && collateralAccountPublicKey.equals(authority);
+			isSolMarket && collateralAccountPublicKey.equals(signerAuthority);
 
 		if (createWSOLTokenAccount) {
 			const { ixs, signers, pubkey } =
@@ -1454,8 +1467,8 @@ export class DriftClient {
 				Token.createCloseAccountInstruction(
 					TOKEN_PROGRAM_ID,
 					collateralAccountPublicKey,
-					authority,
-					authority,
+					signerAuthority,
+					signerAuthority,
 					[]
 				)
 			);
@@ -1478,13 +1491,11 @@ export class DriftClient {
 		reduceOnly = false,
 		userInitialized = true
 	): Promise<TransactionInstruction> {
-		const userAccountPublicKey = subAccountId
-			? await getUserAccountPublicKey(
-					this.program.programId,
-					this.authority,
-					subAccountId
-			  )
-			: await this.getUserAccountPublicKey();
+		const userAccountPublicKey = await getUserAccountPublicKey(
+			this.program.programId,
+			this.authority,
+			subAccountId ?? this.activeSubAccountId
+		);
 
 		let remainingAccounts = [];
 		if (userInitialized) {
@@ -1713,6 +1724,8 @@ export class DriftClient {
 		);
 		this.spotMarketLastSlotCache.set(marketIndex, slot);
 
+		await this.addUser(subAccountId);
+
 		return [txSig, userAccountPublicKey];
 	}
 
@@ -1759,6 +1772,8 @@ export class DriftClient {
 
 		const txSig = await this.program.provider.sendAndConfirm(tx, []);
 
+		await this.addUser(subAccountId);
+
 		return [txSig, userAccountPublicKey];
 	}
 

package/src/driftClientConfig.ts

@@ -21,7 +21,7 @@ export type DriftClientConfig = {
 	userStats?: boolean;
 	authority?: PublicKey; // explicitly pass an authority if signer is delegate
 	includeDelegates?: boolean; // flag for whether to load delegate accounts as well
-	authoritySubaccountMap?: Map<string, number[]>; // if passed this will override subAccountIds and includeDelegates
+	authoritySubAccountMap?: Map<string, number[]>; // if passed this will override subAccountIds and includeDelegates
 	skipLoadUsers?: boolean; // if passed to constructor, no user accounts will be loaded. they will load if updateWallet is called afterwards.
 };
 

package/src/idl/drift.json

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

package/src/phoenix/phoenixSubscriber.ts

@@ -10,6 +10,7 @@ import {
 } from '@ellipsis-labs/phoenix-sdk';
 import { PRICE_PRECISION } from '../constants/numericConstants';
 import { BN } from '@coral-xyz/anchor';
+import { L2Level, L2OrderBookGenerator } from '../dlob/orderBookLevels';
 
 export type PhoenixMarketSubscriberConfig = {
 	connection: Connection;
@@ -26,7 +27,7 @@ export type PhoenixMarketSubscriberConfig = {
 		  };
 };
 
-export class PhoenixSubscriber {
+export class PhoenixSubscriber implements L2OrderBookGenerator {
 	connection: Connection;
 	client: Client;
 	programId: PublicKey;
@@ -127,6 +128,39 @@ export class PhoenixSubscriber {
 		return new BN(Math.floor(ladder.asks[0][0] * PRICE_PRECISION.toNumber()));
 	}
 
+	public getL2Bids(): Generator<L2Level> {
+		return this.getL2Levels('bids');
+	}
+
+	public getL2Asks(): Generator<L2Level> {
+		return this.getL2Levels('asks');
+	}
+
+	*getL2Levels(side: 'bids' | 'asks'): Generator<L2Level> {
+		// @ts-ignore
+		const basePrecision = Math.pow(10, this.market.header.baseParams.decimals);
+		const pricePrecision = PRICE_PRECISION.toNumber();
+
+		const ladder = getMarketUiLadder(
+			this.market,
+			this.lastSlot,
+			this.lastUnixTimestamp,
+			20
+		);
+
+		for (let i = 0; i < ladder[side].length; i++) {
+			const [priceNum, sizeNum] = ladder[side][i];
+			const size = new BN(Math.floor(sizeNum * basePrecision));
+			yield {
+				price: new BN(Math.floor(priceNum * pricePrecision)),
+				size,
+				sources: {
+					phoenix: size,
+				},
+			};
+		}
+	}
+
 	public async unsubscribe(): Promise<void> {
 		if (!this.subscribed) {
 			return;

package/src/serum/serumSubscriber.ts

@@ -125,9 +125,11 @@ export class SerumSubscriber implements L2OrderBookGenerator {
 		// @ts-ignore
 		const basePrecision = Math.pow(10, this.market._baseSplTokenDecimals);
 		const pricePrecision = PRICE_PRECISION.toNumber();
-		for (let { price, size } of this[side].items(side === 'bids')) {
-			price = new BN(price * pricePrecision);
-			size = new BN(size * basePrecision);
+		for (const { price: priceNum, size: sizeNum } of this[side].items(
+			side === 'bids'
+		)) {
+			const price = new BN(priceNum * pricePrecision);
+			const size = new BN(sizeNum * basePrecision);
 			yield {
 				price,
 				size,

package/src/wallet.ts

@@ -1,5 +1,7 @@
 import { Keypair, PublicKey, Transaction } from '@solana/web3.js';
 import { IWallet } from './types';
+import fs from 'fs';
+import bs58 from 'bs58';
 
 export class Wallet implements IWallet {
 	constructor(readonly payer: Keypair) {}
@@ -20,3 +22,23 @@ export class Wallet implements IWallet {
 		return this.payer.publicKey;
 	}
 }
+
+export function loadKeypair(privateKey: string): Keypair {
+	// try to load privateKey as a filepath
+	let loadedKey: Uint8Array;
+	if (fs.existsSync(privateKey)) {
+		loadedKey = new Uint8Array(
+			JSON.parse(fs.readFileSync(privateKey).toString())
+		);
+	} else {
+		if (privateKey.includes(',')) {
+			loadedKey = Uint8Array.from(
+				privateKey.split(',').map((val) => Number(val))
+			);
+		} else {
+			loadedKey = new Uint8Array(bs58.decode(privateKey));
+		}
+	}
+
+	return Keypair.fromSecretKey(Uint8Array.from(loadedKey));
+}