@drift-labs/sdk 0.2.0-master.18 → 0.2.0-master.20

package/lib/index.d.ts

@@ -40,7 +40,6 @@ export * from './math/trade';
 export * from './math/orders';
 export * from './math/repeg';
 export * from './math/margin';
-export * from './orders';
 export * from './orderParams';
 export * from './slot/SlotSubscriber';
 export * from './wallet';

package/lib/index.js

@@ -63,7 +63,6 @@ __exportStar(require("./math/trade"), exports);
 __exportStar(require("./math/orders"), exports);
 __exportStar(require("./math/repeg"), exports);
 __exportStar(require("./math/margin"), exports);
-__exportStar(require("./orders"), exports);
 __exportStar(require("./orderParams"), exports);
 __exportStar(require("./slot/SlotSubscriber"), exports);
 __exportStar(require("./wallet"), exports);

package/lib/math/amm.d.ts

@@ -67,3 +67,4 @@ export declare function getSwapDirection(inputAssetType: AssetType, positionDire
 export declare function calculateTerminalPrice(market: MarketAccount): BN;
 export declare function calculateMaxBaseAssetAmountToTrade(amm: AMM, limit_price: BN, direction: PositionDirection, oraclePriceData?: OraclePriceData): [BN, PositionDirection];
 export declare function calculateQuoteAssetAmountSwapped(quoteAssetReserves: BN, pegMultiplier: BN, swapDirection: SwapDirection): BN;
+export declare function calculateMaxBaseAssetAmountFillable(amm: AMM, orderDirection: PositionDirection): BN;

package/lib/math/amm.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateQuoteAssetAmountSwapped = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateSpreadReserves = exports.calculateSpread = exports.calculateSpreadBN = exports.calculateMaxSpread = exports.calculateEffectiveLeverage = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = exports.calculateBidAskPrice = exports.calculateUpdatedAMMSpreadReserves = exports.calculateUpdatedAMM = exports.calculateNewAmm = exports.calculateOptimalPegAndBudget = exports.calculatePegFromTargetPrice = void 0;
+exports.calculateMaxBaseAssetAmountFillable = exports.calculateQuoteAssetAmountSwapped = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateSpreadReserves = exports.calculateSpread = exports.calculateSpreadBN = exports.calculateMaxSpread = exports.calculateEffectiveLeverage = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = exports.calculateBidAskPrice = exports.calculateUpdatedAMMSpreadReserves = exports.calculateUpdatedAMM = exports.calculateNewAmm = exports.calculateOptimalPegAndBudget = exports.calculatePegFromTargetPrice = void 0;
 const anchor_1 = require("@project-serum/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const types_1 = require("../types");
@@ -367,3 +367,15 @@ function calculateQuoteAssetAmountSwapped(quoteAssetReserves, pegMultiplier, swa
     return quoteAssetAmount;
 }
 exports.calculateQuoteAssetAmountSwapped = calculateQuoteAssetAmountSwapped;
+function calculateMaxBaseAssetAmountFillable(amm, orderDirection) {
+    const maxFillSize = amm.baseAssetReserve.div(new anchor_1.BN(amm.maxBaseAssetAmountRatio));
+    let maxBaseAssetAmountOnSide;
+    if ((0, types_1.isVariant)(orderDirection, 'long')) {
+        maxBaseAssetAmountOnSide = anchor_1.BN.max(numericConstants_1.ZERO, amm.maxBaseAssetReserve.sub(amm.baseAssetReserve));
+    }
+    else {
+        maxBaseAssetAmountOnSide = anchor_1.BN.max(numericConstants_1.ZERO, amm.baseAssetReserve.sub(amm.minBaseAssetReserve));
+    }
+    return (0, __1.standardizeBaseAssetAmount)(anchor_1.BN.min(maxFillSize, maxBaseAssetAmountOnSide), amm.baseAssetAmountStepSize);
+}
+exports.calculateMaxBaseAssetAmountFillable = calculateMaxBaseAssetAmountFillable;

package/lib/math/market.d.ts

@@ -27,5 +27,5 @@ export declare function calculateNewMarketAfterTrade(baseAssetAmount: BN, direct
 export declare function calculateMarkOracleSpread(market: MarketAccount, oraclePriceData: OraclePriceData): BN;
 export declare function calculateOracleSpread(price: BN, oraclePriceData: OraclePriceData): BN;
 export declare function calculateMarketMarginRatio(market: MarketAccount, size: BN, marginCategory: MarginCategory): number;
-export declare function calculateUnsettledAssetWeight(market: MarketAccount, unsettledPnl: BN, marginCategory: MarginCategory): BN;
+export declare function calculateUnrealizedAssetWeight(market: MarketAccount, unrealizedPnl: BN, marginCategory: MarginCategory): BN;
 export declare function calculateMarketAvailablePNL(market: MarketAccount, bank: BankAccount): BN;

package/lib/math/market.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateMarketAvailablePNL = exports.calculateUnsettledAssetWeight = exports.calculateMarketMarginRatio = exports.calculateOracleSpread = exports.calculateMarkOracleSpread = exports.calculateNewMarketAfterTrade = exports.calculateAskPrice = exports.calculateBidPrice = exports.calculateMarkPrice = void 0;
+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");
@@ -72,19 +72,19 @@ function calculateMarketMarginRatio(market, size, marginCategory) {
     return marginRatio;
 }
 exports.calculateMarketMarginRatio = calculateMarketMarginRatio;
-function calculateUnsettledAssetWeight(market, unsettledPnl, marginCategory) {
+function calculateUnrealizedAssetWeight(market, unrealizedPnl, marginCategory) {
     let assetWeight;
     switch (marginCategory) {
         case 'Initial':
-            assetWeight = (0, margin_1.calculateSizeDiscountAssetWeight)(unsettledPnl, market.unsettledImfFactor, new anchor_1.BN(market.unsettledInitialAssetWeight));
+            assetWeight = (0, margin_1.calculateSizeDiscountAssetWeight)(unrealizedPnl, market.unrealizedImfFactor, new anchor_1.BN(market.unrealizedInitialAssetWeight));
             break;
         case 'Maintenance':
-            assetWeight = new anchor_1.BN(market.unsettledMaintenanceAssetWeight);
+            assetWeight = new anchor_1.BN(market.unrealizedMaintenanceAssetWeight);
             break;
     }
     return assetWeight;
 }
-exports.calculateUnsettledAssetWeight = calculateUnsettledAssetWeight;
+exports.calculateUnrealizedAssetWeight = calculateUnrealizedAssetWeight;
 function calculateMarketAvailablePNL(market, bank) {
     return (0, bankBalance_1.getTokenAmount)(market.pnlPool.balance, bank, types_1.BankBalanceType.DEPOSIT);
 }

package/lib/math/orders.d.ts

@@ -8,3 +8,6 @@ export declare function isOrderRiskIncreasingInSameDirection(user: ClearingHouse
 export declare function isOrderReduceOnly(user: ClearingHouseUser, order: Order): boolean;
 export declare function standardizeBaseAssetAmount(baseAssetAmount: BN, stepSize: BN): BN;
 export declare function getLimitPrice(order: Order, market: MarketAccount, oraclePriceData: OraclePriceData, slot: number): BN;
+export declare function isFillableByVAMM(order: Order, market: MarketAccount, oraclePriceData: OraclePriceData, slot: number): boolean;
+export declare function calculateBaseAssetAmountForAmmToFulfill(order: Order, market: MarketAccount, oraclePriceData: OraclePriceData, slot: number): BN;
+export declare function calculateBaseAssetAmountToFillUpToLimitPrice(order: Order, market: MarketAccount, limitPrice: BN, oraclePriceData: OraclePriceData): BN;

package/lib/math/orders.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLimitPrice = exports.standardizeBaseAssetAmount = exports.isOrderReduceOnly = exports.isOrderRiskIncreasingInSameDirection = exports.isOrderRiskIncreasing = void 0;
+exports.calculateBaseAssetAmountToFillUpToLimitPrice = exports.calculateBaseAssetAmountForAmmToFulfill = exports.isFillableByVAMM = exports.getLimitPrice = 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("@project-serum/anchor");
 const auction_1 = require("./auction");
 const market_1 = require("./market");
+const amm_1 = require("./amm");
 function isOrderRiskIncreasing(user, order) {
     if ((0, types_1.isVariant)(order.status, 'init')) {
         return false;
@@ -108,3 +109,36 @@ function getLimitPrice(order, market, oraclePriceData, slot) {
     return limitPrice;
 }
 exports.getLimitPrice = getLimitPrice;
+function isFillableByVAMM(order, market, oraclePriceData, slot) {
+    return ((0, auction_1.isAuctionComplete)(order, slot) &&
+        !calculateBaseAssetAmountForAmmToFulfill(order, market, oraclePriceData, slot).eq(numericConstants_1.ZERO));
+}
+exports.isFillableByVAMM = isFillableByVAMM;
+function calculateBaseAssetAmountForAmmToFulfill(order, market, oraclePriceData, slot) {
+    if ((0, types_1.isOneOfVariant)(order.orderType, ['triggerMarket', 'triggerLimit']) &&
+        order.triggered === false) {
+        return numericConstants_1.ZERO;
+    }
+    const limitPrice = getLimitPrice(order, market, oraclePriceData, slot);
+    const baseAssetAmount = calculateBaseAssetAmountToFillUpToLimitPrice(order, market, limitPrice, oraclePriceData);
+    const maxBaseAssetAmount = (0, amm_1.calculateMaxBaseAssetAmountFillable)(market.amm, order.direction);
+    return anchor_1.BN.min(maxBaseAssetAmount, baseAssetAmount);
+}
+exports.calculateBaseAssetAmountForAmmToFulfill = calculateBaseAssetAmountForAmmToFulfill;
+function calculateBaseAssetAmountToFillUpToLimitPrice(order, market, limitPrice, oraclePriceData) {
+    const [maxAmountToTrade, direction] = (0, amm_1.calculateMaxBaseAssetAmountToTrade)(market.amm, limitPrice, order.direction, oraclePriceData);
+    const baseAssetAmount = standardizeBaseAssetAmount(maxAmountToTrade, market.amm.baseAssetAmountStepSize);
+    // Check that directions are the same
+    const sameDirection = isSameDirection(direction, order.direction);
+    if (!sameDirection) {
+        return numericConstants_1.ZERO;
+    }
+    return baseAssetAmount.gt(order.baseAssetAmount)
+        ? order.baseAssetAmount
+        : baseAssetAmount;
+}
+exports.calculateBaseAssetAmountToFillUpToLimitPrice = calculateBaseAssetAmountToFillUpToLimitPrice;
+function isSameDirection(firstDirection, secondDirection) {
+    return (((0, types_1.isVariant)(firstDirection, 'long') && (0, types_1.isVariant)(secondDirection, 'long')) ||
+        ((0, types_1.isVariant)(firstDirection, 'short') && (0, types_1.isVariant)(secondDirection, 'short')));
+}

package/lib/types.d.ts

@@ -136,6 +136,14 @@ export declare enum TradeSide {
     Sell = 2
 }
 export declare type CandleResolution = '1' | '5' | '15' | '60' | '240' | 'D' | 'W' | 'M';
+export declare type NewUserRecord = {
+    ts: BN;
+    userAuthority: PublicKey;
+    user: PublicKey;
+    userId: number;
+    name: number[];
+    referrer: PublicKey;
+};
 export declare type DepositRecord = {
     ts: BN;
     userAuthority: PublicKey;
@@ -147,6 +155,7 @@ export declare type DepositRecord = {
     bankIndex: BN;
     amount: BN;
     oraclePrice: BN;
+    referrer: PublicKey;
     from?: PublicKey;
     to?: PublicKey;
 };
@@ -303,6 +312,9 @@ export declare type OrderRecord = {
     fillerReward: BN;
     quoteAssetAmountSurplus: BN;
     oraclePrice: BN;
+    referrer: PublicKey;
+    referrerReward: BN;
+    refereeDiscount: BN;
 };
 export declare type StateAccount = {
     admin: PublicKey;
@@ -349,9 +361,9 @@ export declare type MarketAccount = {
     pnlPool: PoolBalance;
     liquidationFee: BN;
     imfFactor: BN;
-    unsettledImfFactor: BN;
-    unsettledInitialAssetWeight: number;
-    unsettledMaintenanceAssetWeight: number;
+    unrealizedImfFactor: BN;
+    unrealizedInitialAssetWeight: number;
+    unrealizedMaintenanceAssetWeight: number;
 };
 export declare type BankAccount = {
     bankIndex: BN;
@@ -439,6 +451,8 @@ export declare type AMM = {
     maxSpread: number;
     marketPosition: UserPosition;
     marketPositionPerLp: UserPosition;
+    maxBaseAssetReserve: BN;
+    minBaseAssetReserve: BN;
 };
 export declare type UserPosition = {
     baseAssetAmount: BN;
@@ -467,11 +481,12 @@ export declare type UserStatsAccount = {
         totalFeePaid: BN;
         totalFeeRebate: BN;
         totalTokenDiscount: BN;
-        totalReferralReward: BN;
         totalRefereeDiscount: BN;
     };
-    authority: PublicKey;
     referrer: PublicKey;
+    isReferrer: boolean;
+    totalReferrerReward: BN;
+    authority: PublicKey;
 };
 export declare type UserAccount = {
     authority: PublicKey;
@@ -483,6 +498,7 @@ export declare type UserAccount = {
     beingLiquidated: boolean;
     bankrupt: boolean;
     nextLiquidationId: number;
+    nextOrderId: BN;
 };
 export declare type UserBankBalance = {
     bankIndex: BN;
@@ -508,9 +524,7 @@ export declare type Order = {
     triggerPrice: BN;
     triggerCondition: OrderTriggerCondition;
     triggered: boolean;
-    discountTier: OrderDiscountTier;
     existingPositionDirection: PositionDirection;
-    referrer: PublicKey;
     postOnly: boolean;
     immediateOrCancel: boolean;
     oraclePriceOffset: BN;
@@ -585,6 +599,10 @@ export declare type TakerInfo = {
     takerStats: PublicKey;
     order: Order;
 };
+export declare type ReferrerInfo = {
+    referrer: PublicKey;
+    referrerStats: PublicKey;
+};
 export interface IWallet {
     signTransaction(tx: Transaction): Promise<Transaction>;
     signAllTransactions(txs: Transaction[]): Promise<Transaction[]>;

package/package.json

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

package/src/clearingHouse.ts

@@ -15,6 +15,7 @@ import {
 	OptionalOrderParams,
 	DefaultOrderParams,
 	OrderType,
+	ReferrerInfo,
 } from './types';
 import * as anchor from '@project-serum/anchor';
 import clearingHouseIDL from './idl/clearing_house.json';
@@ -31,6 +32,7 @@ import {
 	LAMPORTS_PER_SOL,
 	Signer,
 	SystemProgram,
+	ComputeBudgetProgram,
 } from '@solana/web3.js';
 
 import { TokenFaucet } from './tokenFaucet';
@@ -50,7 +52,11 @@ import {
 } from './accounts/types';
 import { TxSender } from './tx/types';
 import { wrapInTx } from './tx/utils';
-import { QUOTE_ASSET_BANK_INDEX, ZERO } from './constants/numericConstants';
+import {
+	ONE,
+	QUOTE_ASSET_BANK_INDEX,
+	ZERO,
+} from './constants/numericConstants';
 import { findDirectionToClose, positionIsAvailable } from './math/position';
 import { getTokenAmount } from './math/bankBalance';
 import { DEFAULT_USER_NAME, encodeName } from './userName';
@@ -340,10 +346,11 @@ export class ClearingHouse {
 
 	public async initializeUserAccount(
 		userId = 0,
-		name = DEFAULT_USER_NAME
+		name = DEFAULT_USER_NAME,
+		referrerInfo?: ReferrerInfo
 	): Promise<[TransactionSignature, PublicKey]> {
 		const [userAccountPublicKey, initializeUserAccountIx] =
-			await this.getInitializeUserInstructions(userId, name);
+			await this.getInitializeUserInstructions(userId, name, referrerInfo);
 
 		const tx = new Transaction();
 		if (userId === 0) {
@@ -357,7 +364,8 @@ export class ClearingHouse {
 
 	async getInitializeUserInstructions(
 		userId = 0,
-		name = DEFAULT_USER_NAME
+		name = DEFAULT_USER_NAME,
+		referrerInfo?: ReferrerInfo
 	): Promise<[PublicKey, TransactionInstruction]> {
 		const userAccountPublicKey = await getUserAccountPublicKey(
 			this.program.programId,
@@ -365,6 +373,20 @@ export class ClearingHouse {
 			userId
 		);
 
+		const remainingAccounts = new Array<AccountMeta>();
+		if (referrerInfo !== undefined) {
+			remainingAccounts.push({
+				pubkey: referrerInfo.referrer,
+				isWritable: true,
+				isSigner: false,
+			});
+			remainingAccounts.push({
+				pubkey: referrerInfo.referrerStats,
+				isWritable: true,
+				isSigner: false,
+			});
+		}
+
 		const nameBuffer = encodeName(name);
 		const initializeUserAccountIx =
 			await this.program.instruction.initializeUser(userId, nameBuffer, {
@@ -377,6 +399,7 @@ export class ClearingHouse {
 					systemProgram: anchor.web3.SystemProgram.programId,
 					state: await this.getStatePublicKey(),
 				},
+				remainingAccounts,
 			});
 
 		return [userAccountPublicKey, initializeUserAccountIx];
@@ -710,6 +733,7 @@ export class ClearingHouse {
 					bank: bank.pubkey,
 					bankVault: bank.vault,
 					user: userAccountPublicKey,
+					userStats: this.getUserStatsAccountPublicKey(),
 					userTokenAccount: userTokenAccount,
 					authority: this.wallet.publicKey,
 					tokenProgram: TOKEN_PROGRAM_ID,
@@ -841,10 +865,11 @@ export class ClearingHouse {
 		bankIndex = new BN(0),
 		userId = 0,
 		name = DEFAULT_USER_NAME,
-		fromUserId?: number
+		fromUserId?: number,
+		referrerInfo?: ReferrerInfo
 	): Promise<[TransactionSignature, PublicKey]> {
 		const [userAccountPublicKey, initializeUserAccountIx] =
-			await this.getInitializeUserInstructions(userId, name);
+			await this.getInitializeUserInstructions(userId, name, referrerInfo);
 
 		const additionalSigners: Array<Signer> = [];
 
@@ -919,7 +944,8 @@ export class ClearingHouse {
 		name = DEFAULT_USER_NAME,
 		bankIndex: BN,
 		tokenFaucet: TokenFaucet,
-		amount: BN
+		amount: BN,
+		referrerInfo?: ReferrerInfo
 	): Promise<[TransactionSignature, PublicKey]> {
 		const [associateTokenPublicKey, createAssociatedAccountIx, mintToIx] =
 			await tokenFaucet.createAssociatedTokenAccountAndMintToInstructions(
@@ -928,7 +954,7 @@ export class ClearingHouse {
 			);
 
 		const [userAccountPublicKey, initializeUserAccountIx] =
-			await this.getInitializeUserInstructions(userId, name);
+			await this.getInitializeUserInstructions(userId, name, referrerInfo);
 
 		const depositCollateralIx = await this.getDepositInstruction(
 			amount,
@@ -1037,6 +1063,7 @@ export class ClearingHouse {
 					bankVault: bank.vault,
 					bankVaultAuthority: bank.vaultAuthority,
 					user: userAccountPublicKey,
+					userStats: this.getUserStatsAccountPublicKey(),
 					userTokenAccount: userTokenAccount,
 					authority: this.wallet.publicKey,
 					tokenProgram: TOKEN_PROGRAM_ID,
@@ -1088,6 +1115,7 @@ export class ClearingHouse {
 				authority: this.wallet.publicKey,
 				fromUser,
 				toUser,
+				userStats: this.getUserStatsAccountPublicKey(),
 				state: await this.getStatePublicKey(),
 			},
 			remainingAccounts,
@@ -1400,11 +1428,18 @@ export class ClearingHouse {
 		userAccountPublicKey: PublicKey,
 		user: UserAccount,
 		order?: Order,
-		makerInfo?: MakerInfo
+		makerInfo?: MakerInfo,
+		referrerInfo?: ReferrerInfo
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.txSender.send(
 			wrapInTx(
-				await this.getFillOrderIx(userAccountPublicKey, user, order, makerInfo)
+				await this.getFillOrderIx(
+					userAccountPublicKey,
+					user,
+					order,
+					makerInfo,
+					referrerInfo
+				)
 			),
 			[],
 			this.opts
@@ -1416,7 +1451,8 @@ export class ClearingHouse {
 		userAccountPublicKey: PublicKey,
 		userAccount: UserAccount,
 		order: Order,
-		makerInfo?: MakerInfo
+		makerInfo?: MakerInfo,
+		referrerInfo?: ReferrerInfo
 	): Promise<TransactionInstruction> {
 		const userStatsPublicKey = getUserStatsAccountPublicKey(
 			this.program.programId,
@@ -1426,7 +1462,11 @@ export class ClearingHouse {
 		const fillerPublicKey = await this.getUserAccountPublicKey();
 		const fillerStatsPublicKey = this.getUserStatsAccountPublicKey();
 
-		const marketIndex = order.marketIndex;
+		const marketIndex = order
+			? order.marketIndex
+			: userAccount.orders.find((order) =>
+					order.orderId.eq(userAccount.nextOrderId.sub(ONE))
+			  ).marketIndex;
 		const marketAccount = this.getMarketAccount(marketIndex);
 
 		const oracleAccountMap = new Map<string, AccountMeta>();
@@ -1501,6 +1541,19 @@ export class ClearingHouse {
 			});
 		}
 
+		if (referrerInfo) {
+			remainingAccounts.push({
+				pubkey: referrerInfo.referrer,
+				isWritable: true,
+				isSigner: false,
+			});
+			remainingAccounts.push({
+				pubkey: referrerInfo.referrerStats,
+				isWritable: true,
+				isSigner: false,
+			});
+		}
+
 		const orderId = order.orderId;
 		const makerOrderId = makerInfo ? makerInfo.order.orderId : null;
 
@@ -1613,10 +1666,13 @@ export class ClearingHouse {
 
 	public async placeAndTake(
 		orderParams: OptionalOrderParams,
-		makerInfo?: MakerInfo
+		makerInfo?: MakerInfo,
+		referrerInfo?: ReferrerInfo
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.txSender.send(
-			wrapInTx(await this.getPlaceAndTakeIx(orderParams, makerInfo)),
+			wrapInTx(
+				await this.getPlaceAndTakeIx(orderParams, makerInfo, referrerInfo)
+			),
 			[],
 			this.opts
 		);
@@ -1626,7 +1682,8 @@ export class ClearingHouse {
 
 	public async getPlaceAndTakeIx(
 		orderParams: OptionalOrderParams,
-		makerInfo?: MakerInfo
+		makerInfo?: MakerInfo,
+		referrerInfo?: ReferrerInfo
 	): Promise<TransactionInstruction> {
 		orderParams = this.getOrderParams(orderParams);
 		const userStatsPublicKey = await this.getUserStatsAccountPublicKey();
@@ -1652,6 +1709,19 @@ export class ClearingHouse {
 			});
 		}
 
+		if (referrerInfo) {
+			remainingAccounts.push({
+				pubkey: referrerInfo.referrer,
+				isWritable: true,
+				isSigner: false,
+			});
+			remainingAccounts.push({
+				pubkey: referrerInfo.referrerStats,
+				isWritable: true,
+				isSigner: false,
+			});
+		}
+
 		return await this.program.instruction.placeAndTake(
 			orderParams,
 			makerOrderId,
@@ -1669,10 +1739,13 @@ export class ClearingHouse {
 
 	public async placeAndMake(
 		orderParams: OptionalOrderParams,
-		takerInfo: TakerInfo
+		takerInfo: TakerInfo,
+		referrerInfo?: ReferrerInfo
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.txSender.send(
-			wrapInTx(await this.getPlaceAndMakeIx(orderParams, takerInfo)),
+			wrapInTx(
+				await this.getPlaceAndMakeIx(orderParams, takerInfo, referrerInfo)
+			),
 			[],
 			this.opts
 		);
@@ -1684,7 +1757,8 @@ export class ClearingHouse {
 
 	public async getPlaceAndMakeIx(
 		orderParams: OptionalOrderParams,
-		takerInfo: TakerInfo
+		takerInfo: TakerInfo,
+		referrerInfo?: ReferrerInfo
 	): Promise<TransactionInstruction> {
 		orderParams = this.getOrderParams(orderParams);
 		const userStatsPublicKey = this.getUserStatsAccountPublicKey();
@@ -1694,6 +1768,19 @@ export class ClearingHouse {
 			writableMarketIndex: orderParams.marketIndex,
 		});
 
+		if (referrerInfo) {
+			remainingAccounts.push({
+				pubkey: referrerInfo.referrer,
+				isWritable: true,
+				isSigner: false,
+			});
+			remainingAccounts.push({
+				pubkey: referrerInfo.referrerStats,
+				isWritable: true,
+				isSigner: false,
+			});
+		}
+
 		const takerOrderId = takerInfo!.order!.orderId;
 		return await this.program.instruction.placeAndMake(
 			orderParams,
@@ -1754,7 +1841,14 @@ export class ClearingHouse {
 			);
 		}
 
-		const tx = new Transaction().add(...ixs);
+		const tx = new Transaction()
+			.add(
+				ComputeBudgetProgram.requestUnits({
+					units: 1_000_000,
+					additionalFee: 0,
+				})
+			)
+			.add(...ixs);
 
 		const { txSig } = await this.txSender.send(tx, [], this.opts);
 		return txSig;

package/src/clearingHouseUser.ts

@@ -33,7 +33,7 @@ import {
 	calculateBaseAssetValue,
 	calculatePositionFundingPNL,
 	calculatePositionPNL,
-	calculateUnsettledAssetWeight,
+	calculateUnrealizedAssetWeight,
 	calculateMarketMarginRatio,
 	PositionDirection,
 	calculateTradeSlippage,
@@ -372,11 +372,11 @@ export class ClearingHouseUser {
 			.positions.filter((pos) =>
 				marketIndex ? pos.marketIndex === marketIndex : true
 			)
-			.reduce((pnl, marketPosition) => {
+			.reduce((unrealizedPnl, marketPosition) => {
 				const market = this.clearingHouse.getMarketAccount(
 					marketPosition.marketIndex
 				);
-				let pnl0 = calculatePositionPNL(
+				let positionUnrealizedPnl = calculatePositionPNL(
 					market,
 					marketPosition,
 					withFunding,
@@ -384,12 +384,12 @@ export class ClearingHouseUser {
 				);
 
 				if (withWeightMarginCategory !== undefined) {
-					if (pnl0.gt(ZERO)) {
-						pnl0 = pnl0
+					if (positionUnrealizedPnl.gt(ZERO)) {
+						positionUnrealizedPnl = positionUnrealizedPnl
 							.mul(
-								calculateUnsettledAssetWeight(
+								calculateUnrealizedAssetWeight(
 									market,
-									pnl0,
+									positionUnrealizedPnl,
 									withWeightMarginCategory
 								)
 							)
@@ -397,7 +397,7 @@ export class ClearingHouseUser {
 					}
 				}
 
-				return pnl.add(pnl0);
+				return unrealizedPnl.add(positionUnrealizedPnl);
 			}, ZERO);
 	}
 
@@ -528,47 +528,9 @@ export class ClearingHouseUser {
 	 * @returns : Precision QUOTE_PRECISION
 	 */
 	public getTotalCollateral(marginCategory: MarginCategory = 'Initial'): BN {
-		return this.getUserAccount()
-			.bankBalances.reduce((totalAssetValue, bankBalance) => {
-				if (
-					bankBalance.balance.eq(ZERO) ||
-					isVariant(bankBalance.balanceType, 'borrow')
-				) {
-					return totalAssetValue;
-				}
-
-				// Todo this needs to account for whether it's based on initial or maintenance requirements
-				const bankAccount: BankAccount = this.clearingHouse.getBankAccount(
-					bankBalance.bankIndex
-				);
-
-				const tokenAmount = getTokenAmount(
-					bankBalance.balance,
-					bankAccount,
-					bankBalance.balanceType
-				);
-
-				const weight = calculateAssetWeight(
-					tokenAmount,
-					bankAccount,
-					marginCategory
-				);
-
-				return totalAssetValue.add(
-					tokenAmount
-						.mul(this.getOracleDataForBank(bankAccount.bankIndex).price)
-						.mul(weight)
-						.div(BANK_WEIGHT_PRECISION)
-						.div(MARK_PRICE_PRECISION)
-						// Adjust for decimals of bank account
-						.div(
-							new BN(10).pow(
-								new BN(bankAccount.decimals).sub(BANK_BALANCE_PRECISION_EXP)
-							)
-						)
-				);
-			}, ZERO)
-			.add(this.getUnrealizedPNL(true, undefined, marginCategory));
+		return this.getBankAssetValue(undefined, marginCategory).add(
+			this.getUnrealizedPNL(true, undefined, marginCategory)
+		);
 	}
 
 	/**