@curvefi/llamalend-api 2.0.16 → 2.0.18

package/lib/constants/abis/ControllerV2.json

@@ -510,22 +510,6 @@
         "stateMutability": "nonpayable",
         "type": "function"
     },
-    {
-        "inputs": [
-            {
-                "name": "_collateral",
-                "type": "uint256"
-            },
-            {
-                "name": "_for",
-                "type": "address"
-            }
-        ],
-        "name": "remove_collateral",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
     {
         "inputs": [
             {
@@ -1015,10 +999,6 @@
                 "name": "_for",
                 "type": "address"
             },
-            {
-                "name": "_caller",
-                "type": "address"
-            },
             {
                 "name": "_full",
                 "type": "bool"
@@ -1624,27 +1604,6 @@
         "stateMutability": "view",
         "type": "function"
     },
-    {
-        "inputs": [
-            {
-                "name": "_debt",
-                "type": "uint256"
-            },
-            {
-                "name": "_N",
-                "type": "uint256"
-            }
-        ],
-        "name": "min_collateral",
-        "outputs": [
-            {
-                "name": "",
-                "type": "uint256"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
     {
         "inputs": [
             {

package/lib/constants/aliases.js

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

package/lib/lendMarkets/modules/v2/loanV2.d.ts

@@ -5,6 +5,7 @@ export declare class LoanV2Module extends LoanBaseModule implements ILoanV2 {
     createLoanHealth(collateral: number | string, debt: number | string, range: number, full?: boolean): Promise<string>;
     addCollateralHealth(collateral: number | string, full?: boolean, address?: string): Promise<string>;
     removeCollateralHealth(collateral: number | string, full?: boolean, address?: string): Promise<string>;
+    maxRemovable(): Promise<string>;
     borrowMoreHealth(collateral: number | string, debt: number | string, full?: boolean, address?: string): Promise<string>;
     repayHealth({ debt, shrink, full, address }: {
         debt: number | string;

package/lib/lendMarkets/modules/v2/loanV2.js

@@ -35,7 +35,7 @@ export class LoanV2Module extends LoanBaseModule {
             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 = yield contract.add_collateral_health_preview(_collateral, address, address, full, this.llamalend.constantOptions);
+            const _health = yield contract.add_collateral_health_preview(_collateral, address, full, this.llamalend.constantOptions);
             return formatUnits(_health * BigInt(100));
         });
     }
@@ -48,6 +48,14 @@ export class LoanV2Module extends LoanBaseModule {
             return formatUnits(_health * BigInt(100));
         });
     }
+    maxRemovable() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const address = _getAddress.call(this.llamalend, '');
+            const { _collateral: _currentCollateral, _debt: _currentDebt, _N } = yield this.market.userPosition.userStateBigInt();
+            const _requiredCollateral = yield this.llamalend.contracts[this.market.addresses.controller].contract.min_collateral(_currentDebt, _N, address, this.llamalend.constantOptions);
+            return formatUnits(_currentCollateral - _requiredCollateral, this.market.collateral_token.decimals);
+        });
+    }
     borrowMoreHealth(collateral_1, debt_1) {
         return __awaiter(this, arguments, void 0, function* (collateral, debt, full = true, address = "") {
             address = _getAddress.call(this.llamalend, address);

package/package.json

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

package/src/constants/abis/ControllerV2.json

@@ -510,22 +510,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "name": "_collateral",
-        "type": "uint256"
-      },
-      {
-        "name": "_for",
-        "type": "address"
-      }
-    ],
-    "name": "remove_collateral",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -1015,10 +999,6 @@
         "name": "_for",
         "type": "address"
       },
-      {
-        "name": "_caller",
-        "type": "address"
-      },
       {
         "name": "_full",
         "type": "bool"
@@ -1624,27 +1604,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "name": "_debt",
-        "type": "uint256"
-      },
-      {
-        "name": "_N",
-        "type": "uint256"
-      }
-    ],
-    "name": "min_collateral",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [
       {

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": "0x68f33663b76874166Bf3C3cB2D7C117dFf38a262",
+    "one_way_factory_v2": "0x1973ED17c267245510a390e0dce4FBcD9D2685f0",
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "gauge_factory_old": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "gauge_factory": "0x871fBD4E01012e2E8457346059e8C189d664DbA4",
@@ -59,4 +59,4 @@ export const ALIASES_SONIC = lowerCaseValues({
     "leverage_zap": "0x0fE38dCC905eC14F6099a83Ac5C93BF2601300CF", // odos v3
     "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
     "leverage_markets_start_id": "0",
-});
+});

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

@@ -28,7 +28,7 @@ export class LoanV2Module extends LoanBaseModule implements ILoanV2 {
         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;
+        const _health = await contract.add_collateral_health_preview(_collateral, address, full, this.llamalend.constantOptions) as bigint;
 
         return formatUnits(_health * BigInt(100));
     }
@@ -43,6 +43,14 @@ export class LoanV2Module extends LoanBaseModule implements ILoanV2 {
         return formatUnits(_health * BigInt(100));
     }
 
+    public async maxRemovable(): Promise<string> {
+        const address = _getAddress.call(this.llamalend, '');
+        const { _collateral: _currentCollateral, _debt: _currentDebt, _N } = await this.market.userPosition.userStateBigInt();
+        const _requiredCollateral = await this.llamalend.contracts[this.market.addresses.controller].contract.min_collateral(_currentDebt, _N, address, this.llamalend.constantOptions)
+
+        return formatUnits(_currentCollateral - _requiredCollateral, this.market.collateral_token.decimals);
+    }
+
     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);