@curvefi/llamalend-api 1.0.10 → 1.0.12

package/lib/interfaces.d.ts

@@ -29,6 +29,8 @@ export interface ILlamma {
     default_bands: number;
     A: number;
     monetary_policy_abi: any;
+    is_deleverage_supported?: boolean;
+    index?: number;
 }
 export interface ICoin {
     address: string;

package/lib/llamalend.js

@@ -357,7 +357,7 @@ class Llamalend {
         this.options = {};
         this.constants = {
             ONE_WAY_MARKETS: {},
-            LLAMMAS,
+            LLAMMAS: {},
             COINS: {},
             DECIMALS: {},
             NETWORK_NAME: 'ethereum',
@@ -393,7 +393,7 @@ class Llamalend {
             this.options = {};
             this.constants = {
                 ONE_WAY_MARKETS: {},
-                LLAMMAS,
+                LLAMMAS: Object.assign({}, LLAMMAS),
                 COINS: {},
                 DECIMALS: {},
                 NETWORK_NAME: 'ethereum',
@@ -602,6 +602,8 @@ class Llamalend {
                             default_bands: 10,
                             A: AParams[i],
                             monetary_policy_abi: MonetaryPolicy2ABI,
+                            is_deleverage_supported: true,
+                            index: N1 + i,
                         };
                     }
                 }

package/lib/mintMarkets/MintMarketTemplate.d.ts

@@ -19,6 +19,8 @@ export declare class MintMarketTemplate {
     defaultBands: number;
     A: number;
     tickSpace: number;
+    isDeleverageSupported: boolean;
+    index?: number;
     estimateGas: {
         createLoanApprove: (collateral: number | string) => Promise<TGas>;
         createLoan: (collateral: number | string, debt: number | string, range: number) => Promise<TGas>;

package/lib/mintMarkets/MintMarketTemplate.js

@@ -14,6 +14,7 @@ import { _getAddress, parseUnits, BN, toBN, fromBN, getBalances, ensureAllowance
 import { _getUserCollateralCrvUsd } from "../external-api.js";
 export class MintMarketTemplate {
     constructor(id) {
+        var _a;
         // ---------------- STATS ----------------
         this.statsParameters = memoize(() => __awaiter(this, void 0, void 0, function* () {
             const llammaContract = llamalend.contracts[this.address].multicallContract;
@@ -254,6 +255,8 @@ export class MintMarketTemplate {
         this.defaultBands = llammaData.default_bands;
         this.A = llammaData.A;
         this.tickSpace = 1 / llammaData.A * 100;
+        this.isDeleverageSupported = (_a = llammaData.is_deleverage_supported) !== null && _a !== void 0 ? _a : false;
+        this.index = llammaData.index;
         this.estimateGas = {
             createLoanApprove: this.createLoanApproveEstimateGas.bind(this),
             createLoan: this.createLoanEstimateGas.bind(this),
@@ -961,12 +964,12 @@ export class MintMarketTemplate {
                 throw Error(`User ${llamalend.signerAddress} is already in liquidation mode`);
             const _collateral = parseUnits(collateral, this.collateralDecimals);
             const contract = llamalend.contracts[this.controller].contract;
-            const gas = yield contract.remove_collateral.estimateGas(_collateral, isEth(this.collateral), llamalend.constantOptions);
+            const gas = this.isDeleverageSupported ? yield contract.remove_collateral.estimateGas(_collateral, llamalend.constantOptions) : yield contract.remove_collateral.estimateGas(_collateral, isEth(this.collateral), llamalend.constantOptions);
             if (estimateGas)
                 return smartNumber(gas);
             yield llamalend.updateFeeData();
             const gasLimit = _mulBy1_3(DIGas(gas));
-            return (yield contract.remove_collateral(_collateral, isEth(this.collateral), Object.assign(Object.assign({}, llamalend.options), { gasLimit }))).hash;
+            return (this.isDeleverageSupported ? yield contract.remove_collateral(_collateral, Object.assign(Object.assign({}, llamalend.options), { gasLimit })) : yield contract.remove_collateral(_collateral, isEth(this.collateral), Object.assign(Object.assign({}, llamalend.options), { gasLimit }))).hash;
         });
     }
     removeCollateralEstimateGas(collateral) {
@@ -1041,12 +1044,12 @@ export class MintMarketTemplate {
             const [, n1] = yield this.userBands(address);
             const { stablecoin } = yield this.userState(address);
             const n = (BN(stablecoin).gt(0)) ? MAX_ACTIVE_BAND : n1 - 1; // In liquidation mode it doesn't matter if active band moves
-            const gas = yield contract.repay.estimateGas(_debt, address, n, isEth(this.collateral), llamalend.constantOptions);
+            const gas = this.isDeleverageSupported ? yield contract.repay.estimateGas(_debt, address, n, llamalend.constantOptions) : yield contract.repay.estimateGas(_debt, address, n, isEth(this.collateral), llamalend.constantOptions);
             if (estimateGas)
                 return smartNumber(gas);
             yield llamalend.updateFeeData();
             const gasLimit = _mulBy1_3(DIGas(gas));
-            return (yield contract.repay(_debt, address, n, isEth(this.collateral), Object.assign(Object.assign({}, llamalend.options), { gasLimit }))).hash;
+            return (this.isDeleverageSupported ? yield contract.repay(_debt, address, n, Object.assign(Object.assign({}, llamalend.options), { gasLimit })) : yield contract.repay(_debt, address, n, isEth(this.collateral), Object.assign(Object.assign({}, llamalend.options), { gasLimit }))).hash;
         });
     }
     repayEstimateGas(debt_1) {
@@ -1269,12 +1272,12 @@ export class MintMarketTemplate {
             const minAmountBN = BN(stablecoin).times(100 - slippage).div(100);
             const _minAmount = fromBN(minAmountBN);
             const contract = llamalend.contracts[this.controller].contract;
-            const gas = (yield contract.liquidate.estimateGas(address, _minAmount, isEth(this.collateral), llamalend.constantOptions));
+            const gas = this.isDeleverageSupported ? (yield contract.liquidate.estimateGas(address, _minAmount, llamalend.constantOptions)) : (yield contract.liquidate.estimateGas(address, _minAmount, isEth(this.collateral), llamalend.constantOptions));
             if (estimateGas)
                 return smartNumber(gas);
             yield llamalend.updateFeeData();
             const gasLimit = _mulBy1_3(DIGas(gas));
-            return (yield contract.liquidate(address, _minAmount, isEth(this.collateral), Object.assign(Object.assign({}, llamalend.options), { gasLimit }))).hash;
+            return (this.isDeleverageSupported ? yield contract.liquidate(address, _minAmount, Object.assign(Object.assign({}, llamalend.options), { gasLimit })) : yield contract.liquidate(address, _minAmount, isEth(this.collateral), Object.assign(Object.assign({}, llamalend.options), { gasLimit }))).hash;
         });
     }
     liquidateEstimateGas(address_1) {

package/package.json

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

package/src/interfaces.ts

@@ -33,6 +33,8 @@ export interface ILlamma {
     default_bands: number,
     A: number,
     monetary_policy_abi: any
+    is_deleverage_supported?: boolean
+    index?: number
 }
 
 export interface ICoin {

package/src/llamalend.ts

@@ -212,7 +212,7 @@ class Llamalend implements ILlamalend {
         this.options = {};
         this.constants = {
             ONE_WAY_MARKETS: {},
-            LLAMMAS,
+            LLAMMAS: {},
             COINS: {},
             DECIMALS: {},
             NETWORK_NAME: 'ethereum',
@@ -250,7 +250,7 @@ class Llamalend implements ILlamalend {
         this.options = {};
         this.constants = {
             ONE_WAY_MARKETS: {},
-            LLAMMAS,
+            LLAMMAS: {...LLAMMAS},
             COINS: {},
             DECIMALS: {},
             NETWORK_NAME: 'ethereum',
@@ -474,6 +474,8 @@ class Llamalend implements ILlamalend {
                         default_bands: 10,
                         A: AParams[i],
                         monetary_policy_abi: MonetaryPolicy2ABI,
+                        is_deleverage_supported: true,
+                        index: N1 + i,
                     }
                 }
             }

package/src/mintMarkets/MintMarketTemplate.ts

@@ -16,7 +16,9 @@ import {
     formatUnits,
     smartNumber,
     MAX_ALLOWANCE,
-    MAX_ACTIVE_BAND, _mulBy1_3, DIGas,
+    MAX_ACTIVE_BAND,
+    _mulBy1_3,
+    DIGas,
 } from "../utils";
 import {IDict, TGas} from "../interfaces";
 import {_getUserCollateralCrvUsd} from "../external-api.js";
@@ -41,6 +43,8 @@ export class MintMarketTemplate {
     defaultBands: number;
     A: number;
     tickSpace: number; // %
+    isDeleverageSupported: boolean;
+    index?: number;
     estimateGas: {
         createLoanApprove: (collateral: number | string) => Promise<TGas>,
         createLoan: (collateral: number | string, debt: number | string, range: number) => Promise<TGas>,
@@ -138,6 +142,8 @@ export class MintMarketTemplate {
         this.defaultBands = llammaData.default_bands;
         this.A = llammaData.A;
         this.tickSpace = 1 / llammaData.A * 100;
+        this.isDeleverageSupported = llammaData.is_deleverage_supported ?? false;
+        this.index = llammaData.index;
         this.estimateGas = {
             createLoanApprove: this.createLoanApproveEstimateGas.bind(this),
             createLoan: this.createLoanEstimateGas.bind(this),
@@ -985,12 +991,12 @@ export class MintMarketTemplate {
 
         const _collateral = parseUnits(collateral, this.collateralDecimals);
         const contract = llamalend.contracts[this.controller].contract;
-        const gas = await contract.remove_collateral.estimateGas(_collateral, isEth(this.collateral), llamalend.constantOptions);
+        const gas = this.isDeleverageSupported ? await contract.remove_collateral.estimateGas(_collateral, llamalend.constantOptions) : await contract.remove_collateral.estimateGas(_collateral, isEth(this.collateral), llamalend.constantOptions);
         if (estimateGas) return smartNumber(gas);
 
         await llamalend.updateFeeData();
         const gasLimit = _mulBy1_3(DIGas(gas));
-        return (await contract.remove_collateral(_collateral, isEth(this.collateral), { ...llamalend.options, gasLimit })).hash
+        return (this.isDeleverageSupported ? await contract.remove_collateral(_collateral, { ...llamalend.options, gasLimit }) : await contract.remove_collateral(_collateral, isEth(this.collateral), { ...llamalend.options, gasLimit })).hash
     }
 
     public async removeCollateralEstimateGas(collateral: number | string): Promise<number> {
@@ -1060,12 +1066,12 @@ export class MintMarketTemplate {
         const [, n1] = await this.userBands(address);
         const { stablecoin } = await this.userState(address);
         const n = (BN(stablecoin).gt(0)) ? MAX_ACTIVE_BAND : n1 - 1;  // In liquidation mode it doesn't matter if active band moves
-        const gas = await contract.repay.estimateGas(_debt, address, n, isEth(this.collateral), llamalend.constantOptions);
+        const gas = this.isDeleverageSupported ? await contract.repay.estimateGas(_debt, address, n, llamalend.constantOptions) : await contract.repay.estimateGas(_debt, address, n, isEth(this.collateral), llamalend.constantOptions);
         if (estimateGas) return smartNumber(gas);
 
         await llamalend.updateFeeData();
         const gasLimit = _mulBy1_3(DIGas(gas));
-        return (await contract.repay(_debt, address, n, isEth(this.collateral), { ...llamalend.options, gasLimit })).hash
+        return (this.isDeleverageSupported ? await contract.repay(_debt, address, n, { ...llamalend.options, gasLimit }) : await contract.repay(_debt, address, n, isEth(this.collateral), { ...llamalend.options, gasLimit })).hash
     }
 
     public async repayEstimateGas(debt: number | string, address = ""): Promise<number> {
@@ -1264,12 +1270,12 @@ export class MintMarketTemplate {
         const minAmountBN: BigNumber = BN(stablecoin).times(100 - slippage).div(100);
         const _minAmount = fromBN(minAmountBN);
         const contract = llamalend.contracts[this.controller].contract;
-        const gas = (await contract.liquidate.estimateGas(address, _minAmount, isEth(this.collateral), llamalend.constantOptions))
+        const gas = this.isDeleverageSupported ? (await contract.liquidate.estimateGas(address, _minAmount, llamalend.constantOptions)) : (await contract.liquidate.estimateGas(address, _minAmount, isEth(this.collateral), llamalend.constantOptions))
         if (estimateGas) return smartNumber(gas);
 
         await llamalend.updateFeeData();
         const gasLimit = _mulBy1_3(DIGas(gas));
-        return (await contract.liquidate(address, _minAmount, isEth(this.collateral), { ...llamalend.options, gasLimit })).hash
+        return (this.isDeleverageSupported ? await contract.liquidate(address, _minAmount, { ...llamalend.options, gasLimit }) : await contract.liquidate(address, _minAmount, isEth(this.collateral), { ...llamalend.options, gasLimit })).hash
     }
 
     public async liquidateEstimateGas(address: string, slippage = 0.1): Promise<number> {