@drift-labs/sdk 0.2.0-temp.2 → 2.0.1

package/src/types.ts

@@ -2,12 +2,62 @@ import { PublicKey, Transaction } from '@solana/web3.js';
 import { BN, ZERO } from '.';
 
 // # Utility Types / Enums / Constants
+
+export class ExchangeStatus {
+	static readonly ACTIVE = { active: {} };
+	static readonly FUNDING_PAUSED = { fundingPaused: {} };
+	static readonly AMM_PAUSED = { ammPaused: {} };
+	static readonly FILL_PAUSED = { fillPaused: {} };
+	static readonly LIQ_PAUSED = { liqPaused: {} };
+	static readonly WITHDRAW_PAUSED = { withdrawPaused: {} };
+	static readonly PAUSED = { paused: {} };
+}
+
+export class MarketStatus {
+	static readonly INITIALIZED = { initialized: {} };
+	static readonly ACTIVE = { active: {} };
+	static readonly FUNDING_PAUSED = { fundingPaused: {} };
+	static readonly AMM_PAUSED = { ammPaused: {} };
+	static readonly FILL_PAUSED = { fillPaused: {} };
+	static readonly WITHDRAW_PAUSED = { withdrawPaused: {} };
+	static readonly REDUCE_ONLY = { reduceOnly: {} };
+	static readonly SETTLEMENT = { settlement: {} };
+	static readonly DELISTED = { delisted: {} };
+}
+
+export class UserStatus {
+	static readonly ACTIVE = { active: {} };
+	static readonly BEING_LIQUIDATED = { beingLiquidated: {} };
+	static readonly BANKRUPT = { bankrupt: {} };
+}
+
+export class ContractType {
+	static readonly PERPETUAL = { perpetual: {} };
+	static readonly FUTURE = { future: {} };
+}
+
+export class ContractTier {
+	static readonly A = { a: {} };
+	static readonly B = { b: {} };
+	static readonly C = { c: {} };
+	static readonly SPECULATIVE = { speculative: {} };
+	static readonly ISOLATED = { isolated: {} };
+}
+
+export class AssetTier {
+	static readonly COLLATERAL = { collateral: {} };
+	static readonly PROTECTED = { protected: {} };
+	static readonly CROSS = { cross: {} };
+	static readonly ISOLATED = { isolated: {} };
+	static readonly UNLISTED = { unlisted: {} };
+}
+
 export class SwapDirection {
 	static readonly ADD = { add: {} };
 	static readonly REMOVE = { remove: {} };
 }
 
-export class BankBalanceType {
+export class SpotBalanceType {
 	static readonly DEPOSIT = { deposit: {} };
 	static readonly BORROW = { borrow: {} };
 }
@@ -35,19 +85,17 @@ export class OrderType {
 	static readonly MARKET = { market: {} };
 }
 
+export declare type MarketTypeStr = 'perp' | 'spot';
+export class MarketType {
+	static readonly SPOT = { spot: {} };
+	static readonly PERP = { perp: {} };
+}
+
 export class OrderStatus {
 	static readonly INIT = { init: {} };
 	static readonly OPEN = { open: {} };
 }
 
-export class OrderDiscountTier {
-	static readonly NONE = { none: {} };
-	static readonly FIRST = { first: {} };
-	static readonly SECOND = { second: {} };
-	static readonly THIRD = { third: {} };
-	static readonly FOURTH = { fourth: {} };
-}
-
 export class OrderAction {
 	static readonly PLACE = { place: {} };
 	static readonly CANCEL = { cancel: {} };
@@ -58,8 +106,8 @@ export class OrderAction {
 
 export class OrderActionExplanation {
 	static readonly NONE = { none: {} };
-	static readonly BREACHED_MARGIN_REQUIREMENT = {
-		breachedMarginRequirement: {},
+	static readonly INSUFFICIENT_FREE_COLLATERAL = {
+		insufficientFreeCollateral: {},
 	};
 	static readonly ORACLE_PRICE_BREACHED_LIMIT_PRICE = {
 		oraclePriceBreachedLimitPrice: {},
@@ -67,11 +115,63 @@ export class OrderActionExplanation {
 	static readonly MARKET_ORDER_FILLED_TO_LIMIT_PRICE = {
 		marketOrderFilledToLimitPrice: {},
 	};
+	static readonly ORDER_EXPIRED = {
+		orderExpired: {},
+	};
+	static readonly LIQUIDATION = {
+		liquidation: {},
+	};
+	static readonly ORDER_FILLED_WITH_AMM = {
+		orderFilledWithAMM: {},
+	};
+	static readonly ORDER_FILLED_WITH_AMM_JIT = {
+		orderFilledWithAMMJit: {},
+	};
+	static readonly ORDER_FILLED_WITH_MATCH = {
+		orderFilledWithMatch: {},
+	};
+	static readonly MARKET_EXPIRED = {
+		marketExpired: {},
+	};
+	static readonly RISK_INCREASING_ORDER = {
+		riskingIncreasingOrder: {},
+	};
+	static readonly ORDER_FILLED_WITH_SERUM = {
+		orderFillWithSerum: {},
+	};
 }
 
 export class OrderTriggerCondition {
 	static readonly ABOVE = { above: {} };
 	static readonly BELOW = { below: {} };
+	static readonly TRIGGERED_ABOVE = { triggeredAbove: {} }; // above condition has been triggered
+	static readonly TRIGGERED_BELOW = { triggeredBelow: {} }; // below condition has been triggered
+}
+
+export class SpotFulfillmentType {
+	static readonly SERUM_v3 = { serumV3: {} };
+}
+
+export class SpotFulfillmentStatus {
+	static readonly ENABLED = { enabled: {} };
+	static readonly DISABLED = { disabled: {} };
+}
+
+export class DepositExplanation {
+	static readonly NONE = { none: {} };
+	static readonly TRANSFER = { transfer: {} };
+}
+
+export class SettlePnlExplanation {
+	static readonly NONE = { none: {} };
+	static readonly EXPIRED_POSITION = { expiredPosition: {} };
+}
+
+export class StakeAction {
+	static readonly STAKE = { stake: {} };
+	static readonly UNSTAKE_REQUEST = { unstakeRequest: {} };
+	static readonly UNSTAKE_CANCEL_REQUEST = { unstakeCancelRequest: {} };
+	static readonly UNSTAKE = { unstake: {} };
 }
 
 export function isVariant(object: unknown, type: string) {
@@ -84,6 +184,10 @@ export function isOneOfVariant(object: unknown, types: string[]) {
 	}, false);
 }
 
+export function getVariant(object: unknown): string {
+	return Object.keys(object)[0];
+}
+
 export enum TradeSide {
 	None = 0,
 	Buy = 1,
@@ -100,6 +204,15 @@ export type CandleResolution =
 	| 'W'
 	| 'M';
 
+export type NewUserRecord = {
+	ts: BN;
+	userAuthority: PublicKey;
+	user: PublicKey;
+	subAccount: number;
+	name: number[];
+	referrer: PublicKey;
+};
+
 export type DepositRecord = {
 	ts: BN;
 	userAuthority: PublicKey;
@@ -108,17 +221,36 @@ export type DepositRecord = {
 		deposit?: any;
 		withdraw?: any;
 	};
-	bankIndex: BN;
+	marketIndex: number;
 	amount: BN;
 	oraclePrice: BN;
-	from?: PublicKey;
-	to?: PublicKey;
+	marketDepositBalance: BN;
+	marketWithdrawBalance: BN;
+	marketCumulativeDepositInterest: BN;
+	marketCumulativeBorrowInterest: BN;
+	totalDepositsAfter: BN;
+	totalWithdrawsAfter: BN;
+	depositRecordId: BN;
+	explanation: DepositExplanation;
+	transferUser?: PublicKey;
+};
+
+export type SpotInterestRecord = {
+	ts: BN;
+	marketIndex: number;
+	depositBalance: BN;
+	cumulativeDepositInterest: BN;
+	borrowBalance: BN;
+	cumulativeBorrowInterest: BN;
+	optimalUtilization: number;
+	optimalBorrowRate: number;
+	maxBorrowRate: number;
 };
 
 export type CurveRecord = {
 	ts: BN;
 	recordId: BN;
-	marketIndex: BN;
+	marketIndex: number;
 	pegMultiplierBefore: BN;
 	baseAssetReserveBefore: BN;
 	quoteAssetReserveBefore: BN;
@@ -129,32 +261,84 @@ export type CurveRecord = {
 	sqrtKAfter: BN;
 	baseAssetAmountLong: BN;
 	baseAssetAmountShort: BN;
-	baseAssetAmount: BN;
-	openInterest: BN;
+	baseAssetAmountWithAmm: BN;
+	totalFee: BN;
+	totalFeeMinusDistributions: BN;
+	adjustmentCost: BN;
+	numberOfUsers: BN;
 	oraclePrice: BN;
-	tradeId: BN;
+	fillRecord: BN;
+};
+
+export declare type InsuranceFundRecord = {
+	ts: BN;
+	spotMarketIndex: number;
+	perpMarketIndex: number;
+	userIfFactor: number;
+	totalIfFactor: number;
+	vaultAmountBefore: BN;
+	insuranceVaultAmountBefore: BN;
+	totalIfSharesBefore: BN;
+	totalIfSharesAfter: BN;
+	amount: BN;
+};
+
+export declare type InsuranceFundStakeRecord = {
+	ts: BN;
+	userAuthority: PublicKey;
+	action: StakeAction;
+	amount: BN;
+	marketIndex: number;
+	insuranceVaultAmountBefore: BN;
+	ifSharesBefore: BN;
+	userIfSharesBefore: BN;
+	totalIfSharesBefore: BN;
+	ifSharesAfter: BN;
+	userIfSharesAfter: BN;
+	totalIfSharesAfter: BN;
 };
 
+export type LPRecord = {
+	ts: BN;
+	user: PublicKey;
+	action: LPAction;
+	nShares: BN;
+	marketIndex: number;
+	deltaBaseAssetAmount: BN;
+	deltaQuoteAssetAmount: BN;
+	pnl: BN;
+};
+
+export class LPAction {
+	static readonly ADD_LIQUIDITY = { addLiquidity: {} };
+	static readonly REMOVE_LIQUIDITY = { removeLiquidity: {} };
+	static readonly SETTLE_LIQUIDITY = { settleLiquidity: {} };
+}
+
 export type FundingRateRecord = {
 	ts: BN;
 	recordId: BN;
-	marketIndex: BN;
+	marketIndex: number;
 	fundingRate: BN;
+	fundingRateLong: BN;
+	fundingRateShort: BN;
 	cumulativeFundingRateLong: BN;
 	cumulativeFundingRateShort: BN;
 	oraclePriceTwap: BN;
 	markPriceTwap: BN;
+	periodRevenue: BN;
+	baseAssetAmountWithAmm: BN;
+	baseAssetAmountWithUnsettledLp: BN;
 };
 
 export type FundingPaymentRecord = {
 	ts: BN;
 	userAuthority: PublicKey;
 	user: PublicKey;
-	marketIndex: BN;
+	marketIndex: number;
 	fundingPayment: BN;
 	baseAssetAmount: BN;
 	userLastCumulativeFunding: BN;
-	userLastFundingRateTs: BN;
 	ammCumulativeFundingLong: BN;
 	ammCumulativeFundingShort: BN;
 };
@@ -166,10 +350,16 @@ export type LiquidationRecord = {
 	liquidationType: LiquidationType;
 	marginRequirement: BN;
 	totalCollateral: BN;
+	marginFreed: BN;
+	liquidationId: number;
+	bankrupt: boolean;
+	canceledOrderIds: BN[];
 	liquidatePerp: LiquidatePerpRecord;
-	liquidateBorrow: LiquidateBorrowRecord;
+	liquidateSpot: LiquidateSpotRecord;
 	liquidateBorrowForPerpPnl: LiquidateBorrowForPerpPnlRecord;
 	liquidatePerpPnlForDeposit: LiquidatePerpPnlForDepositRecord;
+	perpBankruptcy: PerpBankruptcyRecord;
+	spotBankruptcy: SpotBankruptcyRecord;
 };
 
 export class LiquidationType {
@@ -181,144 +371,263 @@ export class LiquidationType {
 	static readonly LIQUIDATE_PERP_PNL_FOR_DEPOSIT = {
 		liquidatePerpPnlForDeposit: {},
 	};
+	static readonly PERP_BANKRUPTCY = {
+		perpBankruptcy: {},
+	};
+	static readonly BORROW_BANKRUPTCY = {
+		borrowBankruptcy: {},
+	};
 }
 
 export type LiquidatePerpRecord = {
-	marketIndex: BN;
-	orderIds: BN[];
+	marketIndex: number;
 	oraclePrice: BN;
 	baseAssetAmount: BN;
 	quoteAssetAmount: BN;
-	userPnl: BN;
-	liquidatorPnl: BN;
-	canceledOrdersFee: BN;
+	lpShares: BN;
 	userOrderId: BN;
 	liquidatorOrderId: BN;
 	fillRecordId: BN;
+	liquidatorFee: BN;
+	ifFee: BN;
 };
 
-export type LiquidateBorrowRecord = {
-	assetBankIndex: BN;
+export type LiquidateSpotRecord = {
+	assetMarketIndex: number;
 	assetPrice: BN;
 	assetTransfer: BN;
-	liabilityBankIndex: BN;
+	liabilityMarketIndex: number;
 	liabilityPrice: BN;
 	liabilityTransfer: BN;
+	ifFee: BN;
 };
 
 export type LiquidateBorrowForPerpPnlRecord = {
-	marketIndex: BN;
+	perpMarketIndex: number;
 	marketOraclePrice: BN;
 	pnlTransfer: BN;
-	liabilityBankIndex: BN;
+	liabilityMarketIndex: number;
 	liabilityPrice: BN;
 	liabilityTransfer: BN;
 };
 
 export type LiquidatePerpPnlForDepositRecord = {
-	marketIndex: BN;
+	perpMarketIndex: number;
 	marketOraclePrice: BN;
 	pnlTransfer: BN;
-	assetBankIndex: BN;
+	assetMarketIndex: number;
 	assetPrice: BN;
 	assetTransfer: BN;
 };
 
+export type PerpBankruptcyRecord = {
+	marketIndex: number;
+	pnl: BN;
+	ifPayment: BN;
+	clawbackUser: PublicKey | null;
+	clawbackUserPayment: BN | null;
+	cumulativeFundingRateDelta: BN;
+};
+
+export type SpotBankruptcyRecord = {
+	marketIndex: number;
+	borrowAmount: BN;
+	cumulativeDepositInterestDelta: BN;
+	ifPayment: BN;
+};
+
+export type SettlePnlRecord = {
+	ts: BN;
+	user: PublicKey;
+	marketIndex: number;
+	pnl: BN;
+	baseAssetAmount: BN;
+	quoteAssetAmountAfter: BN;
+	quoteEntryAmount: BN;
+	settlePrice: BN;
+	explanation: SettlePnlExplanation;
+};
+
 export type OrderRecord = {
 	ts: BN;
-	taker: PublicKey;
-	maker: PublicKey;
-	takerOrder: Order;
-	makerOrder: Order;
-	takerUnsettledPnl: BN;
-	makerUnsettledPnl: BN;
+	user: PublicKey;
+	order: Order;
+};
+
+export type OrderActionRecord = {
+	ts: BN;
 	action: OrderAction;
 	actionExplanation: OrderActionExplanation;
-	filler: PublicKey;
-	fillRecordId: BN;
-	marketIndex: BN;
-	baseAssetAmountFilled: BN;
-	quoteAssetAmountFilled: BN;
-	makerRebate: BN;
-	takerFee: BN;
-	fillerReward: BN;
-	quoteAssetAmountSurplus: BN;
+	marketIndex: number;
+	marketType: MarketType;
+	filler: PublicKey | null;
+	fillerReward: BN | null;
+	fillRecordId: BN | null;
+	baseAssetAmountFilled: BN | null;
+	quoteAssetAmountFilled: BN | null;
+	takerFee: BN | null;
+	makerFee: BN | null;
+	referrerReward: number | null;
+	quoteAssetAmountSurplus: BN | null;
+	spotFulfillmentMethodFee: BN | null;
+	taker: PublicKey | null;
+	takerOrderId: number | null;
+	takerOrderDirection: PositionDirection | null;
+	takerOrderBaseAssetAmount: BN | null;
+	takerOrderCumulativeBaseAssetAmountFilled: BN | null;
+	takerOrderCumulativeQuoteAssetAmountFilled: BN | null;
+	maker: PublicKey | null;
+	makerOrderId: number | null;
+	makerOrderDirection: PositionDirection | null;
+	makerOrderBaseAssetAmount: BN | null;
+	makerOrderCumulativeBaseAssetAmountFilled: BN | null;
+	makerOrderCumulativeQuoteAssetAmountFilled: BN | null;
 	oraclePrice: BN;
 };
 
 export type StateAccount = {
 	admin: PublicKey;
-	fundingPaused: boolean;
-	exchangePaused: boolean;
-	adminControlsPrices: boolean;
-	insuranceVault: PublicKey;
-	insuranceVaultAuthority: PublicKey;
-	insuranceVaultNonce: number;
-	marginRatioInitial: BN;
-	marginRatioMaintenance: BN;
-	marginRatioPartial: BN;
-	partialLiquidationClosePercentageNumerator: BN;
-	partialLiquidationClosePercentageDenominator: BN;
-	partialLiquidationPenaltyPercentageNumerator: BN;
-	partialLiquidationPenaltyPercentageDenominator: BN;
-	fullLiquidationPenaltyPercentageNumerator: BN;
-	fullLiquidationPenaltyPercentageDenominator: BN;
-	partialLiquidationLiquidatorShareDenominator: BN;
-	fullLiquidationLiquidatorShareDenominator: BN;
-	feeStructure: FeeStructure;
-	totalFee: BN;
-	totalFeeWithdrawn: BN;
+	exchangeStatus: ExchangeStatus;
 	whitelistMint: PublicKey;
 	discountMint: PublicKey;
 	oracleGuardRails: OracleGuardRails;
-	maxDeposit: BN;
-	numberOfMarkets: BN;
-	numberOfBanks: BN;
-	minOrderQuoteAssetAmount: BN;
+	numberOfAuthorities: BN;
+	numberOfSubAccounts: BN;
+	numberOfMarkets: number;
+	numberOfSpotMarkets: number;
+	minPerpAuctionDuration: number;
+	defaultMarketOrderTimeInForce: number;
+	defaultSpotAuctionDuration: number;
+	liquidationMarginBufferRatio: number;
+	settlementDuration: number;
+	signer: PublicKey;
+	signerNonce: number;
+	srmVault: PublicKey;
+	perpFeeStructure: FeeStructure;
+	spotFeeStructure: FeeStructure;
+	lpCooldownTime: BN;
 };
 
-export type MarketAccount = {
-	initialized: boolean;
-	marketIndex: BN;
+export type PerpMarketAccount = {
+	status: MarketStatus;
+	contractType: ContractType;
+	contractTier: ContractTier;
+	expiryTs: BN;
+	expiryPrice: BN;
+	marketIndex: number;
 	pubkey: PublicKey;
+	name: number[];
 	amm: AMM;
-	baseAssetAmount: BN;
-	baseAssetAmountLong: BN;
-	baseAssetAmountShort: BN;
-	openInterest: BN;
+	numberOfUsersWithBase: number;
+	numberOfUsers: number;
 	marginRatioInitial: number;
 	marginRatioMaintenance: number;
 	nextFillRecordId: BN;
+	nextFundingRateRecordId: BN;
+	nextCurveRecordId: BN;
 	pnlPool: PoolBalance;
-	liquidationFee: BN;
+	liquidatorFee: number;
+	ifLiquidationFee: number;
+	imfFactor: number;
+	unrealizedPnlImfFactor: number;
+	unrealizedPnlMaxImbalance: BN;
+	unrealizedPnlInitialAssetWeight: number;
+	unrealizedPnlMaintenanceAssetWeight: number;
+	insuranceClaim: {
+		revenueWithdrawSinceLastSettle: BN;
+		maxRevenueWithdrawPerPeriod: BN;
+		lastRevenueWithdrawTs: BN;
+		quoteSettledInsurance: BN;
+		quoteMaxInsurance: BN;
+	};
 };
 
-export type BankAccount = {
-	bankIndex: BN;
+export type HistoricalOracleData = {
+	lastOraclePrice: BN;
+	lastOracleDelay: BN;
+	lastOracleConf: BN;
+	lastOraclePriceTwap: BN;
+	lastOraclePriceTwap5Min: BN;
+	lastOraclePriceTwapTs: BN;
+};
+
+export type HistoricalIndexData = {
+	lastIndexBidPrice: BN;
+	lastIndexAskPrice: BN;
+	lastIndexPriceTwap: BN;
+	lastIndexPriceTwap5Min: BN;
+	lastIndexPriceTwapTs: BN;
+};
+
+export type SpotMarketAccount = {
+	status: MarketStatus;
+	assetTier: AssetTier;
+
+	marketIndex: number;
 	pubkey: PublicKey;
 	mint: PublicKey;
 	vault: PublicKey;
-	vaultAuthority: PublicKey;
-	vaultAuthorityNonce: number;
+
+	oracle: PublicKey;
+	oracleSource: OracleSource;
+	historicalOracleData: HistoricalOracleData;
+	historicalIndexData: HistoricalIndexData;
+
+	insuranceFund: {
+		vault: PublicKey;
+		totalShares: BN;
+		userShares: BN;
+		sharesBase: BN;
+		unstakingPeriod: BN;
+		lastRevenueSettleTs: BN;
+		revenueSettlePeriod: BN;
+		totalFactor: number;
+		userFactor: number;
+	};
+
+	revenuePool: PoolBalance;
+
+	ifLiquidationFee: number;
+
 	decimals: number;
-	optimalUtilization: BN;
-	optimalBorrowRate: BN;
-	maxBorrowRate: BN;
+	optimalUtilization: number;
+	optimalBorrowRate: number;
+	maxBorrowRate: number;
 	cumulativeDepositInterest: BN;
 	cumulativeBorrowInterest: BN;
+	totalSocialLoss: BN;
+	totalQuoteSocialLoss: BN;
 	depositBalance: BN;
 	borrowBalance: BN;
-	lastUpdated: BN;
-	oracle: PublicKey;
-	initialAssetWeight: BN;
-	maintenanceAssetWeight: BN;
-	initialLiabilityWeight: BN;
-	maintenanceLiabilityWeight: BN;
-	liquidationFee: BN;
+	maxTokenDeposits: BN;
+
+	lastInterestTs: BN;
+	lastTwapTs: BN;
+	initialAssetWeight: number;
+	maintenanceAssetWeight: number;
+	initialLiabilityWeight: number;
+	maintenanceLiabilityWeight: number;
+	liquidatorFee: number;
+	imfFactor: number;
+
+	withdrawGuardThreshold: BN;
+	depositTokenTwap: BN;
+	borrowTokenTwap: BN;
+	utilizationTwap: BN;
+	nextDepositRecordId: BN;
+
+	orderStepSize: BN;
+	orderTickSize: BN;
+	nextFillRecordId: BN;
+	spotFeePool: PoolBalance;
+	totalSpotFee: BN;
+
+	ordersEnabled: boolean;
 };
 
 export type PoolBalance = {
-	balance: BN;
+	scaledBalance: BN;
+	marketIndex: number;
 };
 
 export type AMM = {
@@ -328,139 +637,209 @@ export type AMM = {
 	lastFundingRate: BN;
 	lastFundingRateTs: BN;
 	lastMarkPriceTwap: BN;
+	lastMarkPriceTwap5Min: BN;
 	lastMarkPriceTwapTs: BN;
-	lastOraclePriceTwap: BN;
-	lastOraclePriceTwapTs: BN;
-	lastOracleMarkSpreadPct: BN;
-	lastOracleConfPct: BN;
+	lastTradeTs: BN;
+
 	oracle: PublicKey;
 	oracleSource: OracleSource;
+	historicalOracleData: HistoricalOracleData;
+
+	lastOracleReservePriceSpreadPct: BN;
+	lastOracleConfPct: BN;
+
 	fundingPeriod: BN;
 	quoteAssetReserve: BN;
 	pegMultiplier: BN;
 	cumulativeFundingRateLong: BN;
 	cumulativeFundingRateShort: BN;
-	cumulativeRepegRebateLong: BN;
-	cumulativeRepegRebateShort: BN;
+	last24hAvgFundingRate: BN;
+	lastFundingRateShort: BN;
+	lastFundingRateLong: BN;
+
+	totalLiquidationFee: BN;
 	totalFeeMinusDistributions: BN;
 	totalFeeWithdrawn: BN;
 	totalFee: BN;
-	minimumQuoteAssetTradeSize: BN;
-	baseAssetAmountStepSize: BN;
-	maxBaseAssetAmountRatio: number;
+	userLpShares: BN;
+	baseAssetAmountWithUnsettledLp: BN;
+	orderStepSize: BN;
+	orderTickSize: BN;
+	maxFillReserveFraction: number;
 	maxSlippageRatio: number;
-	lastOraclePrice: BN;
 	baseSpread: number;
 	curveUpdateIntensity: number;
-	netBaseAssetAmount: BN;
-	quoteAssetAmountLong: BN;
-	quoteAssetAmountShort: BN;
+	baseAssetAmountWithAmm: BN;
+	baseAssetAmountLong: BN;
+	baseAssetAmountShort: BN;
+	quoteAssetAmount: BN;
 	terminalQuoteAssetReserve: BN;
+	concentrationCoef: BN;
 	feePool: PoolBalance;
 	totalExchangeFee: BN;
 	totalMmFee: BN;
 	netRevenueSinceLastFunding: BN;
 	lastUpdateSlot: BN;
+	lastOracleNormalisedPrice: BN;
+	lastOracleValid: boolean;
 	lastBidPriceTwap: BN;
 	lastAskPriceTwap: BN;
-	longSpread: BN;
-	shortSpread: BN;
+	longSpread: number;
+	shortSpread: number;
 	maxSpread: number;
+
+	baseAssetAmountPerLp: BN;
+	quoteAssetAmountPerLp: BN;
+
+	ammJitIntensity: number;
+	maxOpenInterest: BN;
+	maxBaseAssetReserve: BN;
+	minBaseAssetReserve: BN;
+	totalSocialLoss: BN;
+
+	quoteBreakEvenAmountLong: BN;
+	quoteBreakEvenAmountShort: BN;
+	quoteEntryAmountLong: BN;
+	quoteEntryAmountShort: BN;
+
+	markStd: BN;
+	oracleStd: BN;
+	longIntensityCount: number;
+	longIntensityVolume: BN;
+	shortIntensityCount: number;
+	shortIntensityVolume: BN;
+	volume24H: BN;
+	minOrderSize: BN;
+	maxPositionSize: BN;
+
+	bidBaseAssetReserve: BN;
+	bidQuoteAssetReserve: BN;
+	askBaseAssetReserve: BN;
+	askQuoteAssetReserve: BN;
 };
 
 // # User Account Types
-export type UserPosition = {
+export type PerpPosition = {
 	baseAssetAmount: BN;
 	lastCumulativeFundingRate: BN;
-	marketIndex: BN;
+	marketIndex: number;
 	quoteAssetAmount: BN;
 	quoteEntryAmount: BN;
-	openOrders: BN;
-	unsettledPnl: BN;
+	quoteBreakEvenAmount: BN;
+	openOrders: number;
 	openBids: BN;
 	openAsks: BN;
+	settledPnl: BN;
+	lpShares: BN;
+	remainderBaseAssetAmount: number;
+	lastNetBaseAssetAmountPerLp: BN;
+	lastNetQuoteAssetAmountPerLp: BN;
 };
 
-export type UserAccount = {
-	authority: PublicKey;
-	name: number[];
-	userId: number;
-	bankBalances: UserBankBalance[];
-	collateral: BN;
-	cumulativeDeposits: BN;
+export type UserStatsAccount = {
+	numberOfSubAccounts: number;
+	numberOfSubAccountsCreated: number;
+	makerVolume30D: BN;
+	takerVolume30D: BN;
+	fillerVolume30D: BN;
+	lastMakerVolume30DTs: BN;
+	lastTakerVolume30DTs: BN;
+	lastFillerVolume30DTs: BN;
 	fees: {
 		totalFeePaid: BN;
 		totalFeeRebate: BN;
 		totalTokenDiscount: BN;
-		totalReferralReward: BN;
 		totalRefereeDiscount: BN;
+		totalReferrerReward: BN;
+		current_epoch_referrer_reward: BN;
 	};
-	positions: UserPosition[];
+	referrer: PublicKey;
+	isReferrer: boolean;
+	authority: PublicKey;
+	ifStakedQuoteAssetAmount: BN;
+};
+
+export type UserAccount = {
+	authority: PublicKey;
+	delegate: PublicKey;
+	name: number[];
+	subAccountId: number;
+	spotPositions: SpotPosition[];
+	perpPositions: PerpPosition[];
 	orders: Order[];
-	beingLiquidated: boolean;
+	status: UserStatus;
+	nextLiquidationId: number;
+	nextOrderId: number;
+	maxMarginRatio: number;
+	lastAddPerpLpSharesTs: BN;
+	settledPerpPnl: BN;
+	totalDeposits: BN;
+	totalWithdraws: BN;
+	totalSocialLoss: BN;
+	cumulativePerpFunding: BN;
 };
 
-export type UserBankBalance = {
-	bankIndex: BN;
-	balanceType: BankBalanceType;
-	balance: BN;
+export type SpotPosition = {
+	marketIndex: number;
+	balanceType: SpotBalanceType;
+	scaledBalance: BN;
+	openOrders: number;
+	openBids: BN;
+	openAsks: BN;
+	cumulativeDeposits: BN;
 };
 
 export type Order = {
 	status: OrderStatus;
 	orderType: OrderType;
-	ts: BN;
+	marketType: MarketType;
 	slot: BN;
-	orderId: BN;
+	orderId: number;
 	userOrderId: number;
-	marketIndex: BN;
+	marketIndex: number;
 	price: BN;
 	baseAssetAmount: BN;
 	baseAssetAmountFilled: BN;
 	quoteAssetAmount: BN;
 	quoteAssetAmountFilled: BN;
-	fee: BN;
 	direction: PositionDirection;
 	reduceOnly: boolean;
 	triggerPrice: BN;
 	triggerCondition: OrderTriggerCondition;
-	triggered: boolean;
-	discountTier: OrderDiscountTier;
 	existingPositionDirection: PositionDirection;
-	referrer: PublicKey;
 	postOnly: boolean;
 	immediateOrCancel: boolean;
-	oraclePriceOffset: BN;
+	oraclePriceOffset: number;
 	auctionDuration: number;
 	auctionStartPrice: BN;
 	auctionEndPrice: BN;
+	maxTs: BN;
 };
 
 export type OrderParams = {
 	orderType: OrderType;
+	marketType: MarketType;
 	userOrderId: number;
 	direction: PositionDirection;
 	baseAssetAmount: BN;
 	price: BN;
-	marketIndex: BN;
+	marketIndex: number;
 	reduceOnly: boolean;
 	postOnly: boolean;
 	immediateOrCancel: boolean;
-	triggerPrice: BN;
+	triggerPrice: BN | null;
 	triggerCondition: OrderTriggerCondition;
 	positionLimit: BN;
-	oraclePriceOffset: BN;
-	padding0: boolean;
-	padding1: BN;
-	optionalAccounts: {
-		discountToken: boolean;
-		referrer: boolean;
-	};
+	oraclePriceOffset: number | null;
+	auctionDuration: number | null;
+	maxTs: BN | null;
+	auctionStartPrice: BN | null;
+	auctionEndPrice: BN | null;
 };
 
 export type NecessaryOrderParams = {
 	orderType: OrderType;
-	marketIndex: BN;
+	marketIndex: number;
 	baseAssetAmount: BN;
 	direction: PositionDirection;
 };
@@ -469,38 +848,46 @@ export type OptionalOrderParams = {
 	[Property in keyof OrderParams]?: OrderParams[Property];
 } & NecessaryOrderParams;
 
-export const DefaultOrderParams = {
+export const DefaultOrderParams: OrderParams = {
 	orderType: OrderType.MARKET,
+	marketType: MarketType.PERP,
 	userOrderId: 0,
 	direction: PositionDirection.LONG,
 	baseAssetAmount: ZERO,
 	price: ZERO,
-	marketIndex: ZERO,
+	marketIndex: 0,
 	reduceOnly: false,
 	postOnly: false,
 	immediateOrCancel: false,
-	triggerPrice: ZERO,
+	triggerPrice: null,
 	triggerCondition: OrderTriggerCondition.ABOVE,
 	positionLimit: ZERO,
-	oraclePriceOffset: ZERO,
-	padding0: ZERO,
-	padding1: ZERO,
-	optionalAccounts: {
-		discountToken: false,
-		referrer: false,
-	},
+	oraclePriceOffset: null,
+	auctionDuration: null,
+	maxTs: null,
+	auctionStartPrice: null,
+	auctionEndPrice: null,
 };
 
 export type MakerInfo = {
 	maker: PublicKey;
+	makerStats: PublicKey;
+	makerUserAccount: UserAccount;
 	order: Order;
 };
 
 export type TakerInfo = {
 	taker: PublicKey;
+	takerStats: PublicKey;
+	takerUserAccount: UserAccount;
 	order: Order;
 };
 
+export type ReferrerInfo = {
+	referrer: PublicKey;
+	referrerStats: PublicKey;
+};
+
 // # Misc Types
 export interface IWallet {
 	signTransaction(tx: Transaction): Promise<Transaction>;
@@ -509,40 +896,29 @@ export interface IWallet {
 }
 
 export 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;
-	cancelOrderFee: BN;
+	flatFillerFee: BN;
+	referrerRewardEpochUpperBound: BN;
+};
+
+export type FeeTier = {
+	feeNumerator: number;
+	feeDenominator: number;
+	makerRebateNumerator: number;
+	makerRebateDenominator: number;
+	referrerRewardNumerator: number;
+	referrerRewardDenominator: number;
+	refereeFeeNumerator: number;
+	refereeFeeDenominator: number;
+};
+
+export type OrderFillerRewardStructure = {
+	rewardNumerator: BN;
+	rewardDenominator: BN;
+	timeBasedRewardLowerBound: BN;
 };
 
 export type OracleGuardRails = {
@@ -551,17 +927,40 @@ export type OracleGuardRails = {
 		markOracleDivergenceDenominator: BN;
 	};
 	validity: {
-		slotsBeforeStale: BN;
+		slotsBeforeStaleForAmm: BN;
+		slotsBeforeStaleForMargin: BN;
 		confidenceIntervalMaxSize: BN;
 		tooVolatileRatio: BN;
 	};
-	useForLiquidations: boolean;
 };
 
-export type OrderFillerRewardStructure = {
-	rewardNumerator: BN;
-	rewardDenominator: BN;
-	timeBasedRewardLowerBound: BN;
+export type MarginCategory = 'Initial' | 'Maintenance';
+
+export type InsuranceFundStake = {
+	marketIndex: number;
+	authority: PublicKey;
+
+	ifShares: BN;
+	ifBase: BN;
+
+	lastWithdrawRequestShares: BN;
+	lastWithdrawRequestValue: BN;
+	lastWithdrawRequestTs: BN;
 };
 
-export type MarginCategory = 'Initial' | 'Maintenance';
+export type SerumV3FulfillmentConfigAccount = {
+	fulfillmentType: SpotFulfillmentType;
+	status: SpotFulfillmentStatus;
+	pubkey: PublicKey;
+	marketIndex: number;
+	serumProgramId: PublicKey;
+	serumMarket: PublicKey;
+	serumRequestQueue: PublicKey;
+	serumEventQueue: PublicKey;
+	serumBids: PublicKey;
+	serumAsks: PublicKey;
+	serumBaseVault: PublicKey;
+	serumQuoteVault: PublicKey;
+	serumOpenOrders: PublicKey;
+	serumSignerNonce: BN;
+};