@drift-labs/sdk 0.2.0-master.11 → 0.2.0-master.14

package/src/orders.ts

@@ -1,163 +1,9 @@
-import {
-	isVariant,
-	MarketAccount,
-	Order,
-	PositionDirection,
-	UserAccount,
-	UserPosition,
-} from './types';
+import { isVariant, MarketAccount, Order, PositionDirection } from './types';
 import { BN, standardizeBaseAssetAmount } from '.';
-import { calculateNewMarketAfterTrade } from './math/market';
-import {
-	AMM_TO_QUOTE_PRECISION_RATIO,
-	PEG_PRECISION,
-	ZERO,
-} from './constants/numericConstants';
+import { ZERO } from './constants/numericConstants';
 import { calculateMaxBaseAssetAmountToTrade } from './math/amm';
-import {
-	findDirectionToClose,
-	positionCurrentDirection,
-} from './math/position';
 import { OraclePriceData } from '.';
 
-export function calculateNewStateAfterOrder(
-	userAccount: UserAccount,
-	userPosition: UserPosition,
-	market: MarketAccount,
-	order: Order
-): [UserAccount, UserPosition, MarketAccount] | null {
-	if (isVariant(order.status, 'init')) {
-		return null;
-	}
-
-	const baseAssetAmountToTrade = calculateBaseAssetAmountMarketCanExecute(
-		market,
-		order
-	);
-	if (baseAssetAmountToTrade.lt(market.amm.baseAssetAmountStepSize)) {
-		return null;
-	}
-
-	const userAccountAfter = Object.assign({}, userAccount);
-	const userPositionAfter = Object.assign({}, userPosition);
-
-	const currentPositionDirection = positionCurrentDirection(userPosition);
-	const increasePosition =
-		userPosition.baseAssetAmount.eq(ZERO) ||
-		isSameDirection(order.direction, currentPositionDirection);
-
-	if (increasePosition) {
-		const marketAfter = calculateNewMarketAfterTrade(
-			baseAssetAmountToTrade,
-			order.direction,
-			market
-		);
-
-		const { quoteAssetAmountSwapped, baseAssetAmountSwapped } =
-			calculateAmountSwapped(market, marketAfter);
-
-		userPositionAfter.baseAssetAmount = userPositionAfter.baseAssetAmount.add(
-			baseAssetAmountSwapped
-		);
-		userPositionAfter.quoteAssetAmount = userPositionAfter.quoteAssetAmount.add(
-			quoteAssetAmountSwapped
-		);
-
-		return [userAccountAfter, userPositionAfter, marketAfter];
-	} else {
-		const reversePosition = baseAssetAmountToTrade.gt(
-			userPosition.baseAssetAmount.abs()
-		);
-
-		if (reversePosition) {
-			const intermediateMarket = calculateNewMarketAfterTrade(
-				userPosition.baseAssetAmount,
-				findDirectionToClose(userPosition),
-				market
-			);
-
-			const { quoteAssetAmountSwapped: baseAssetValue } =
-				calculateAmountSwapped(market, intermediateMarket);
-
-			let pnl;
-			if (isVariant(currentPositionDirection, 'long')) {
-				pnl = baseAssetValue.sub(userPosition.quoteAssetAmount);
-			} else {
-				pnl = userPosition.quoteAssetAmount.sub(baseAssetValue);
-			}
-
-			userAccountAfter.collateral = userAccountAfter.collateral.add(pnl);
-
-			const baseAssetAmountLeft = baseAssetAmountToTrade.sub(
-				userPosition.baseAssetAmount.abs()
-			);
-
-			const marketAfter = calculateNewMarketAfterTrade(
-				baseAssetAmountLeft,
-				order.direction,
-				intermediateMarket
-			);
-
-			const { quoteAssetAmountSwapped, baseAssetAmountSwapped } =
-				calculateAmountSwapped(intermediateMarket, marketAfter);
-
-			userPositionAfter.quoteAssetAmount = quoteAssetAmountSwapped;
-			userPositionAfter.baseAssetAmount = baseAssetAmountSwapped;
-
-			return [userAccountAfter, userPositionAfter, marketAfter];
-		} else {
-			const marketAfter = calculateNewMarketAfterTrade(
-				baseAssetAmountToTrade,
-				order.direction,
-				market
-			);
-
-			const {
-				quoteAssetAmountSwapped: baseAssetValue,
-				baseAssetAmountSwapped,
-			} = calculateAmountSwapped(market, marketAfter);
-
-			const costBasisRealized = userPosition.quoteAssetAmount
-				.mul(baseAssetAmountSwapped.abs())
-				.div(userPosition.baseAssetAmount.abs());
-
-			let pnl;
-			if (isVariant(currentPositionDirection, 'long')) {
-				pnl = baseAssetValue.sub(costBasisRealized);
-			} else {
-				pnl = costBasisRealized.sub(baseAssetValue);
-			}
-
-			userAccountAfter.collateral = userAccountAfter.collateral.add(pnl);
-
-			userPositionAfter.baseAssetAmount = userPositionAfter.baseAssetAmount.add(
-				baseAssetAmountSwapped
-			);
-			userPositionAfter.quoteAssetAmount =
-				userPositionAfter.quoteAssetAmount.sub(costBasisRealized);
-
-			return [userAccountAfter, userPositionAfter, marketAfter];
-		}
-	}
-}
-
-function calculateAmountSwapped(
-	marketBefore: MarketAccount,
-	marketAfter: MarketAccount
-): { quoteAssetAmountSwapped: BN; baseAssetAmountSwapped: BN } {
-	return {
-		quoteAssetAmountSwapped: marketBefore.amm.quoteAssetReserve
-			.sub(marketAfter.amm.quoteAssetReserve)
-			.abs()
-			.mul(marketBefore.amm.pegMultiplier)
-			.div(PEG_PRECISION)
-			.div(AMM_TO_QUOTE_PRECISION_RATIO),
-		baseAssetAmountSwapped: marketBefore.amm.baseAssetReserve.sub(
-			marketAfter.amm.baseAssetReserve
-		),
-	};
-}
-
 export function calculateBaseAssetAmountMarketCanExecute(
 	market: MarketAccount,
 	order: Order,
@@ -192,7 +38,8 @@ export function calculateAmountToTradeForLimit(
 	const [maxAmountToTrade, direction] = calculateMaxBaseAssetAmountToTrade(
 		market.amm,
 		limitPrice,
-		order.direction
+		order.direction,
+		oraclePriceData
 	);
 
 	const baseAssetAmount = standardizeBaseAssetAmount(

package/src/tokenFaucet.js

@@ -0,0 +1,189 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TokenFaucet = void 0;
+const anchor = __importStar(require("@project-serum/anchor"));
+const anchor_1 = require("@project-serum/anchor");
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+const token_faucet_json_1 = __importDefault(require("./idl/token_faucet.json"));
+class TokenFaucet {
+    constructor(connection, wallet, programId, mint, opts) {
+        this.connection = connection;
+        this.wallet = wallet;
+        this.opts = opts || anchor_1.AnchorProvider.defaultOptions();
+        const provider = new anchor_1.AnchorProvider(connection, wallet, this.opts);
+        this.provider = provider;
+        this.program = new anchor_1.Program(token_faucet_json_1.default, programId, provider);
+        this.mint = mint;
+    }
+    getFaucetConfigPublicKeyAndNonce() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return anchor.web3.PublicKey.findProgramAddress([
+                Buffer.from(anchor.utils.bytes.utf8.encode('faucet_config')),
+                this.mint.toBuffer(),
+            ], this.program.programId);
+        });
+    }
+    getMintAuthority() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return (yield anchor.web3.PublicKey.findProgramAddress([
+                Buffer.from(anchor.utils.bytes.utf8.encode('mint_authority')),
+                this.mint.toBuffer(),
+            ], this.program.programId))[0];
+        });
+    }
+    getFaucetConfigPublicKey() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return (yield this.getFaucetConfigPublicKeyAndNonce())[0];
+        });
+    }
+    initialize() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [faucetConfigPublicKey] = yield this.getFaucetConfigPublicKeyAndNonce();
+            return yield this.program.rpc.initialize({
+                accounts: {
+                    faucetConfig: faucetConfigPublicKey,
+                    admin: this.wallet.publicKey,
+                    mintAccount: this.mint,
+                    rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                    systemProgram: anchor.web3.SystemProgram.programId,
+                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                },
+            });
+        });
+    }
+    fetchState() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.program.account.faucetConfig.fetch(yield this.getFaucetConfigPublicKey());
+        });
+    }
+    mintToUserIx(userTokenAccount, amount) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.program.instruction.mintToUser(amount, {
+                accounts: {
+                    faucetConfig: yield this.getFaucetConfigPublicKey(),
+                    mintAccount: this.mint,
+                    userTokenAccount,
+                    mintAuthority: yield this.getMintAuthority(),
+                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                },
+            });
+        });
+    }
+    mintToUser(userTokenAccount, amount) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const mintIx = yield this.mintToUserIx(userTokenAccount, amount);
+            const tx = new web3_js_1.Transaction().add(mintIx);
+            const txSig = yield this.program.provider.sendAndConfirm(tx, [], this.opts);
+            return txSig;
+        });
+    }
+    transferMintAuthority() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.program.rpc.transferMintAuthority({
+                accounts: {
+                    faucetConfig: yield this.getFaucetConfigPublicKey(),
+                    mintAccount: this.mint,
+                    mintAuthority: yield this.getMintAuthority(),
+                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                    admin: this.wallet.publicKey,
+                },
+            });
+        });
+    }
+    createAssociatedTokenAccountAndMintTo(userPublicKey, amount) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const tx = new web3_js_1.Transaction();
+            const [associatedTokenPublicKey, createAssociatedAccountIx, mintToTx] = yield this.createAssociatedTokenAccountAndMintToInstructions(userPublicKey, amount);
+            let associatedTokenAccountExists = false;
+            try {
+                const assosciatedTokenAccount = yield this.connection.getAccountInfo(associatedTokenPublicKey);
+                associatedTokenAccountExists = !!assosciatedTokenAccount;
+            }
+            catch (e) {
+                // token account doesn't exist
+                associatedTokenAccountExists = false;
+            }
+            const skipAccountCreation = associatedTokenAccountExists;
+            if (!skipAccountCreation)
+                tx.add(createAssociatedAccountIx);
+            tx.add(mintToTx);
+            const txSig = yield this.program.provider.sendAndConfirm(tx, [], this.opts);
+            return [associatedTokenPublicKey, txSig];
+        });
+    }
+    createAssociatedTokenAccountAndMintToInstructions(userPublicKey, amount) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const state = yield this.fetchState();
+            const associateTokenPublicKey = yield this.getAssosciatedMockUSDMintAddress({ userPubKey: userPublicKey });
+            const createAssociatedAccountIx = spl_token_1.Token.createAssociatedTokenAccountInstruction(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, spl_token_1.TOKEN_PROGRAM_ID, state.mint, associateTokenPublicKey, userPublicKey, this.wallet.publicKey);
+            const mintToIx = yield this.mintToUserIx(associateTokenPublicKey, amount);
+            return [associateTokenPublicKey, createAssociatedAccountIx, mintToIx];
+        });
+    }
+    getAssosciatedMockUSDMintAddress(props) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const state = yield this.fetchState();
+            return spl_token_1.Token.getAssociatedTokenAddress(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, spl_token_1.TOKEN_PROGRAM_ID, state.mint, props.userPubKey);
+        });
+    }
+    getTokenAccountInfo(props) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const assosciatedKey = yield this.getAssosciatedMockUSDMintAddress(props);
+            const state = yield this.fetchState();
+            const token = new spl_token_1.Token(this.connection, state.mint, spl_token_1.TOKEN_PROGRAM_ID, 
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            this.provider.payer);
+            return yield token.getAccountInfo(assosciatedKey);
+        });
+    }
+    subscribeToTokenAccount(props) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const tokenAccountKey = yield this.getAssosciatedMockUSDMintAddress(props);
+                props.callback(yield this.getTokenAccountInfo(props));
+                // Couldn't find a way to do it using anchor framework subscription, someone on serum discord recommended this way
+                this.connection.onAccountChange(tokenAccountKey, (_accountInfo /* accountInfo is a buffer which we don't know how to deserialize */) => __awaiter(this, void 0, void 0, function* () {
+                    props.callback(yield this.getTokenAccountInfo(props));
+                }));
+                return true;
+            }
+            catch (e) {
+                return false;
+            }
+        });
+    }
+}
+exports.TokenFaucet = TokenFaucet;

package/src/tokenFaucet.ts

@@ -92,11 +92,8 @@ export class TokenFaucet {
 		);
 	}
 
-	public async mintToUser(
-		userTokenAccount: PublicKey,
-		amount: BN
-	): Promise<TransactionSignature> {
-		return await this.program.rpc.mintToUser(amount, {
+	private async mintToUserIx(userTokenAccount: PublicKey, amount: BN) {
+		return this.program.instruction.mintToUser(amount, {
 			accounts: {
 				faucetConfig: await this.getFaucetConfigPublicKey(),
 				mintAccount: this.mint,
@@ -107,6 +104,19 @@ export class TokenFaucet {
 		});
 	}
 
+	public async mintToUser(
+		userTokenAccount: PublicKey,
+		amount: BN
+	): Promise<TransactionSignature> {
+		const mintIx = await this.mintToUserIx(userTokenAccount, amount);
+
+		const tx = new Transaction().add(mintIx);
+
+		const txSig = await this.program.provider.sendAndConfirm(tx, [], this.opts);
+
+		return txSig;
+	}
+
 	public async transferMintAuthority(): Promise<TransactionSignature> {
 		return await this.program.rpc.transferMintAuthority({
 			accounts: {
@@ -123,12 +133,33 @@ export class TokenFaucet {
 		userPublicKey: PublicKey,
 		amount: BN
 	): Promise<[PublicKey, TransactionSignature]> {
+		const tx = new Transaction();
+
 		const [associatedTokenPublicKey, createAssociatedAccountIx, mintToTx] =
 			await this.createAssociatedTokenAccountAndMintToInstructions(
 				userPublicKey,
 				amount
 			);
-		const tx = new Transaction().add(createAssociatedAccountIx).add(mintToTx);
+
+		let associatedTokenAccountExists = false;
+
+		try {
+			const assosciatedTokenAccount = await this.connection.getAccountInfo(
+				associatedTokenPublicKey
+			);
+
+			associatedTokenAccountExists = !!assosciatedTokenAccount;
+		} catch (e) {
+			// token account doesn't exist
+			associatedTokenAccountExists = false;
+		}
+
+		const skipAccountCreation = associatedTokenAccountExists;
+
+		if (!skipAccountCreation) tx.add(createAssociatedAccountIx);
+
+		tx.add(mintToTx);
+
 		const txSig = await this.program.provider.sendAndConfirm(tx, [], this.opts);
 		return [associatedTokenPublicKey, txSig];
 	}
@@ -153,15 +184,7 @@ export class TokenFaucet {
 				this.wallet.publicKey
 			);
 
-		const mintToIx = await this.program.instruction.mintToUser(amount, {
-			accounts: {
-				faucetConfig: await this.getFaucetConfigPublicKey(),
-				mintAccount: state.mint,
-				userTokenAccount: associateTokenPublicKey,
-				mintAuthority: state.mintAuthority,
-				tokenProgram: TOKEN_PROGRAM_ID,
-			},
-		});
+		const mintToIx = await this.mintToUserIx(associateTokenPublicKey, amount);
 
 		return [associateTokenPublicKey, createAssociatedAccountIx, mintToIx];
 	}

package/src/tx/retryTxSender.ts

@@ -56,9 +56,17 @@ export class RetryTxSender implements TxSender {
 		const rawTransaction = tx.serialize();
 		const startTime = this.getTimestamp();
 
-		const txid: TransactionSignature =
-			await this.provider.connection.sendRawTransaction(rawTransaction, opts);
-		this.sendToAdditionalConnections(rawTransaction, opts);
+		let txid: TransactionSignature;
+		try {
+			txid = await this.provider.connection.sendRawTransaction(
+				rawTransaction,
+				opts
+			);
+			this.sendToAdditionalConnections(rawTransaction, opts);
+		} catch (e) {
+			console.error(e);
+			throw e;
+		}
 
 		let done = false;
 		const resolveReference: ResolveReference = {

package/src/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultOrderParams = exports.TradeSide = exports.isOneOfVariant = exports.isVariant = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderDiscountTier = exports.OrderStatus = exports.OrderType = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.BankBalanceType = exports.SwapDirection = void 0;
+exports.DefaultOrderParams = exports.LiquidationType = exports.TradeSide = exports.isOneOfVariant = exports.isVariant = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderDiscountTier = exports.OrderStatus = exports.OrderType = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.BankBalanceType = exports.SwapDirection = void 0;
 const _1 = require(".");
 // # Utility Types / Enums / Constants
 class SwapDirection {
@@ -91,6 +91,17 @@ var TradeSide;
     TradeSide[TradeSide["Buy"] = 1] = "Buy";
     TradeSide[TradeSide["Sell"] = 2] = "Sell";
 })(TradeSide = exports.TradeSide || (exports.TradeSide = {}));
+class LiquidationType {
+}
+exports.LiquidationType = LiquidationType;
+LiquidationType.LIQUIDATE_PERP = { liquidatePerp: {} };
+LiquidationType.LIQUIDATE_BORROW = { liquidateBorrow: {} };
+LiquidationType.LIQUIDATE_BORROW_FOR_PERP_PNL = {
+    liquidateBorrowForPerpPnl: {},
+};
+LiquidationType.LIQUIDATE_PERP_PNL_FOR_DEPOSIT = {
+    liquidatePerpPnlForDeposit: {},
+};
 exports.DefaultOrderParams = {
     orderType: OrderType.MARKET,
     userOrderId: 0,

package/src/types.ts

@@ -67,6 +67,12 @@ export class OrderActionExplanation {
 	static readonly MARKET_ORDER_FILLED_TO_LIMIT_PRICE = {
 		marketOrderFilledToLimitPrice: {},
 	};
+	static readonly CANCELED_FOR_LIQUIDATION = {
+		canceledForLiquidation: {},
+	};
+	static readonly MARKET_ORDER_AUCTION_EXPIRED = {
+		marketOrderAuctionExpired: {},
+	};
 }
 
 export class OrderTriggerCondition {
@@ -166,10 +172,13 @@ export type LiquidationRecord = {
 	liquidationType: LiquidationType;
 	marginRequirement: BN;
 	totalCollateral: BN;
+	liquidationId: number;
 	liquidatePerp: LiquidatePerpRecord;
 	liquidateBorrow: LiquidateBorrowRecord;
 	liquidateBorrowForPerpPnl: LiquidateBorrowForPerpPnlRecord;
 	liquidatePerpPnlForDeposit: LiquidatePerpPnlForDepositRecord;
+	perpBankruptcy: PerpBankruptcyRecord;
+	borrowBankruptcy: BorrowBankruptcyRecord;
 };
 
 export class LiquidationType {
@@ -181,6 +190,12 @@ export class LiquidationType {
 	static readonly LIQUIDATE_PERP_PNL_FOR_DEPOSIT = {
 		liquidatePerpPnlForDeposit: {},
 	};
+	static readonly PERP_BANKRUPTCY = {
+		perpBankruptcy: {},
+	};
+	static readonly BORROW_BANKRUPTCY = {
+		borrowBankruptcy: {},
+	};
 }
 
 export type LiquidatePerpRecord = {
@@ -224,14 +239,37 @@ export type LiquidatePerpPnlForDepositRecord = {
 	assetTransfer: BN;
 };
 
+export type PerpBankruptcyRecord = {
+	marketIndex: BN;
+	pnl: BN;
+	cumulativeFundingRateDelta: BN;
+};
+
+export type BorrowBankruptcyRecord = {
+	bankIndex: BN;
+	borrowAmount: BN;
+	cumulativeDepositInterestDelta: BN;
+};
+
+export type SettlePnlRecord = {
+	ts: BN;
+	user: PublicKey;
+	marketIndex: BN;
+	pnl: BN;
+	baseAssetAmount: BN;
+	quoteAssetAmountAfter: BN;
+	quoteEntryamount: BN;
+	settlePrice: BN;
+};
+
 export type OrderRecord = {
 	ts: BN;
 	taker: PublicKey;
 	maker: PublicKey;
 	takerOrder: Order;
 	makerOrder: Order;
-	takerUnsettledPnl: BN;
-	makerUnsettledPnl: BN;
+	takerPnl: BN;
+	makerPnl: BN;
 	action: OrderAction;
 	actionExplanation: OrderActionExplanation;
 	filler: PublicKey;
@@ -291,6 +329,10 @@ export type MarketAccount = {
 	nextFillRecordId: BN;
 	pnlPool: PoolBalance;
 	liquidationFee: BN;
+	imfFactor: BN;
+	unsettledImfFactor: BN;
+	unsettledInitialAssetWeight: number;
+	unsettledMaintenanceAssetWeight: number;
 };
 
 export type BankAccount = {
@@ -315,6 +357,12 @@ export type BankAccount = {
 	initialLiabilityWeight: BN;
 	maintenanceLiabilityWeight: BN;
 	liquidationFee: BN;
+	imfFactor: BN;
+
+	withdrawGuardThreshold: BN;
+	depositTokenTwap: BN;
+	borrowTokenTwap: BN;
+	utilizationTwap: BN;
 };
 
 export type PoolBalance = {
@@ -328,8 +376,10 @@ export type AMM = {
 	lastFundingRate: BN;
 	lastFundingRateTs: BN;
 	lastMarkPriceTwap: BN;
+	lastMarkPriceTwap5min: BN;
 	lastMarkPriceTwapTs: BN;
 	lastOraclePriceTwap: BN;
+	lastOraclePriceTwap5min: BN;
 	lastOraclePriceTwapTs: BN;
 	lastOracleMarkSpreadPct: BN;
 	lastOracleConfPct: BN;
@@ -340,11 +390,16 @@ export type AMM = {
 	pegMultiplier: BN;
 	cumulativeFundingRateLong: BN;
 	cumulativeFundingRateShort: BN;
+	cumulativeFundingRateLp: BN;
 	cumulativeRepegRebateLong: BN;
 	cumulativeRepegRebateShort: BN;
 	totalFeeMinusDistributions: BN;
 	totalFeeWithdrawn: BN;
 	totalFee: BN;
+	cumulativeFundingPaymentPerLp: BN;
+	cumulativeFeePerLp: BN;
+	cumulativeNetBaseAssetAmountPerLp: BN;
+	userLpShares: BN;
 	minimumQuoteAssetTradeSize: BN;
 	baseAssetAmountStepSize: BN;
 	maxBaseAssetAmountRatio: number;
@@ -366,6 +421,8 @@ export type AMM = {
 	longSpread: BN;
 	shortSpread: BN;
 	maxSpread: number;
+	marketPosition: UserPosition;
+	marketPositionPerLp: UserPosition;
 };
 
 // # User Account Types
@@ -376,18 +433,23 @@ export type UserPosition = {
 	quoteAssetAmount: BN;
 	quoteEntryAmount: BN;
 	openOrders: BN;
-	unsettledPnl: BN;
 	openBids: BN;
 	openAsks: BN;
+	realizedPnl: BN;
+	lpShares: BN;
+	lastFeePerLp: BN;
+	lastNetBaseAssetAmountPerLp: BN;
+	lastNetQuoteAssetAmountPerLp: BN;
 };
 
-export type UserAccount = {
-	authority: PublicKey;
-	name: number[];
-	userId: number;
-	bankBalances: UserBankBalance[];
-	collateral: BN;
-	cumulativeDeposits: BN;
+export type UserStatsAccount = {
+	numberOfUsers: number;
+	makerVolume30D: BN;
+	takerVolume30D: BN;
+	fillerVolume30D: BN;
+	lastMakerVolume30DTs: BN;
+	lastTakerVolume30DTs: BN;
+	lastFillerVolume30DTs: BN;
 	fees: {
 		totalFeePaid: BN;
 		totalFeeRebate: BN;
@@ -395,9 +457,18 @@ export type UserAccount = {
 		totalReferralReward: BN;
 		totalRefereeDiscount: BN;
 	};
+};
+
+export type UserAccount = {
+	authority: PublicKey;
+	name: number[];
+	userId: number;
+	bankBalances: UserBankBalance[];
 	positions: UserPosition[];
 	orders: Order[];
 	beingLiquidated: boolean;
+	bankrupt: boolean;
+	nextLiquidationId: number;
 };
 
 export type UserBankBalance = {
@@ -493,11 +564,13 @@ export const DefaultOrderParams = {
 
 export type MakerInfo = {
 	maker: PublicKey;
+	makerStats: PublicKey;
 	order: Order;
 };
 
 export type TakerInfo = {
 	taker: PublicKey;
+	takerStats: PublicKey;
 	order: Order;
 };