@curvefi/llamalend-api 1.0.34 → 1.0.36

package/lib/constants/abis/crvUSD/controller_v2.json

@@ -397,6 +397,10 @@
             {
                 "name": "callback_args",
                 "type": "uint256[]"
+            },
+            {
+                "name": "callback_bytes",
+                "type": "bytes"
             }
         ],
         "name": "create_loan_extended",
@@ -448,6 +452,34 @@
         "stateMutability": "payable",
         "type": "function"
     },
+    {
+        "stateMutability": "nonpayable",
+        "type": "function",
+        "name": "borrow_more_extended",
+        "inputs": [
+            {
+                "name": "collateral",
+                "type": "uint256"
+            },
+            {
+                "name": "debt",
+                "type": "uint256"
+            },
+            {
+                "name": "callbacker",
+                "type": "address"
+            },
+            {
+                "name": "callback_args",
+                "type": "uint256[]"
+            },
+            {
+                "name": "callback_bytes",
+                "type": "bytes"
+            }
+        ],
+        "outputs": []
+    },
     {
         "inputs": [
             {
@@ -477,6 +509,10 @@
             {
                 "name": "callback_args",
                 "type": "uint256[]"
+            },
+            {
+                "name": "callback_bytes",
+                "type": "bytes"
             }
         ],
         "name": "repay_extended",

package/lib/external-api.d.ts

@@ -14,6 +14,7 @@ type UserCollateral = {
 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 _getUserCollateralForce: (network: INetworkName, controller: string, user: string, newTx: string) => Promise<void>;
 export declare const _getUserCollateralCrvUsd: ((network: INetworkName, controller: string, user: string) => Promise<string>) & memoize.Memoized<(network: INetworkName, controller: string, user: string) => Promise<string>>;
+export declare const _getUserCollateralCrvUsdFull: ((network: INetworkName, controller: string, user: string) => Promise<UserCollateral>) & memoize.Memoized<(network: INetworkName, controller: string, user: string) => Promise<UserCollateral>>;
 export declare const _getMarketsData: ((network: INetworkName) => Promise<IMarketData>) & memoize.Memoized<(network: INetworkName) => Promise<IMarketData>>;
 export declare function _getQuoteOdos(this: Llamalend, fromToken: string, toToken: string, _amount: bigint, blacklist: string, pathVizImage: boolean, slippage?: number): Promise<IQuoteOdos>;
 export declare function _getExpectedOdos(this: Llamalend, fromToken: string, toToken: string, _amount: bigint, blacklist: string): Promise<string>;

package/lib/external-api.js

@@ -119,6 +119,14 @@ export const _getUserCollateralCrvUsd = memoize((network, controller, user) => _
     promise: true,
     maxAge: 60 * 1000, // 1m
 });
+export const _getUserCollateralCrvUsdFull = memoize((network, controller, user) => __awaiter(void 0, void 0, void 0, function* () {
+    const url = `https://prices.curve.finance/v1/crvusd/collateral_events/${network}/${controller}/${user}`;
+    const response = yield fetch(url);
+    return yield response.json();
+}), {
+    promise: true,
+    maxAge: 60 * 1000, // 1m
+});
 export const _getMarketsData = memoize((network) => __awaiter(void 0, void 0, void 0, function* () {
     const url = `https://api.curve.finance/api/getLendingVaults/${network}/oneway`;
     const response = yield fetch(url, { headers: { "accept": "application/json" } });

package/lib/mintMarkets/MintMarketTemplate.d.ts

@@ -329,5 +329,8 @@ export declare class MintMarketTemplate {
     private _deleverageRepay;
     private deleverageRepayEstimateGas;
     private deleverageRepay;
+    private _checkLeverageForStats;
+    currentLeverage(userAddress?: string): Promise<string>;
+    currentPnL(userAddress?: string): Promise<Record<string, string>>;
     getLlamalend(): Llamalend;
 }

package/lib/mintMarkets/MintMarketTemplate.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import memoize from "memoizee";
 import BigNumber from "bignumber.js";
 import { _getAddress, parseUnits, BN, toBN, fromBN, getBalances, ensureAllowance, hasAllowance, ensureAllowanceEstimateGas, isEth, _cutZeros, formatUnits, smartNumber, MAX_ALLOWANCE, MAX_ACTIVE_BAND, _mulBy1_3, DIGas, } from "../utils";
-import { _getUserCollateralCrvUsd } from "../external-api.js";
+import { _getUserCollateralCrvUsd, _getUserCollateralCrvUsdFull } from "../external-api.js";
 import { LeverageV2Module } from "./modules";
 export class MintMarketTemplate {
     constructor(id, llammaData, llamalend) {
@@ -1740,6 +1740,61 @@ export class MintMarketTemplate {
             return yield this._deleverageRepay(collateral, slippage, false);
         });
     }
+    // ---------------- CURRENT LEVERAGE & PNL ----------------
+    _checkLeverageForStats() {
+        const leverageV2Module = new LeverageV2Module(this);
+        if (!leverageV2Module.hasLeverage()) {
+            throw Error("This market does not support leverage");
+        }
+    }
+    currentLeverage() {
+        return __awaiter(this, arguments, void 0, function* (userAddress = '') {
+            var _a;
+            this._checkLeverageForStats();
+            userAddress = _getAddress.call(this.llamalend, userAddress);
+            const [userCollateral, { collateral }] = yield Promise.all([
+                _getUserCollateralCrvUsdFull(this.llamalend.constants.NETWORK_NAME, this.controller, userAddress),
+                this.userState(userAddress),
+            ]);
+            const total_deposit_from_user = (_a = userCollateral.total_deposit_from_user_precise) !== null && _a !== void 0 ? _a : userCollateral.total_deposit_precise;
+            return BN(collateral).div(total_deposit_from_user).toString();
+        });
+    }
+    currentPnL() {
+        return __awaiter(this, arguments, void 0, function* (userAddress = '') {
+            var _a;
+            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] = yield this.llamalend.multicallProvider.all(calls);
+            if (!(userState || oraclePrice)) {
+                throw new Error('Multicall error');
+            }
+            const debt = userState[2];
+            const userCollateral = yield _getUserCollateralCrvUsdFull(this.llamalend.constants.NETWORK_NAME, this.controller, userAddress);
+            const totalDepositUsdValueFull = userCollateral.total_deposit_usd_value;
+            const totalDepositUsdValueUser = (_a = userCollateral.total_deposit_from_user_usd_value) !== null && _a !== void 0 ? _a : 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 } = yield 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(),
+            };
+        });
+    }
     getLlamalend() {
         return this.llamalend;
     }

package/package.json

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

package/src/constants/abis/crvUSD/controller_v2.json

@@ -397,6 +397,10 @@
       {
         "name": "callback_args",
         "type": "uint256[]"
+      },
+      {
+        "name": "callback_bytes",
+        "type": "bytes"
       }
     ],
     "name": "create_loan_extended",
@@ -448,6 +452,34 @@
     "stateMutability": "payable",
     "type": "function"
   },
+  {
+    "stateMutability": "nonpayable",
+    "type": "function",
+    "name": "borrow_more_extended",
+    "inputs": [
+      {
+        "name": "collateral",
+        "type": "uint256"
+      },
+      {
+        "name": "debt",
+        "type": "uint256"
+      },
+      {
+        "name": "callbacker",
+        "type": "address"
+      },
+      {
+        "name": "callback_args",
+        "type": "uint256[]"
+      },
+      {
+        "name": "callback_bytes",
+        "type": "bytes"
+      }
+    ],
+    "outputs": []
+  },
   {
     "inputs": [
       {
@@ -477,6 +509,10 @@
       {
         "name": "callback_args",
         "type": "uint256[]"
+      },
+      {
+        "name": "callback_bytes",
+        "type": "bytes"
       }
     ],
     "name": "repay_extended",

package/src/external-api.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`;

package/src/mintMarkets/MintMarketTemplate.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;
     }