@curvefi/llamalend-api 2.0.10 → 2.0.12

package/src/constants/aliases.ts

@@ -29,7 +29,7 @@ export const ALIASES_ARBITRUM = lowerCaseValues({
 export const ALIASES_OPTIMISM = lowerCaseValues({
     "crv": "0x0994206dfE8De6Ec6920FF4D779B0d950605Fb53",
     "one_way_factory": "0x5EA8f3D674C70b020586933A0a5b250734798BeF",
-    "one_way_factory_v2": "0x7E0D6AA94d342c8EaccCf30ff84911ea6b5d5C15",
+    "one_way_factory_v2": "0x68f33663b76874166Bf3C3cB2D7C117dFf38a262",
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "gauge_factory_old": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "gauge_factory": "0x871fBD4E01012e2E8457346059e8C189d664DbA4",

package/src/lendMarkets/fetch/fetchFactoryData.ts

@@ -72,7 +72,6 @@ export const getFactoryMarketDataV2 = async (llamalend: Llamalend) => {
 
     for (let i = 0; i < markets_count; i++) {
         calls.push(createCall(factory, 'markets', [i]));
-        calls.push(createCall(factory, 'names', [i]));
     }
 
     const res = await llamalend.multicallProvider.all(calls);
@@ -87,8 +86,7 @@ export const getFactoryMarketDataV2 = async (llamalend: Llamalend) => {
     const gauges: string[] = [];
 
     for (let i = 0; i < markets_count; i++) {
-        const marketData = res[i * 2] as any;
-        const name = res[(i * 2) + 1] as string;
+        const marketData = res[i] as any;
 
         vaults.push(marketData[0].toLowerCase());
         controllers.push(marketData[1].toLowerCase());
@@ -96,7 +94,7 @@ export const getFactoryMarketDataV2 = async (llamalend: Llamalend) => {
         collateral_tokens.push(marketData[3].toLowerCase());
         borrowed_tokens.push(marketData[4].toLowerCase());
         monetary_policies.push(marketData[6].toLowerCase());
-        names.push(name);
+        names.push(''); // new factory does not give names, it's generated at the market creation level
         gauges.push(llamalend.constants.ZERO_ADDRESS);
     }
 

package/src/lendMarkets/fetch/fetchLendMarkets.ts

@@ -52,7 +52,7 @@ const registerMarkets = (
         llamalend.constants.DECIMALS[gauges[index]] = 18;
 
         const marketData = {
-            name: names[index],
+            name: names[index] || `${COIN_DATA[collateral_tokens[index]].symbol}/${COIN_DATA[borrowed_tokens[index]].symbol}`,
             version: version,
             addresses: {
                 amm: amms[index],

package/src/lendMarkets/interfaces/common/userPosition.ts

@@ -2,9 +2,9 @@ import {IDict} from "../../../interfaces";
 
 export interface IUserPosition {
     userLoanExists: (address?: string) => Promise<boolean>,
-    userStateBigInt: (address?: string) => Promise<{ _collateral: bigint, _borrowed: bigint, _debt: bigint, _N: bigint }>,
+    userStateBigInt: (address?: string) => Promise<{ _collateral: bigint, _borrowed: bigint, _debt: bigint, _N: bigint, isSoftLiquidation: boolean }>,
     userBandsBigInt:(address: string) => Promise<bigint[]>,
-    userState: (address?: string) => Promise<{ collateral: string, borrowed: string, debt: string, N: string }>,
+    userState: (address?: string) => Promise<{ collateral: string, borrowed: string, debt: string, N: string, isSoftLiquidation: boolean }>,
     userHealth: (full?: boolean, address?: string) => Promise<string>,
     userBands: (address?: string) => Promise<number[]>,
     userRange: (address?: string) => Promise<number>,

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

@@ -36,7 +36,7 @@ export class UserPositionModule implements IUserPosition {
         maxAge: 10 * 1000, // 10s
     });
 
-    public async userState(address = ""): Promise<{ collateral: string, borrowed: string, debt: string, N: string }> {
+    public async userState(address = ""): Promise<{ collateral: string, borrowed: string, debt: string, N: string, isSoftLiquidation: boolean }> {
         const { _collateral, _borrowed, _debt, _N } = await this._userState(address);
 
         return {
@@ -44,11 +44,13 @@ export class UserPositionModule implements IUserPosition {
             borrowed: formatUnits(_borrowed, this.market.borrowed_token.decimals),
             debt: formatUnits(_debt, this.market.borrowed_token.decimals),
             N: formatUnits(_N, 0),
+            isSoftLiquidation: !!_debt && !!_borrowed,
         };
     }
 
-    public async userStateBigInt(address = ""): Promise<{ _collateral: bigint, _borrowed: bigint, _debt: bigint, _N: bigint }> {
-        return await this._userState(address);
+    public async userStateBigInt(address = ""): Promise<{ _collateral: bigint, _borrowed: bigint, _debt: bigint, _N: bigint, isSoftLiquidation: boolean }> {
+        const state = await this._userState(address);
+        return { ...state, isSoftLiquidation: !!state._debt && !!state._borrowed };
     }
 
     public async userHealth(full = true, address = ""): Promise<string> {

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

@@ -68,7 +68,7 @@ export class LoanV2Module extends LoanBaseModule implements ILoanV2 {
         const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
         const collateral = parseUnits(collateralAmount, this.market.collateral_token.decimals)
         const address = _getAddress.call(this.llamalend, '');
-        const N = range ? BigInt(range) : null;
+        const N = BigInt(range || 0);
 
         return contract.max_borrowable(collateral, N, address, this.llamalend.constantOptions);
     }

package/src/mintMarkets/MintMarketTemplate.ts

@@ -536,13 +536,14 @@ export class MintMarketTemplate {
         return { _collateral, _stablecoin, _debt }
     }
 
-    public async userState(address = ""): Promise<{ collateral: string, stablecoin: string, debt: string }> {
+    public async userState(address = ""): Promise<{ collateral: string, stablecoin: string, debt: string, isSoftLiquidation: boolean }> {
         const { _collateral, _stablecoin, _debt } = await this._userState(address);
 
         return {
             collateral: formatUnits(_collateral, this.collateralDecimals),
             stablecoin: formatUnits(_stablecoin),
             debt: formatUnits(_debt),
+            isSoftLiquidation: !!_debt && !!_stablecoin,
         };
     }