@curvefi/llamalend-api 1.1.7 → 1.1.8

package/lib/interfaces.d.ts

@@ -229,4 +229,10 @@ export interface ILeverageMetrics {
     health: string;
 }
 export type GetExpectedFn = (fromToken: string, toToken: string, amountIn: bigint, blacklist: string | string[]) => Promise<IQuote>;
+export interface IRates {
+    borrowApr: string;
+    lendApr: string;
+    borrowApy: string;
+    lendApy: string;
+}
 export {};

package/lib/mintMarkets/MintMarketTemplate.d.ts

@@ -1,6 +1,6 @@
 import memoize from "memoizee";
 import type { Llamalend } from "../llamalend.js";
-import { IDict, ILlamma, TGas } from "../interfaces.js";
+import { IDict, ILlamma, TGas, IRates } from "../interfaces.js";
 import { ILeverageV2 } from "./interfaces/leverage.js";
 export declare class MintMarketTemplate {
     private llamalend;
@@ -46,8 +46,8 @@ export declare class MintMarketTemplate {
         parameters: () => Promise<{
             fee: string;
             admin_fee: string;
-            rate: string;
-            future_rate: string;
+            rates: IRates;
+            future_rates: IRates;
             liquidation_discount: string;
             loan_discount: string;
         }>;
@@ -134,18 +134,19 @@ export declare class MintMarketTemplate {
         };
     };
     constructor(id: string, llammaData: ILlamma, llamalend: Llamalend);
+    private _buildRatesObject;
     statsParameters: (() => Promise<{
         fee: string;
         admin_fee: string;
-        rate: string;
-        future_rate: string;
+        rates: IRates;
+        future_rates: IRates;
         liquidation_discount: string;
         loan_discount: string;
     }>) & memoize.Memoized<() => Promise<{
         fee: string;
         admin_fee: string;
-        rate: string;
-        future_rate: string;
+        rates: IRates;
+        future_rates: IRates;
         liquidation_discount: string;
         loan_discount: string;
     }>>;

package/lib/mintMarkets/MintMarketTemplate.js

@@ -15,7 +15,6 @@ import { LeverageV2Module } from "./modules/index.js";
 export class MintMarketTemplate {
     constructor(id, llammaData, llamalend) {
         var _a;
-        // ---------------- STATS ----------------
         this.statsParameters = memoize(() => __awaiter(this, void 0, void 0, function* () {
             const llammaContract = this.llamalend.contracts[this.address].multicallContract;
             const controllerContract = this.llamalend.contracts[this.controller].multicallContract;
@@ -31,10 +30,9 @@ export class MintMarketTemplate {
             const [_fee, _admin_fee, _rate, _mp_rate, _liquidation_discount, _loan_discount] = yield this.llamalend.multicallProvider.all(calls);
             const [fee, admin_fee, liquidation_discount, loan_discount] = [_fee, _admin_fee, _liquidation_discount, _loan_discount]
                 .map((x) => formatUnits(x * BigInt(100)));
-            // (1+rate)**(365*86400)-1 ~= (e**(rate*365*86400))-1
-            const rate = String(((Math.pow(2.718281828459, Number((toBN(_rate).times(365).times(86400))))) - 1) * 100);
-            const future_rate = String(((Math.pow(2.718281828459, Number((toBN(_mp_rate).times(365).times(86400))))) - 1) * 100);
-            return { fee, admin_fee, rate, future_rate, liquidation_discount, loan_discount };
+            const rates = this._buildRatesObject(_rate);
+            const future_rates = this._buildRatesObject(_mp_rate);
+            return { fee, admin_fee, rates, future_rates, liquidation_discount, loan_discount };
         }), {
             promise: true,
             maxAge: 5 * 60 * 1000, // 5m
@@ -378,6 +376,18 @@ export class MintMarketTemplate {
             },
         };
     }
+    // ---------------- STATS ----------------
+    _buildRatesObject(rate) {
+        const borrowApr = toBN(rate).times(365).times(86400).times(100).toString();
+        // borrowApy = e**(rate*365*86400) - 1
+        const borrowApy = String(((Math.pow(2.718281828459, (toBN(rate).times(365).times(86400)).toNumber())) - 1) * 100);
+        return {
+            borrowApr,
+            borrowApy,
+            lendApr: "0",
+            lendApy: "0",
+        };
+    }
     statsBalances() {
         return __awaiter(this, void 0, void 0, function* () {
             const crvusdContract = this.llamalend.contracts[this.llamalend.crvUsdAddress].multicallContract;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/llamalend-api",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "JavaScript library for Curve Lending",
   "main": "lib/index.js",
   "author": "Macket",

package/src/interfaces.ts

@@ -248,4 +248,11 @@ export type GetExpectedFn = (
     toToken: string,
     amountIn: bigint,
     blacklist: string | string[],
-) => Promise<IQuote>;
+) => Promise<IQuote>;
+
+export interface IRates {
+    borrowApr: string;
+    lendApr: string;
+    borrowApy: string;
+    lendApy: string;
+}

package/src/lendMarkets/LendMarketTemplate.ts

@@ -23,7 +23,7 @@ import {
     smartNumber,
     calculateFutureLeverage,
 } from "../utils.js";
-import {IDict, TGas, TAmount, IReward, IQuoteOdos, IOneWayMarket, IPartialFrac} from "../interfaces.js";
+import {IDict, TGas, TAmount, IReward, IQuoteOdos, IOneWayMarket, IPartialFrac, IRates} from "../interfaces.js";
 import { _getExpectedOdos, _getQuoteOdos, _assembleTxOdos, _getUserCollateral, _getUserCollateralForce, _getMarketsData } from "../external-api.js";
 import ERC20Abi from '../constants/abis/ERC20.json' with {type: 'json'};
 import {cacheKey, cacheStats} from "../cache/index.js";
@@ -1016,7 +1016,7 @@ export class LendMarketTemplate {
         return await mpContract.future_rate(this.addresses.controller, _dReserves, _dDebt);
     }
 
-    private async statsRates(isGetter = true, useAPI = false): Promise<{borrowApr: string, lendApr: string, borrowApy: string, lendApy: string}> {
+    private async statsRates(isGetter = true, useAPI = false): Promise<IRates> {
         if(useAPI) {
             const response = await _getMarketsData(this.llamalend.constants.NETWORK_NAME);
 
@@ -1052,7 +1052,7 @@ export class LendMarketTemplate {
         }
     }
 
-    private async statsFutureRates(dReserves: TAmount, dDebt: TAmount, useAPI = true): Promise<{borrowApr: string, lendApr: string, borrowApy: string, lendApy: string}> {
+    private async statsFutureRates(dReserves: TAmount, dDebt: TAmount, useAPI = true): Promise<IRates> {
         const _dReserves = parseUnits(dReserves, this.borrowed_token.decimals);
         const _dDebt = parseUnits(dDebt, this.borrowed_token.decimals);
         const _rate = await this._getFutureRate(_dReserves, _dDebt);

package/src/mintMarkets/MintMarketTemplate.ts

@@ -21,7 +21,7 @@ import {
     DIGas,
     calculateFutureLeverage,
 } from "../utils.js";
-import {IDict, ILlamma, TGas} from "../interfaces.js";
+import {IDict, ILlamma, TGas, IRates} from "../interfaces.js";
 import {_getUserCollateralCrvUsd, _getUserCollateralCrvUsdFull} from "../external-api.js";
 import { ILeverageV2 } from "./interfaces/leverage.js";
 import { LeverageV2Module } from "./modules/index.js";
@@ -71,8 +71,8 @@ export class MintMarketTemplate {
         parameters: () => Promise<{
             fee: string, // %
             admin_fee: string, // %
-            rate: string, // %
-            future_rate: string, // %
+            rates: IRates,
+            future_rates: IRates,
             liquidation_discount: string, // %
             loan_discount: string, // %
         }>,
@@ -282,11 +282,23 @@ export class MintMarketTemplate {
 
     // ---------------- STATS ----------------
 
+    private _buildRatesObject(rate: bigint): IRates {
+        const borrowApr = toBN(rate).times(365).times(86400).times(100).toString();
+        // borrowApy = e**(rate*365*86400) - 1
+        const borrowApy = String(((2.718281828459 ** (toBN(rate).times(365).times(86400)).toNumber()) - 1) * 100);
+        return {
+            borrowApr,
+            borrowApy,
+            lendApr: "0",
+            lendApy: "0",
+        };
+    }
+
     public statsParameters = memoize(async (): Promise<{
         fee: string, // %
         admin_fee: string, // %
-        rate: string, // %
-        future_rate: string, // %
+        rates: IRates,
+        future_rates: IRates,
         liquidation_discount: string, // %
         loan_discount: string, // %
     }> => {
@@ -307,11 +319,10 @@ export class MintMarketTemplate {
         const [fee, admin_fee, liquidation_discount, loan_discount] = [_fee, _admin_fee, _liquidation_discount, _loan_discount]
             .map((x) => formatUnits(x * BigInt(100)));
 
-        // (1+rate)**(365*86400)-1 ~= (e**(rate*365*86400))-1
-        const rate = String(((2.718281828459 ** Number((toBN(_rate).times(365).times(86400)))) - 1) * 100);
-        const future_rate = String(((2.718281828459 ** Number((toBN(_mp_rate).times(365).times(86400)))) - 1) * 100);
+        const rates = this._buildRatesObject(_rate);
+        const future_rates = this._buildRatesObject(_mp_rate);
 
-        return { fee, admin_fee, rate, future_rate, liquidation_discount, loan_discount }
+        return { fee, admin_fee, rates, future_rates, liquidation_discount, loan_discount }
     },
     {
         promise: true,