@carrot-protocol/clend-rpc 0.1.6 → 0.1.7-fe-math-dev-24c809a

package/dist/index.d.ts

@@ -4,5 +4,5 @@ export { MockJupiterUtils } from "./mockJupiterUtils";
 export { IJupiterUtils, JupiterUtils, SwapInputs, SwapQuote, SwapIxs, } from "./jupiterUtils";
 export * from "./addresses";
 export { BankConfigCompact, ClendGroup, Bank, ClendAccount, FeeState, Balance, newInterestRateConfigCompact, newBankConfigCompact, RiskTier, BankOperationalState, AssetTag, newClendAccountBalance, InterestRateConfigCompact, TOKEN_DECIMALS, TOKEN_PROGRAMS, USDC_MINT, JLP_MINT, } from "./state";
-export * from "./math";
 export * from "./events";
+export * as Common from "@carrot-protocol/clend-common";

package/dist/index.js

@@ -10,11 +10,33 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JLP_MINT = exports.USDC_MINT = exports.TOKEN_PROGRAMS = exports.TOKEN_DECIMALS = exports.newClendAccountBalance = exports.AssetTag = exports.BankOperationalState = exports.RiskTier = exports.newBankConfigCompact = exports.newInterestRateConfigCompact = exports.JupiterUtils = exports.MockJupiterUtils = exports.Instructions = exports.ClendClient = void 0;
+exports.Common = exports.JLP_MINT = exports.USDC_MINT = exports.TOKEN_PROGRAMS = exports.TOKEN_DECIMALS = exports.newClendAccountBalance = exports.AssetTag = exports.BankOperationalState = exports.RiskTier = exports.newBankConfigCompact = exports.newInterestRateConfigCompact = exports.JupiterUtils = exports.MockJupiterUtils = exports.Instructions = exports.ClendClient = void 0;
 var rpc_1 = require("./rpc");
 Object.defineProperty(exports, "ClendClient", { enumerable: true, get: function () { return rpc_1.ClendClient; } });
 var instructions_1 = require("./instructions");
@@ -35,6 +57,7 @@ Object.defineProperty(exports, "TOKEN_DECIMALS", { enumerable: true, get: functi
 Object.defineProperty(exports, "TOKEN_PROGRAMS", { enumerable: true, get: function () { return state_1.TOKEN_PROGRAMS; } });
 Object.defineProperty(exports, "USDC_MINT", { enumerable: true, get: function () { return state_1.USDC_MINT; } });
 Object.defineProperty(exports, "JLP_MINT", { enumerable: true, get: function () { return state_1.JLP_MINT; } });
-__exportStar(require("./math"), exports);
 __exportStar(require("./events"), exports);
+// re-export clend-common
+exports.Common = __importStar(require("@carrot-protocol/clend-common"));
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6BAAoC;AAA3B,kGAAA,WAAW,OAAA;AACpB,+CAA8C;AAArC,4GAAA,YAAY,OAAA;AACrB,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,+CAMwB;AAJtB,4GAAA,YAAY,OAAA;AAKd,8CAA4B;AAC5B,iCAkBiB;AAXf,qHAAA,4BAA4B,OAAA;AAC5B,6GAAA,oBAAoB,OAAA;AACpB,iGAAA,QAAQ,OAAA;AACR,6GAAA,oBAAoB,OAAA;AACpB,iGAAA,QAAQ,OAAA;AACR,+GAAA,sBAAsB,OAAA;AAEtB,uGAAA,cAAc,OAAA;AACd,uGAAA,cAAc,OAAA;AACd,kGAAA,SAAS,OAAA;AACT,iGAAA,QAAQ,OAAA;AAEV,yCAAuB;AACvB,2CAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAAoC;AAA3B,kGAAA,WAAW,OAAA;AACpB,+CAA8C;AAArC,4GAAA,YAAY,OAAA;AACrB,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,+CAMwB;AAJtB,4GAAA,YAAY,OAAA;AAKd,8CAA4B;AAC5B,iCAkBiB;AAXf,qHAAA,4BAA4B,OAAA;AAC5B,6GAAA,oBAAoB,OAAA;AACpB,iGAAA,QAAQ,OAAA;AACR,6GAAA,oBAAoB,OAAA;AACpB,iGAAA,QAAQ,OAAA;AACR,+GAAA,sBAAsB,OAAA;AAEtB,uGAAA,cAAc,OAAA;AACd,uGAAA,cAAc,OAAA;AACd,kGAAA,SAAS,OAAA;AACT,iGAAA,QAAQ,OAAA;AAEV,2CAAyB;AAEzB,yBAAyB;AACzB,wEAAwD"}

package/dist/rpc.js

@@ -11,10 +11,10 @@ const spl_token_1 = require("@solana/spl-token");
 const utils_1 = require("./utils");
 const addresses_1 = require("./addresses");
 const state_1 = require("./state");
-const math_1 = require("./math");
+const clend_common_1 = require("@carrot-protocol/clend-common");
 const jupiterUtils_1 = require("./jupiterUtils");
 const api_1 = require("@jup-ag/api");
-const math_2 = require("./math");
+const clend_common_2 = require("@carrot-protocol/clend-common");
 const pyth_solana_receiver_1 = require("@pythnetwork/pyth-solana-receiver");
 const events_1 = require("./events");
 class ClendClient {
@@ -205,16 +205,16 @@ class ClendClient {
         const totalLiabilityShares = (0, utils_1.wrappedI80F48toBigNumber)(data.totalLiabilityShares);
         const liabilityShareValue = Number((0, utils_1.wrappedI80F48toBigNumber)(data.liabilityShareValue));
         const mintDecimals = Number(data.mintDecimals);
-        const assetAmount = (0, math_1.calculateTotalAssetQuantity)(totalAssetShares, assetShareValue);
-        const assetAmountUi = (0, math_1.amountToUi)(assetAmount, mintDecimals);
-        const liabilityAmount = (0, math_1.calculateTotalLiabilityQuantity)(totalLiabilityShares, liabilityShareValue);
-        const liabilityAmountUi = (0, math_1.amountToUi)(liabilityAmount, mintDecimals);
-        const utilizationRate = (0, math_1.calculateBankUtilizationRate)(totalAssetShares, assetShareValue, totalLiabilityShares, liabilityShareValue);
-        const baseInterestRate = (0, math_1.calculateBaseInterestRate)(utilizationRate, bankConfig.interestRateConfig.optimalUtilizationRate, bankConfig.interestRateConfig.plateauInterestRate, bankConfig.interestRateConfig.maxInterestRate);
-        const supplyApy = (0, math_1.calculateSupplyApy)(utilizationRate, baseInterestRate, bankConfig.interestRateConfig.protocolIrFee, bankConfig.interestRateConfig.insuranceIrFee);
-        const borrowApy = (0, math_1.calculateBorrowApy)(baseInterestRate, bankConfig.interestRateConfig.protocolFixedFeeApr, bankConfig.interestRateConfig.insuranceFeeFixedApr);
+        const assetAmount = (0, clend_common_1.calculateTotalAssetQuantity)(totalAssetShares, assetShareValue);
+        const assetAmountUi = (0, clend_common_1.amountToUi)(assetAmount, mintDecimals);
+        const liabilityAmount = (0, clend_common_1.calculateTotalLiabilityQuantity)(totalLiabilityShares, liabilityShareValue);
+        const liabilityAmountUi = (0, clend_common_1.amountToUi)(liabilityAmount, mintDecimals);
+        const utilizationRate = (0, clend_common_1.calculateBankUtilizationRate)(totalAssetShares, assetShareValue, totalLiabilityShares, liabilityShareValue);
+        const baseInterestRate = (0, clend_common_1.calculateBaseInterestRate)(utilizationRate, bankConfig.interestRateConfig.optimalUtilizationRate, bankConfig.interestRateConfig.plateauInterestRate, bankConfig.interestRateConfig.maxInterestRate);
+        const supplyApy = (0, clend_common_1.calculateSupplyApy)(utilizationRate, baseInterestRate, bankConfig.interestRateConfig.protocolIrFee, bankConfig.interestRateConfig.insuranceIrFee);
+        const borrowApy = (0, clend_common_1.calculateBorrowApy)(baseInterestRate, bankConfig.interestRateConfig.protocolFixedFeeApr, bankConfig.interestRateConfig.insuranceFeeFixedApr);
         const currentTimestamp = Math.floor(Date.now() / 1000);
-        const accruedInterest = (0, math_1.calculateAccruedInterest)(data.lastUpdate, assetAmountUi, liabilityAmountUi, utilizationRate, bankConfig.interestRateConfig, currentTimestamp);
+        const accruedInterest = (0, clend_common_1.calculateAccruedInterest)(data.lastUpdate, assetAmountUi, liabilityAmountUi, utilizationRate, bankConfig.interestRateConfig, currentTimestamp);
         return {
             key: bank,
             mint: new anchor_1.web3.PublicKey(data.mint),
@@ -299,12 +299,12 @@ class ClendClient {
         }
         // calculate account health factor and leverage
         // uses weighted values of assets and liabilities
-        const { healthFactor: healthFactorWeighted, leverage: leverageWeighted } = (0, math_1.calculateHealthFactorAndLeverage)(healthFactorWeightedAssetArgs, healthFactorWeightedLiabilityArgs);
+        const { healthFactor: healthFactorWeighted, leverage: leverageWeighted } = (0, clend_common_1.calculateHealthFactorAndLeverage)(healthFactorWeightedAssetArgs, healthFactorWeightedLiabilityArgs);
         // calculate account health factor and leverage
         // uses unweighted values of assets and liabilities
-        const { healthFactor: healthFactorUnweighted, leverage: leverageUnweighted, } = (0, math_1.calculateHealthFactorAndLeverage)(healthFactorUnweightedAssetArgs, healthFactorUnweightedLiabilityArgs);
+        const { healthFactor: healthFactorUnweighted, leverage: leverageUnweighted, } = (0, clend_common_1.calculateHealthFactorAndLeverage)(healthFactorUnweightedAssetArgs, healthFactorUnweightedLiabilityArgs);
         // calculate ltv with maintenance margin
-        const ltv = (0, math_1.calculateLtv)(balances.map((b) => b.assetWeightedMaintValue), balances.map((b) => b.liabilityWeightedMaintValue));
+        const ltv = (0, clend_common_1.calculateLtv)(balances.map((b) => b.assetWeightedMaintValue), balances.map((b) => b.liabilityWeightedMaintValue));
         return {
             key: clendAccount,
             authority: new anchor_1.web3.PublicKey(data.authority),
@@ -515,9 +515,9 @@ class ClendClient {
             weightAsset = bankData.config.assetWeightMaint;
             weightLiab = bankData.config.liabilityWeightMaint;
             // Calculate weighted values for this balance
-            currentWeightedAssetsMaint += (0, math_1.calculateWeightedValue)(balance.assetBalanceUi, balance.price, // Use price from the balance data
+            currentWeightedAssetsMaint += (0, clend_common_1.calculateWeightedValue)(balance.assetBalanceUi, balance.price, // Use price from the balance data
             weightAsset);
-            currentWeightedLiabilitiesMaint += (0, math_1.calculateWeightedValue)(balance.liabilityBalanceUi, balance.price, // Use price from the balance data
+            currentWeightedLiabilitiesMaint += (0, clend_common_1.calculateWeightedValue)(balance.liabilityBalanceUi, balance.price, // Use price from the balance data
             weightLiab);
         }
         // Check if the specific collateral and liability balances were found
@@ -598,7 +598,7 @@ class ClendClient {
             throw new Error("Calculated asset amount for liquidation is zero or negative.");
         }
         // Convert the final UI amount to BN for the instruction
-        const finalAssetAmount = (0, math_1.uiToAmount)(calculatedAssetAmountUi, assetBankData.mintDecimals);
+        const finalAssetAmount = (0, clend_common_1.uiToAmount)(calculatedAssetAmountUi, assetBankData.mintDecimals);
         utils_1.logger.info("Final Asset Amount to Liquidate", {
             assetAmountUi: calculatedAssetAmountUi,
         });
@@ -736,22 +736,22 @@ class ClendClient {
         const debtBankData = await this.getBank(debtBank);
         const collateralBankData = await this.getBank(collateralBank);
         // Calculate borrow amount based on target leverage
-        const depositAmountUI = (0, math_1.amountToUi)(depositAmount, collateralDecimals);
+        const depositAmountUI = (0, clend_common_1.amountToUi)(depositAmount, collateralDecimals);
         // Get current prices from Jupiter
         const collateralPrice = await this.getOraclePrice(collateralMint);
         const debtPrice = await this.getOraclePrice(debtMint);
         // Calculate collateral value in debt token terms
-        const { borrowAmountUi, totalDepositAmountUi } = (0, math_1.computeLoopingAmounts)(depositAmountUI, targetLeverage, collateralPrice, debtPrice, 1, 1);
-        const borrowAmount = (0, math_1.uiToAmount)(borrowAmountUi, debtDecimals);
+        const { borrowAmountUi, totalDepositAmountUi } = (0, clend_common_1.computeLoopingAmounts)(depositAmountUI, targetLeverage, collateralPrice, debtPrice, 1, 1);
+        const borrowAmount = (0, clend_common_1.uiToAmount)(borrowAmountUi, debtDecimals);
         // get origination fee rate
         const originationFeeRate = debtBankData.config.interestRateConfig.protocolOriginationFee;
         // adjust borrow amount for borrowing costs
-        const borrowAmountAfterBorrowingCosts = (0, math_1.adjustBorrowForOriginationFee)(borrowAmount, originationFeeRate);
+        const borrowAmountAfterBorrowingCosts = (0, clend_common_1.adjustBorrowForOriginationFee)(borrowAmount, originationFeeRate);
         // 3. Adjust for Slippage (Borrow MORE)
         // Apply slippage adjustment to the amount already adjusted for costs
-        const finalBorrowAmount = (0, math_1.adjustAmountForSlippage)(borrowAmountAfterBorrowingCosts, // Input the cost-adjusted amount
+        const finalBorrowAmount = (0, clend_common_1.adjustAmountForSlippage)(borrowAmountAfterBorrowingCosts, // Input the cost-adjusted amount
         slippageBps);
-        const finalBorrowAmountUi = (0, math_1.amountToUi)(finalBorrowAmount, debtDecimals);
+        const finalBorrowAmountUi = (0, clend_common_1.amountToUi)(finalBorrowAmount, debtDecimals);
         utils_1.logger.info("depositLeverage params calculated", {
             borrowAmount: borrowAmount.toString(),
             borrowAmountAfterBorrowingCosts: borrowAmountAfterBorrowingCosts.toString(),
@@ -769,7 +769,7 @@ class ClendClient {
         });
         return {
             borrowAmount: finalBorrowAmount,
-            totalDepositAmount: (0, math_1.uiToAmount)(totalDepositAmountUi, collateralDecimals),
+            totalDepositAmount: (0, clend_common_1.uiToAmount)(totalDepositAmountUi, collateralDecimals),
             debtBankData,
             collateralBankData,
         };
@@ -906,7 +906,7 @@ class ClendClient {
         if (withdrawAll) {
             utils_1.logger.info("withdrawLeverage withdrawing all");
             collateralToWithdraw = collateralAmount;
-            debtToRepay = (0, math_1.calculateLiabilityInterest)(debtBalance.liabilityShares, debtBankData.liabilityShareValue, debtBankData.borrowApy, debtBankData.lastUpdate.toNumber(), new Date().getTime() / 1000);
+            debtToRepay = (0, clend_common_1.calculateLiabilityInterest)(debtBalance.liabilityShares, debtBankData.liabilityShareValue, debtBankData.borrowApy, debtBankData.lastUpdate.toNumber(), new Date().getTime() / 1000);
             utils_1.logger.info(`calculated debt to repay`, {
                 debtToRepayWithInterest: debtToRepay.toString(),
                 debtToRepayRaw: debtAmount.toString(),
@@ -915,7 +915,7 @@ class ClendClient {
         else {
             utils_1.logger.info("withdrawLeverage partial withdrawal");
             // For partial withdrawal, calculate debt to maintain leverage
-            const withdrawAmountUI = (0, math_1.amountToUi)(withdrawAmount, collateralDecimals);
+            const withdrawAmountUI = (0, clend_common_1.amountToUi)(withdrawAmount, collateralDecimals);
             // Get the weights for leverage calculation
             const collateralMaintWeight = collateralBankData.config.assetWeightMaint;
             const debtMaintWeight = debtBankData.config.liabilityWeightMaint;
@@ -924,7 +924,7 @@ class ClendClient {
                 debtMaintWeight,
             });
             // Calculate leverage-preserving withdrawal
-            const { debtToRepayUi, newCollateralUi, newDebtUi, currentLeverage, newLeverage, } = (0, math_2.computeWithdrawLeverageAmounts)(collateralAmountUI, debtAmountUI, withdrawAmountUI, collateralPrice, debtPrice, 1, 1);
+            const { debtToRepayUi, newCollateralUi, newDebtUi, currentLeverage, newLeverage, } = (0, clend_common_2.computeWithdrawLeverageAmounts)(collateralAmountUI, debtAmountUI, withdrawAmountUI, collateralPrice, debtPrice, 1, 1);
             utils_1.logger.debug("withdrawLeverage params calculated", {
                 debtToRepayUi,
                 newCollateralUi,
@@ -934,12 +934,12 @@ class ClendClient {
             });
             // Set the amounts to withdraw and repay
             collateralToWithdraw = withdrawAmount;
-            debtToRepay = (0, math_1.uiToAmount)(debtToRepayUi, debtDecimals);
+            debtToRepay = (0, clend_common_1.uiToAmount)(debtToRepayUi, debtDecimals);
         }
         // add interest accrual buffer to debt to repay
         // for now we do a conservative 120 seconds
         const timeBufferSec = 120;
-        debtToRepay = (0, math_1.addInterestAccrualBuffer)(debtToRepay, debtBankData.borrowApy, timeBufferSec);
+        debtToRepay = (0, clend_common_1.addInterestAccrualBuffer)(debtToRepay, debtBankData.borrowApy, timeBufferSec);
         utils_1.logger.debug("final calculated amounts", {
             collateralToWithdraw: collateralToWithdraw.toString(),
             debtToRepay: debtToRepay.toString(),
@@ -1011,11 +1011,11 @@ class ClendClient {
         if (withdrawAll) {
             utils_1.logger.info("WithdrawAll selected");
             collateralToWithdraw = collateralAmount;
-            debtToRepay = (0, math_1.calculateLiabilityInterest)(debtBalance.liabilityShares, debtBankData.liabilityShareValue, debtBankData.borrowApy, debtBankData.lastUpdate.toNumber(), new Date().getTime() / 1000);
+            debtToRepay = (0, clend_common_1.calculateLiabilityInterest)(debtBalance.liabilityShares, debtBankData.liabilityShareValue, debtBankData.borrowApy, debtBankData.lastUpdate.toNumber(), new Date().getTime() / 1000);
             // add interest accrual buffer to debt to repay
             // for now we do a conservative 120 seconds
             const timeBufferSec = 120;
-            debtToRepay = (0, math_1.addInterestAccrualBuffer)(debtToRepay, debtBankData.borrowApy, timeBufferSec);
+            debtToRepay = (0, clend_common_1.addInterestAccrualBuffer)(debtToRepay, debtBankData.borrowApy, timeBufferSec);
             utils_1.logger.info(`calculated debt to repay`, {
                 debtToRepayWithInterest: debtToRepay.toString(),
                 debtToRepayRaw: debtAmount.toString(),
@@ -1024,13 +1024,13 @@ class ClendClient {
         else {
             utils_1.logger.info("Calculating partial deleverage for net withdrawal");
             // 1. Calculate estimated current debt accurately
-            const estimatedCurrentDebt = (0, math_1.calculateLiabilityInterest)(debtBalance.liabilityShares, debtBankData.liabilityShareValue, debtBankData.borrowApy, debtBankData.lastUpdate.toNumber(), Math.floor(Date.now() / 1000));
-            const estimatedCurrentDebtUi = (0, math_1.amountToUi)(estimatedCurrentDebt, debtDecimals);
-            const collateralAmountUI = (0, math_1.amountToUi)(collateralAmount, collateralDecimals);
+            const estimatedCurrentDebt = (0, clend_common_1.calculateLiabilityInterest)(debtBalance.liabilityShares, debtBankData.liabilityShareValue, debtBankData.borrowApy, debtBankData.lastUpdate.toNumber(), Math.floor(Date.now() / 1000));
+            const estimatedCurrentDebtUi = (0, clend_common_1.amountToUi)(estimatedCurrentDebt, debtDecimals);
+            const collateralAmountUI = (0, clend_common_1.amountToUi)(collateralAmount, collateralDecimals);
             const collateralValue = collateralAmountUI * collateralPrice;
             const estimatedCurrentDebtValue = estimatedCurrentDebtUi * debtPrice;
             // 2. Calculate ideal portion of debt to repay (baseDebtToRepay)
-            const desiredNetWithdrawalUi = (0, math_1.amountToUi)(desiredNetWithdraw, collateralDecimals);
+            const desiredNetWithdrawalUi = (0, clend_common_1.amountToUi)(desiredNetWithdraw, collateralDecimals);
             const denominator = 1 - estimatedCurrentDebtValue / collateralValue;
             if (denominator <= 0) {
                 throw new Error("Invalid calculation state: denominator non-positive.");
@@ -1040,11 +1040,11 @@ class ClendClient {
                 ? (estimatedCurrentDebtUi / collateralAmountUI) *
                     idealCollateralToWithdrawUi
                 : 0;
-            const baseDebtToRepay = (0, math_1.uiToAmount)(idealDebtToRepayUi, debtDecimals);
+            const baseDebtToRepay = (0, clend_common_1.uiToAmount)(idealDebtToRepayUi, debtDecimals);
             // 3. Calculate final debt target (including future buffer)
             const timeBufferSec = 60; // Or pass as parameter
-            const finalDebtToRepay = (0, math_1.addInterestAccrualBuffer)(baseDebtToRepay, debtBankData.borrowApy, timeBufferSec);
-            const finalDebtToRepayUi = (0, math_1.amountToUi)(finalDebtToRepay, debtDecimals);
+            const finalDebtToRepay = (0, clend_common_1.addInterestAccrualBuffer)(baseDebtToRepay, debtBankData.borrowApy, timeBufferSec);
+            const finalDebtToRepayUi = (0, clend_common_1.amountToUi)(finalDebtToRepay, debtDecimals);
             utils_1.logger.debug("Calculated final debt repay target", {
                 finalDebtToRepay: finalDebtToRepay.toString(),
             });
@@ -1061,9 +1061,9 @@ class ClendClient {
                 .mul(debtPrice)
                 .div(collateralPrice);
             // Ideal collateral input for the swap (BN)
-            const idealCollateralForSwapBN = (0, math_1.uiToAmount)(idealCollateralForSwapUi.toNumber(), collateralDecimals);
+            const idealCollateralForSwapBN = (0, clend_common_1.uiToAmount)(idealCollateralForSwapUi.toNumber(), collateralDecimals);
             // Max collateral input for the swap (BN), using the adjustment function
-            const collateralToSwapMax = (0, math_1.adjustAmountForSlippage)(idealCollateralForSwapBN, slippageBps);
+            const collateralToSwapMax = (0, clend_common_1.adjustAmountForSlippage)(idealCollateralForSwapBN, slippageBps);
             utils_1.logger.debug("Calculated max collateral needed for swap", {
                 collateralToSwapMax: collateralToSwapMax.toString(),
             });
@@ -1152,10 +1152,10 @@ class ClendClient {
         const collateralPrice = collateralBalance.price;
         const debtPrice = debtBalance.price;
         // Estimate current debt including accrued interest
-        const estimatedCurrentDebt = (0, math_1.calculateLiabilityInterest)(
+        const estimatedCurrentDebt = (0, clend_common_1.calculateLiabilityInterest)(
         // Using user's function name
         debtBalance.liabilityShares, debtBankData.liabilityShareValue, debtBankData.borrowApy, debtBankData.lastUpdate.toNumber(), Math.floor(Date.now() / 1000));
-        const estimatedCurrentDebtUi = (0, math_1.amountToUi)(estimatedCurrentDebt, debtDecimals);
+        const estimatedCurrentDebtUi = (0, clend_common_1.amountToUi)(estimatedCurrentDebt, debtDecimals);
         utils_1.logger.debug("Estimated current state", {
             collateralAmountUI,
             estimatedCurrentDebtUi,
@@ -1164,11 +1164,11 @@ class ClendClient {
         });
         // Calculate current leverage (using notional/unweighted for consistency with compute function)
         // Use estimatedCurrentDebtUi for accuracy
-        const currentLeverage = (0, math_1.calculateWeightedLeverage)(collateralAmountUI, collateralPrice, 1, estimatedCurrentDebtUi, // Use estimated current debt
+        const currentLeverage = (0, clend_common_1.calculateWeightedLeverage)(collateralAmountUI, collateralPrice, 1, estimatedCurrentDebtUi, // Use estimated current debt
         debtPrice, 1);
         utils_1.logger.debug("Calculated current leverage", { currentLeverage });
         // Calculate the IDEAL deltas based on estimated current state
-        const { collateralDelta: idealCollateralDeltaUi, debtDelta: idealDebtDeltaUi, isIncrease, } = (0, math_1.computeAdjustLeverageAmounts)(collateralAmountUI, estimatedCurrentDebtUi, // Use estimated current debt
+        const { collateralDelta: idealCollateralDeltaUi, debtDelta: idealDebtDeltaUi, isIncrease, } = (0, clend_common_1.computeAdjustLeverageAmounts)(collateralAmountUI, estimatedCurrentDebtUi, // Use estimated current debt
         collateralPrice, debtPrice, currentLeverage, targetLeverage, 1, 1);
         utils_1.logger.debug("Ideal deltas calculated", {
             idealCollateralDeltaUi,
@@ -1187,16 +1187,16 @@ class ClendClient {
             }
             else {
                 // 1. Convert ideal UI delta to BN
-                const idealAdditionalDebtAmount = (0, math_1.uiToAmount)(idealDebtDeltaUi, debtDecimals);
+                const idealAdditionalDebtAmount = (0, clend_common_1.uiToAmount)(idealDebtDeltaUi, debtDecimals);
                 // 2. Adjust for origination fee
                 const originationFeeRate = debtBankData.config.interestRateConfig.protocolOriginationFee;
-                const additionalDebtAfterFee = (0, math_1.adjustBorrowForOriginationFee)(idealAdditionalDebtAmount, originationFeeRate);
+                const additionalDebtAfterFee = (0, clend_common_1.adjustBorrowForOriginationFee)(idealAdditionalDebtAmount, originationFeeRate);
                 // 3. Adjust for slippage (borrow MORE)
-                const finalAdditionalDebt = (0, math_1.adjustAmountForSlippage)(
+                const finalAdditionalDebt = (0, clend_common_1.adjustAmountForSlippage)(
                 // Use renamed function
                 additionalDebtAfterFee, slippageBps);
                 // 4. Convert final adjusted BN back to UI units for return
-                finalDebtDeltaUi = (0, math_1.amountToUi)(finalAdditionalDebt, debtDecimals);
+                finalDebtDeltaUi = (0, clend_common_1.amountToUi)(finalAdditionalDebt, debtDecimals);
                 utils_1.logger.debug("Debt delta adjustments applied (Increase)", {
                     idealDebtDeltaUi,
                     idealAdditionalDebtAmount: idealAdditionalDebtAmount.toString(),
@@ -1216,13 +1216,13 @@ class ClendClient {
             }
             else {
                 // 1. Convert ideal UI delta (amount to repay) to BN
-                const baseDebtToRepay = (0, math_1.uiToAmount)(idealDebtDeltaUi, debtDecimals);
+                const baseDebtToRepay = (0, clend_common_1.uiToAmount)(idealDebtDeltaUi, debtDecimals);
                 const timeBufferSec = 60;
                 // 2. Add future interest buffer using addInterestAccrualBuffer
-                const finalDebtToRepayTargetBN = (0, math_1.addInterestAccrualBuffer)(
+                const finalDebtToRepayTargetBN = (0, clend_common_1.addInterestAccrualBuffer)(
                 // Using user's function name
                 baseDebtToRepay, debtBankData.borrowApy, timeBufferSec);
-                finalDebtDeltaUi = (0, math_1.amountToUi)(finalDebtToRepayTargetBN, debtDecimals); // This is the final debt change target
+                finalDebtDeltaUi = (0, clend_common_1.amountToUi)(finalDebtToRepayTargetBN, debtDecimals); // This is the final debt change target
                 utils_1.logger.debug("Debt delta adjustments applied (Decrease)", {
                     idealDebtDeltaUi,
                     baseDebtToRepay: baseDebtToRepay.toString(),
@@ -1242,13 +1242,13 @@ class ClendClient {
                     .mul(debtPrice)
                     .div(collateralPrice);
                 // Ideal collateral input for the swap (BN)
-                const idealCollateralForSwapBN = (0, math_1.uiToAmount)(idealCollateralForSwapUi.toNumber(), collateralDecimals);
+                const idealCollateralForSwapBN = (0, clend_common_1.uiToAmount)(idealCollateralForSwapUi.toNumber(), collateralDecimals);
                 // Max collateral needed for swap (BN), using the adjustment function
-                const collateralToSwapMax = (0, math_1.adjustAmountForSlippage)(
+                const collateralToSwapMax = (0, clend_common_1.adjustAmountForSlippage)(
                 // Use renamed function
                 idealCollateralForSwapBN, slippageBps);
                 // This collateral amount is the change needed (it will be withdrawn)
-                finalCollateralDeltaUi = (0, math_1.amountToUi)(collateralToSwapMax, collateralDecimals);
+                finalCollateralDeltaUi = (0, clend_common_1.amountToUi)(collateralToSwapMax, collateralDecimals);
                 utils_1.logger.debug("Collateral delta recalculated for swap (Decrease)", {
                     finalDebtDeltaUi,
                     idealCollateralForSwapUi: idealCollateralForSwapUi.toString(),
@@ -1323,7 +1323,7 @@ class ClendClient {
         if (isIncrease) {
             utils_1.logger.info("Building instructions for increasing leverage");
             // Use the finalDebtDeltaUi passed in (already adjusted)
-            const additionalDebtAmount = (0, math_1.uiToAmount)(finalDebtDeltaUi, debtBankData.mintDecimals);
+            const additionalDebtAmount = (0, clend_common_1.uiToAmount)(finalDebtDeltaUi, debtBankData.mintDecimals);
             utils_1.logger.debug("additionalDebtAmount to borrow (final adjusted)", {
                 additionalDebtAmount: additionalDebtAmount.toString(),
             });
@@ -1361,9 +1361,9 @@ class ClendClient {
             // Decreasing Leverage
             utils_1.logger.info("Building instructions for decreasing leverage");
             // Use the finalDebtDeltaUi passed in (already includes future buffer)
-            const finalDebtToRepayBN = (0, math_1.uiToAmount)(finalDebtDeltaUi, debtBankData.mintDecimals);
+            const finalDebtToRepayBN = (0, clend_common_1.uiToAmount)(finalDebtDeltaUi, debtBankData.mintDecimals);
             // Use the finalCollateralDeltaUi passed in (already includes slippage adjustment for swap)
-            const finalCollateralToWithdrawBN = (0, math_1.uiToAmount)(finalCollateralDeltaUi, collateralBankData.mintDecimals);
+            const finalCollateralToWithdrawBN = (0, clend_common_1.uiToAmount)(finalCollateralDeltaUi, collateralBankData.mintDecimals);
             utils_1.logger.debug("Final amounts for decrease operation (Native)", {
                 finalDebtToRepayBN: finalDebtToRepayBN.toString(),
                 finalCollateralToWithdrawBN: finalCollateralToWithdrawBN.toString(),