@curvefi/llamalend-api 2.0.2 → 2.0.3

package/lib/index.d.ts

@@ -26,7 +26,7 @@ export declare function createLlamalend(): {
     readonly signerAddress: string;
     LendMarketTemplate: typeof LendMarketTemplate;
     MintMarketTemplate: typeof MintMarketTemplate;
-    getLendMarket: (lendMarketId: string) => LendMarketTemplate;
+    getLendMarket: (lendMarketId: string) => LendMarketTemplate<"v1"> | LendMarketTemplate<"v2">;
     getMintMarket: (mintMarketId: string) => MintMarketTemplate;
     totalSupply: () => Promise<{
         total: string;
@@ -128,7 +128,7 @@ declare const _default: {
     readonly signerAddress: string;
     LendMarketTemplate: typeof LendMarketTemplate;
     MintMarketTemplate: typeof MintMarketTemplate;
-    getLendMarket: (lendMarketId: string) => LendMarketTemplate;
+    getLendMarket: (lendMarketId: string) => LendMarketTemplate<"v1"> | LendMarketTemplate<"v2">;
     getMintMarket: (mintMarketId: string) => MintMarketTemplate;
     totalSupply: () => Promise<{
         total: string;

package/lib/lendMarkets/LendMarketTemplate.d.ts

@@ -4,11 +4,14 @@ import { ILeverageZapV2 } from "./interfaces/leverageZapV2.js";
 import { IUserPosition, IWallet, IPrices, IAmm, IVault } from "./interfaces/common";
 import { IStatsV1, ILoanV1, ILeverageV1 } from "./interfaces/v1";
 import { IStatsV2, ILoanV2, ILeverageV2 } from "./interfaces/v2";
-export declare class LendMarketTemplate {
+type LoanForVersion<V extends 'v1' | 'v2'> = V extends 'v1' ? ILoanV1 : ILoanV2;
+type StatsForVersion<V extends 'v1' | 'v2'> = V extends 'v1' ? IStatsV1 : IStatsV2;
+type LeverageForVersion<V extends 'v1' | 'v2'> = V extends 'v1' ? ILeverageV1 : ILeverageV2;
+export declare class LendMarketTemplate<V extends 'v1' | 'v2' = 'v1' | 'v2'> {
     private llamalend;
     id: string;
     name: string;
-    version: 'v1' | 'v2';
+    version: V;
     addresses: {
         amm: string;
         controller: string;
@@ -41,10 +44,11 @@ export declare class LendMarketTemplate {
     prices: IPrices;
     amm: IAmm;
     vault: IVault;
-    stats: IStatsV1 | IStatsV2;
-    loan: ILoanV1 | ILoanV2;
-    leverage: ILeverageV1 | ILeverageV2;
+    stats: StatsForVersion<V>;
+    loan: LoanForVersion<V>;
+    leverage: LeverageForVersion<V>;
     leverageZapV2: ILeverageZapV2;
     constructor(id: string, marketData: IOneWayMarket, llamalend: Llamalend);
     getLlamalend(): Llamalend;
 }
+export {};

package/lib/lendMarkets/LendMarketTemplate.js

@@ -29,7 +29,7 @@ export class LendMarketTemplate {
     constructor(id, marketData, llamalend) {
         this.swapDataCache = {};
         this.llamalend = llamalend;
-        this.version = marketData.version || 'v1';
+        this.version = (marketData.version || 'v1');
         this.id = id;
         this.name = marketData.name;
         this.addresses = marketData.addresses;

package/lib/lendMarkets/fetch/fetchLendMarkets.js

@@ -10,14 +10,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { getFactoryMarketDataV1, getFactoryMarketDataV2, getFactoryMarketDataByAPI } from "./fetchFactoryData.js";
 import LlammaABI from '../../constants/abis/Llamma.json' with { type: 'json' };
 import ControllerABI from '../../constants/abis/Controller.json' with { type: 'json' };
+import ControllerV2ABI from '../../constants/abis/ControllerV2.json' with { type: 'json' };
 import MonetaryPolicyABI from '../../constants/abis/MonetaryPolicy.json' with { type: 'json' };
 import VaultABI from '../../constants/abis/Vault.json' with { type: 'json' };
 import GaugeABI from '../../constants/abis/GaugeV5.json' with { type: 'json' };
 import SidechainGaugeABI from '../../constants/abis/SidechainGauge.json' with { type: 'json' };
+const controllerAbiMap = {
+    'v1': ControllerABI,
+    'v2': ControllerV2ABI,
+};
 const registerMarkets = (llamalend, names, amms, controllers, borrowed_tokens, collateral_tokens, monetary_policies, vaults, gauges, COIN_DATA, version) => {
     amms.forEach((amm, index) => {
         llamalend.setContract(amms[index], LlammaABI);
-        llamalend.setContract(controllers[index], ControllerABI);
+        llamalend.setContract(controllers[index], controllerAbiMap[version]);
         llamalend.setContract(monetary_policies[index], MonetaryPolicyABI);
         llamalend.setContract(vaults[index], VaultABI);
         if (gauges[index]) {

package/lib/lendMarkets/interfaces/v2/loanV2.d.ts

@@ -42,7 +42,7 @@ export interface ILoanV2 {
     repayPrices: (debt: TAmount, address?: string) => Promise<string[]>;
     repayIsApproved: (debt: TAmount) => Promise<boolean>;
     repayApprove: (debt: TAmount) => Promise<string[]>;
-    repayHealth: (debt: TAmount, full?: boolean, address?: string) => Promise<string>;
+    repayHealth: (debt: TAmount, shrink?: boolean, full?: boolean, address?: string) => Promise<string>;
     repay: (debt: TAmount, address?: string) => Promise<string>;
     repayFutureLeverage: (debt: TAmount, userAddress?: string) => Promise<string>;
     fullRepayIsApproved: (address?: string) => Promise<boolean>;

package/lib/lendMarkets/lendMarketConstructor.d.ts

@@ -1,3 +1,3 @@
 import { LendMarketTemplate } from "./LendMarketTemplate.js";
 import type { Llamalend } from "../llamalend.js";
-export declare const getLendMarket: (this: Llamalend, lendMarketId: string) => LendMarketTemplate;
+export declare const getLendMarket: (this: Llamalend, lendMarketId: string) => LendMarketTemplate<"v1"> | LendMarketTemplate<"v2">;

package/lib/lendMarkets/lendMarketConstructor.js

@@ -4,7 +4,12 @@ export const getLendMarket = function (lendMarketId) {
         const marketData = this.constants.ONE_WAY_MARKETS[lendMarketId] || this.constants.ONE_WAY_MARKETS_V2[lendMarketId];
         if (!marketData)
             throw new Error(`Lend market with id ${lendMarketId} not found`);
-        this.lendMarkets[lendMarketId] = new LendMarketTemplate(lendMarketId, marketData, this);
+        if (marketData.version === 'v2') {
+            this.lendMarkets[lendMarketId] = new LendMarketTemplate(lendMarketId, marketData, this);
+        }
+        else {
+            this.lendMarkets[lendMarketId] = new LendMarketTemplate(lendMarketId, marketData, this);
+        }
     }
     return this.lendMarkets[lendMarketId];
 };

package/lib/lendMarkets/modules/common/loanBase.d.ts

@@ -71,7 +71,6 @@ export declare class LoanBaseModule {
     repayIsApproved(debt: number | string): Promise<boolean>;
     private repayApproveEstimateGas;
     repayApprove(debt: number | string): Promise<string[]>;
-    repayHealth(debt: number | string, full?: boolean, address?: string): Promise<string>;
     private _repay;
     repayEstimateGas(debt: number | string, address?: string): Promise<TGas>;
     repay(debt: number | string, address?: string): Promise<string>;

package/lib/lendMarkets/modules/common/loanBase.js

@@ -162,10 +162,8 @@ export class LoanBaseModule {
             const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
             const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
             const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            // TODO: verify parameters
-            let _health = yield contract.health_calculator(this.llamalend.constants.ZERO_ADDRESS, _collateral, _debt, full, range, this.llamalend.constantOptions);
-            _health = _health * BigInt(100);
-            return formatUnits(_health);
+            const _health = yield contract.health_calculator(this.llamalend.constants.ZERO_ADDRESS, _collateral, _debt, full, range, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
         });
     }
     createLoanIsApproved(collateral) {
@@ -254,9 +252,8 @@ export class LoanBaseModule {
             const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
             const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
             const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            let _health = yield contract.health_calculator(address, _collateral, _debt, full, 0, this.llamalend.constantOptions);
-            _health = _health * BigInt(100);
-            return formatUnits(_health);
+            const _health = yield contract.health_calculator(address, _collateral, _debt, full, 0, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
         });
     }
     borrowMoreIsApproved(collateral) {
@@ -345,9 +342,8 @@ export class LoanBaseModule {
             address = _getAddress.call(this.llamalend, address);
             const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
             const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            let _health = yield contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions);
-            _health = _health * BigInt(100);
-            return formatUnits(_health);
+            const _health = yield contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
         });
     }
     addCollateralIsApproved(collateral) {
@@ -444,9 +440,8 @@ export class LoanBaseModule {
             address = _getAddress.call(this.llamalend, address);
             const _collateral = parseUnits(collateral, this.market.collateral_token.decimals) * BigInt(-1);
             const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            let _health = yield contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions);
-            _health = _health * BigInt(100);
-            return formatUnits(_health);
+            const _health = yield contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
         });
     }
     _removeCollateral(collateral, estimateGas) {
@@ -532,16 +527,6 @@ export class LoanBaseModule {
             return yield ensureAllowance.call(this.llamalend, [this.market.borrowed_token.address], [debt], this.market.addresses.controller);
         });
     }
-    repayHealth(debt_1) {
-        return __awaiter(this, arguments, void 0, function* (debt, full = true, address = "") {
-            address = _getAddress.call(this.llamalend, address);
-            const _debt = parseUnits(debt) * BigInt(-1);
-            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            let _health = yield contract.health_calculator(address, 0, _debt, full, 0, this.llamalend.constantOptions);
-            _health = _health * BigInt(100);
-            return formatUnits(_health);
-        });
-    }
     _repay(debt, address, estimateGas) {
         return __awaiter(this, void 0, void 0, function* () {
             address = _getAddress.call(this.llamalend, address);

package/lib/lendMarkets/modules/v1/loanV1.d.ts

@@ -1,4 +1,5 @@
 import { LoanBaseModule } from "../common/loanBase.js";
 import { ILoanV1 } from "../../interfaces/v1/loanV1";
 export declare class LoanV1Module extends LoanBaseModule implements ILoanV1 {
+    repayHealth(debt: number | string, full?: boolean, address?: string): Promise<string>;
 }

package/lib/lendMarkets/modules/v1/loanV1.js

@@ -1,3 +1,22 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { LoanBaseModule } from "../common/loanBase.js";
+import { _getAddress, formatUnits, parseUnits } from "../../../utils";
 export class LoanV1Module extends LoanBaseModule {
+    repayHealth(debt_1) {
+        return __awaiter(this, arguments, void 0, function* (debt, full = true, address = "") {
+            address = _getAddress.call(this.llamalend, address);
+            const _debt = parseUnits(debt) * BigInt(-1);
+            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+            const _health = yield contract.health_calculator(address, 0, _debt, full, 0, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
+        });
+    }
 }

package/lib/lendMarkets/modules/v2/loanV2.d.ts

@@ -1,4 +1,9 @@
 import { LoanBaseModule } from "../common/loanBase.js";
 import { ILoanV2 } from "../../interfaces/v2";
 export declare class LoanV2Module extends LoanBaseModule implements ILoanV2 {
+    createLoanHealth(collateral: number | string, debt: number | string, range: number, full?: boolean): Promise<string>;
+    addCollateralHealth(collateral: number | string, full?: boolean, address?: string): Promise<string>;
+    removeCollateralHealth(collateral: number | string, full?: boolean, address?: string): Promise<string>;
+    borrowMoreHealth(collateral: number | string, debt: number | string, full?: boolean, address?: string): Promise<string>;
+    repayHealth(debt: number | string, shrink?: boolean, full?: boolean, address?: string): Promise<string>;
 }

package/lib/lendMarkets/modules/v2/loanV2.js

@@ -1,3 +1,60 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { LoanBaseModule } from "../common/loanBase.js";
+import { _getAddress, formatUnits, parseUnits } from "../../../utils";
 export class LoanV2Module extends LoanBaseModule {
+    createLoanHealth(collateral_1, debt_1, range_1) {
+        return __awaiter(this, arguments, void 0, function* (collateral, debt, range, full = true) {
+            const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
+            const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
+            const address = _getAddress.call(this.llamalend, '');
+            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+            const _health = yield contract.create_loan_health_preview(_collateral, _debt, range, address, full, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
+        });
+    }
+    addCollateralHealth(collateral_1) {
+        return __awaiter(this, arguments, void 0, function* (collateral, full = true, address = "") {
+            address = _getAddress.call(this.llamalend, address);
+            const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
+            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+            const _health = yield contract.add_collateral_health_preview(_collateral, address, address, full, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
+        });
+    }
+    removeCollateralHealth(collateral_1) {
+        return __awaiter(this, arguments, void 0, function* (collateral, full = true, address = "") {
+            address = _getAddress.call(this.llamalend, address);
+            const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
+            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+            const _health = yield contract.remove_collateral_health_preview(_collateral, address, full, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
+        });
+    }
+    borrowMoreHealth(collateral_1, debt_1) {
+        return __awaiter(this, arguments, void 0, function* (collateral, debt, full = true, address = "") {
+            address = _getAddress.call(this.llamalend, address);
+            const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
+            const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
+            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+            const _health = yield contract.borrow_more_health_preview(_collateral, _debt, address, full, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
+        });
+    }
+    repayHealth(debt_1) {
+        return __awaiter(this, arguments, void 0, function* (debt, shrink = false, full = true, address = "") {
+            address = _getAddress.call(this.llamalend, address);
+            const _debt = parseUnits(debt);
+            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+            const _health = yield contract.repay_health_preview(0, _debt, address, address, shrink, full, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
+        });
+    }
 }

package/lib/llamalend.d.ts

@@ -21,7 +21,7 @@ declare class Llamalend implements ILlamalend {
         [addres: string]: MintMarketTemplate;
     };
     lendMarkets: {
-        [addres: string]: LendMarketTemplate;
+        [address: string]: LendMarketTemplate<'v1'> | LendMarketTemplate<'v2'>;
     };
     feeData: {
         gasPrice?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/llamalend-api",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "JavaScript library for Curve Lending",
   "main": "lib/index.js",
   "author": "Macket",
@@ -20,7 +20,9 @@
     "watch": "tsc --watch",
     "watch:lib": "rm -rf lib && tsc --watch --project tsconfig.build.json"
   },
-  "engines": { "node": "24" },
+  "engines": {
+    "node": "24"
+  },
   "type": "module",
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.1",
@@ -35,10 +37,14 @@
     "chai": "^5.3.3",
     "eslint": "^9.38.0",
     "globals": "^16.4.0",
-    "mocha": "^11.7.4",
+    "mocha": "^11.7.5",
     "typescript": "^5.9.3",
     "vue-eslint-parser": "^10.2.0"
   },
+  "overrides": {
+    "serialize-javascript": "^7.0.4",
+    "diff": "^8.0.3"
+  },
   "dependencies": {
     "@curvefi/ethcall": "6.0.16",
     "bignumber.js": "9.3.1",