@curvefi/llamalend-api 1.0.16 → 1.0.18

package/README.md

@@ -829,13 +829,16 @@ import llamalend from "@curvefi/llamalend-api";
     
     await lendMarket.currentLeverage()
     //0.94083266399502623316
-    
-    await lendMarket.currentPosition()
-    // {
-    //      currentPosition: "95777.510614373750083"
-    //      deposited: "219533.5105208847"
-    //      percentage: "-56.372259347958530763"
-    // }
+
+    await lendMarket.currentPnL()
+    /*
+    {
+        currentPosition:"9.383656846426222260"
+        currentProfit:"0.007205653033021260"
+        deposited:"1.572195559253977"
+        percentage:"0.46"
+    }
+     */
     
     await lendMarket.tokensToLiquidate(addressToLiquidate);
     // 301.533523886491869218

package/lib/external-api.d.ts

@@ -5,6 +5,9 @@ type UserCollateral = {
     total_deposit_precise: string;
     total_deposit_from_user: number;
     total_deposit_usd_value: number;
+    total_borrowed: number;
+    total_deposit_from_user_precise: number;
+    total_deposit_from_user_usd_value: number;
 };
 export declare const _getUserCollateral: ((network: INetworkName, controller: string, user: string) => Promise<UserCollateral>) & memoize.Memoized<(network: INetworkName, controller: string, user: string) => Promise<UserCollateral>>;
 export declare const _getUserCollateralCrvUsd: ((network: INetworkName, controller: string, user: string) => Promise<string>) & memoize.Memoized<(network: INetworkName, controller: string, user: string) => Promise<string>>;

package/lib/external-api.js

@@ -112,9 +112,12 @@ export const _getUserCollateral = memoize((network, controller, user) => __await
     const response = yield fetch(url);
     const data = yield response.json();
     return {
+        total_borrowed: data.total_borrowed,
+        total_deposit_from_user_precise: data.total_deposit_from_user_precise, // Total deposit
         total_deposit_precise: data.total_deposit_precise,
         total_deposit_from_user: data.total_deposit_from_user,
         total_deposit_usd_value: data.total_deposit_usd_value,
+        total_deposit_from_user_usd_value: data.total_deposit_from_user_usd_value,
     };
 }), {
     promise: true,

package/lib/lendMarkets/LendMarketTemplate.js

@@ -2655,46 +2655,44 @@ export class LendMarketTemplate {
     currentLeverage() {
         return __awaiter(this, arguments, void 0, function* (userAddress = '') {
             userAddress = _getAddress(userAddress);
-            const [userCollateral, _current_collateral_estimation] = yield Promise.all([
+            const [userCollateral, { collateral }] = yield Promise.all([
                 _getUserCollateral(llamalend.constants.NETWORK_NAME, this.addresses.controller, userAddress),
-                llamalend.contracts[this.addresses.amm].contract.get_y_up(userAddress),
+                this.userState(userAddress),
             ]);
-            const total_deposit_from_user = userCollateral.total_deposit_from_user;
-            const current_collateral_estimation = llamalend.formatUnits(_current_collateral_estimation, this.collateral_token.decimals);
-            return BN(current_collateral_estimation).div(total_deposit_from_user).toString();
+            const total_deposit_from_user = userCollateral.total_deposit_from_user_precise;
+            return BN(collateral).div(total_deposit_from_user).toString();
         });
     }
     currentPnL() {
         return __awaiter(this, arguments, void 0, function* (userAddress = '') {
             userAddress = _getAddress(userAddress);
             const calls = [
-                llamalend.contracts[this.addresses.amm].multicallContract.get_y_up(userAddress),
                 llamalend.contracts[this.addresses.controller].multicallContract.user_state(userAddress, llamalend.constantOptions),
                 llamalend.contracts[this.addresses.amm].multicallContract.price_oracle(userAddress),
             ];
-            const [currentCollateralEstimation, userState, oraclePrice] = yield llamalend.multicallProvider.all(calls);
-            if (!(currentCollateralEstimation || userState || oraclePrice)) {
+            const [userState, oraclePrice] = yield llamalend.multicallProvider.all(calls);
+            if (!(userState || oraclePrice)) {
                 throw new Error('Multicall error');
             }
             const debt = userState[2];
             const userCollateral = yield _getUserCollateral(llamalend.constants.NETWORK_NAME, this.addresses.controller, userAddress);
-            const totalDepositUsdValue = userCollateral.total_deposit_usd_value;
-            const currentCollateralEstimationFormatted = llamalend.formatUnits(currentCollateralEstimation, this.collateral_token.decimals);
+            const totalDepositUsdValueFull = userCollateral.total_deposit_usd_value;
+            const totalDepositUsdValueUser = userCollateral.total_deposit_from_user_usd_value;
+            const totalBorrowed = userCollateral.total_borrowed;
             const oraclePriceFormatted = llamalend.formatUnits(oraclePrice, 18);
             const debtFormatted = llamalend.formatUnits(debt, 18);
-            const currentPosition = BN(currentCollateralEstimationFormatted)
-                .times(oraclePriceFormatted)
-                .minus(debtFormatted)
-                .toFixed(this.collateral_token.decimals);
-            const percentage = BN(currentPosition)
-                .div(totalDepositUsdValue)
-                .minus(1)
-                .times(100)
-                .toString();
+            const { _collateral: AmmCollateral, _borrowed: AmmBorrowed } = yield this._userState(userAddress);
+            const [AmmCollateralFormatted, AmmBorrowedFormatted] = [llamalend.formatUnits(AmmCollateral, this.collateral_token.decimals), llamalend.formatUnits(AmmBorrowed, this.borrowed_token.decimals)];
+            const a = BN(AmmCollateralFormatted).times(oraclePriceFormatted);
+            const b = BN(totalBorrowed).minus(debtFormatted);
+            const currentPosition = a.plus(AmmBorrowedFormatted).plus(b);
+            const currentProfit = currentPosition.minus(totalDepositUsdValueFull);
+            const percentage = currentProfit.div(totalDepositUsdValueUser).times(100);
             return {
-                currentPosition: currentPosition,
-                deposited: totalDepositUsdValue.toString(),
-                percentage: percentage,
+                currentPosition: currentPosition.toFixed(this.borrowed_token.decimals).toString(),
+                deposited: totalDepositUsdValueUser.toString(),
+                currentProfit: currentProfit.toFixed(this.borrowed_token.decimals).toString(),
+                percentage: percentage.toFixed(2).toString(),
             };
         });
     }

package/lib/utils.js

@@ -194,7 +194,7 @@ export const getAllowance = (coins, address, spender) => __awaiter(void 0, void
 // coins can be either addresses or symbols
 export const hasAllowance = (coins, amounts, address, spender) => __awaiter(void 0, void 0, void 0, function* () {
     const coinAddresses = _getCoinAddresses(coins);
-    const decimals = _getCoinDecimals(coinAddresses);
+    const decimals = _getCoinDecimals(coinAddresses).map((item) => Number(item));
     const _allowance = yield _getAllowance(coinAddresses, address, spender);
     const _amounts = amounts.map((a, i) => parseUnits(a, decimals[i]));
     return _allowance.map((a, i) => a >= _amounts[i]).reduce((a, b) => a && b);

package/package.json

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

package/src/external-api.ts

@@ -115,16 +115,19 @@ export const _getUsdPricesFromApi = async (): Promise<IDict<number>> => {
     return priceDictByMaxTvl
 }
 
-type UserCollateral = { total_deposit_precise: string, total_deposit_from_user: number, total_deposit_usd_value: number }
+type UserCollateral = { total_deposit_precise: string, total_deposit_from_user: number, total_deposit_usd_value: number , total_borrowed: number, total_deposit_from_user_precise: number, total_deposit_from_user_usd_value: number}
 export const _getUserCollateral = memoize(
     async (network: INetworkName, controller: string, user: string): Promise<UserCollateral> => {
         const url = `https://prices.curve.finance/v1/lending/collateral_events/${network}/${controller}/${user}`;
         const response = await fetch(url);
         const data = await response.json() as UserCollateral;
         return {
+            total_borrowed: data.total_borrowed,
+            total_deposit_from_user_precise: data.total_deposit_from_user_precise, // Total deposit
             total_deposit_precise: data.total_deposit_precise,
             total_deposit_from_user: data.total_deposit_from_user,
             total_deposit_usd_value: data.total_deposit_usd_value,
+            total_deposit_from_user_usd_value: data.total_deposit_from_user_usd_value,
         }
     },
     {

package/src/lendMarkets/LendMarketTemplate.ts

@@ -2991,57 +2991,57 @@ export class LendMarketTemplate {
 
     public async currentLeverage(userAddress = ''): Promise<string> {
         userAddress = _getAddress(userAddress);
-        const [userCollateral, _current_collateral_estimation] = await Promise.all([
+        const [userCollateral, {collateral}] = await Promise.all([
             _getUserCollateral(llamalend.constants.NETWORK_NAME, this.addresses.controller, userAddress),
-            llamalend.contracts[this.addresses.amm].contract.get_y_up(userAddress),
+            this.userState(userAddress),
         ]);
 
-        const total_deposit_from_user = userCollateral.total_deposit_from_user;
-        const current_collateral_estimation = llamalend.formatUnits(_current_collateral_estimation, this.collateral_token.decimals);
-
+        const total_deposit_from_user = userCollateral.total_deposit_from_user_precise;
 
-        return BN(current_collateral_estimation).div(total_deposit_from_user).toString();
+        return BN(collateral).div(total_deposit_from_user).toString();
     }
 
     public async currentPnL(userAddress = ''): Promise<Record<string, string>> {
         userAddress = _getAddress(userAddress);
 
         const calls = [
-            llamalend.contracts[this.addresses.amm].multicallContract.get_y_up(userAddress),
             llamalend.contracts[this.addresses.controller].multicallContract.user_state(userAddress, llamalend.constantOptions),
             llamalend.contracts[this.addresses.amm].multicallContract.price_oracle(userAddress),
         ];
 
-        const [currentCollateralEstimation, userState, oraclePrice] = await llamalend.multicallProvider.all(calls) as  [bigint, bigint[],bigint];
+        const [userState, oraclePrice] = await llamalend.multicallProvider.all(calls) as  [bigint[],bigint];
 
-        if(!(currentCollateralEstimation || userState || oraclePrice)) {
+        if(!(userState || oraclePrice)) {
             throw new Error('Multicall error')
         }
 
         const debt = userState[2];
 
         const userCollateral = await _getUserCollateral(llamalend.constants.NETWORK_NAME, this.addresses.controller, userAddress);
-        const totalDepositUsdValue = userCollateral.total_deposit_usd_value;
+        const totalDepositUsdValueFull = userCollateral.total_deposit_usd_value;
+        const totalDepositUsdValueUser = userCollateral.total_deposit_from_user_usd_value;
+        const totalBorrowed = userCollateral.total_borrowed;
 
-        const currentCollateralEstimationFormatted = llamalend.formatUnits(currentCollateralEstimation, this.collateral_token.decimals);
         const oraclePriceFormatted = llamalend.formatUnits(oraclePrice, 18);
         const debtFormatted = llamalend.formatUnits(debt, 18);
 
-        const currentPosition = BN(currentCollateralEstimationFormatted)
-            .times(oraclePriceFormatted)
-            .minus(debtFormatted)
-            .toFixed(this.collateral_token.decimals)
+        const {_collateral: AmmCollateral, _borrowed: AmmBorrowed} = await this._userState(userAddress)
+        const [AmmCollateralFormatted, AmmBorrowedFormatted] = [llamalend.formatUnits(AmmCollateral, this.collateral_token.decimals), llamalend.formatUnits(AmmBorrowed, this.borrowed_token.decimals)];
+
+        const a = BN(AmmCollateralFormatted).times(oraclePriceFormatted);
+        const b = BN(totalBorrowed).minus(debtFormatted)
+
+        const currentPosition = a.plus(AmmBorrowedFormatted).plus(b);
+
+        const currentProfit = currentPosition.minus(totalDepositUsdValueFull);
 
-        const percentage = BN(currentPosition)
-            .div(totalDepositUsdValue)
-            .minus(1)
-            .times(100)
-            .toString();
+        const percentage = currentProfit.div(totalDepositUsdValueUser).times(100);
 
         return {
-            currentPosition: currentPosition,
-            deposited: totalDepositUsdValue.toString(),
-            percentage: percentage,
+            currentPosition: currentPosition.toFixed(this.borrowed_token.decimals).toString(),
+            deposited: totalDepositUsdValueUser.toString(),
+            currentProfit: currentProfit.toFixed(this.borrowed_token.decimals).toString(),
+            percentage: percentage.toFixed(2).toString(),
         };
     }
 }

package/src/utils.ts

@@ -226,7 +226,7 @@ export const getAllowance = async (coins: string[], address: string, spender: st
 // coins can be either addresses or symbols
 export const hasAllowance = async (coins: string[], amounts: (number | string)[], address: string, spender: string): Promise<boolean> => {
     const coinAddresses = _getCoinAddresses(coins);
-    const decimals = _getCoinDecimals(coinAddresses);
+    const decimals = _getCoinDecimals(coinAddresses).map((item) => Number(item));
     const _allowance = await _getAllowance(coinAddresses, address, spender);
     const _amounts = amounts.map((a, i) => parseUnits(a, decimals[i]));