@velocity-exchange/sdk 0.0.5 → 0.2.0

package/src/adminClient.ts

@@ -7,6 +7,7 @@
  * pause/unpause exchange, and all ~126 admin instruction handlers in `instructions/admin.rs`.
  */
 import {
+	AccountMeta,
 	AddressLookupTableAccount,
 	Keypair,
 	LAMPORTS_PER_SOL,
@@ -24,7 +25,6 @@ import {
 	MarketStatus,
 	ContractTier,
 	AssetTier,
-	IfRebalanceConfigParams,
 	TxParams,
 	AddAmmConstituentMappingDatum,
 	SwapReduceOnly,
@@ -32,6 +32,8 @@ import {
 	ConstituentStatus,
 	LPPoolAccount,
 	TransferFeeAndPnlPoolDirection,
+	MarketType,
+	SpotMarketAccount,
 } from './types';
 import { DEFAULT_MARKET_NAME, encodeName } from './userName';
 import { BN } from './isomorphic/anchor';
@@ -42,13 +44,10 @@ import {
 	getSpotMarketVaultPublicKey,
 	getPerpMarketPublicKey,
 	getInsuranceFundVaultPublicKey,
-	getProtocolIfSharesTransferConfigPublicKey,
 	getPrelaunchOraclePublicKey,
 	getUserStatsAccountPublicKey,
 	getPythLazerOraclePublicKey,
 	getTokenProgramForSpotMarket,
-	getIfRebalanceConfigPublicKey,
-	getInsuranceFundStakeAccountPublicKey,
 	getLpPoolPublicKey,
 	getAmmConstituentMappingPublicKey,
 	getConstituentTargetBasePublicKey,
@@ -61,6 +60,7 @@ import {
 } from './addresses/pda';
 import { squareRootBN } from './math/utils';
 import {
+	ASSOCIATED_TOKEN_PROGRAM_ID,
 	createInitializeMint2Instruction,
 	createMintToInstruction,
 	createTransferCheckedInstruction,
@@ -76,7 +76,6 @@ import {
 	ONE,
 	BASE_PRECISION,
 	PRICE_PRECISION,
-	GOV_SPOT_MARKET_INDEX,
 } from './constants/numericConstants';
 import { calculateTargetPriceTrade } from './math/trade';
 import { calculateAmmReservesAfterSwap, getSwapDirection } from './math/amm';
@@ -95,7 +94,7 @@ export class AdminClient extends VelocityClient {
 			throw new Error('Clearing house already initialized');
 		}
 
-		const [driftStatePublicKey] =
+		const [velocityStatePublicKey] =
 			await getVelocityStateAccountPublicKeyAndNonce(this.program.programId);
 
 		const initializeIx = await this.program.instruction.initialize({
@@ -103,10 +102,10 @@ export class AdminClient extends VelocityClient {
 				admin: this.isSubscribed
 					? this.getStateAccount().coldAdmin
 					: this.wallet.publicKey,
-				state: driftStatePublicKey,
+				state: velocityStatePublicKey,
 				quoteAssetMint: usdcMint,
 				rent: SYSVAR_RENT_PUBKEY,
-				driftSigner: this.getSignerPublicKey(),
+				velocitySigner: this.getSignerPublicKey(),
 				systemProgram: anchor.web3.SystemProgram.programId,
 				tokenProgram: TOKEN_PROGRAM_ID,
 			},
@@ -226,7 +225,11 @@ export class AdminClient extends VelocityClient {
 			spotMarketIndex
 		);
 
-		const tokenProgram = (await this.connection.getAccountInfo(mint)).owner;
+		const mintAccountInfo = await this.connection.getAccountInfo(mint);
+		if (!mintAccountInfo) {
+			throw new Error(`Mint account ${mint.toString()} not found`);
+		}
+		const tokenProgram = mintAccountInfo.owner;
 
 		const nameBuffer = encodeName(name);
 		const initializeIx = await this.program.instruction.initializeSpotMarket(
@@ -260,7 +263,7 @@ export class AdminClient extends VelocityClient {
 					spotMarket,
 					spotMarketVault,
 					insuranceFundVault,
-					driftSigner: this.getSignerPublicKey(),
+					velocitySigner: this.getSignerPublicKey(),
 					spotMarketMint: mint,
 					oracle,
 					rent: SYSVAR_RENT_PUBKEY,
@@ -315,7 +318,7 @@ export class AdminClient extends VelocityClient {
 					spotMarket: spotMarketPublicKey,
 					spotMarketVault: spotMarketVaultPublicKey,
 					insuranceFundVault: insuranceFundVaultPublicKey,
-					driftSigner: this.getSignerPublicKey(),
+					velocitySigner: this.getSignerPublicKey(),
 					tokenProgram: TOKEN_PROGRAM_ID,
 				},
 			}
@@ -527,13 +530,14 @@ export class AdminClient extends VelocityClient {
 	public async getAddMarketToAmmCacheIx(
 		perpMarketIndex: number
 	): Promise<TransactionInstruction> {
+		const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
 		return await this.program.instruction.addMarketToAmmCache({
 			accounts: {
 				state: await this.getStatePublicKey(),
 				admin: this.useHotWalletAdmin
 					? this.wallet.publicKey
 					: this.getStateAccount().coldAdmin,
-				perpMarket: this.getPerpMarketAccount(perpMarketIndex).pubkey,
+				perpMarket: perpMarketAccount.pubkey,
 				ammCache: getAmmCachePublicKey(this.program.programId),
 				rent: SYSVAR_RENT_PUBKEY,
 				systemProgram: anchor.web3.SystemProgram.programId,
@@ -787,6 +791,7 @@ export class AdminClient extends VelocityClient {
 		perpMarketIndex: number,
 		sqrtK: BN
 	): Promise<TransactionInstruction> {
+		const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
 		return await this.program.instruction.updateK(sqrtK, {
 			accounts: {
 				state: await this.getStatePublicKey(),
@@ -797,7 +802,7 @@ export class AdminClient extends VelocityClient {
 					this.program.programId,
 					perpMarketIndex
 				),
-				oracle: this.getPerpMarketAccount(perpMarketIndex).amm.oracle,
+				oracle: perpMarketAccount.oracle,
 			},
 		});
 	}
@@ -863,8 +868,9 @@ export class AdminClient extends VelocityClient {
 
 	public async getRecenterPerpMarketAmmCrankIx(
 		perpMarketIndex: number,
-		depth: BN
+		depth?: BN
 	): Promise<TransactionInstruction> {
+		const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
 		return await this.program.instruction.recenterPerpMarketAmmCrank(
 			depth ?? null,
 			{
@@ -881,7 +887,7 @@ export class AdminClient extends VelocityClient {
 						this.program.programId,
 						QUOTE_SPOT_MARKET_INDEX
 					),
-					oracle: this.getPerpMarketAccount(perpMarketIndex).amm.oracle,
+					oracle: perpMarketAccount.oracle,
 				},
 			}
 		);
@@ -1015,7 +1021,7 @@ export class AdminClient extends VelocityClient {
 		perpMarketIndex: number,
 		targetPrice: BN
 	): Promise<TransactionInstruction> {
-		const perpMarket = this.getPerpMarketAccount(perpMarketIndex);
+		const perpMarket = this.getPerpMarketAccountOrThrow(perpMarketIndex);
 
 		const [direction, tradeSize, _] = calculateTargetPriceTrade(
 			perpMarket,
@@ -1078,7 +1084,7 @@ export class AdminClient extends VelocityClient {
 			this.program.programId,
 			perpMarketIndex
 		);
-		const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
+		const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
 
 		return await this.program.instruction.repegAmmCurve(newPeg, {
 			accounts: {
@@ -1086,7 +1092,7 @@ export class AdminClient extends VelocityClient {
 				admin: this.isSubscribed
 					? this.getStateAccount().coldAdmin
 					: this.wallet.publicKey,
-				oracle: ammData.oracle,
+				oracle: perpMarketAccount.oracle,
 				perpMarket: perpMarketPublicKey,
 			},
 		});
@@ -1108,7 +1114,7 @@ export class AdminClient extends VelocityClient {
 	public async getUpdatePerpMarketAmmOracleTwapIx(
 		perpMarketIndex: number
 	): Promise<TransactionInstruction> {
-		const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
+		const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
 		const perpMarketPublicKey = await getPerpMarketPublicKey(
 			this.program.programId,
 			perpMarketIndex
@@ -1120,7 +1126,7 @@ export class AdminClient extends VelocityClient {
 				admin: this.isSubscribed
 					? this.getStateAccount().coldAdmin
 					: this.wallet.publicKey,
-				oracle: ammData.oracle,
+				oracle: perpMarketAccount.oracle,
 				perpMarket: perpMarketPublicKey,
 			},
 		});
@@ -1142,7 +1148,7 @@ export class AdminClient extends VelocityClient {
 	public async getResetPerpMarketAmmOracleTwapIx(
 		perpMarketIndex: number
 	): Promise<TransactionInstruction> {
-		const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
+		const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
 		const perpMarketPublicKey = await getPerpMarketPublicKey(
 			this.program.programId,
 			perpMarketIndex
@@ -1154,7 +1160,7 @@ export class AdminClient extends VelocityClient {
 				admin: this.isSubscribed
 					? this.getStateAccount().coldAdmin
 					: this.wallet.publicKey,
-				oracle: ammData.oracle,
+				oracle: perpMarketAccount.oracle,
 				perpMarket: perpMarketPublicKey,
 			},
 		});
@@ -1204,7 +1210,7 @@ export class AdminClient extends VelocityClient {
 					perpMarketIndex
 				),
 				sourceVault,
-				driftSigner: this.getSignerPublicKey(),
+				velocitySigner: this.getSignerPublicKey(),
 				quoteSpotMarket: spotMarket.pubkey,
 				spotMarketVault: spotMarket.vault,
 				tokenProgram: TOKEN_PROGRAM_ID,
@@ -1273,9 +1279,9 @@ export class AdminClient extends VelocityClient {
 		amount: BN,
 		sourceVault: PublicKey
 	): Promise<TransactionInstruction> {
-		const spotMarket = this.getSpotMarketAccount(spotMarketIndex);
+		const spotMarket = this.getSpotMarketAccountOrThrow(spotMarketIndex);
 
-		const remainingAccounts = [];
+		const remainingAccounts: AccountMeta[] = [];
 		this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
 		if (this.isTransferHook(spotMarket)) {
 			await this.addExtraAccountMetasToRemainingAccounts(
@@ -1425,15 +1431,13 @@ export class AdminClient extends VelocityClient {
 	public async updatePerpMarketAmmSummaryStats(
 		perpMarketIndex: number,
 		updateAmmSummaryStats?: boolean,
-		netUnsettledFundingPnl?: BN,
-		excludeTotalLiqFee?: boolean
+		netUnsettledFundingPnl?: BN
 	): Promise<TransactionSignature> {
 		const updatePerpMarketMarginRatioIx =
 			await this.getUpdatePerpMarketAmmSummaryStatsIx(
 				perpMarketIndex,
 				updateAmmSummaryStats,
-				netUnsettledFundingPnl,
-				excludeTotalLiqFee
+				netUnsettledFundingPnl
 			);
 
 		const tx = await this.buildTransaction(updatePerpMarketMarginRatioIx);
@@ -1446,14 +1450,13 @@ export class AdminClient extends VelocityClient {
 	public async getUpdatePerpMarketAmmSummaryStatsIx(
 		perpMarketIndex: number,
 		updateAmmSummaryStats?: boolean,
-		netUnsettledFundingPnl?: BN,
-		excludeTotalLiqFee?: boolean
+		netUnsettledFundingPnl?: BN
 	): Promise<TransactionInstruction> {
+		const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
 		return await this.program.instruction.updatePerpMarketAmmSummaryStats(
 			{
 				updateAmmSummaryStats: updateAmmSummaryStats ?? null,
 				netUnsettledFundingPnl: netUnsettledFundingPnl ?? null,
-				excludeTotalLiqFee: excludeTotalLiqFee ?? null,
 			},
 			{
 				accounts: {
@@ -1469,7 +1472,7 @@ export class AdminClient extends VelocityClient {
 						this.program.programId,
 						QUOTE_SPOT_MARKET_INDEX
 					),
-					oracle: this.getPerpMarketAccount(perpMarketIndex).amm.oracle,
+					oracle: perpMarketAccount.oracle,
 				},
 			}
 		);
@@ -2053,12 +2056,14 @@ export class AdminClient extends VelocityClient {
 
 	public async updateWithdrawGuardThreshold(
 		spotMarketIndex: number,
-		withdrawGuardThreshold: BN
+		withdrawGuardThreshold: BN,
+		oracle?: PublicKey
 	): Promise<TransactionSignature> {
 		const updateWithdrawGuardThresholdIx =
 			await this.getUpdateWithdrawGuardThresholdIx(
 				spotMarketIndex,
-				withdrawGuardThreshold
+				withdrawGuardThreshold,
+				oracle
 			);
 
 		const tx = await this.buildTransaction(updateWithdrawGuardThresholdIx);
@@ -2070,8 +2075,39 @@ export class AdminClient extends VelocityClient {
 
 	public async getUpdateWithdrawGuardThresholdIx(
 		spotMarketIndex: number,
-		withdrawGuardThreshold: BN
+		withdrawGuardThreshold: BN,
+		oracle?: PublicKey
 	): Promise<TransactionInstruction> {
+		const spotMarketPublicKey = await getSpotMarketPublicKey(
+			this.program.programId,
+			spotMarketIndex
+		);
+
+		if (!oracle) {
+			const cachedSpotMarket = this.isSubscribed
+				? this.getSpotMarketAccount(spotMarketIndex)
+				: undefined;
+			if (cachedSpotMarket) {
+				oracle = cachedSpotMarket.oracle;
+			} else {
+				const accountInfo = await this.connection.getAccountInfo(
+					spotMarketPublicKey
+				);
+				if (!accountInfo) {
+					throw new Error(
+						`Spot market account not found: ${spotMarketPublicKey.toString()}`
+					);
+				}
+				const spotMarket = (
+					this.program.account as any
+				).spotMarket.coder.accounts.decodeUnchecked(
+					'spotMarket',
+					accountInfo.data
+				) as SpotMarketAccount;
+				oracle = spotMarket.oracle;
+			}
+		}
+
 		return await this.program.instruction.updateWithdrawGuardThreshold(
 			withdrawGuardThreshold,
 			{
@@ -2080,10 +2116,8 @@ export class AdminClient extends VelocityClient {
 						? this.getStateAccount().coldAdmin
 						: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
-					spotMarket: await getSpotMarketPublicKey(
-						this.program.programId,
-						spotMarketIndex
-					),
+					spotMarket: spotMarketPublicKey,
+					oracle,
 				},
 			}
 		);
@@ -2091,13 +2125,13 @@ export class AdminClient extends VelocityClient {
 
 	public async updateSpotMarketIfFactor(
 		spotMarketIndex: number,
-		userIfFactor: BN,
-		totalIfFactor: BN
+		ifFeeFactor: number,
+		protocolFeeFactor: number
 	): Promise<TransactionSignature> {
 		const updateSpotMarketIfFactorIx = await this.getUpdateSpotMarketIfFactorIx(
 			spotMarketIndex,
-			userIfFactor,
-			totalIfFactor
+			ifFeeFactor,
+			protocolFeeFactor
 		);
 
 		const tx = await this.buildTransaction(updateSpotMarketIfFactorIx);
@@ -2109,13 +2143,13 @@ export class AdminClient extends VelocityClient {
 
 	public async getUpdateSpotMarketIfFactorIx(
 		spotMarketIndex: number,
-		userIfFactor: BN,
-		totalIfFactor: BN
+		ifFeeFactor: number,
+		protocolFeeFactor: number
 	): Promise<TransactionInstruction> {
 		return await this.program.instruction.updateSpotMarketIfFactor(
 			spotMarketIndex,
-			userIfFactor,
-			totalIfFactor,
+			ifFeeFactor,
+			protocolFeeFactor,
 			{
 				accounts: {
 					admin: this.isSubscribed
@@ -2353,6 +2387,7 @@ export class AdminClient extends VelocityClient {
 		oracleSource: OracleSource,
 		skipInvaraintCheck = false
 	): Promise<TransactionInstruction> {
+		const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
 		return await this.program.instruction.updatePerpMarketOracle(
 			oracle,
 			oracleSource,
@@ -2368,7 +2403,7 @@ export class AdminClient extends VelocityClient {
 						perpMarketIndex
 					),
 					oracle: oracle,
-					oldOracle: this.getPerpMarketAccount(perpMarketIndex).amm.oracle,
+					oldOracle: perpMarketAccount.oracle,
 					ammCache: getAmmCachePublicKey(this.program.programId),
 				},
 			}
@@ -2603,6 +2638,7 @@ export class AdminClient extends VelocityClient {
 		oracleSource: OracleSource,
 		skipInvaraintCheck = false
 	): Promise<TransactionInstruction> {
+		const spotMarketAccount = this.getSpotMarketAccountOrThrow(spotMarketIndex);
 		return await this.program.instruction.updateSpotMarketOracle(
 			oracle,
 			oracleSource,
@@ -2618,7 +2654,7 @@ export class AdminClient extends VelocityClient {
 						spotMarketIndex
 					),
 					oracle: oracle,
-					oldOracle: this.getSpotMarketAccount(spotMarketIndex).oracle,
+					oldOracle: spotMarketAccount.oracle,
 				},
 			}
 		);
@@ -3255,6 +3291,7 @@ export class AdminClient extends VelocityClient {
 		perpMarketIndex: number,
 		maxSlippageRatio: number
 	): Promise<TransactionInstruction> {
+		const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
 		return await (this.program.instruction as any).updateMaxSlippageRatio(
 			maxSlippageRatio,
 			{
@@ -3263,7 +3300,7 @@ export class AdminClient extends VelocityClient {
 						? this.getStateAccount().coldAdmin
 						: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
-					perpMarket: this.getPerpMarketAccount(perpMarketIndex).pubkey,
+					perpMarket: perpMarketAccount.pubkey,
 				},
 			}
 		);
@@ -3477,6 +3514,46 @@ export class AdminClient extends VelocityClient {
 		);
 	}
 
+	public async updatePerpMarketFeePoolBufferTarget(
+		perpMarketIndex: number,
+		feePoolBufferTarget: BN
+	): Promise<TransactionSignature> {
+		const updatePerpMarketFeePoolBufferTargetIx =
+			await this.getUpdatePerpMarketFeePoolBufferTargetIx(
+				perpMarketIndex,
+				feePoolBufferTarget
+			);
+
+		const tx = await this.buildTransaction(
+			updatePerpMarketFeePoolBufferTargetIx
+		);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
+
+	public async getUpdatePerpMarketFeePoolBufferTargetIx(
+		perpMarketIndex: number,
+		feePoolBufferTarget: BN
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketFeePoolBufferTarget(
+			feePoolBufferTarget,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().coldAdmin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updateSpotMarketFeeAdjustment(
 		perpMarketIndex: number,
 		feeAdjustment: number
@@ -3518,13 +3595,15 @@ export class AdminClient extends VelocityClient {
 	public async updatePerpMarketLiquidationFee(
 		perpMarketIndex: number,
 		liquidatorFee: number,
-		ifLiquidationFee: number
+		ifLiquidationFee: number,
+		protocolLiquidationFee = 0
 	): Promise<TransactionSignature> {
 		const updatePerpMarketLiquidationFeeIx =
 			await this.getUpdatePerpMarketLiquidationFeeIx(
 				perpMarketIndex,
 				liquidatorFee,
-				ifLiquidationFee
+				ifLiquidationFee,
+				protocolLiquidationFee
 			);
 
 		const tx = await this.buildTransaction(updatePerpMarketLiquidationFeeIx);
@@ -3537,11 +3616,13 @@ export class AdminClient extends VelocityClient {
 	public async getUpdatePerpMarketLiquidationFeeIx(
 		perpMarketIndex: number,
 		liquidatorFee: number,
-		ifLiquidationFee: number
+		ifLiquidationFee: number,
+		protocolLiquidationFee = 0
 	): Promise<TransactionInstruction> {
 		return await this.program.instruction.updatePerpMarketLiquidationFee(
 			liquidatorFee,
 			ifLiquidationFee,
+			protocolLiquidationFee,
 			{
 				accounts: {
 					admin: this.isSubscribed
@@ -3560,13 +3641,15 @@ export class AdminClient extends VelocityClient {
 	public async updateSpotMarketLiquidationFee(
 		spotMarketIndex: number,
 		liquidatorFee: number,
-		ifLiquidationFee: number
+		ifLiquidationFee: number,
+		protocolLiquidationFee = 0
 	): Promise<TransactionSignature> {
 		const updateSpotMarketLiquidationFeeIx =
 			await this.getUpdateSpotMarketLiquidationFeeIx(
 				spotMarketIndex,
 				liquidatorFee,
-				ifLiquidationFee
+				ifLiquidationFee,
+				protocolLiquidationFee
 			);
 
 		const tx = await this.buildTransaction(updateSpotMarketLiquidationFeeIx);
@@ -3579,11 +3662,13 @@ export class AdminClient extends VelocityClient {
 	public async getUpdateSpotMarketLiquidationFeeIx(
 		spotMarketIndex: number,
 		liquidatorFee: number,
-		ifLiquidationFee: number
+		ifLiquidationFee: number,
+		protocolLiquidationFee = 0
 	): Promise<TransactionInstruction> {
 		return await this.program.instruction.updateSpotMarketLiquidationFee(
 			liquidatorFee,
 			ifLiquidationFee,
+			protocolLiquidationFee,
 			{
 				accounts: {
 					admin: this.isSubscribed
@@ -3599,187 +3684,155 @@ export class AdminClient extends VelocityClient {
 		);
 	}
 
-	public async initializeProtocolIfSharesTransferConfig(): Promise<TransactionSignature> {
-		const initializeProtocolIfSharesTransferConfigIx =
-			await this.getInitializeProtocolIfSharesTransferConfigIx();
-
-		const tx = await this.buildTransaction(
-			initializeProtocolIfSharesTransferConfigIx
-		);
-
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-
-		return txSig;
-	}
-
-	public async getInitializeProtocolIfSharesTransferConfigIx(): Promise<TransactionInstruction> {
-		return await (
-			this.program.instruction as any
-		).initializeProtocolIfSharesTransferConfig({
-			accounts: {
-				admin: this.isSubscribed
-					? this.getStateAccount().coldAdmin
-					: this.wallet.publicKey,
-				state: await this.getStatePublicKey(),
-				rent: SYSVAR_RENT_PUBKEY,
-				systemProgram: anchor.web3.SystemProgram.programId,
-				protocolIfSharesTransferConfig:
-					getProtocolIfSharesTransferConfigPublicKey(this.program.programId),
-			},
-		});
-	}
-
-	public async updateProtocolIfSharesTransferConfig(
-		whitelistedSigners?: PublicKey[],
-		maxTransferPerEpoch?: BN
+	public async updateProtocolFeeRecipient(
+		protocolFeeRecipient: PublicKey,
+		marketType: MarketType
 	): Promise<TransactionSignature> {
-		const updateProtocolIfSharesTransferConfigIx =
-			await this.getUpdateProtocolIfSharesTransferConfigIx(
-				whitelistedSigners,
-				maxTransferPerEpoch
-			);
-
-		const tx = await this.buildTransaction(
-			updateProtocolIfSharesTransferConfigIx
+		const ix = await this.getUpdateProtocolFeeRecipientIx(
+			protocolFeeRecipient,
+			marketType
 		);
-
+		const tx = await this.buildTransaction(ix);
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-
 		return txSig;
 	}
 
-	public async getUpdateProtocolIfSharesTransferConfigIx(
-		whitelistedSigners?: PublicKey[],
-		maxTransferPerEpoch?: BN
+	public async getUpdateProtocolFeeRecipientIx(
+		protocolFeeRecipient: PublicKey,
+		marketType: MarketType
 	): Promise<TransactionInstruction> {
-		return await (
-			this.program.instruction as any
-		).updateProtocolIfSharesTransferConfig(
-			whitelistedSigners || null,
-			maxTransferPerEpoch,
+		return await this.program.instruction.updateProtocolFeeRecipient(
+			protocolFeeRecipient,
+			marketType,
 			{
 				accounts: {
 					admin: this.isSubscribed
 						? this.getStateAccount().coldAdmin
 						: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
-					protocolIfSharesTransferConfig:
-						getProtocolIfSharesTransferConfigPublicKey(this.program.programId),
 				},
 			}
 		);
 	}
 
-	public async transferProtocolIfSharesToRevenuePool(
-		outMarketIndex: number,
-		inMarketIndex: number,
-		amount: BN
+	public async withdrawProtocolFeesSpot(
+		marketIndex: number,
+		amount: BN,
+		txParams?: TxParams
 	): Promise<TransactionSignature> {
-		const transferProtocolIfSharesToRevenuePoolIx =
-			await this.getTransferProtocolIfSharesToRevenuePoolIx(
-				outMarketIndex,
-				inMarketIndex,
-				amount
-			);
-
-		const tx = await this.buildTransaction(
-			transferProtocolIfSharesToRevenuePoolIx
-		);
-
+		const ix = await this.getWithdrawProtocolFeesSpotIx(marketIndex, amount);
+		const tx = await this.buildTransaction(ix, txParams);
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-
 		return txSig;
 	}
 
-	public async getTransferProtocolIfSharesToRevenuePoolIx(
-		outMarketIndex: number,
-		inMarketIndex: number,
+	public async getWithdrawProtocolFeesSpotIx(
+		marketIndex: number,
 		amount: BN
 	): Promise<TransactionInstruction> {
-		const remainingAccounts = await this.getRemainingAccounts({
-			userAccounts: [],
-			writableSpotMarketIndexes: [outMarketIndex],
-		});
+		const spotMarket = this.getSpotMarketAccountOrThrow(marketIndex);
+		const tokenProgramId = this.getTokenProgramForSpotMarket(spotMarket);
+		const recipient = this.getStateAccount().protocolFeeRecipientSpot;
+		const recipientTokenAccount = getAssociatedTokenAddressSync(
+			spotMarket.mint,
+			recipient,
+			true,
+			tokenProgramId
+		);
 
-		return await this.program.instruction.transferProtocolIfSharesToRevenuePool(
-			outMarketIndex,
+		const remainingAccounts: {
+			pubkey: PublicKey;
+			isSigner: boolean;
+			isWritable: boolean;
+		}[] = [];
+		if (this.isTransferHook(spotMarket)) {
+			await this.addExtraAccountMetasToRemainingAccounts(
+				spotMarket.mint,
+				remainingAccounts
+			);
+		}
+
+		return await this.program.instruction.withdrawProtocolFeesSpot(
+			marketIndex,
 			amount,
 			{
 				accounts: {
-					authority: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
-					insuranceFundVault: await getInsuranceFundVaultPublicKey(
-						this.program.programId,
-						outMarketIndex
-					),
-					spotMarketVault: await getSpotMarketVaultPublicKey(
-						this.program.programId,
-						outMarketIndex
-					),
-					ifRebalanceConfig: await getIfRebalanceConfigPublicKey(
-						this.program.programId,
-						inMarketIndex,
-						outMarketIndex
-					),
-					tokenProgram: TOKEN_PROGRAM_ID,
-					driftSigner: this.getStateAccount().signer,
+					payer: this.wallet.publicKey,
+					authority: this.wallet.publicKey,
+					spotMarket: spotMarket.pubkey,
+					spotMarketVault: spotMarket.vault,
+					mint: spotMarket.mint,
+					recipient,
+					recipientTokenAccount,
+					tokenProgram: tokenProgramId,
+					velocitySigner: this.getSignerPublicKey(),
+					systemProgram: SystemProgram.programId,
+					associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
 				},
 				remainingAccounts,
 			}
 		);
 	}
 
-	public async adminWithdrawFromInsuranceFundVault(
+	public async withdrawProtocolFeesPerp(
 		marketIndex: number,
 		amount: BN,
-		recipientTokenAccount: PublicKey,
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
-		const ix = await this.getAdminWithdrawFromInsuranceFundVaultIx(
-			marketIndex,
-			amount,
-			recipientTokenAccount
-		);
+		const ix = await this.getWithdrawProtocolFeesPerpIx(marketIndex, amount);
 		const tx = await this.buildTransaction(ix, txParams);
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
 	}
 
-	public async getAdminWithdrawFromInsuranceFundVaultIx(
+	public async getWithdrawProtocolFeesPerpIx(
 		marketIndex: number,
-		amount: BN,
-		recipientTokenAccount: PublicKey
+		amount: BN
 	): Promise<TransactionInstruction> {
-		const spotMarket = this.getSpotMarketAccount(marketIndex);
-		const tokenProgramId = this.getTokenProgramForSpotMarket(spotMarket);
+		const perpMarket = this.getPerpMarketAccountOrThrow(marketIndex);
+		const quoteSpotMarket = this.getSpotMarketAccountOrThrow(
+			perpMarket.quoteSpotMarketIndex
+		);
+		const tokenProgramId = this.getTokenProgramForSpotMarket(quoteSpotMarket);
+		const recipient = this.getStateAccount().protocolFeeRecipientPerp;
+		const recipientTokenAccount = getAssociatedTokenAddressSync(
+			quoteSpotMarket.mint,
+			recipient,
+			true,
+			tokenProgramId
+		);
 
 		const remainingAccounts: {
 			pubkey: PublicKey;
 			isSigner: boolean;
 			isWritable: boolean;
 		}[] = [];
-		this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
-		if (this.isTransferHook(spotMarket)) {
+		if (this.isTransferHook(quoteSpotMarket)) {
 			await this.addExtraAccountMetasToRemainingAccounts(
-				spotMarket.mint,
+				quoteSpotMarket.mint,
 				remainingAccounts
 			);
 		}
 
-		return await this.program.instruction.adminWithdrawFromInsuranceFundVault(
+		return await this.program.instruction.withdrawProtocolFeesPerp(
 			marketIndex,
 			amount,
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
-					authority: this.isSubscribed
-						? this.getStateAccount().coldAdmin
-						: this.wallet.publicKey,
-					spotMarket: spotMarket.pubkey,
-					insuranceFundVault: spotMarket.insuranceFund.vault,
+					payer: this.wallet.publicKey,
+					authority: this.wallet.publicKey,
+					perpMarket: perpMarket.pubkey,
+					quoteSpotMarket: quoteSpotMarket.pubkey,
+					spotMarketVault: quoteSpotMarket.vault,
+					mint: quoteSpotMarket.mint,
+					recipient,
 					recipientTokenAccount,
 					tokenProgram: tokenProgramId,
-					driftSigner: this.getSignerPublicKey(),
+					velocitySigner: this.getSignerPublicKey(),
+					systemProgram: SystemProgram.programId,
+					associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ID,
 				},
 				remainingAccounts,
 			}
@@ -4055,36 +4108,44 @@ export class AdminClient extends VelocityClient {
 		);
 	}
 
-	public async initializeIfRebalanceConfig(
-		params: IfRebalanceConfigParams
+	public async updatePerpMarketFundingBiasSensitivity(
+		perpMarketIndex: number,
+		fundingBiasSensitivity: number
 	): Promise<TransactionSignature> {
-		const initializeIfRebalanceConfigIx =
-			await this.getInitializeIfRebalanceConfigIx(params);
-
-		const tx = await this.buildTransaction(initializeIfRebalanceConfigIx);
+		const updatePerpMarketFundingBiasSensitivityIx =
+			await this.getUpdatePerpMarketFundingBiasSensitivityIx(
+				perpMarketIndex,
+				fundingBiasSensitivity
+			);
+		const tx = await this.buildTransaction(
+			updatePerpMarketFundingBiasSensitivityIx
+		);
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 
 		return txSig;
 	}
 
-	public async getInitializeIfRebalanceConfigIx(
-		params: IfRebalanceConfigParams
+	public async getUpdatePerpMarketFundingBiasSensitivityIx(
+		perpMarketIndex: number,
+		fundingBiasSensitivity: number
 	): Promise<TransactionInstruction> {
-		return await this.program.instruction.initializeIfRebalanceConfig(params, {
-			accounts: {
-				admin: this.isSubscribed
-					? this.getStateAccount().coldAdmin
-					: this.wallet.publicKey,
-				state: await this.getStatePublicKey(),
-				ifRebalanceConfig: await getIfRebalanceConfigPublicKey(
-					this.program.programId,
-					params.inMarketIndex,
-					params.outMarketIndex
-				),
-				rent: SYSVAR_RENT_PUBKEY,
-				systemProgram: anchor.web3.SystemProgram.programId,
-			},
-		});
+		const perpMarketPublicKey = await getPerpMarketPublicKey(
+			this.program.programId,
+			perpMarketIndex
+		);
+
+		return await this.program.instruction.updatePerpMarketFundingBiasSensitivity(
+			fundingBiasSensitivity,
+			{
+				accounts: {
+					admin: this.useHotWalletAdmin
+						? this.wallet.publicKey
+						: this.getStateAccount().coldAdmin,
+					state: await this.getStatePublicKey(),
+					perpMarket: perpMarketPublicKey,
+				},
+			}
+		);
 	}
 
 	public async initializePythLazerOracle(
@@ -4141,7 +4202,7 @@ export class AdminClient extends VelocityClient {
 		adminTokenAccount?: PublicKey
 	): Promise<TransactionInstruction> {
 		const state = await this.getStatePublicKey();
-		const spotMarket = this.getSpotMarketAccount(marketIndex);
+		const spotMarket = this.getSpotMarketAccountOrThrow(marketIndex);
 
 		const remainingAccounts = this.getRemainingAccounts({
 			userAccounts: [],
@@ -4311,106 +4372,6 @@ export class AdminClient extends VelocityClient {
 		);
 	}
 
-	public async updateDelegateUserGovTokenInsuranceStake(
-		authority: PublicKey,
-		delegate: PublicKey
-	): Promise<TransactionSignature> {
-		const updateDelegateUserGovTokenInsuranceStakeIx =
-			await this.getUpdateDelegateUserGovTokenInsuranceStakeIx(
-				authority,
-				delegate
-			);
-
-		const tx = await this.buildTransaction(
-			updateDelegateUserGovTokenInsuranceStakeIx
-		);
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-
-		return txSig;
-	}
-
-	public async getUpdateDelegateUserGovTokenInsuranceStakeIx(
-		authority: PublicKey,
-		delegate: PublicKey
-	): Promise<TransactionInstruction> {
-		const marketIndex = GOV_SPOT_MARKET_INDEX;
-		const spotMarket = this.getSpotMarketAccount(marketIndex);
-		const ifStakeAccountPublicKey = getInsuranceFundStakeAccountPublicKey(
-			this.program.programId,
-			delegate,
-			marketIndex
-		);
-		const userStatsPublicKey = getUserStatsAccountPublicKey(
-			this.program.programId,
-			authority
-		);
-
-		const ix = (
-			this.program.instruction as any
-		).getUpdateDelegateUserGovTokenInsuranceStakeIx({
-			accounts: {
-				state: await this.getStatePublicKey(),
-				spotMarket: spotMarket.pubkey,
-				insuranceFundStake: ifStakeAccountPublicKey,
-				userStats: userStatsPublicKey,
-				signer: this.wallet.publicKey,
-				insuranceFundVault: spotMarket.insuranceFund.vault,
-			},
-		});
-
-		return ix;
-	}
-
-	public async depositIntoInsuranceFundStake(
-		marketIndex: number,
-		amount: BN,
-		userStatsPublicKey: PublicKey,
-		insuranceFundStakePublicKey: PublicKey,
-		userTokenAccountPublicKey: PublicKey,
-		txParams?: TxParams
-	): Promise<TransactionSignature> {
-		const tx = await this.buildTransaction(
-			await this.getDepositIntoInsuranceFundStakeIx(
-				marketIndex,
-				amount,
-				userStatsPublicKey,
-				insuranceFundStakePublicKey,
-				userTokenAccountPublicKey
-			),
-			txParams
-		);
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-		return txSig;
-	}
-
-	public async getDepositIntoInsuranceFundStakeIx(
-		marketIndex: number,
-		amount: BN,
-		userStatsPublicKey: PublicKey,
-		insuranceFundStakePublicKey: PublicKey,
-		userTokenAccountPublicKey: PublicKey
-	): Promise<TransactionInstruction> {
-		const spotMarket = this.getSpotMarketAccount(marketIndex);
-		return await this.program.instruction.depositIntoInsuranceFundStake(
-			marketIndex,
-			amount,
-			{
-				accounts: {
-					signer: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-					spotMarket: spotMarket.pubkey,
-					insuranceFundStake: insuranceFundStakePublicKey,
-					userStats: userStatsPublicKey,
-					spotMarketVault: spotMarket.vault,
-					insuranceFundVault: spotMarket.insuranceFund.vault,
-					userTokenAccount: userTokenAccountPublicKey,
-					tokenProgram: this.getTokenProgramForSpotMarket(spotMarket),
-					driftSigner: this.getSignerPublicKey(),
-				},
-			}
-		);
-	}
-
 	public async updateFeatureBitFlagsSettleLpPool(
 		enable: boolean
 	): Promise<TransactionSignature> {
@@ -4653,7 +4614,7 @@ export class AdminClient extends VelocityClient {
 			lpPool,
 			spotMarketIndex
 		);
-		const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
+		const spotMarketAccount = this.getSpotMarketAccountOrThrow(spotMarketIndex);
 
 		return [
 			this.program.instruction.initializeConstituent(
@@ -5094,7 +5055,7 @@ export class AdminClient extends VelocityClient {
 	}
 
 	/**
-	 * Get the drift begin_swap and end_swap instructions
+	 * Get the velocity begin_swap and end_swap instructions
 	 *
 	 * @param outMarketIndex the market index of the token you're buying
 	 * @param inMarketIndex the market index of the token you're selling
@@ -5144,8 +5105,8 @@ export class AdminClient extends VelocityClient {
 				userAccountPublicKey,
 			});
 		}
-		const outSpotMarket = this.getSpotMarketAccount(outMarketIndex);
-		const inSpotMarket = this.getSpotMarketAccount(inMarketIndex);
+		const outSpotMarket = this.getSpotMarketAccountOrThrow(outMarketIndex);
+		const inSpotMarket = this.getSpotMarketAccountOrThrow(inMarketIndex);
 
 		const outTokenProgram = this.getTokenProgramForSpotMarket(outSpotMarket);
 		const inTokenProgram = this.getTokenProgramForSpotMarket(inSpotMarket);
@@ -5194,7 +5155,7 @@ export class AdminClient extends VelocityClient {
 			}
 		);
 
-		const remainingAccounts = [];
+		const remainingAccounts: AccountMeta[] = [];
 		remainingAccounts.push({
 			pubkey: outTokenProgram,
 			isWritable: false,
@@ -5251,8 +5212,8 @@ export class AdminClient extends VelocityClient {
 		ixs: TransactionInstruction[];
 		lookupTables: AddressLookupTableAccount[];
 	}> {
-		const outMarket = this.getSpotMarketAccount(outMarketIndex);
-		const inMarket = this.getSpotMarketAccount(inMarketIndex);
+		const outMarket = this.getSpotMarketAccountOrThrow(outMarketIndex);
+		const inMarket = this.getSpotMarketAccountOrThrow(inMarketIndex);
 
 		if (!quote) {
 			const fetchedQuote = await jupiterClient.getQuote({
@@ -5368,8 +5329,10 @@ export class AdminClient extends VelocityClient {
 		inSpotMarketIndex: number,
 		outSpotMarketIndex: number
 	): Promise<TransactionInstruction[]> {
-		const inSpotMarketAccount = this.getSpotMarketAccount(inSpotMarketIndex);
-		const outSpotMarketAccount = this.getSpotMarketAccount(outSpotMarketIndex);
+		const inSpotMarketAccount =
+			this.getSpotMarketAccountOrThrow(inSpotMarketIndex);
+		const outSpotMarketAccount =
+			this.getSpotMarketAccountOrThrow(outSpotMarketIndex);
 
 		const outTokenAccount = await this.getAssociatedTokenAccount(
 			outSpotMarketAccount.marketIndex,
@@ -5437,6 +5400,8 @@ export class AdminClient extends VelocityClient {
 		minOutAmount: BN,
 		externalUserAuthority: PublicKey
 	) {
+		const inMarket = this.getSpotMarketAccountOrThrow(inMarketIndex);
+		const outMarket = this.getSpotMarketAccountOrThrow(outMarketIndex);
 		const { beginSwapIx, endSwapIx } = await this.getSwapIx(
 			{
 				lpPoolId,
@@ -5462,13 +5427,13 @@ export class AdminClient extends VelocityClient {
 			await this.getAssociatedTokenAccount(
 				inMarketIndex,
 				false,
-				getTokenProgramForSpotMarket(this.getSpotMarketAccount(inMarketIndex)),
+				getTokenProgramForSpotMarket(inMarket),
 				externalUserAuthority
 			),
 			await this.getAssociatedTokenAccount(
 				outMarketIndex,
 				false,
-				getTokenProgramForSpotMarket(this.getSpotMarketAccount(outMarketIndex)),
+				getTokenProgramForSpotMarket(outMarket),
 				externalUserAuthority
 			),
 			inMarketIndex,
@@ -5514,8 +5479,10 @@ export class AdminClient extends VelocityClient {
 		withdrawIx: TransactionInstruction;
 	}> {
 		const lpPool = getLpPoolPublicKey(this.program.programId, lpPoolId);
-		const depositSpotMarket = this.getSpotMarketAccount(depositMarketIndex);
-		const withdrawSpotMarket = this.getSpotMarketAccount(borrowMarketIndex);
+		const depositSpotMarket =
+			this.getSpotMarketAccountOrThrow(depositMarketIndex);
+		const withdrawSpotMarket =
+			this.getSpotMarketAccountOrThrow(borrowMarketIndex);
 
 		const depositTokenProgram =
 			this.getTokenProgramForSpotMarket(depositSpotMarket);
@@ -5573,7 +5540,7 @@ export class AdminClient extends VelocityClient {
 					spotMarketVault: withdrawSpotMarket.vault,
 					tokenProgram: withdrawTokenProgram,
 					mint: withdrawSpotMarket.mint,
-					driftSigner: getVelocitySignerPublicKey(this.program.programId),
+					velocitySigner: getVelocitySignerPublicKey(this.program.programId),
 					oracle: withdrawSpotMarket.oracle,
 				},
 			}
@@ -5663,6 +5630,7 @@ export class AdminClient extends VelocityClient {
 		lpFeeTransferScalar?: number,
 		lpExchangeFeeExcluscionScalar?: number
 	): Promise<TransactionInstruction> {
+		const perpMarketAccount = this.getPerpMarketAccountOrThrow(marketIndex);
 		return this.program.instruction.updatePerpMarketLpPoolFeeTransferScalar(
 			lpFeeTransferScalar ?? null,
 			lpExchangeFeeExcluscionScalar ?? null,
@@ -5672,7 +5640,7 @@ export class AdminClient extends VelocityClient {
 						? this.wallet.publicKey
 						: this.getStateAccount().coldAdmin,
 					state: await this.getStatePublicKey(),
-					perpMarket: this.getPerpMarketAccount(marketIndex).pubkey,
+					perpMarket: perpMarketAccount.pubkey,
 				},
 			}
 		);
@@ -5695,6 +5663,7 @@ export class AdminClient extends VelocityClient {
 		marketIndex: number,
 		pausedOperations: number
 	): Promise<TransactionInstruction> {
+		const perpMarketAccount = this.getPerpMarketAccountOrThrow(marketIndex);
 		return this.program.instruction.updatePerpMarketLpPoolPausedOperations(
 			pausedOperations,
 			{
@@ -5703,7 +5672,7 @@ export class AdminClient extends VelocityClient {
 						? this.wallet.publicKey
 						: this.getStateAccount().coldAdmin,
 					state: await this.getStatePublicKey(),
-					perpMarket: this.getPerpMarketAccount(marketIndex).pubkey,
+					perpMarket: perpMarketAccount.pubkey,
 				},
 			}
 		);
@@ -5768,13 +5737,14 @@ export class AdminClient extends VelocityClient {
 		marketIndex: number,
 		marketConfig: number
 	): Promise<TransactionInstruction> {
+		const perpMarketAccount = this.getPerpMarketAccountOrThrow(marketIndex);
 		return this.program.instruction.updatePerpMarketConfig(marketConfig, {
 			accounts: {
 				admin: this.useHotWalletAdmin
 					? this.wallet.publicKey
 					: this.getStateAccount().coldAdmin,
 				state: await this.getStatePublicKey(),
-				perpMarket: this.getPerpMarketAccount(marketIndex).pubkey,
+				perpMarket: perpMarketAccount.pubkey,
 			},
 		});
 	}
@@ -5921,13 +5891,13 @@ export enum HotRole {
 	LpCache = 'lpCache',
 	LpSwap = 'lpSwap',
 	LpSettle = 'lpSettle',
-	IfRebalance = 'ifRebalance',
 	FeatureFlag = 'featureFlag',
 	Fuel = 'fuel',
 	UserFlag = 'userFlag',
 	VaultDeposit = 'vaultDeposit',
 	MmOracleCrank = 'mmOracleCrank',
 	AmmSpreadAdjust = 'ammSpreadAdjust',
+	FeeWithdraw = 'feeWithdraw',
 }
 
 /** Anchor encodes Rust enums as `{ <variant>: {} }`. */