fix: traded interest rates (#768)

notional-finance · Apr 19, 2024 · df7f9fc · df7f9fc
1 parent 4984998
commit df7f9fc
Showing 1 changed file with 11 additions and 18 deletions.
diff --git a/packages/notionable/src/base-trade/trade-calculation.ts b/packages/notionable/src/base-trade/trade-calculation.ts
@@ -459,24 +459,22 @@ function computeCollateralOptions(
   return options.map((c) => {
     const i = { ...inputs, collateral: c };
     try {
-      const { collateralBalance, netRealizedCollateralBalance, collateralFee } =
-        calculationFn(
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          i as any
-        ) as {
-          collateralFee: TokenBalance;
-          collateralBalance: TokenBalance;
-          netRealizedCollateralBalance: TokenBalance;
-        };
+      const { collateralBalance, netRealizedCollateralBalance } = calculationFn(
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        i as any
+      ) as {
+        collateralFee: TokenBalance;
+        collateralBalance: TokenBalance;
+        netRealizedCollateralBalance: TokenBalance;
+      };
 
       return {
         token: c,
         balance: collateralBalance,
         ..._getTradedInterestRate(
           netRealizedCollateralBalance,
           collateralBalance,
-          fCashMarket,
-          collateralFee
+          fCashMarket
         ),
       };
     } catch (e) {
@@ -510,7 +508,7 @@ function computeDebtOptions(
         );
       }
 
-      const { debtBalance, netRealizedDebtBalance, debtFee } = calculationFn(
+      const { debtBalance, netRealizedDebtBalance } = calculationFn(
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         i as any
       ) as {
@@ -526,7 +524,6 @@ function computeDebtOptions(
           netRealizedDebtBalance,
           debtBalance.unwrapVaultToken(),
           fCashMarket,
-          debtFee,
           tradeType
         ),
       };
@@ -545,18 +542,14 @@ function _getTradedInterestRate(
   realized: TokenBalance,
   amount: TokenBalance,
   fCashMarket: fCashMarket,
-  fee?: TokenBalance,
   tradeType?: TradeType | VaultTradeType
 ) {
   let interestRate: number | undefined;
   let utilization: number | undefined;
   if (amount.tokenType === 'fCash') {
     // We net off the fee for fcash so that we show it as an up-front
     // trading fee rather than part of the implied yield
-    interestRate = fCashMarket.getImpliedInterestRate(
-      realized.sub(fee?.toUnderlying() || realized.copy(0)),
-      amount
-    );
+    interestRate = fCashMarket.getImpliedInterestRate(realized, amount);
   } else if (amount.tokenType === 'PrimeCash') {
     // Increases or decreases the prime supply accordingly
     utilization = fCashMarket.getPrimeCashUtilization(amount, undefined);