@curvefi/llamalend-api 2.2.5 → 2.3.0

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

@@ -42,40 +42,40 @@ export class LeverageV1ZapV2Module extends LeverageZapV2BaseModule {
             return yield this.llamalend.contracts[this.market.addresses.controller].contract.health_calculator(user, _dCollateral, _dDebt, full, N, this.llamalend.constantOptions);
         });
     }
-    _createLoanContractCall(_userCollateral, _userBorrowed, _debt, _minRecv, range, router, exchangeCalldata, estimateGas) {
+    _createLoanContractCall(_userCollateral, _debt, _minRecv, range, router, exchangeCalldata, estimateGas) {
         return __awaiter(this, void 0, void 0, function* () {
-            const zapCalldata = buildCalldataForLeverageZapV2(router, exchangeCalldata);
+            const zapCalldata = buildCalldataForLeverageZapV2({ controllerId: parseUnits(this._getMarketId(), 0), _minRecv, router, exchangeCalldata });
             const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            const gas = yield contract.create_loan_extended.estimateGas(_userCollateral, _debt, range, this._getLeverageZapAddress(), [0, parseUnits(this._getMarketId(), 0), _userBorrowed, _minRecv], zapCalldata, Object.assign({}, this.llamalend.constantOptions));
+            const gas = yield contract.create_loan_extended.estimateGas(_userCollateral, _debt, range, this._getLeverageZapAddress(), [], zapCalldata, Object.assign({}, this.llamalend.constantOptions));
             if (estimateGas)
                 return smartNumber(gas);
             yield this.llamalend.updateFeeData();
             const gasLimit = _mulBy1_3(DIGas(gas));
-            return (yield contract.create_loan_extended(_userCollateral, _debt, range, this._getLeverageZapAddress(), [0, parseUnits(this._getMarketId(), 0), _userBorrowed, _minRecv], zapCalldata, Object.assign(Object.assign({}, this.llamalend.options), { gasLimit }))).hash;
+            return (yield contract.create_loan_extended(_userCollateral, _debt, range, this._getLeverageZapAddress(), [], zapCalldata, Object.assign(Object.assign({}, this.llamalend.options), { gasLimit }))).hash;
         });
     }
-    _borrowMoreContractCall(_userCollateral, _userBorrowed, _debt, _minRecv, router, exchangeCalldata, estimateGas) {
+    _borrowMoreContractCall(_userCollateral, _debt, _minRecv, router, exchangeCalldata, estimateGas) {
         return __awaiter(this, void 0, void 0, function* () {
-            const zapCalldata = buildCalldataForLeverageZapV2(router, exchangeCalldata);
+            const zapCalldata = buildCalldataForLeverageZapV2({ controllerId: parseUnits(this._getMarketId(), 0), _minRecv, router, exchangeCalldata });
             const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            const gas = yield contract.borrow_more_extended.estimateGas(_userCollateral, _debt, this._getLeverageZapAddress(), [0, parseUnits(this._getMarketId(), 0), _userBorrowed, _minRecv], zapCalldata, Object.assign({}, this.llamalend.constantOptions));
+            const gas = yield contract.borrow_more_extended.estimateGas(_userCollateral, _debt, this._getLeverageZapAddress(), [], zapCalldata, Object.assign({}, this.llamalend.constantOptions));
             if (estimateGas)
                 return smartNumber(gas);
             yield this.llamalend.updateFeeData();
             const gasLimit = _mulBy1_3(DIGas(gas));
-            return (yield contract.borrow_more_extended(_userCollateral, _debt, this._getLeverageZapAddress(), [0, parseUnits(this._getMarketId(), 0), _userBorrowed, _minRecv], zapCalldata, Object.assign(Object.assign({}, this.llamalend.options), { gasLimit }))).hash;
+            return (yield contract.borrow_more_extended(_userCollateral, _debt, this._getLeverageZapAddress(), [], zapCalldata, Object.assign(Object.assign({}, this.llamalend.options), { gasLimit }))).hash;
         });
     }
-    _repayContractCall(_userCollateral, _userBorrowed, _minRecv, router, exchangeCalldata, estimateGas) {
+    _repayContractCall(_userCollateral, _minRecv, router, exchangeCalldata, estimateGas) {
         return __awaiter(this, void 0, void 0, function* () {
-            const zapCalldata = buildCalldataForLeverageZapV2(router, exchangeCalldata);
+            const zapCalldata = buildCalldataForLeverageZapV2({ controllerId: parseUnits(this._getMarketId(), 0), _minRecv, router, exchangeCalldata });
             const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            const gas = yield contract.repay_extended.estimateGas(this._getLeverageZapAddress(), [0, parseUnits(this._getMarketId(), 0), _userCollateral, _userBorrowed, _minRecv], zapCalldata);
+            const gas = yield contract.repay_extended.estimateGas(this._getLeverageZapAddress(), [], zapCalldata);
             if (estimateGas)
                 return smartNumber(gas);
             yield this.llamalend.updateFeeData();
             const gasLimit = _mulBy1_3(DIGas(gas));
-            return (yield contract.repay_extended(this._getLeverageZapAddress(), [0, parseUnits(this._getMarketId(), 0), _userCollateral, _userBorrowed, _minRecv], zapCalldata, Object.assign(Object.assign({}, this.llamalend.options), { gasLimit }))).hash;
+            return (yield contract.repay_extended(this._getLeverageZapAddress(), [], zapCalldata, Object.assign(Object.assign({}, this.llamalend.options), { gasLimit }))).hash;
         });
     }
 }

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/leverageV2ZapV2.d.ts

@@ -8,7 +8,7 @@ export declare class LeverageV2ZapV2Module extends LeverageZapV2BaseModule {
     protected _calcCreateLoanHealthCall(_collateral: bigint, _dDebt: bigint, N: number | bigint, full: boolean): Promise<bigint>;
     protected _calcBorrowMoreHealthCall(_collateral: bigint, _dDebt: bigint, _N: number | bigint, user: string, full: boolean): Promise<bigint>;
     protected _calcRepayHealthCall(_dCollateral: bigint, _dDebt: bigint, _N: number | bigint, user: string, full: boolean): Promise<bigint>;
-    protected _createLoanContractCall(_userCollateral: bigint, _userBorrowed: bigint, _debt: bigint, _minRecv: bigint, range: number, router: string, exchangeCalldata: string, estimateGas: boolean): Promise<string | TGas>;
-    protected _borrowMoreContractCall(_userCollateral: bigint, _userBorrowed: bigint, _debt: bigint, _minRecv: bigint, router: string, exchangeCalldata: string, estimateGas: boolean): Promise<string | TGas>;
-    protected _repayContractCall(_userCollateral: bigint, _userBorrowed: bigint, _minRecv: bigint, router: string, exchangeCalldata: string, estimateGas: boolean): Promise<string | TGas>;
+    protected _createLoanContractCall(_userCollateral: bigint, _debt: bigint, _minRecv: bigint, range: number, router: string, exchangeCalldata: string, estimateGas: boolean): Promise<string | TGas>;
+    protected _borrowMoreContractCall(_userCollateral: bigint, _debt: bigint, _minRecv: bigint, router: string, exchangeCalldata: string, estimateGas: boolean): Promise<string | TGas>;
+    protected _repayContractCall(_userCollateral: bigint, _minRecv: bigint, router: string, exchangeCalldata: string, estimateGas: boolean): Promise<string | TGas>;
 }

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

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { LeverageZapV2BaseModule } from "../common/leverageZapV2Base.js";
-import { _getAddress, smartNumber, _mulBy1_3, DIGas, MAX_ACTIVE_BAND, buildCalldataForLeverageZapV2Llv2, } from "../../../utils";
+import { _getAddress, smartNumber, _mulBy1_3, DIGas, MAX_ACTIVE_BAND, buildCalldataForLeverageZapV2, } from "../../../utils";
 export class LeverageV2ZapV2Module extends LeverageZapV2BaseModule {
     _getLeverageZapAddress() {
         return this.llamalend.constants.ALIASES.leverage_zap_v2_llv2;
@@ -47,16 +47,14 @@ export class LeverageV2ZapV2Module extends LeverageZapV2BaseModule {
             return yield this.llamalend.contracts[this.market.addresses.controller].contract.repay_health_preview(_dCollateralAbs, _dDebtAbs, user, _shrink, full, this.llamalend.constantOptions);
         });
     }
-    _createLoanContractCall(_userCollateral, _userBorrowed, _debt, _minRecv, range, router, exchangeCalldata, estimateGas) {
+    _createLoanContractCall(_userCollateral, _debt, _minRecv, range, router, exchangeCalldata, estimateGas) {
         return __awaiter(this, void 0, void 0, function* () {
             const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
             const _for = _getAddress.call(this.llamalend, '');
             const _callbacker = this._getLeverageZapAddress();
-            const zapCalldata = buildCalldataForLeverageZapV2Llv2({
-                op: 'create_loan',
+            const zapCalldata = buildCalldataForLeverageZapV2({
                 controllerId: this._getMarketId(),
-                userBorrowed: _userBorrowed,
-                minRecv: _minRecv,
+                _minRecv,
                 router,
                 exchangeCalldata,
             });
@@ -68,16 +66,14 @@ export class LeverageV2ZapV2Module extends LeverageZapV2BaseModule {
             return (yield contract.create_loan(_userCollateral, _debt, range, _for, _callbacker, zapCalldata, Object.assign(Object.assign({}, this.llamalend.options), { gasLimit }))).hash;
         });
     }
-    _borrowMoreContractCall(_userCollateral, _userBorrowed, _debt, _minRecv, router, exchangeCalldata, estimateGas) {
+    _borrowMoreContractCall(_userCollateral, _debt, _minRecv, router, exchangeCalldata, estimateGas) {
         return __awaiter(this, void 0, void 0, function* () {
             const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
             const _for = _getAddress.call(this.llamalend, '');
             const _callbacker = this._getLeverageZapAddress();
-            const zapCalldata = buildCalldataForLeverageZapV2Llv2({
-                op: 'borrow_more',
+            const zapCalldata = buildCalldataForLeverageZapV2({
                 controllerId: this._getMarketId(),
-                userBorrowed: _userBorrowed,
-                minRecv: _minRecv,
+                _minRecv,
                 router,
                 exchangeCalldata,
             });
@@ -89,17 +85,14 @@ export class LeverageV2ZapV2Module extends LeverageZapV2BaseModule {
             return (yield contract.borrow_more(_userCollateral, _debt, _for, _callbacker, zapCalldata, Object.assign(Object.assign({}, this.llamalend.options), { gasLimit }))).hash;
         });
     }
-    _repayContractCall(_userCollateral, _userBorrowed, _minRecv, router, exchangeCalldata, estimateGas) {
+    _repayContractCall(_userCollateral, _minRecv, router, exchangeCalldata, estimateGas) {
         return __awaiter(this, void 0, void 0, function* () {
             const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
             const _for = _getAddress.call(this.llamalend, '');
             const _callbacker = this._getLeverageZapAddress();
-            const zapCalldata = buildCalldataForLeverageZapV2Llv2({
-                op: 'repay',
+            const zapCalldata = buildCalldataForLeverageZapV2({
                 controllerId: this._getMarketId(),
-                userCollateral: _userCollateral,
-                userBorrowed: _userBorrowed,
-                minRecv: _minRecv,
+                _minRecv,
                 router,
                 exchangeCalldata,
             });

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/lib/utils.d.ts

@@ -58,18 +58,10 @@ export declare const getLsdApy: ((name: "wstETH" | "sfrxETH") => Promise<{
     apyMean30d: number;
 }>>;
 export declare const calculateFutureLeverage: (currentCollateral: number | string, totalDepositFromUser: number | string, collateral: number | string, operation: "add" | "remove") => string;
-export declare const buildCalldataForLeverageZapV2: (routerAddress: string, exchangeCalldata: string) => string;
 export type LeverageZapV2LLv2CalldataParams = {
     controllerId: number | string | bigint;
-    minRecv: bigint;
+    _minRecv: bigint;
     router: string;
     exchangeCalldata: string;
-} & ({
-    op: 'create_loan' | 'borrow_more';
-    userBorrowed: bigint;
-} | {
-    op: 'repay';
-    userCollateral: bigint;
-    userBorrowed: bigint;
-});
-export declare const buildCalldataForLeverageZapV2Llv2: (params: LeverageZapV2LLv2CalldataParams) => string;
+};
+export declare const buildCalldataForLeverageZapV2: (params: LeverageZapV2LLv2CalldataParams) => string;

package/lib/utils.js

@@ -443,17 +443,9 @@ export const calculateFutureLeverage = (currentCollateral, totalDepositFromUser,
         return currentCollateralBN.minus(collateralBN).div(totalDepositBN.minus(collateralBN)).toString();
     }
 };
-export const buildCalldataForLeverageZapV2 = (routerAddress, exchangeCalldata) => {
-    const cleanCalldata = exchangeCalldata.startsWith('0x') ? exchangeCalldata.slice(2) : exchangeCalldata;
-    const abiCoder = ethers.AbiCoder.defaultAbiCoder();
-    return abiCoder.encode(['address', 'bytes'], [routerAddress, '0x' + cleanCalldata]);
-};
-export const buildCalldataForLeverageZapV2Llv2 = (params) => {
+export const buildCalldataForLeverageZapV2 = (params) => {
     const cleanCalldata = params.exchangeCalldata.startsWith('0x') ? params.exchangeCalldata.slice(2) : params.exchangeCalldata;
     const exchangeBytes = '0x' + cleanCalldata;
     const abiCoder = ethers.AbiCoder.defaultAbiCoder();
-    if (params.op === 'repay') {
-        return abiCoder.encode(['uint256', 'uint256', 'uint256', 'uint256', 'address', 'bytes'], [BigInt(params.controllerId), params.userCollateral, params.userBorrowed, params.minRecv, params.router, exchangeBytes]);
-    }
-    return abiCoder.encode(['uint256', 'uint256', 'uint256', 'address', 'bytes'], [BigInt(params.controllerId), params.userBorrowed, params.minRecv, params.router, exchangeBytes]);
+    return abiCoder.encode(['uint256', 'uint256', 'address', 'bytes'], [BigInt(params.controllerId), params._minRecv, params.router, exchangeBytes]);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/llamalend-api",
-  "version": "2.2.5",
+  "version": "2.3.0",
   "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/constants/aliases.ts

@@ -8,7 +8,7 @@ export const ALIASES_ETHEREUM = lowerCaseValues({
     "minter": '0xd061D61a4d941c39E5453435B6345Dc261C2fcE0',
     "gauge_factory": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "leverage_zap_deprecated": "0xC8E8430dc7Cb23C32543329acCC68c9055C23e18", // odos v3
-    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
+    "leverage_zap_v2": "0x19010d0f5D5a88aC609B568c91057679eed643d3",
     "leverage_zap_v2_llv2": "0x0000000000000000000000000000000000000000",
     "leverage_markets_start_id": "9",
     "crvUSD": "0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E",
@@ -21,7 +21,7 @@ export const ALIASES_ARBITRUM = lowerCaseValues({
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "gauge_factory": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "leverage_zap_deprecated": "0xFE02553d3Ba4c3f39F36a4632F91404DF94b9AE2", // odos v3
-    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
+    "leverage_zap_v2": "0x227d2f40E3a66C0344D8Af373b4d48A8744d6560",
     "leverage_zap_v2_llv2": "0x0000000000000000000000000000000000000000",
     "leverage_markets_start_id": "9",
 });
@@ -35,7 +35,7 @@ export const ALIASES_OPTIMISM = lowerCaseValues({
     "gauge_factory": "0x871fBD4E01012e2E8457346059e8C189d664DbA4",
     "old_gauge_end_index": "4",
     "leverage_zap_deprecated": "0xBFab8ebc836E1c4D81837798FC076D219C9a1855", // odos v3
-    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
+    "leverage_zap_v2": "0x56C526b0159a258887e0d79ec3a80dfb940d0cD7",
     "leverage_zap_v2_llv2": "0x0000000000000000000000000000000000000000",
     "leverage_markets_start_id": "0",
     "gas_oracle": '0xc0d3C0d3C0d3c0D3C0D3C0d3C0d3C0D3C0D3000f',
@@ -50,7 +50,7 @@ export const ALIASES_FRAXTAL = lowerCaseValues({
     "gauge_factory": "0x0b8d6b6cefc7aa1c2852442e518443b1b22e1c52",
     "old_gauge_end_index": "3",
     "leverage_zap_deprecated": "0x3294514B78Df4Bb90132567fcf8E5e99f390B687", // odos v3
-    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
+    "leverage_zap_v2": "0xA7a4bb50AF91f90b6fEb3388E7f8286aF45b299B",
     "leverage_zap_v2_llv2": "0x0000000000000000000000000000000000000000",
     "leverage_markets_start_id": "0",
 });
@@ -61,7 +61,7 @@ export const ALIASES_SONIC = lowerCaseValues({
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "gauge_factory": "0xf3A431008396df8A8b2DF492C913706BDB0874ef",
     "leverage_zap_deprecated": "0x0fE38dCC905eC14F6099a83Ac5C93BF2601300CF", // odos v3
-    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
+    "leverage_zap_v2": "0xEfadDdE5B43917CcC738AdE6962295A0B343f7CE",
     "leverage_zap_v2_llv2": "0x0000000000000000000000000000000000000000",
     "leverage_markets_start_id": "0",
 });

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/leverageZapV2.ts

@@ -7,12 +7,10 @@ export interface ILeverageZapV2 {
 
     createLoanMaxRecv: ({
         userCollateral,
-        userBorrowed,
         range,
         getExpected,
     }: {
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         range: number,
         getExpected: GetExpectedFn
     }) => Promise<{
@@ -26,11 +24,9 @@ export interface ILeverageZapV2 {
     }>,
     createLoanMaxRecvAllRanges: ({
         userCollateral,
-        userBorrowed,
         getExpected,
     }: {
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         getExpected: GetExpectedFn
     }) => Promise<IDict<{
         maxDebt: string,
@@ -43,12 +39,10 @@ export interface ILeverageZapV2 {
     }>>,
     createLoanExpectedCollateral: ({
         userCollateral,
-        userBorrowed,
         debt,
         quote,
     }: {
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         debt: TAmount,
         quote: IQuote
     }) => Promise<{
@@ -61,14 +55,12 @@ export interface ILeverageZapV2 {
     }>,
     createLoanExpectedMetrics: ({
         userCollateral,
-        userBorrowed,
         debt,
         range,
         quote,
         healthIsFull,
     }: {
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         debt: TAmount,
         range: number,
         quote: IQuote,
@@ -76,59 +68,48 @@ export interface ILeverageZapV2 {
     }) => Promise<ILeverageMetrics>,
     createLoanMaxRange: ({
         userCollateral,
-        userBorrowed,
         debt,
         getExpected,
     }: {
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         debt: TAmount,
         getExpected: GetExpectedFn
     }) => Promise<number>,
     createLoanBandsAllRanges: ({
         userCollateral,
-        userBorrowed,
         debt,
         getExpected,
         quote,
     }: {
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         debt: TAmount,
         getExpected: GetExpectedFn,
         quote: IQuote
     }) => Promise<IDict<[number, number] | null>>,
     createLoanPricesAllRanges: ({
         userCollateral,
-        userBorrowed,
         debt,
         getExpected,
         quote,
     }: {
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         debt: TAmount,
         getExpected: GetExpectedFn,
         quote: IQuote
     }) => Promise<IDict<[string, string] | null>>,
     createLoanIsApproved: ({
         userCollateral,
-        userBorrowed,
     }: {
-        userCollateral: TAmount,
-        userBorrowed: TAmount
+        userCollateral: TAmount
     }) => Promise<boolean>,
     createLoanApprove: ({
         userCollateral,
-        userBorrowed,
     }: {
-        userCollateral: TAmount,
-        userBorrowed: TAmount
+        userCollateral: TAmount
     }) => Promise<string[]>,
     calcMinRecv: (expected: TAmount, slippage: number) => string,
     createLoan: ({
         userCollateral,
-        userBorrowed,
         debt,
         range,
         minRecv,
@@ -136,7 +117,6 @@ export interface ILeverageZapV2 {
         calldata,
     }: {
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         debt: TAmount,
         range: number,
         minRecv: TAmount,
@@ -144,9 +124,8 @@ export interface ILeverageZapV2 {
         calldata: string
     }) => Promise<string>,
 
-    borrowMoreMaxRecv: ({ userCollateral, userBorrowed, getExpected, address }: {
+    borrowMoreMaxRecv: ({ userCollateral, getExpected, address }: {
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         getExpected: GetExpectedFn,
         address?: string
     }) => Promise<{
@@ -157,9 +136,8 @@ export interface ILeverageZapV2 {
         collateralFromMaxDebt: string,
         avgPrice: string,
     }>,
-    borrowMoreExpectedCollateral: ({ userCollateral, userBorrowed, dDebt, quote, address }: {
+    borrowMoreExpectedCollateral: ({ userCollateral, dDebt, quote, address }: {
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         dDebt: TAmount,
         quote: IQuote,
         address?: string
@@ -170,42 +148,36 @@ export interface ILeverageZapV2 {
         collateralFromDebt: string,
         avgPrice: string
     }>,
-    borrowMoreExpectedMetrics: ({ userCollateral, userBorrowed, debt, quote, healthIsFull, address }: {
+    borrowMoreExpectedMetrics: ({ userCollateral, debt, quote, healthIsFull, address }: {
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         debt: TAmount,
         quote: IQuote,
         healthIsFull?: boolean,
         address?: string
     }) => Promise<ILeverageMetrics>,
-    borrowMoreIsApproved: ({ userCollateral, userBorrowed }: {
-        userCollateral: TAmount,
-        userBorrowed: TAmount
+    borrowMoreIsApproved: ({ userCollateral }: {
+        userCollateral: TAmount
     }) => Promise<boolean>,
-    borrowMoreApprove: ({ userCollateral, userBorrowed }: {
-        userCollateral: TAmount,
-        userBorrowed: TAmount
+    borrowMoreApprove: ({ userCollateral }: {
+        userCollateral: TAmount
     }) => Promise<string[]>,
-    borrowMore: ({ userCollateral, userBorrowed, debt, minRecv, router, calldata }: {
+    borrowMore: ({ userCollateral, debt, minRecv, router, calldata }: {
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         debt: TAmount,
         minRecv: TAmount,
         router: string,
         calldata: string
     }) => Promise<string>,
-    borrowMoreFutureLeverage: ({ userCollateral, userBorrowed, debt, quote, address }: {
+    borrowMoreFutureLeverage: ({ userCollateral, debt, quote, address }: {
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         debt: TAmount,
         quote: IQuote,
         address?: string
     }) => Promise<string>,
 
-    repayExpectedBorrowed: ({ stateCollateral, userCollateral, userBorrowed, quote }: {
+    repayExpectedBorrowed: ({ stateCollateral, userCollateral, quote }: {
         stateCollateral: TAmount,
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         quote: IQuote
     }) => Promise<{
         totalBorrowed: string,
@@ -214,60 +186,50 @@ export interface ILeverageZapV2 {
         userBorrowed: string,
         avgPrice: string
     }>,
-    repayIsFull: ({ stateCollateral, userCollateral, userBorrowed, quote, address }: {
+    repayIsFull: ({ stateCollateral, userCollateral, quote, address }: {
         stateCollateral: TAmount,
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         quote: IQuote,
         address?: string
     }) => Promise<boolean>,
-    repayIsAvailable: ({ stateCollateral, userCollateral, userBorrowed, quote, address }: {
+    repayIsAvailable: ({ stateCollateral, userCollateral, quote, address }: {
         stateCollateral: TAmount,
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         quote: IQuote,
         address?: string
     }) => Promise<boolean>,
-    repayExpectedMetrics: ({ stateCollateral, userCollateral, userBorrowed, healthIsFull, quote, address }: {
+    repayExpectedMetrics: ({ stateCollateral, userCollateral, healthIsFull, quote, address }: {
         stateCollateral: TAmount,
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         healthIsFull: boolean,
         quote: IQuote,
         address: string
     }) => Promise<ILeverageMetrics>,
-    repayIsApproved: ({ userCollateral, userBorrowed }: {
-        userCollateral: TAmount,
-        userBorrowed: TAmount
+    repayIsApproved: ({ userCollateral }: {
+        userCollateral: TAmount
     }) => Promise<boolean>,
-    repayApprove: ({ userCollateral, userBorrowed }: {
-        userCollateral: TAmount,
-        userBorrowed: TAmount
+    repayApprove: ({ userCollateral }: {
+        userCollateral: TAmount
     }) => Promise<string[]>,
-    repay: ({ stateCollateral, userCollateral, userBorrowed, minRecv, router, calldata }: {
+    repay: ({ stateCollateral, userCollateral, minRecv, router, calldata }: {
         stateCollateral: TAmount,
         userCollateral: TAmount,
-        userBorrowed: TAmount,
         minRecv: TAmount,
         router: string,
         calldata: string
     }) => Promise<string>,
-    repayFutureLeverage: ({ stateCollateral, userCollateral, userBorrowed, quote, address }: {
+    repayFutureLeverage: ({ stateCollateral, userCollateral, address }: {
         stateCollateral: TAmount,
         userCollateral: TAmount,
-        userBorrowed: TAmount,
-        quote: IQuote,
         address?: string
     }) => Promise<string>,
 
     estimateGas: {
-        createLoanApprove: ({ userCollateral, userBorrowed }: {
-            userCollateral: TAmount,
-            userBorrowed: TAmount
+        createLoanApprove: ({ userCollateral }: {
+            userCollateral: TAmount
         }) => Promise<TGas>,
-        createLoan: ({ userCollateral, userBorrowed, debt, range, minRecv, router, calldata }: {
+        createLoan: ({ userCollateral, debt, range, minRecv, router, calldata }: {
             userCollateral: TAmount,
-            userBorrowed: TAmount,
             debt: TAmount,
             range: number,
             minRecv: TAmount,
@@ -275,27 +237,23 @@ export interface ILeverageZapV2 {
             calldata: string
         }) => Promise<number>,
 
-        borrowMoreApprove: ({ userCollateral, userBorrowed }: {
-            userCollateral: TAmount,
-            userBorrowed: TAmount
+        borrowMoreApprove: ({ userCollateral }: {
+            userCollateral: TAmount
         }) => Promise<TGas>,
-        borrowMore: ({ userCollateral, userBorrowed, debt, minRecv, router, calldata }: {
+        borrowMore: ({ userCollateral, debt, minRecv, router, calldata }: {
             userCollateral: TAmount,
-            userBorrowed: TAmount,
             debt: TAmount,
             minRecv: TAmount,
             router: string,
             calldata: string
         }) => Promise<number>,
 
-        repayApprove: ({ userCollateral, userBorrowed }: {
-            userCollateral: TAmount,
-            userBorrowed: TAmount
+        repayApprove: ({ userCollateral }: {
+            userCollateral: TAmount
         }) => Promise<TGas>,
-        repay: ({ stateCollateral, userCollateral, userBorrowed, minRecv, router, calldata }: {
+        repay: ({ stateCollateral, userCollateral, minRecv, router, calldata }: {
             stateCollateral: TAmount,
             userCollateral: TAmount,
-            userBorrowed: TAmount,
             minRecv: TAmount,
             router: string,
             calldata: string

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[]>;