@curvefi/llamalend-api 2.2.5 → 2.2.6

package/lib/constants/abis/ControllerV2.json

@@ -1191,23 +1191,6 @@
         "stateMutability": "view",
         "type": "function"
     },
-    {
-        "inputs": [
-            {
-                "name": "_user",
-                "type": "address"
-            }
-        ],
-        "name": "tokens_to_shrink",
-        "outputs": [
-            {
-                "name": "",
-                "type": "uint256"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
     {
         "inputs": [
             {

package/lib/lendMarkets/LendMarketTemplate.js

@@ -142,6 +142,7 @@ export class LendMarketTemplate {
             removeCollateralBands: loan.removeCollateralBands.bind(loan),
             removeCollateralPrices: loan.removeCollateralPrices.bind(loan),
             removeCollateralHealth: loan.removeCollateralHealth.bind(loan),
+            tokensToShrink: loan.tokensToShrink.bind(loan),
             removeCollateral: loan.removeCollateral.bind(loan),
             removeCollateralFutureLeverage: loan.removeCollateralFutureLeverage.bind(loan),
             repayBands: loan.repayBands.bind(loan),

package/lib/lendMarkets/interfaces/v1/loanV1.d.ts

@@ -32,6 +32,7 @@ export interface ILoanV1 {
     addCollateralApprove: (collateral: TAmount) => Promise<string[]>;
     addCollateral: (collateral: TAmount, address?: string) => Promise<string>;
     addCollateralFutureLeverage: (collateral: TAmount, userAddress?: string) => Promise<string>;
+    tokensToShrink: (dCollateral?: TAmount, address?: string) => Promise<string>;
     maxRemovable: () => Promise<string>;
     removeCollateralBands: (collateral: TAmount) => Promise<[number, number]>;
     removeCollateralPrices: (collateral: TAmount) => Promise<string[]>;

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

@@ -32,6 +32,7 @@ export interface ILoanV2 {
     addCollateralApprove: (collateral: TAmount) => Promise<string[]>;
     addCollateral: (collateral: TAmount, address?: string) => Promise<string>;
     addCollateralFutureLeverage: (collateral: TAmount, userAddress?: string) => Promise<string>;
+    tokensToShrink: (dCollateral?: TAmount, address?: string) => Promise<string>;
     maxRemovable: () => Promise<string>;
     removeCollateralBands: (collateral: TAmount) => Promise<[number, number]>;
     removeCollateralPrices: (collateral: TAmount) => Promise<string[]>;

package/lib/lendMarkets/modules/common/loanBase.d.ts

@@ -39,6 +39,7 @@ export declare abstract class LoanBaseModule {
     abstract borrowMoreHealth(collateral: number | string, debt: number | string, full?: boolean, address?: string): Promise<string>;
     abstract addCollateralHealth(collateral: number | string, full?: boolean, address?: string): Promise<string>;
     abstract removeCollateralHealth(collateral: number | string, full?: boolean, address?: string): Promise<string>;
+    abstract tokensToShrink(dCollateral?: number | string, address?: string): Promise<string>;
     _checkRange(range: number): void;
     createLoanMaxRecv(collateral: TAmount, range: number): Promise<string>;
     createLoanMaxRecvAllRanges: ((collateral: number | string) => Promise<{

package/lib/lendMarkets/modules/v1/loanV1.d.ts

@@ -10,6 +10,7 @@ export declare class LoanV1Module extends LoanBaseModule implements ILoanV1 {
     borrowMoreHealth(collateral: number | string, debt: number | string, full?: boolean, address?: string): Promise<string>;
     addCollateralHealth(collateral: number | string, full?: boolean, address?: string): Promise<string>;
     removeCollateralHealth(collateral: number | string, full?: boolean, address?: string): Promise<string>;
+    tokensToShrink(): Promise<string>;
     protected _repayBands({ debt, address }: {
         debt: number | string;
         address: string;

package/lib/lendMarkets/modules/v1/loanV1.js

@@ -75,6 +75,11 @@ export class LoanV1Module extends LoanBaseModule {
             return formatUnits(_health * BigInt(100));
         });
     }
+    tokensToShrink() {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw Error("tokensToShrink is not supported for v1 markets");
+        });
+    }
     _repayBands(_a) {
         return __awaiter(this, arguments, void 0, function* ({ debt, address }) {
             const { _collateral: _currentCollateral, _borrowed, _debt: _currentDebt, _N } = yield this.market.userPosition.userStateBigInt(address);

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>;
+    tokensToShrink(dCollateral?: number | string, 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 }: {

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

@@ -48,6 +48,15 @@ export class LoanV2Module extends LoanBaseModule {
             return formatUnits(_health * BigInt(100));
         });
     }
+    tokensToShrink() {
+        return __awaiter(this, arguments, void 0, function* (dCollateral = 0, address = "") {
+            address = _getAddress.call(this.llamalend, address);
+            const _dCollateral = parseUnits(dCollateral, this.market.collateral_token.decimals);
+            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+            const _tokens = yield contract.tokens_to_shrink(address, _dCollateral, this.llamalend.constantOptions);
+            return formatUnits(_tokens, this.market.borrowed_token.decimals);
+        });
+    }
     maxRemovable() {
         return __awaiter(this, void 0, void 0, function* () {
             const address = _getAddress.call(this.llamalend, '');

package/package.json

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

package/src/constants/abis/ControllerV2.json

@@ -1191,23 +1191,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "name": "_user",
-        "type": "address"
-      }
-    ],
-    "name": "tokens_to_shrink",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [
       {

package/src/lendMarkets/LendMarketTemplate.ts

@@ -249,6 +249,7 @@ export class LendMarketTemplate<V extends 'v1' | 'v2' = 'v1' | 'v2'> {
             removeCollateralBands: loan.removeCollateralBands.bind(loan),
             removeCollateralPrices: loan.removeCollateralPrices.bind(loan),
             removeCollateralHealth: loan.removeCollateralHealth.bind(loan),
+            tokensToShrink: loan.tokensToShrink.bind(loan),
             removeCollateral: loan.removeCollateral.bind(loan),
             removeCollateralFutureLeverage: loan.removeCollateralFutureLeverage.bind(loan),
 

package/src/lendMarkets/interfaces/v1/loanV1.ts

@@ -30,6 +30,8 @@ export interface ILoanV1 {
     addCollateral: (collateral: TAmount, address?: string) => Promise<string>;
     addCollateralFutureLeverage: (collateral: TAmount, userAddress?: string) => Promise<string>;
 
+    tokensToShrink: (dCollateral?: TAmount, address?: string) => Promise<string>;
+
     maxRemovable: () => Promise<string>;
     removeCollateralBands: (collateral: TAmount) => Promise<[number, number]>;
     removeCollateralPrices: (collateral: TAmount) => Promise<string[]>;

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

@@ -30,6 +30,8 @@ export interface ILoanV2 {
     addCollateral: (collateral: TAmount, address?: string) => Promise<string>;
     addCollateralFutureLeverage: (collateral: TAmount, userAddress?: string) => Promise<string>;
 
+    tokensToShrink: (dCollateral?: TAmount, address?: string) => Promise<string>;
+
     maxRemovable: () => Promise<string>;
     removeCollateralBands: (collateral: TAmount) => Promise<[number, number]>;
     removeCollateralPrices: (collateral: TAmount) => Promise<string[]>;

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

@@ -56,6 +56,8 @@ export abstract class LoanBaseModule {
 
     public abstract removeCollateralHealth(collateral: number | string, full?: boolean, address?: string): Promise<string>;
 
+    public abstract tokensToShrink(dCollateral?: number | string, address?: string): Promise<string>;
+
     public _checkRange(range: number): void {
         if (range < this.market.minBands) throw Error(`range must be >= ${this.market.minBands}`);
         if (range > this.market.maxBands) throw Error(`range must be <= ${this.market.maxBands}`);

package/src/lendMarkets/modules/v1/loanV1.ts

@@ -80,6 +80,10 @@ export class LoanV1Module extends LoanBaseModule implements ILoanV1 {
         return formatUnits(_health * BigInt(100));
     }
 
+    public async tokensToShrink(): Promise<string> {
+        throw Error("tokensToShrink is not supported for v1 markets");
+    }
+
     protected async _repayBands({ debt, address }: { debt: number | string, address: string, shrink?: boolean }): Promise<[bigint, bigint]> {
         const { _collateral: _currentCollateral, _borrowed, _debt: _currentDebt, _N } = await this.market.userPosition.userStateBigInt(address);
         if (_currentDebt === BigInt(0)) throw Error(`Loan for ${address} does not exist`);

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

@@ -43,6 +43,16 @@ export class LoanV2Module extends LoanBaseModule implements ILoanV2 {
         return formatUnits(_health * BigInt(100));
     }
 
+    public async tokensToShrink(dCollateral: number | string = 0, address = ""): Promise<string> {
+        address = _getAddress.call(this.llamalend, address);
+        const _dCollateral = parseUnits(dCollateral, this.market.collateral_token.decimals);
+
+        const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+        const _tokens = await contract.tokens_to_shrink(address, _dCollateral, this.llamalend.constantOptions) as bigint;
+
+        return formatUnits(_tokens, this.market.borrowed_token.decimals);
+    }
+
     public async maxRemovable(): Promise<string> {
         const address = _getAddress.call(this.llamalend, '');
         const { _collateral: _currentCollateral, _debt: _currentDebt, _N } = await this.market.userPosition.userStateBigInt();