@curvefi/llamalend-api 2.0.2 → 2.0.3

package/src/lendMarkets/LendMarketTemplate.ts

@@ -24,6 +24,10 @@ import {
     VaultModule,
 } from "./modules/common";
 
+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;
+
 type V1ModuleConstructors = {
     UserPosition: typeof UserPositionModule;
     Stats: typeof StatsV1Module;
@@ -73,11 +77,11 @@ const versionModules: { v1: V1ModuleConstructors; v2: V2ModuleConstructors } = {
     },
 };
 
-export class LendMarketTemplate {
+export class LendMarketTemplate<V extends 'v1' | 'v2' = 'v1' | 'v2'> {
     private llamalend: Llamalend;
     id: string;
     name: string;
-    version: 'v1' | 'v2';
+    version: V;
     addresses: {
         amm: string,
         controller: string,
@@ -111,14 +115,14 @@ export 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) {
         this.llamalend = llamalend;
-        this.version = marketData.version || 'v1';
+        this.version = (marketData.version || 'v1') as V;
         this.id = id;
         this.name = marketData.name;
         this.addresses = marketData.addresses;
@@ -172,7 +176,7 @@ export class LendMarketTemplate {
             totalDebt: stats.statsTotalDebt.bind(this),
             ammBalances: stats.statsAmmBalances.bind(this),
             capAndAvailable: stats.statsCapAndAvailable.bind(this),
-        }
+        } as StatsForVersion<V>
 
         this.wallet = {
             balances: wallet.balances.bind(this),
@@ -285,7 +289,7 @@ export class LendMarketTemplate {
                 partialSelfLiquidateApprove: loan.estimateGas.partialSelfLiquidateApprove,
                 partialSelfLiquidate: loan.partialSelfLiquidateEstimateGas.bind(loan),
             },
-        }
+        } as LoanForVersion<V>
 
         this.vault = {
             maxDeposit: vault.vaultMaxDeposit.bind(vault),
@@ -389,7 +393,7 @@ export class LendMarketTemplate {
                 repayApprove: leverageZapV1.leverageRepayApproveEstimateGas.bind(leverageZapV1),
                 repay: leverageZapV1.leverageRepayEstimateGas.bind(leverageZapV1),
             },
-        }
+        } as LeverageForVersion<V>
 
         this.leverageZapV2 = {
             hasLeverage: leverageZapV2.hasLeverage.bind(leverageZapV2),

package/src/lendMarkets/fetch/fetchLendMarkets.ts

@@ -4,11 +4,17 @@ import { getFactoryMarketDataV1, getFactoryMarketDataV2, getFactoryMarketDataByA
 
 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: Llamalend,
     names: string[],
@@ -24,7 +30,7 @@ const registerMarkets = (
 ) => {
     amms.forEach((amm: string, index: number) => {
         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/src/lendMarkets/interfaces/v2/loanV2.ts

@@ -41,7 +41,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>;
 

package/src/lendMarkets/lendMarketConstructor.ts

@@ -1,11 +1,15 @@
 import { LendMarketTemplate} from "./LendMarketTemplate.js";
 import type { Llamalend } from "../llamalend.js";
 
-export const getLendMarket = function (this: Llamalend, lendMarketId: string): LendMarketTemplate {
+export const getLendMarket = function (this: Llamalend, lendMarketId: string): LendMarketTemplate<'v1'> | LendMarketTemplate<'v2'> {
     if (!(lendMarketId in this.lendMarkets)) {
         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<'v2'>(lendMarketId, marketData, this);
+        } else {
+            this.lendMarkets[lendMarketId] = new LendMarketTemplate<'v1'>(lendMarketId, marketData, this);
+        }
     }
     return this.lendMarkets[lendMarketId];
 }

package/src/lendMarkets/modules/common/loanBase.ts

@@ -155,11 +155,10 @@ export class LoanBaseModule {
         const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
 
         const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-        // TODO: verify parameters
-        let _health = await contract.health_calculator(this.llamalend.constants.ZERO_ADDRESS, _collateral, _debt, full, range, this.llamalend.constantOptions) as bigint;
-        _health = _health * BigInt(100);
 
-        return formatUnits(_health);
+        const _health = await contract.health_calculator(this.llamalend.constants.ZERO_ADDRESS, _collateral, _debt, full, range, this.llamalend.constantOptions) as bigint;
+
+        return formatUnits(_health * BigInt(100));
     }
 
     public async createLoanIsApproved(collateral: number | string): Promise<boolean> {
@@ -243,10 +242,9 @@ export class LoanBaseModule {
         const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
 
         const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-        let _health = await contract.health_calculator(address, _collateral, _debt, full, 0, this.llamalend.constantOptions) as bigint;
-        _health = _health * BigInt(100);
+        const _health = await contract.health_calculator(address, _collateral, _debt, full, 0, this.llamalend.constantOptions) as bigint;
 
-        return formatUnits(_health);
+        return formatUnits(_health * BigInt(100));
     }
 
     public async borrowMoreIsApproved(collateral: number | string): Promise<boolean> {
@@ -330,10 +328,9 @@ export class LoanBaseModule {
         const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
 
         const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-        let _health = await contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions) as bigint;
-        _health = _health * BigInt(100);
+        const _health = await contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions) as bigint;
 
-        return formatUnits(_health);
+        return formatUnits(_health * BigInt(100));
     }
 
     public async addCollateralIsApproved(collateral: number | string): Promise<boolean> {
@@ -424,10 +421,9 @@ export class LoanBaseModule {
         const _collateral = parseUnits(collateral, this.market.collateral_token.decimals) * BigInt(-1);
 
         const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-        let _health = await contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions) as bigint;
-        _health = _health * BigInt(100);
+        const _health = await contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions) as bigint;
 
-        return formatUnits(_health);
+        return formatUnits(_health * BigInt(100));
     }
 
     private async _removeCollateral(collateral: number | string, estimateGas: boolean): Promise<string | TGas> {
@@ -505,17 +501,6 @@ export class LoanBaseModule {
         return await ensureAllowance.call(this.llamalend, [this.market.borrowed_token.address], [debt], this.market.addresses.controller);
     }
 
-    public async repayHealth(debt: number | string, full = true, address = ""): Promise<string> {
-        address = _getAddress.call(this.llamalend, address);
-        const _debt = parseUnits(debt) * BigInt(-1);
-
-        const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-        let _health = await contract.health_calculator(address, 0, _debt, full, 0, this.llamalend.constantOptions) as bigint;
-        _health = _health * BigInt(100);
-
-        return formatUnits(_health);
-    }
-
     private async _repay(debt: number | string, address: string, estimateGas: boolean): Promise<string | TGas> {
         address = _getAddress.call(this.llamalend, address);
         const { debt: currentDebt } = await this.market.userPosition.userState(address);

package/src/lendMarkets/modules/v1/loanV1.ts

@@ -1,4 +1,15 @@
 import { LoanBaseModule } from "../common/loanBase.js";
 import { ILoanV1 } from "../../interfaces/v1/loanV1";
+import {_getAddress, formatUnits, parseUnits} from "../../../utils";
 
-export class LoanV1Module extends LoanBaseModule implements ILoanV1 {}
+export class LoanV1Module extends LoanBaseModule implements ILoanV1 {
+    public async repayHealth(debt: number | string, full = true, address = ""): Promise<string> {
+        address = _getAddress.call(this.llamalend, address);
+        const _debt = parseUnits(debt) * BigInt(-1);
+
+        const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+        const _health = await contract.health_calculator(address, 0, _debt, full, 0, this.llamalend.constantOptions) as bigint;
+
+        return formatUnits(_health * BigInt(100));
+    }
+}

package/src/lendMarkets/modules/v2/loanV2.ts

@@ -1,4 +1,58 @@
 import { LoanBaseModule } from "../common/loanBase.js";
 import { ILoanV2 } from "../../interfaces/v2";
+import {_getAddress, formatUnits, parseUnits} from "../../../utils";
 
-export class LoanV2Module extends LoanBaseModule implements ILoanV2 {}
+export class LoanV2Module extends LoanBaseModule implements ILoanV2 {
+    public async createLoanHealth(collateral: number | string, debt: number | string, range: number, full = true): Promise<string> {
+        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 = await contract.create_loan_health_preview(_collateral, _debt, range, address, full, this.llamalend.constantOptions) as bigint;
+
+        return formatUnits(_health * BigInt(100));
+    }
+
+    public async addCollateralHealth(collateral: number | string, full = true, address = ""): Promise<string> {
+        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 = await contract.add_collateral_health_preview(_collateral, address, address, full, this.llamalend.constantOptions) as bigint;
+
+        return formatUnits(_health * BigInt(100));
+    }
+
+    public async removeCollateralHealth(collateral: number | string, full = true, address = ""): Promise<string> {
+        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 = await contract.remove_collateral_health_preview(_collateral, address, full, this.llamalend.constantOptions) as bigint;
+
+        return formatUnits(_health * BigInt(100));
+    }
+
+    public async borrowMoreHealth(collateral: number | string, debt: number | string, full = true, address = ""): Promise<string> {
+        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 = await contract.borrow_more_health_preview(_collateral, _debt, address, full, this.llamalend.constantOptions) as bigint;
+
+        return formatUnits(_health * BigInt(100));
+    }
+
+    public async repayHealth(debt: number | string, shrink = false, full = true, address = ""): Promise<string> {
+        address = _getAddress.call(this.llamalend, address);
+        const _debt = parseUnits(debt);
+
+        const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+        const _health = await contract.repay_health_preview(0, _debt, address, address, shrink, full, this.llamalend.constantOptions) as bigint;
+
+        return formatUnits(_health * BigInt(100));
+    }
+}

package/src/llamalend.ts

@@ -99,7 +99,7 @@ class Llamalend implements ILlamalend {
     chainId: IChainId;
     contracts: { [index: string]: ICurveContract };
     mintMarkets: { [addres: string]: MintMarketTemplate };
-    lendMarkets: { [addres: string]: LendMarketTemplate };
+    lendMarkets: { [address: string]: LendMarketTemplate<'v1'> | LendMarketTemplate<'v2'> };
     feeData: { gasPrice?: number, maxFeePerGas?: number, maxPriorityFeePerGas?: number };
     constantOptions: { gasLimit: number };
     options: { gasPrice?: number | bigint, maxFeePerGas?: number | bigint, maxPriorityFeePerGas?: number | bigint };