Merge branch 'main' of github.com:curvefi/curve-llamalend.js into chore/node

Author: DanielSchiavini

package-lock.json

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

package.json

@@ -40,8 +40,8 @@ export const LLAMMAS: IDict<ILlamma> = lowerCaseLlammasAddresses({
         controller_address: '0x4e59541306910ad6dc1dac0ac9dfb29bd9f15c67',
         monetary_policy_address: '0x1E7d3bf98d3f8D8CE193236c3e0eC4b00e32DaaE',
         collateral_address: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
-        leverage_zap: '0xA2518b71ee64E910741f5Cf480b19E8e402de4d7',
-        deleverage_zap: '0xb911D7e59BA82FDF477a2Ab22Ff25125072C9282',
+        leverage_zap: '0x1eaAb18c70E23331857AA47701Bb516590C8Ba2A',
+        deleverage_zap: '0xcd129c2433E3324129f19EBa42e8D115761B6f2B',
         health_calculator_zap: "0xCF61Ee62b136e3553fB545bd8fEc11fb7f830d6A",
         collateral_symbol: 'WBTC',
         collateral_decimals: 8,
@@ -86,8 +86,8 @@ export const LLAMMAS: IDict<ILlamma> = lowerCaseLlammasAddresses({
         controller_address: '0x1c91da0223c763d2e0173243eadaa0a2ea47e704',
         monetary_policy_address: '0xb8687d7dc9d8fa32fabde63e19b2dbc9bb8b2138',
         collateral_address: '0x18084fba666a33d37592fa2633fd49a74dd93a88',
-        leverage_zap: '0xD79964C70Cb06224FdA4c48387B53E9819bcB71c',
-        deleverage_zap: '0xAA25a6Fa9e4dADaE0d3EE59bEA19fbcf0284830C',
+        leverage_zap: '0x52D18d48F92a3f8625aa34F90fb18e8469458A5d',
+        deleverage_zap: '0x627E55e2A01f6bF73A956D24E8B2858c9BEB1fD7',
         collateral_symbol: 'tBTC',
         collateral_decimals: 18,
         min_bands: 4,

src/constants/llammas.ts

@@ -141,6 +141,18 @@ export const _getUserCollateralCrvUsd = memoize(
     }
 )
 
+export const _getUserCollateralCrvUsdFull = memoize(
+    async (network: INetworkName, controller: string, user: string): Promise<UserCollateral> => {
+        const url = `https://prices.curve.finance/v1/crvusd/collateral_events/${network}/${controller}/${user}`;
+        const response = await fetch(url);
+        return await response.json() as UserCollateral;
+    },
+    {
+        promise: true,
+        maxAge: 60 * 1000, // 1m
+    }
+)
+
 export const _getMarketsData = memoize(
     async (network: INetworkName): Promise<IMarketData> => {
         const url = `https://api.curve.finance/api/getLendingVaults/${network}/oneway`;

src/external-api.ts

@@ -21,7 +21,7 @@ import {
     DIGas,
 } from "../utils";
 import {IDict, ILlamma, TGas} from "../interfaces";
-import {_getUserCollateralCrvUsd} from "../external-api.js";
+import {_getUserCollateralCrvUsd, _getUserCollateralCrvUsdFull} from "../external-api.js";
 import { ILeverageV2 } from "./interfaces/leverage.js";
 import { LeverageV2Module } from "./modules";
 
@@ -1871,6 +1871,72 @@ export class MintMarketTemplate {
         return await this._deleverageRepay(collateral, slippage, false) as string;
     }
 
+    // ---------------- CURRENT LEVERAGE & PNL ----------------
+
+    private _checkLeverageForStats(): void {
+        const leverageV2Module = new LeverageV2Module(this);
+        if (!leverageV2Module.hasLeverage()) {
+            throw Error("This market does not support leverage");
+        }
+    }
+
+    public async currentLeverage(userAddress = ''): Promise<string> {
+        this._checkLeverageForStats();
+        userAddress = _getAddress.call(this.llamalend, userAddress);
+        
+        const [userCollateral, {collateral}] = await Promise.all([
+            _getUserCollateralCrvUsdFull(this.llamalend.constants.NETWORK_NAME, this.controller, userAddress),
+            this.userState(userAddress),
+        ]);
+
+        const total_deposit_from_user = userCollateral.total_deposit_from_user_precise ?? userCollateral.total_deposit_precise;
+
+        return BN(collateral).div(total_deposit_from_user).toString();
+    }
+
+    public async currentPnL(userAddress = ''): Promise<Record<string, string>> {
+        this._checkLeverageForStats();
+        userAddress = _getAddress.call(this.llamalend, userAddress);
+
+        const calls = [
+            this.llamalend.contracts[this.controller].multicallContract.user_state(userAddress, this.llamalend.constantOptions),
+            this.llamalend.contracts[this.address].multicallContract.price_oracle(this.llamalend.constantOptions),
+        ];
+
+        const [userState, oraclePrice] = await this.llamalend.multicallProvider.all(calls) as  [bigint[], bigint];
+
+        if(!(userState || oraclePrice)) {
+            throw new Error('Multicall error')
+        }
+
+        const debt = userState[2];
+
+        const userCollateral = await _getUserCollateralCrvUsdFull(this.llamalend.constants.NETWORK_NAME, this.controller, userAddress);
+        const totalDepositUsdValueFull = userCollateral.total_deposit_usd_value;
+        const totalDepositUsdValueUser = userCollateral.total_deposit_from_user_usd_value ?? userCollateral.total_deposit_usd_value;
+        const totalBorrowed = userCollateral.total_borrowed;
+
+        const oraclePriceFormatted = this.llamalend.formatUnits(oraclePrice, 18);
+        const debtFormatted = this.llamalend.formatUnits(debt, 18);
+
+        const {_collateral: ammCollateral, _stablecoin: ammBorrowed} = await this._userState(userAddress)
+        const [ammCollateralFormatted, ammBorrowedFormatted] = [this.llamalend.formatUnits(ammCollateral, this.collateralDecimals), this.llamalend.formatUnits(ammBorrowed, 18)];
+
+        const collateralValueUsd = BN(ammCollateralFormatted).times(oraclePriceFormatted);
+        const repaidDebt = BN(totalBorrowed).minus(debtFormatted)
+
+        const currentPosition = collateralValueUsd.plus(ammBorrowedFormatted).plus(repaidDebt);
+        const currentProfit = currentPosition.minus(totalDepositUsdValueFull);
+        const percentage = currentProfit.div(totalDepositUsdValueUser).times(100);
+
+        return {
+            currentPosition: currentPosition.toString(),
+            deposited: totalDepositUsdValueUser.toString(),
+            currentProfit: currentProfit.toString(),
+            percentage: percentage.toString(),
+        };
+    }
+
     public getLlamalend(): Llamalend {
         return this.llamalend;
     }