@drift-labs/sdk 0.2.0-master.27 → 0.2.0-master.29

package/lib/math/market.d.ts

@@ -29,4 +29,5 @@ export declare function calculateOracleSpread(price: BN, oraclePriceData: Oracle
 export declare function calculateMarketMarginRatio(market: PerpMarketAccount, size: BN, marginCategory: MarginCategory): number;
 export declare function calculateUnrealizedAssetWeight(market: PerpMarketAccount, quoteSpotMarket: SpotMarketAccount, unrealizedPnl: BN, marginCategory: MarginCategory, oraclePriceData: OraclePriceData): BN;
 export declare function calculateMarketAvailablePNL(perpMarket: PerpMarketAccount, spotMarket: SpotMarketAccount): BN;
-export declare function calculateNetUserImbalance(market: PerpMarketAccount, bank: SpotMarketAccount, oraclePriceData: OraclePriceData): BN;
+export declare function calculateNetUserPnl(perpMarket: PerpMarketAccount, oraclePriceData: OraclePriceData): BN;
+export declare function calculateNetUserPnlImbalance(perpMarket: PerpMarketAccount, spotMarket: SpotMarketAccount, oraclePriceData: OraclePriceData): BN;

package/lib/math/market.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateNetUserImbalance = exports.calculateMarketAvailablePNL = exports.calculateUnrealizedAssetWeight = exports.calculateMarketMarginRatio = exports.calculateOracleSpread = exports.calculateMarkOracleSpread = exports.calculateNewMarketAfterTrade = exports.calculateAskPrice = exports.calculateBidPrice = exports.calculateMarkPrice = void 0;
+exports.calculateNetUserPnlImbalance = exports.calculateNetUserPnl = exports.calculateMarketAvailablePNL = exports.calculateUnrealizedAssetWeight = exports.calculateMarketMarginRatio = exports.calculateOracleSpread = exports.calculateMarkOracleSpread = exports.calculateNewMarketAfterTrade = exports.calculateAskPrice = exports.calculateBidPrice = exports.calculateMarkPrice = void 0;
 const anchor_1 = require("@project-serum/anchor");
 const types_1 = require("../types");
 const amm_1 = require("./amm");
@@ -78,7 +78,7 @@ function calculateUnrealizedAssetWeight(market, quoteSpotMarket, unrealizedPnl,
         case 'Initial':
             assetWeight = new anchor_1.BN(market.unrealizedInitialAssetWeight);
             if (market.unrealizedMaxImbalance.gt(numericConstants_1.ZERO)) {
-                const netUnsettledPnl = calculateNetUserImbalance(market, quoteSpotMarket, oraclePriceData);
+                const netUnsettledPnl = calculateNetUserPnlImbalance(market, quoteSpotMarket, oraclePriceData);
                 if (netUnsettledPnl.gt(market.unrealizedMaxImbalance)) {
                     assetWeight = assetWeight
                         .mul(market.unrealizedMaxImbalance)
@@ -98,17 +98,22 @@ function calculateMarketAvailablePNL(perpMarket, spotMarket) {
     return (0, spotBalance_1.getTokenAmount)(perpMarket.pnlPool.balance, spotMarket, types_1.SpotBalanceType.DEPOSIT);
 }
 exports.calculateMarketAvailablePNL = calculateMarketAvailablePNL;
-function calculateNetUserImbalance(market, bank, oraclePriceData) {
-    const netUserPositionValue = market.amm.netBaseAssetAmount
+function calculateNetUserPnl(perpMarket, oraclePriceData) {
+    const netUserPositionValue = perpMarket.amm.netBaseAssetAmount
         .mul(oraclePriceData.price)
         .div(numericConstants_1.BASE_PRECISION)
         .div(numericConstants_1.PRICE_TO_QUOTE_PRECISION);
-    const netUserCostBasis = market.amm.quoteAssetAmountLong
-        .add(market.amm.quoteAssetAmountShort)
-        .sub(market.amm.cumulativeSocialLoss);
-    const userEntitledPnl = netUserPositionValue.add(netUserCostBasis);
-    const pnlPool = (0, spotBalance_1.getTokenAmount)(market.pnlPool.balance, bank, types_1.SpotBalanceType.DEPOSIT);
-    const imbalance = userEntitledPnl.sub(pnlPool);
+    const netUserCostBasis = perpMarket.amm.quoteAssetAmountLong
+        .add(perpMarket.amm.quoteAssetAmountShort)
+        .sub(perpMarket.amm.cumulativeSocialLoss);
+    const netUserPnl = netUserPositionValue.add(netUserCostBasis);
+    return netUserPnl;
+}
+exports.calculateNetUserPnl = calculateNetUserPnl;
+function calculateNetUserPnlImbalance(perpMarket, spotMarket, oraclePriceData) {
+    const netUserPnl = calculateNetUserPnl(perpMarket, oraclePriceData);
+    const pnlPool = (0, spotBalance_1.getTokenAmount)(perpMarket.pnlPool.balance, spotMarket, types_1.SpotBalanceType.DEPOSIT);
+    const imbalance = netUserPnl.sub(pnlPool);
     return imbalance;
 }
-exports.calculateNetUserImbalance = calculateNetUserImbalance;
+exports.calculateNetUserPnlImbalance = calculateNetUserPnlImbalance;

package/lib/math/position.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="bn.js" />
-import { BN } from '../';
+import { BN, SpotMarketAccount } from '../';
 import { OraclePriceData } from '../oracles/types';
 import { PerpMarketAccount, PositionDirection, PerpPosition } from '../types';
 /**
@@ -10,7 +10,7 @@ import { PerpMarketAccount, PositionDirection, PerpPosition } from '../types';
  * @param oraclePriceData
  * @returns Base Asset Value. : Precision QUOTE_PRECISION
  */
-export declare function calculateBaseAssetValue(market: PerpMarketAccount, userPosition: PerpPosition, oraclePriceData: OraclePriceData): BN;
+export declare function calculateBaseAssetValue(market: PerpMarketAccount, userPosition: PerpPosition, oraclePriceData: OraclePriceData, useSpread?: boolean, skipUpdate?: boolean): BN;
 /**
  * calculatePositionPNL
  * = BaseAssetAmount * (Avg Exit Price - Avg Entry Price)
@@ -21,7 +21,7 @@ export declare function calculateBaseAssetValue(market: PerpMarketAccount, userP
  * @returns BaseAssetAmount : Precision QUOTE_PRECISION
  */
 export declare function calculatePositionPNL(market: PerpMarketAccount, perpPosition: PerpPosition, withFunding: boolean, oraclePriceData: OraclePriceData): BN;
-export declare function calculateUnsettledPnl(market: PerpMarketAccount, perpPosition: PerpPosition, oraclePriceData: OraclePriceData): BN;
+export declare function calculateClaimablePnl(market: PerpMarketAccount, spotMarket: SpotMarketAccount, perpPosition: PerpPosition, oraclePriceData: OraclePriceData): BN;
 /**
  *
  * @param market

package/lib/math/position.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEmptyPosition = exports.positionCurrentDirection = exports.findDirectionToClose = exports.calculateCostBasis = exports.calculateEntryPrice = exports.positionIsAvailable = exports.calculatePositionFundingPNL = exports.calculateUnsettledPnl = exports.calculatePositionPNL = exports.calculateBaseAssetValue = void 0;
+exports.isEmptyPosition = exports.positionCurrentDirection = exports.findDirectionToClose = exports.calculateCostBasis = exports.calculateEntryPrice = exports.positionIsAvailable = exports.calculatePositionFundingPNL = exports.calculateClaimablePnl = exports.calculatePositionPNL = exports.calculateBaseAssetValue = void 0;
 const __1 = require("../");
 const numericConstants_1 = require("../constants/numericConstants");
 const types_1 = require("../types");
 const amm_1 = require("./amm");
 const margin_1 = require("./margin");
+const market_1 = require("./market");
 /**
  * calculateBaseAssetValue
  * = market value of closing entire position
@@ -14,23 +15,28 @@ const margin_1 = require("./margin");
  * @param oraclePriceData
  * @returns Base Asset Value. : Precision QUOTE_PRECISION
  */
-function calculateBaseAssetValue(market, userPosition, oraclePriceData) {
+function calculateBaseAssetValue(market, userPosition, oraclePriceData, useSpread = true, skipUpdate = false) {
     if (userPosition.baseAssetAmount.eq(numericConstants_1.ZERO)) {
         return numericConstants_1.ZERO;
     }
     const directionToClose = findDirectionToClose(userPosition);
     let prepegAmm;
-    if (market.amm.baseSpread > 0) {
-        const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, directionToClose, oraclePriceData);
-        prepegAmm = {
-            baseAssetReserve,
-            quoteAssetReserve,
-            sqrtK: sqrtK,
-            pegMultiplier: newPeg,
-        };
+    if (!skipUpdate) {
+        if (market.amm.baseSpread > 0 && useSpread) {
+            const { baseAssetReserve, quoteAssetReserve, sqrtK, newPeg } = (0, amm_1.calculateUpdatedAMMSpreadReserves)(market.amm, directionToClose, oraclePriceData);
+            prepegAmm = {
+                baseAssetReserve,
+                quoteAssetReserve,
+                sqrtK: sqrtK,
+                pegMultiplier: newPeg,
+            };
+        }
+        else {
+            prepegAmm = (0, amm_1.calculateUpdatedAMM)(market.amm, oraclePriceData);
+        }
     }
     else {
-        prepegAmm = (0, amm_1.calculateUpdatedAMM)(market.amm, oraclePriceData);
+        prepegAmm = market.amm;
     }
     const [newQuoteAssetReserve, _] = (0, amm_1.calculateAmmReservesAfterSwap)(prepegAmm, 'base', userPosition.baseAssetAmount.abs(), (0, amm_1.getSwapDirection)('base', directionToClose));
     switch (directionToClose) {
@@ -75,19 +81,20 @@ function calculatePositionPNL(market, perpPosition, withFunding = false, oracleP
     return pnl;
 }
 exports.calculatePositionPNL = calculatePositionPNL;
-function calculateUnsettledPnl(market, perpPosition, oraclePriceData) {
+function calculateClaimablePnl(market, spotMarket, perpPosition, oraclePriceData) {
     const unrealizedPnl = calculatePositionPNL(market, perpPosition, true, oraclePriceData);
-    let unsettledPnl = unrealizedPnl;
+    const fundingPnL = calculatePositionFundingPNL(market, perpPosition).div(numericConstants_1.PRICE_TO_QUOTE_PRECISION);
+    let unsettledPnl = unrealizedPnl.add(fundingPnL);
     if (unrealizedPnl.gt(numericConstants_1.ZERO)) {
-        const fundingPnL = calculatePositionFundingPNL(market, perpPosition).div(numericConstants_1.PRICE_TO_QUOTE_PRECISION);
+        const excessPnlPool = __1.BN.max(numericConstants_1.ZERO, (0, market_1.calculateNetUserPnlImbalance)(market, spotMarket, oraclePriceData).mul(new __1.BN(-1)));
         const maxPositivePnl = __1.BN.max(perpPosition.quoteAssetAmount
             .sub(perpPosition.quoteEntryAmount)
-            .add(fundingPnL), numericConstants_1.ZERO);
+            .add(excessPnlPool), numericConstants_1.ZERO);
         unsettledPnl = __1.BN.min(maxPositivePnl, unrealizedPnl);
     }
     return unsettledPnl;
 }
-exports.calculateUnsettledPnl = calculateUnsettledPnl;
+exports.calculateClaimablePnl = calculateClaimablePnl;
 /**
  *
  * @param market

package/lib/math/repeg.js

@@ -71,6 +71,14 @@ function calculateBudgetedKBN(x, y, budget, Q, d) {
         .div(numericConstants_1.AMM_RESERVE_PRECISION)
         .div(numericConstants_1.QUOTE_PRECISION);
     const denom2 = pegged_y_d_d;
+    // protocol is spending to increase k
+    if (C.lt(numericConstants_1.ZERO)) {
+        // thus denom1 is negative and solution is unstable
+        if (denom1.lt(pegged_y_d_d.abs())) {
+            console.log('budget cost exceeds stable K solution');
+            return [new anchor_1.BN(10000), new anchor_1.BN(1)];
+        }
+    }
     const numerator = numer1.sub(numer2).div(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO);
     const denominator = denom1.add(denom2).div(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO);
     return [numerator, denominator];

package/lib/types.d.ts

@@ -419,8 +419,6 @@ export declare type StateAccount = {
     exchangePaused: boolean;
     adminControlsPrices: boolean;
     insuranceVault: PublicKey;
-    perpFeeStructure: FeeStructure;
-    spotFeeStructure: FeeStructure;
     totalFee: BN;
     totalFeeWithdrawn: BN;
     whitelistMint: PublicKey;
@@ -436,6 +434,8 @@ export declare type StateAccount = {
     minPerpAuctionDuration: number;
     defaultSpotAuctionDuration: number;
     liquidationMarginBufferRatio: number;
+    perpFeeStructure: FeeStructure;
+    spotFeeStructure: FeeStructure;
 };
 export declare type PerpMarketAccount = {
     status: MarketStatus;
@@ -581,7 +581,7 @@ export declare type PerpPosition = {
     openOrders: BN;
     openBids: BN;
     openAsks: BN;
-    realizedPnl: BN;
+    settledPnl: BN;
     lpShares: BN;
     lastFeePerLp: BN;
     lastNetBaseAssetAmountPerLp: BN;
@@ -605,10 +605,11 @@ export declare type UserStatsAccount = {
     isReferrer: boolean;
     totalReferrerReward: BN;
     authority: PublicKey;
-    quoteAssetInsuranceFundStake: BN;
+    stakedQuoteAssetAmount: BN;
 };
 export declare type UserAccount = {
     authority: PublicKey;
+    delegate: PublicKey;
     name: number[];
     userId: number;
     spotPositions: SpotPosition[];
@@ -733,40 +734,27 @@ export interface IWallet {
     publicKey: PublicKey;
 }
 export declare type FeeStructure = {
-    feeNumerator: BN;
-    feeDenominator: BN;
-    discountTokenTiers: {
-        firstTier: {
-            minimumBalance: BN;
-            discountNumerator: BN;
-            discountDenominator: BN;
-        };
-        secondTier: {
-            minimumBalance: BN;
-            discountNumerator: BN;
-            discountDenominator: BN;
-        };
-        thirdTier: {
-            minimumBalance: BN;
-            discountNumerator: BN;
-            discountDenominator: BN;
-        };
-        fourthTier: {
-            minimumBalance: BN;
-            discountNumerator: BN;
-            discountDenominator: BN;
-        };
-    };
-    referralDiscount: {
-        referrerRewardNumerator: BN;
-        referrerRewardDenominator: BN;
-        refereeDiscountNumerator: BN;
-        refereeDiscountDenominator: BN;
-    };
+    feeTiers: FeeTier[];
     makerRebateNumerator: BN;
     makerRebateDenominator: BN;
     fillerRewardStructure: OrderFillerRewardStructure;
     flatFillerFee: BN;
+    referrerRewardEpochUpperBound: BN;
+};
+export declare type FeeTier = {
+    feeNumerator: number;
+    feeDenominator: number;
+    makerRebateNumerator: number;
+    makerRebateDenominator: number;
+    referrerRewardNumerator: number;
+    referrerRewardDenominator: number;
+    refereeFeeNumerator: number;
+    refereeFeeDenominator: number;
+};
+export declare type OrderFillerRewardStructure = {
+    rewardNumerator: BN;
+    rewardDenominator: BN;
+    timeBasedRewardLowerBound: BN;
 };
 export declare type OracleGuardRails = {
     priceDivergence: {
@@ -780,11 +768,6 @@ export declare type OracleGuardRails = {
     };
     useForLiquidations: boolean;
 };
-export declare type OrderFillerRewardStructure = {
-    rewardNumerator: BN;
-    rewardDenominator: BN;
-    timeBasedRewardLowerBound: BN;
-};
 export declare type MarginCategory = 'Initial' | 'Maintenance';
 export declare type InsuranceFundStake = {
     marketIndex: BN;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.2.0-master.27",
+	"version": "0.2.0-master.29",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/admin.ts

@@ -3,12 +3,7 @@ import {
 	SYSVAR_RENT_PUBKEY,
 	TransactionSignature,
 } from '@solana/web3.js';
-import {
-	FeeStructure,
-	OracleGuardRails,
-	OracleSource,
-	OrderFillerRewardStructure,
-} from './types';
+import { FeeStructure, OracleGuardRails, OracleSource } from './types';
 import { BN } from '@project-serum/anchor';
 import * as anchor from '@project-serum/anchor';
 import {
@@ -278,7 +273,7 @@ export class Admin extends ClearingHouse {
 		marketIndex: BN,
 		concentrationScale: BN
 	): Promise<TransactionSignature> {
-		return await this.program.rpc.updateConcentrationScale(concentrationScale, {
+		return await this.program.rpc.updateConcentrationCoef(concentrationScale, {
 			accounts: {
 				state: await this.getStatePublicKey(),
 				admin: this.wallet.publicKey,
@@ -611,22 +606,21 @@ export class Admin extends ClearingHouse {
 		);
 	}
 
-	public async updateOrderFillerRewardStructure(
-		orderFillerRewardStructure: OrderFillerRewardStructure
+	public async updatePerpFeeStructure(
+		feeStructure: FeeStructure
 	): Promise<TransactionSignature> {
-		return await this.program.rpc.updateOrderFillerRewardStructure(
-			orderFillerRewardStructure,
-			{
-				accounts: {
-					admin: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-				},
-			}
-		);
+		return await this.program.rpc.updatePerpFeeStructure(feeStructure, {
+			accounts: {
+				admin: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+			},
+		});
 	}
 
-	public async updateFee(fees: FeeStructure): Promise<TransactionSignature> {
-		return await this.program.rpc.updateFee(fees, {
+	public async updateSpotFeeStructure(
+		feeStructure: FeeStructure
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateSpotFeeStructure(feeStructure, {
 			accounts: {
 				admin: this.wallet.publicKey,
 				state: await this.getStatePublicKey(),

package/src/clearingHouse.ts

@@ -1,5 +1,10 @@
 import { AnchorProvider, BN, Idl, Program } from '@project-serum/anchor';
-import { Token, TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import bs58 from 'bs58';
+import {
+	ASSOCIATED_TOKEN_PROGRAM_ID,
+	Token,
+	TOKEN_PROGRAM_ID,
+} from '@solana/spl-token';
 import {
 	StateAccount,
 	IWallet,
@@ -97,6 +102,7 @@ export class ClearingHouse {
 	_isSubscribed = false;
 	txSender: TxSender;
 	marketLastSlotCache = new Map<number, number>();
+	authority: PublicKey;
 
 	public get isSubscribed() {
 		return this._isSubscribed && this.accountSubscriber.isSubscribed;
@@ -121,6 +127,7 @@ export class ClearingHouse {
 			this.provider
 		);
 
+		this.authority = config.authority ?? this.wallet.publicKey;
 		const userIds = config.userIds ?? [0];
 		this.activeUserId = config.activeUserId ?? userIds[0];
 		this.userAccountSubscriptionConfig =
@@ -138,7 +145,7 @@ export class ClearingHouse {
 				clearingHouse: this,
 				userStatsAccountPublicKey: getUserStatsAccountPublicKey(
 					this.program.programId,
-					this.wallet.publicKey
+					this.authority
 				),
 				accountSubscription: this.userAccountSubscriptionConfig,
 			});
@@ -203,7 +210,7 @@ export class ClearingHouse {
 	): ClearingHouseUser {
 		const userAccountPublicKey = getUserAccountPublicKeySync(
 			this.program.programId,
-			this.wallet.publicKey,
+			this.authority,
 			userId
 		);
 
@@ -494,6 +501,36 @@ export class ClearingHouse {
 		);
 	}
 
+	public async updateUserDelegate(
+		delegate: PublicKey,
+		userId = 0
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateUserDelegate(userId, delegate, {
+			accounts: {
+				user: await this.getUserAccountPublicKey(),
+				authority: this.wallet.publicKey,
+			},
+		});
+	}
+
+	public async getUserAccountsForDelegate(
+		delegate: PublicKey
+	): Promise<UserAccount[]> {
+		const programAccounts = await this.program.account.user.all([
+			{
+				memcmp: {
+					offset: 40,
+					/** data to match, as base-58 encoded string and limited to less than 129 bytes */
+					bytes: bs58.encode(delegate.toBuffer()),
+				},
+			},
+		]);
+
+		return programAccounts.map(
+			(programAccount) => programAccount.account as UserAccount
+		);
+	}
+
 	public getUser(userId?: number): ClearingHouseUser {
 		userId = userId ?? this.activeUserId;
 		if (!this.users.has(userId)) {
@@ -518,7 +555,7 @@ export class ClearingHouse {
 
 		this.userStatsAccountPublicKey = getUserStatsAccountPublicKey(
 			this.program.programId,
-			this.wallet.publicKey
+			this.authority
 		);
 		return this.userStatsAccountPublicKey;
 	}
@@ -732,7 +769,7 @@ export class ClearingHouse {
 
 		const isSolMarket = spotMarketAccount.mint.equals(WRAPPED_SOL_MINT);
 
-		const authority = this.wallet.publicKey;
+		const authority = this.authority;
 
 		const createWSOLTokenAccount =
 			isSolMarket && collateralAccountPublicKey.equals(authority);
@@ -793,7 +830,7 @@ export class ClearingHouse {
 		const userAccountPublicKey = userId
 			? await getUserAccountPublicKey(
 					this.program.programId,
-					this.wallet.publicKey,
+					this.authority,
 					userId
 			  )
 			: await this.getUserAccountPublicKey();
@@ -841,10 +878,10 @@ export class ClearingHouse {
 		);
 	}
 
-	private async checkIfAccountExists(account: PublicKey) {
+	private async checkIfAccountExists(account: PublicKey): Promise<boolean> {
 		try {
 			const accountInfo = await this.connection.getAccountInfo(account);
-			return accountInfo && true;
+			return accountInfo != null;
 		} catch (e) {
 			// Doesn't already exist
 			return false;
@@ -947,6 +984,23 @@ export class ClearingHouse {
 		return result;
 	}
 
+	public getAssociatedTokenAccountCreationIx(
+		tokenMintAddress: PublicKey,
+		associatedTokenAddress: PublicKey
+	): anchor.web3.TransactionInstruction {
+		const createAssociatedAccountIx =
+			Token.createAssociatedTokenAccountInstruction(
+				ASSOCIATED_TOKEN_PROGRAM_ID,
+				TOKEN_PROGRAM_ID,
+				tokenMintAddress,
+				associatedTokenAddress,
+				this.wallet.publicKey,
+				this.wallet.publicKey
+			);
+
+		return createAssociatedAccountIx;
+	}
+
 	/**
 	 * Creates the Clearing House User account for a user, and deposits some initial collateral
 	 * @param amount
@@ -1109,6 +1163,18 @@ export class ClearingHouse {
 			});
 
 			signers.forEach((signer) => additionalSigners.push(signer));
+		} else {
+			const accountExists = await this.checkIfAccountExists(userTokenAccount);
+
+			if (!accountExists) {
+				const createAssociatedTokenAccountIx =
+					this.getAssociatedTokenAccountCreationIx(
+						spotMarketAccount.mint,
+						userTokenAccount
+					);
+
+				tx.add(createAssociatedTokenAccountIx);
+			}
 		}
 
 		const withdrawCollateral = await this.getWithdrawIx(
@@ -3199,6 +3265,13 @@ export class ClearingHouse {
 		return oracleData;
 	}
 
+	public getOracleDataForSpotMarket(marketIndex: BN): OraclePriceData {
+		const oracleKey = this.getSpotMarketAccount(marketIndex).oracle;
+		const oracleData = this.getOraclePriceDataAndSlot(oracleKey).data;
+
+		return oracleData;
+	}
+
 	public async initializeInsuranceFundStake(
 		marketIndex: BN
 	): Promise<TransactionSignature> {

package/src/clearingHouseConfig.ts

@@ -19,6 +19,7 @@ export type ClearingHouseConfig = {
 	oracleInfos?: OracleInfo[];
 	env?: DriftEnv;
 	userStats?: boolean;
+	authority?: PublicKey; // explicitly pass an authority if signer is delegate
 };
 
 type ClearingHouseSubscriptionConfig =

package/src/clearingHouseUser.ts

@@ -142,7 +142,7 @@ export class ClearingHouseUser {
 			openOrders: ZERO,
 			openBids: ZERO,
 			openAsks: ZERO,
-			realizedPnl: ZERO,
+			settledPnl: ZERO,
 			lpShares: ZERO,
 			lastFeePerLp: ZERO,
 			lastNetBaseAssetAmountPerLp: ZERO,
@@ -1071,7 +1071,7 @@ export class ClearingHouseUser {
 			openOrders: new BN(0),
 			openBids: new BN(0),
 			openAsks: new BN(0),
-			realizedPnl: ZERO,
+			settledPnl: ZERO,
 			lpShares: ZERO,
 			lastFeePerLp: ZERO,
 			lastNetBaseAssetAmountPerLp: ZERO,
@@ -1395,11 +1395,11 @@ export class ClearingHouseUser {
 	 * @returns feeForQuote : Precision QUOTE_PRECISION
 	 */
 	public calculateFeeForQuoteAmount(quoteAmount: BN): BN {
-		const feeStructure = this.clearingHouse.getStateAccount().perpFeeStructure;
-
+		const feeTier =
+			this.clearingHouse.getStateAccount().perpFeeStructure.feeTiers[0];
 		return quoteAmount
-			.mul(feeStructure.feeNumerator)
-			.div(feeStructure.feeDenominator);
+			.mul(new BN(feeTier.feeNumerator))
+			.div(new BN(feeTier.feeDenominator));
 	}
 
 	/**

package/src/config.ts

@@ -28,7 +28,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 	devnet: {
 		ENV: 'devnet',
 		PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-		CLEARING_HOUSE_PROGRAM_ID: 'CUowJP5Dea7pkc2mKrkX2RuZUrPXL3u419iBRXyZEWQz',
+		CLEARING_HOUSE_PROGRAM_ID: '6MVFno8SFkVffGuCCQzg2wi8FvF8sPRFDNHa13ZPP9cK',
 		USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
 		PERP_MARKETS: DevnetPerpMarkets,
 		SPOT_MARKETS: DevnetSpotMarkets,