@velocity-exchange/sdk 0.1.0 → 0.2.1

package/lib/browser/adminClient.js

@@ -86,7 +86,11 @@ class AdminClient extends velocityClient_1.VelocityClient {
         const spotMarket = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex);
         const spotMarketVault = await (0, pda_1.getSpotMarketVaultPublicKey)(this.program.programId, spotMarketIndex);
         const insuranceFundVault = await (0, pda_1.getInsuranceFundVaultPublicKey)(this.program.programId, 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 = (0, userName_1.encodeName)(name);
         const initializeIx = await this.program.instruction.initializeSpotMarket(optimalUtilization, optimalRate, maxRate, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor, liquidatorFee, ifLiquidationFee, activeStatus, assetTier, scaleInitialAssetWeightStart, withdrawGuardThreshold, orderTickSize, orderStepSize, ifTotalFactor, nameBuffer, {
             accounts: {
@@ -196,13 +200,14 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return txSig;
     }
     async getAddMarketToAmmCacheIx(perpMarketIndex) {
+        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: (0, pda_1.getAmmCachePublicKey)(this.program.programId),
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
                 systemProgram: anchor.web3.SystemProgram.programId,
@@ -337,6 +342,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return txSig;
     }
     async getUpdateKIx(perpMarketIndex, sqrtK) {
+        const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
         return await this.program.instruction.updateK(sqrtK, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -344,7 +350,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                     ? this.getStateAccount().coldAdmin
                     : this.wallet.publicKey,
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
-                oracle: this.getPerpMarketAccount(perpMarketIndex).oracle,
+                oracle: perpMarketAccount.oracle,
             },
         });
     }
@@ -373,6 +379,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return txSig;
     }
     async getRecenterPerpMarketAmmCrankIx(perpMarketIndex, depth) {
+        const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
         return await this.program.instruction.recenterPerpMarketAmmCrank(depth !== null && depth !== void 0 ? depth : null, {
             accounts: {
                 admin: this.useHotWalletAdmin
@@ -381,7 +388,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, numericConstants_1.QUOTE_SPOT_MARKET_INDEX),
-                oracle: this.getPerpMarketAccount(perpMarketIndex).oracle,
+                oracle: perpMarketAccount.oracle,
             },
         });
     }
@@ -444,7 +451,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return txSig;
     }
     async getMoveAmmToPriceIx(perpMarketIndex, targetPrice) {
-        const perpMarket = this.getPerpMarketAccount(perpMarketIndex);
+        const perpMarket = this.getPerpMarketAccountOrThrow(perpMarketIndex);
         const [direction, tradeSize, _] = (0, trade_1.calculateTargetPriceTrade)(perpMarket, targetPrice, new anchor_1.BN(1000), 'quote', undefined //todo
         );
         const [newQuoteAssetAmount, newBaseAssetAmount] = (0, amm_1.calculateAmmReservesAfterSwap)(perpMarket.amm, 'quote', tradeSize, (0, amm_1.getSwapDirection)('quote', direction));
@@ -467,7 +474,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
     }
     async getRepegAmmCurveIx(newPeg, perpMarketIndex) {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
-        const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
+        const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
         return await this.program.instruction.repegAmmCurve(newPeg, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -486,7 +493,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return txSig;
     }
     async getUpdatePerpMarketAmmOracleTwapIx(perpMarketIndex) {
-        const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
+        const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
         return await this.program.instruction.updatePerpMarketAmmOracleTwap({
             accounts: {
@@ -506,7 +513,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return txSig;
     }
     async getResetPerpMarketAmmOracleTwapIx(perpMarketIndex) {
-        const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
+        const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
         return await this.program.instruction.resetPerpMarketAmmOracleTwap({
             accounts: {
@@ -576,7 +583,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return txSig;
     }
     async getDepositIntoSpotMarketVaultIx(spotMarketIndex, amount, sourceVault) {
-        const spotMarket = this.getSpotMarketAccount(spotMarketIndex);
+        const spotMarket = this.getSpotMarketAccountOrThrow(spotMarketIndex);
         const remainingAccounts = [];
         this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
         if (this.isTransferHook(spotMarket)) {
@@ -653,17 +660,17 @@ class AdminClient extends velocityClient_1.VelocityClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketAmmSummaryStats(perpMarketIndex, updateAmmSummaryStats, netUnsettledFundingPnl, excludeTotalLiqFee) {
-        const updatePerpMarketMarginRatioIx = await this.getUpdatePerpMarketAmmSummaryStatsIx(perpMarketIndex, updateAmmSummaryStats, netUnsettledFundingPnl, excludeTotalLiqFee);
+    async updatePerpMarketAmmSummaryStats(perpMarketIndex, updateAmmSummaryStats, netUnsettledFundingPnl) {
+        const updatePerpMarketMarginRatioIx = await this.getUpdatePerpMarketAmmSummaryStatsIx(perpMarketIndex, updateAmmSummaryStats, netUnsettledFundingPnl);
         const tx = await this.buildTransaction(updatePerpMarketMarginRatioIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getUpdatePerpMarketAmmSummaryStatsIx(perpMarketIndex, updateAmmSummaryStats, netUnsettledFundingPnl, excludeTotalLiqFee) {
+    async getUpdatePerpMarketAmmSummaryStatsIx(perpMarketIndex, updateAmmSummaryStats, netUnsettledFundingPnl) {
+        const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
         return await this.program.instruction.updatePerpMarketAmmSummaryStats({
             updateAmmSummaryStats: updateAmmSummaryStats !== null && updateAmmSummaryStats !== void 0 ? updateAmmSummaryStats : null,
             netUnsettledFundingPnl: netUnsettledFundingPnl !== null && netUnsettledFundingPnl !== void 0 ? netUnsettledFundingPnl : null,
-            excludeTotalLiqFee: excludeTotalLiqFee !== null && excludeTotalLiqFee !== void 0 ? excludeTotalLiqFee : null,
         }, {
             accounts: {
                 admin: this.useHotWalletAdmin
@@ -672,7 +679,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, numericConstants_1.QUOTE_SPOT_MARKET_INDEX),
-                oracle: this.getPerpMarketAccount(perpMarketIndex).oracle,
+                oracle: perpMarketAccount.oracle,
             },
         });
     }
@@ -970,31 +977,49 @@ class AdminClient extends velocityClient_1.VelocityClient {
             },
         });
     }
-    async updateWithdrawGuardThreshold(spotMarketIndex, withdrawGuardThreshold) {
-        const updateWithdrawGuardThresholdIx = await this.getUpdateWithdrawGuardThresholdIx(spotMarketIndex, withdrawGuardThreshold);
+    async updateWithdrawGuardThreshold(spotMarketIndex, withdrawGuardThreshold, oracle) {
+        const updateWithdrawGuardThresholdIx = await this.getUpdateWithdrawGuardThresholdIx(spotMarketIndex, withdrawGuardThreshold, oracle);
         const tx = await this.buildTransaction(updateWithdrawGuardThresholdIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getUpdateWithdrawGuardThresholdIx(spotMarketIndex, withdrawGuardThreshold) {
+    async getUpdateWithdrawGuardThresholdIx(spotMarketIndex, withdrawGuardThreshold, oracle) {
+        const spotMarketPublicKey = await (0, pda_1.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.spotMarket.coder.accounts.decodeUnchecked('spotMarket', accountInfo.data);
+                oracle = spotMarket.oracle;
+            }
+        }
         return await this.program.instruction.updateWithdrawGuardThreshold(withdrawGuardThreshold, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().coldAdmin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+                spotMarket: spotMarketPublicKey,
+                oracle,
             },
         });
     }
-    async updateSpotMarketIfFactor(spotMarketIndex, userIfFactor, totalIfFactor) {
-        const updateSpotMarketIfFactorIx = await this.getUpdateSpotMarketIfFactorIx(spotMarketIndex, userIfFactor, totalIfFactor);
+    async updateSpotMarketIfFactor(spotMarketIndex, ifFeeFactor, protocolFeeFactor) {
+        const updateSpotMarketIfFactorIx = await this.getUpdateSpotMarketIfFactorIx(spotMarketIndex, ifFeeFactor, protocolFeeFactor);
         const tx = await this.buildTransaction(updateSpotMarketIfFactorIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getUpdateSpotMarketIfFactorIx(spotMarketIndex, userIfFactor, totalIfFactor) {
-        return await this.program.instruction.updateSpotMarketIfFactor(spotMarketIndex, userIfFactor, totalIfFactor, {
+    async getUpdateSpotMarketIfFactorIx(spotMarketIndex, ifFeeFactor, protocolFeeFactor) {
+        return await this.program.instruction.updateSpotMarketIfFactor(spotMarketIndex, ifFeeFactor, protocolFeeFactor, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().coldAdmin
@@ -1096,6 +1121,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return txSig;
     }
     async getUpdatePerpMarketOracleIx(perpMarketIndex, oracle, oracleSource, skipInvaraintCheck = false) {
+        const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
         return await this.program.instruction.updatePerpMarketOracle(oracle, oracleSource, skipInvaraintCheck, {
             accounts: {
                 admin: this.isSubscribed
@@ -1104,7 +1130,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
                 oracle: oracle,
-                oldOracle: this.getPerpMarketAccount(perpMarketIndex).oracle,
+                oldOracle: perpMarketAccount.oracle,
                 ammCache: (0, pda_1.getAmmCachePublicKey)(this.program.programId),
             },
         });
@@ -1209,6 +1235,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return txSig;
     }
     async getUpdateSpotMarketOracleIx(spotMarketIndex, oracle, oracleSource, skipInvaraintCheck = false) {
+        const spotMarketAccount = this.getSpotMarketAccountOrThrow(spotMarketIndex);
         return await this.program.instruction.updateSpotMarketOracle(oracle, oracleSource, skipInvaraintCheck, {
             accounts: {
                 admin: this.isSubscribed
@@ -1217,7 +1244,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
                 oracle: oracle,
-                oldOracle: this.getSpotMarketAccount(spotMarketIndex).oracle,
+                oldOracle: spotMarketAccount.oracle,
             },
         });
     }
@@ -1513,13 +1540,14 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return txSig;
     }
     async getUpdateMaxSlippageRatioIx(perpMarketIndex, maxSlippageRatio) {
+        const perpMarketAccount = this.getPerpMarketAccountOrThrow(perpMarketIndex);
         return await this.program.instruction.updateMaxSlippageRatio(maxSlippageRatio, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().coldAdmin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: this.getPerpMarketAccount(perpMarketIndex).pubkey,
+                perpMarket: perpMarketAccount.pubkey,
             },
         });
     }
@@ -1608,142 +1636,154 @@ class AdminClient extends velocityClient_1.VelocityClient {
             },
         });
     }
-    async updateSpotMarketFeeAdjustment(perpMarketIndex, feeAdjustment) {
-        const updateSpotMarketFeeAdjustmentIx = await this.getUpdateSpotMarketFeeAdjustmentIx(perpMarketIndex, feeAdjustment);
-        const tx = await this.buildTransaction(updateSpotMarketFeeAdjustmentIx);
+    async updatePerpMarketFeePoolBufferTarget(perpMarketIndex, feePoolBufferTarget) {
+        const updatePerpMarketFeePoolBufferTargetIx = await this.getUpdatePerpMarketFeePoolBufferTargetIx(perpMarketIndex, feePoolBufferTarget);
+        const tx = await this.buildTransaction(updatePerpMarketFeePoolBufferTargetIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getUpdateSpotMarketFeeAdjustmentIx(spotMarketIndex, feeAdjustment) {
-        return await this.program.instruction.updateSpotMarketFeeAdjustment(feeAdjustment, {
+    async getUpdatePerpMarketFeePoolBufferTargetIx(perpMarketIndex, feePoolBufferTarget) {
+        return await this.program.instruction.updatePerpMarketFeePoolBufferTarget(feePoolBufferTarget, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().coldAdmin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
     }
-    async updatePerpMarketLiquidationFee(perpMarketIndex, liquidatorFee, ifLiquidationFee) {
-        const updatePerpMarketLiquidationFeeIx = await this.getUpdatePerpMarketLiquidationFeeIx(perpMarketIndex, liquidatorFee, ifLiquidationFee);
-        const tx = await this.buildTransaction(updatePerpMarketLiquidationFeeIx);
+    async updateSpotMarketFeeAdjustment(perpMarketIndex, feeAdjustment) {
+        const updateSpotMarketFeeAdjustmentIx = await this.getUpdateSpotMarketFeeAdjustmentIx(perpMarketIndex, feeAdjustment);
+        const tx = await this.buildTransaction(updateSpotMarketFeeAdjustmentIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getUpdatePerpMarketLiquidationFeeIx(perpMarketIndex, liquidatorFee, ifLiquidationFee) {
-        return await this.program.instruction.updatePerpMarketLiquidationFee(liquidatorFee, ifLiquidationFee, {
+    async getUpdateSpotMarketFeeAdjustmentIx(spotMarketIndex, feeAdjustment) {
+        return await this.program.instruction.updateSpotMarketFeeAdjustment(feeAdjustment, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().coldAdmin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
     }
-    async updateSpotMarketLiquidationFee(spotMarketIndex, liquidatorFee, ifLiquidationFee) {
-        const updateSpotMarketLiquidationFeeIx = await this.getUpdateSpotMarketLiquidationFeeIx(spotMarketIndex, liquidatorFee, ifLiquidationFee);
-        const tx = await this.buildTransaction(updateSpotMarketLiquidationFeeIx);
+    async updatePerpMarketLiquidationFee(perpMarketIndex, liquidatorFee, ifLiquidationFee, protocolLiquidationFee = 0) {
+        const updatePerpMarketLiquidationFeeIx = await this.getUpdatePerpMarketLiquidationFeeIx(perpMarketIndex, liquidatorFee, ifLiquidationFee, protocolLiquidationFee);
+        const tx = await this.buildTransaction(updatePerpMarketLiquidationFeeIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getUpdateSpotMarketLiquidationFeeIx(spotMarketIndex, liquidatorFee, ifLiquidationFee) {
-        return await this.program.instruction.updateSpotMarketLiquidationFee(liquidatorFee, ifLiquidationFee, {
+    async getUpdatePerpMarketLiquidationFeeIx(perpMarketIndex, liquidatorFee, ifLiquidationFee, protocolLiquidationFee = 0) {
+        return await this.program.instruction.updatePerpMarketLiquidationFee(liquidatorFee, ifLiquidationFee, protocolLiquidationFee, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().coldAdmin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
     }
-    async initializeProtocolIfSharesTransferConfig() {
-        const initializeProtocolIfSharesTransferConfigIx = await this.getInitializeProtocolIfSharesTransferConfigIx();
-        const tx = await this.buildTransaction(initializeProtocolIfSharesTransferConfigIx);
+    async updateSpotMarketLiquidationFee(spotMarketIndex, liquidatorFee, ifLiquidationFee, protocolLiquidationFee = 0) {
+        const updateSpotMarketLiquidationFeeIx = await this.getUpdateSpotMarketLiquidationFeeIx(spotMarketIndex, liquidatorFee, ifLiquidationFee, protocolLiquidationFee);
+        const tx = await this.buildTransaction(updateSpotMarketLiquidationFeeIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getInitializeProtocolIfSharesTransferConfigIx() {
-        return await this.program.instruction.initializeProtocolIfSharesTransferConfig({
+    async getUpdateSpotMarketLiquidationFeeIx(spotMarketIndex, liquidatorFee, ifLiquidationFee, protocolLiquidationFee = 0) {
+        return await this.program.instruction.updateSpotMarketLiquidationFee(liquidatorFee, ifLiquidationFee, protocolLiquidationFee, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().coldAdmin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                systemProgram: anchor.web3.SystemProgram.programId,
-                protocolIfSharesTransferConfig: (0, pda_1.getProtocolIfSharesTransferConfigPublicKey)(this.program.programId),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
     }
-    async updateProtocolIfSharesTransferConfig(whitelistedSigners, maxTransferPerEpoch) {
-        const updateProtocolIfSharesTransferConfigIx = await this.getUpdateProtocolIfSharesTransferConfigIx(whitelistedSigners, maxTransferPerEpoch);
-        const tx = await this.buildTransaction(updateProtocolIfSharesTransferConfigIx);
+    async updateProtocolFeeRecipient(protocolFeeRecipient, marketType) {
+        const ix = await this.getUpdateProtocolFeeRecipientIx(protocolFeeRecipient, marketType);
+        const tx = await this.buildTransaction(ix);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getUpdateProtocolIfSharesTransferConfigIx(whitelistedSigners, maxTransferPerEpoch) {
-        return await this.program.instruction.updateProtocolIfSharesTransferConfig(whitelistedSigners || null, maxTransferPerEpoch, {
+    async getUpdateProtocolFeeRecipientIx(protocolFeeRecipient, marketType) {
+        return await this.program.instruction.updateProtocolFeeRecipient(protocolFeeRecipient, marketType, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().coldAdmin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                protocolIfSharesTransferConfig: (0, pda_1.getProtocolIfSharesTransferConfigPublicKey)(this.program.programId),
             },
         });
     }
-    async transferProtocolIfSharesToRevenuePool(outMarketIndex, inMarketIndex, amount) {
-        const transferProtocolIfSharesToRevenuePoolIx = await this.getTransferProtocolIfSharesToRevenuePoolIx(outMarketIndex, inMarketIndex, amount);
-        const tx = await this.buildTransaction(transferProtocolIfSharesToRevenuePoolIx);
+    async withdrawProtocolFeesSpot(marketIndex, amount, txParams) {
+        const ix = await this.getWithdrawProtocolFeesSpotIx(marketIndex, amount);
+        const tx = await this.buildTransaction(ix, txParams);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getTransferProtocolIfSharesToRevenuePoolIx(outMarketIndex, inMarketIndex, amount) {
-        const remainingAccounts = await this.getRemainingAccounts({
-            userAccounts: [],
-            writableSpotMarketIndexes: [outMarketIndex],
-        });
-        return await this.program.instruction.transferProtocolIfSharesToRevenuePool(outMarketIndex, amount, {
+    async getWithdrawProtocolFeesSpotIx(marketIndex, amount) {
+        const spotMarket = this.getSpotMarketAccountOrThrow(marketIndex);
+        const tokenProgramId = this.getTokenProgramForSpotMarket(spotMarket);
+        const recipient = this.getStateAccount().protocolFeeRecipientSpot;
+        const recipientTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(spotMarket.mint, recipient, true, tokenProgramId);
+        const remainingAccounts = [];
+        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 (0, pda_1.getInsuranceFundVaultPublicKey)(this.program.programId, outMarketIndex),
-                spotMarketVault: await (0, pda_1.getSpotMarketVaultPublicKey)(this.program.programId, outMarketIndex),
-                ifRebalanceConfig: await (0, pda_1.getIfRebalanceConfigPublicKey)(this.program.programId, inMarketIndex, outMarketIndex),
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                velocitySigner: 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: web3_js_1.SystemProgram.programId,
+                associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
             },
             remainingAccounts,
         });
     }
-    async adminWithdrawFromInsuranceFundVault(marketIndex, amount, recipientTokenAccount, txParams) {
-        const ix = await this.getAdminWithdrawFromInsuranceFundVaultIx(marketIndex, amount, recipientTokenAccount);
+    async withdrawProtocolFeesPerp(marketIndex, amount, txParams) {
+        const ix = await this.getWithdrawProtocolFeesPerpIx(marketIndex, amount);
         const tx = await this.buildTransaction(ix, txParams);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getAdminWithdrawFromInsuranceFundVaultIx(marketIndex, amount, recipientTokenAccount) {
-        const spotMarket = this.getSpotMarketAccount(marketIndex);
-        const tokenProgramId = this.getTokenProgramForSpotMarket(spotMarket);
+    async getWithdrawProtocolFeesPerpIx(marketIndex, amount) {
+        const perpMarket = this.getPerpMarketAccountOrThrow(marketIndex);
+        const quoteSpotMarket = this.getSpotMarketAccountOrThrow(perpMarket.quoteSpotMarketIndex);
+        const tokenProgramId = this.getTokenProgramForSpotMarket(quoteSpotMarket);
+        const recipient = this.getStateAccount().protocolFeeRecipientPerp;
+        const recipientTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(quoteSpotMarket.mint, recipient, true, tokenProgramId);
         const remainingAccounts = [];
-        this.addTokenMintToRemainingAccounts(spotMarket, remainingAccounts);
-        if (this.isTransferHook(spotMarket)) {
-            await this.addExtraAccountMetasToRemainingAccounts(spotMarket.mint, remainingAccounts);
+        if (this.isTransferHook(quoteSpotMarket)) {
+            await this.addExtraAccountMetasToRemainingAccounts(quoteSpotMarket.mint, remainingAccounts);
         }
-        return await this.program.instruction.adminWithdrawFromInsuranceFundVault(marketIndex, amount, {
+        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,
                 velocitySigner: this.getSignerPublicKey(),
+                systemProgram: web3_js_1.SystemProgram.programId,
+                associatedTokenProgram: spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID,
             },
             remainingAccounts,
         });
@@ -1874,22 +1914,21 @@ class AdminClient extends velocityClient_1.VelocityClient {
             },
         });
     }
-    async initializeIfRebalanceConfig(params) {
-        const initializeIfRebalanceConfigIx = await this.getInitializeIfRebalanceConfigIx(params);
-        const tx = await this.buildTransaction(initializeIfRebalanceConfigIx);
+    async updatePerpMarketFundingBiasSensitivity(perpMarketIndex, fundingBiasSensitivity) {
+        const updatePerpMarketFundingBiasSensitivityIx = await this.getUpdatePerpMarketFundingBiasSensitivityIx(perpMarketIndex, fundingBiasSensitivity);
+        const tx = await this.buildTransaction(updatePerpMarketFundingBiasSensitivityIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getInitializeIfRebalanceConfigIx(params) {
-        return await this.program.instruction.initializeIfRebalanceConfig(params, {
+    async getUpdatePerpMarketFundingBiasSensitivityIx(perpMarketIndex, fundingBiasSensitivity) {
+        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
+        return await this.program.instruction.updatePerpMarketFundingBiasSensitivity(fundingBiasSensitivity, {
             accounts: {
-                admin: this.isSubscribed
-                    ? this.getStateAccount().coldAdmin
-                    : this.wallet.publicKey,
+                admin: this.useHotWalletAdmin
+                    ? this.wallet.publicKey
+                    : this.getStateAccount().coldAdmin,
                 state: await this.getStatePublicKey(),
-                ifRebalanceConfig: await (0, pda_1.getIfRebalanceConfigPublicKey)(this.program.programId, params.inMarketIndex, params.outMarketIndex),
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                systemProgram: anchor.web3.SystemProgram.programId,
+                perpMarket: perpMarketPublicKey,
             },
         });
     }
@@ -1920,7 +1959,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
     }
     async getAdminDepositIx(marketIndex, amount, depositUserAccount, adminTokenAccount) {
         const state = await this.getStatePublicKey();
-        const spotMarket = this.getSpotMarketAccount(marketIndex);
+        const spotMarket = this.getSpotMarketAccountOrThrow(marketIndex);
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [],
             writableSpotMarketIndexes: [marketIndex],
@@ -2022,51 +2061,6 @@ class AdminClient extends velocityClient_1.VelocityClient {
             },
         });
     }
-    async updateDelegateUserGovTokenInsuranceStake(authority, delegate) {
-        const updateDelegateUserGovTokenInsuranceStakeIx = await this.getUpdateDelegateUserGovTokenInsuranceStakeIx(authority, delegate);
-        const tx = await this.buildTransaction(updateDelegateUserGovTokenInsuranceStakeIx);
-        const { txSig } = await this.sendTransaction(tx, [], this.opts);
-        return txSig;
-    }
-    async getUpdateDelegateUserGovTokenInsuranceStakeIx(authority, delegate) {
-        const marketIndex = numericConstants_1.GOV_SPOT_MARKET_INDEX;
-        const spotMarket = this.getSpotMarketAccount(marketIndex);
-        const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, delegate, marketIndex);
-        const userStatsPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, authority);
-        const ix = this.program.instruction.getUpdateDelegateUserGovTokenInsuranceStakeIx({
-            accounts: {
-                state: await this.getStatePublicKey(),
-                spotMarket: spotMarket.pubkey,
-                insuranceFundStake: ifStakeAccountPublicKey,
-                userStats: userStatsPublicKey,
-                signer: this.wallet.publicKey,
-                insuranceFundVault: spotMarket.insuranceFund.vault,
-            },
-        });
-        return ix;
-    }
-    async depositIntoInsuranceFundStake(marketIndex, amount, userStatsPublicKey, insuranceFundStakePublicKey, userTokenAccountPublicKey, txParams) {
-        const tx = await this.buildTransaction(await this.getDepositIntoInsuranceFundStakeIx(marketIndex, amount, userStatsPublicKey, insuranceFundStakePublicKey, userTokenAccountPublicKey), txParams);
-        const { txSig } = await this.sendTransaction(tx, [], this.opts);
-        return txSig;
-    }
-    async getDepositIntoInsuranceFundStakeIx(marketIndex, amount, userStatsPublicKey, insuranceFundStakePublicKey, userTokenAccountPublicKey) {
-        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),
-                velocitySigner: this.getSignerPublicKey(),
-            },
-        });
-    }
     async updateFeatureBitFlagsSettleLpPool(enable) {
         const updateFeatureBitFlagsSettleLpPoolIx = await this.getUpdateFeatureBitFlagsSettleLpPoolIx(enable);
         const tx = await this.buildTransaction(updateFeatureBitFlagsSettleLpPoolIx);
@@ -2183,7 +2177,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
         const spotMarketIndex = initializeConstituentParams.spotMarketIndex;
         const constituentTargetBase = (0, pda_1.getConstituentTargetBasePublicKey)(this.program.programId, lpPool);
         const constituent = (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool, spotMarketIndex);
-        const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
+        const spotMarketAccount = this.getSpotMarketAccountOrThrow(spotMarketIndex);
         return [
             this.program.instruction.initializeConstituent(spotMarketIndex, initializeConstituentParams.decimals, initializeConstituentParams.maxWeightDeviation, initializeConstituentParams.swapFeeMin, initializeConstituentParams.swapFeeMax, initializeConstituentParams.maxBorrowTokenAmount, initializeConstituentParams.oracleStalenessThreshold, initializeConstituentParams.costToTrade, initializeConstituentParams.constituentDerivativeIndex != null
                 ? initializeConstituentParams.constituentDerivativeIndex
@@ -2423,8 +2417,8 @@ class AdminClient extends velocityClient_1.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);
         const lpPool = (0, pda_1.getLpPoolPublicKey)(this.program.programId, lpPoolId);
@@ -2472,8 +2466,8 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return { beginSwapIx, endSwapIx };
     }
     async getLpJupiterSwapIxV6({ jupiterClient, outMarketIndex, inMarketIndex, amount, slippageBps, swapMode, onlyDirectRoutes, quote, lpPoolId, }) {
-        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({
                 inputMint: inMarket.mint,
@@ -2534,8 +2528,8 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return { ixs, lookupTables };
     }
     async getDevnetLpSwapIxs(amountIn, amountOut, externalUserAuthority, externalUserInTokenAccount, externalUserOutTokenAccount, inSpotMarketIndex, outSpotMarketIndex) {
-        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, false, (0, pda_1.getTokenProgramForSpotMarket)(outSpotMarketAccount));
         const inTokenAccount = await this.getAssociatedTokenAccount(inSpotMarketAccount.marketIndex, false, (0, pda_1.getTokenProgramForSpotMarket)(inSpotMarketAccount));
         const externalCreateInTokenAccountIx = this.createAssociatedTokenAccountIdempotentInstruction(externalUserInTokenAccount, this.wallet.publicKey, externalUserAuthority, this.getSpotMarketAccount(inSpotMarketIndex).mint);
@@ -2551,6 +2545,8 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return ixs;
     }
     async getAllDevnetLpSwapIxs(lpPoolId, inMarketIndex, outMarketIndex, inAmount, minOutAmount, externalUserAuthority) {
+        const inMarket = this.getSpotMarketAccountOrThrow(inMarketIndex);
+        const outMarket = this.getSpotMarketAccountOrThrow(outMarketIndex);
         const { beginSwapIx, endSwapIx } = await this.getSwapIx({
             lpPoolId,
             inMarketIndex,
@@ -2559,7 +2555,7 @@ class AdminClient extends velocityClient_1.VelocityClient {
             inTokenAccount: await this.getAssociatedTokenAccount(inMarketIndex, false),
             outTokenAccount: await this.getAssociatedTokenAccount(outMarketIndex, false),
         }, true);
-        const devnetLpSwapIxs = await this.getDevnetLpSwapIxs(inAmount, minOutAmount, externalUserAuthority, await this.getAssociatedTokenAccount(inMarketIndex, false, (0, pda_1.getTokenProgramForSpotMarket)(this.getSpotMarketAccount(inMarketIndex)), externalUserAuthority), await this.getAssociatedTokenAccount(outMarketIndex, false, (0, pda_1.getTokenProgramForSpotMarket)(this.getSpotMarketAccount(outMarketIndex)), externalUserAuthority), inMarketIndex, outMarketIndex);
+        const devnetLpSwapIxs = await this.getDevnetLpSwapIxs(inAmount, minOutAmount, externalUserAuthority, await this.getAssociatedTokenAccount(inMarketIndex, false, (0, pda_1.getTokenProgramForSpotMarket)(inMarket), externalUserAuthority), await this.getAssociatedTokenAccount(outMarketIndex, false, (0, pda_1.getTokenProgramForSpotMarket)(outMarket), externalUserAuthority), inMarketIndex, outMarketIndex);
         return [
             beginSwapIx,
             ...devnetLpSwapIxs,
@@ -2574,8 +2570,8 @@ class AdminClient extends velocityClient_1.VelocityClient {
     }
     async getDepositWithdrawToProgramVaultIxs(lpPoolId, depositMarketIndex, borrowMarketIndex, amountToDeposit, amountToBorrow) {
         const lpPool = (0, pda_1.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);
         const withdrawTokenProgram = this.getTokenProgramForSpotMarket(withdrawSpotMarket);
         const depositConstituent = (0, pda_1.getConstituentPublicKey)(this.program.programId, lpPool, depositMarketIndex);
@@ -2638,13 +2634,14 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return txSig;
     }
     async getUpdatePerpMarketLpPoolFeeTransferScalarIx(marketIndex, lpFeeTransferScalar, lpExchangeFeeExcluscionScalar) {
+        const perpMarketAccount = this.getPerpMarketAccountOrThrow(marketIndex);
         return this.program.instruction.updatePerpMarketLpPoolFeeTransferScalar(lpFeeTransferScalar !== null && lpFeeTransferScalar !== void 0 ? lpFeeTransferScalar : null, lpExchangeFeeExcluscionScalar !== null && lpExchangeFeeExcluscionScalar !== void 0 ? lpExchangeFeeExcluscionScalar : null, {
             accounts: {
                 admin: this.useHotWalletAdmin
                     ? this.wallet.publicKey
                     : this.getStateAccount().coldAdmin,
                 state: await this.getStatePublicKey(),
-                perpMarket: this.getPerpMarketAccount(marketIndex).pubkey,
+                perpMarket: perpMarketAccount.pubkey,
             },
         });
     }
@@ -2655,13 +2652,14 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return txSig;
     }
     async getUpdatePerpMarketLpPoolPausedOperationsIx(marketIndex, pausedOperations) {
+        const perpMarketAccount = this.getPerpMarketAccountOrThrow(marketIndex);
         return this.program.instruction.updatePerpMarketLpPoolPausedOperations(pausedOperations, {
             accounts: {
                 admin: this.useHotWalletAdmin
                     ? this.wallet.publicKey
                     : this.getStateAccount().coldAdmin,
                 state: await this.getStatePublicKey(),
-                perpMarket: this.getPerpMarketAccount(marketIndex).pubkey,
+                perpMarket: perpMarketAccount.pubkey,
             },
         });
     }
@@ -2688,13 +2686,14 @@ class AdminClient extends velocityClient_1.VelocityClient {
         return txSig;
     }
     async getUpdatePerpMarketConfigIx(marketIndex, marketConfig) {
+        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,
             },
         });
     }
@@ -2784,13 +2783,13 @@ var HotRole;
     HotRole["LpCache"] = "lpCache";
     HotRole["LpSwap"] = "lpSwap";
     HotRole["LpSettle"] = "lpSettle";
-    HotRole["IfRebalance"] = "ifRebalance";
     HotRole["FeatureFlag"] = "featureFlag";
     HotRole["Fuel"] = "fuel";
     HotRole["UserFlag"] = "userFlag";
     HotRole["VaultDeposit"] = "vaultDeposit";
     HotRole["MmOracleCrank"] = "mmOracleCrank";
     HotRole["AmmSpreadAdjust"] = "ammSpreadAdjust";
+    HotRole["FeeWithdraw"] = "feeWithdraw";
 })(HotRole || (exports.HotRole = HotRole = {}));
 /** Anchor encodes Rust enums as `{ <variant>: {} }`. */
 function encodeHotRole(role) {