@curvefi/llamalend-api 1.0.30 → 1.0.31

package/lib/lendMarkets/lendMarketConstructor.js

@@ -1,5 +1,10 @@
 import { LendMarketTemplate } from "./LendMarketTemplate.js";
 export const getLendMarket = function (lendMarketId) {
-    const marketData = this.constants.ONE_WAY_MARKETS[lendMarketId];
-    return new LendMarketTemplate(lendMarketId, marketData, this);
+    if (!(lendMarketId in this.lendMarkets)) {
+        const marketData = this.constants.ONE_WAY_MARKETS[lendMarketId];
+        if (!marketData)
+            throw new Error(`Lend market with id ${lendMarketId} not found`);
+        this.lendMarkets[lendMarketId] = new LendMarketTemplate(lendMarketId, marketData, this);
+    }
+    return this.lendMarkets[lendMarketId];
 };

package/lib/llamalend.d.ts

@@ -1,6 +1,8 @@
 import { ethers, Networkish, BigNumberish, Numeric } from "ethers";
 import { Provider as MulticallProvider } from '@curvefi/ethcall';
 import { IChainId, ILlamalend, ILlamma, IDict, INetworkName, ICurveContract, IOneWayMarket, ICoin } from "./interfaces.js";
+import { MintMarketTemplate } from "./mintMarkets";
+import { LendMarketTemplate } from "./lendMarkets";
 export declare const NETWORK_CONSTANTS: {
     [index: number]: any;
 };
@@ -15,6 +17,12 @@ declare class Llamalend implements ILlamalend {
     contracts: {
         [index: string]: ICurveContract;
     };
+    mintMarkets: {
+        [addres: string]: MintMarketTemplate;
+    };
+    lendMarkets: {
+        [addres: string]: LendMarketTemplate;
+    };
     feeData: {
         gasPrice?: number;
         maxFeePerGas?: number;

package/lib/llamalend.js

@@ -352,6 +352,8 @@ class Llamalend {
         this.chainId = 1;
         this.multicallProvider = null;
         this.contracts = {};
+        this.mintMarkets = {};
+        this.lendMarkets = {};
         this.feeData = {};
         this.constantOptions = { gasLimit: 12000000 };
         this.options = {};

package/lib/mintMarkets/MintMarketTemplate.d.ts

@@ -1,6 +1,6 @@
 import memoize from "memoizee";
 import type { Llamalend } from "../llamalend.js";
-import { IDict, TGas } from "../interfaces";
+import { IDict, ILlamma, TGas } from "../interfaces";
 import { ILeverageV2 } from "./interfaces/leverage.js";
 export declare class MintMarketTemplate {
     private llamalend;
@@ -132,7 +132,7 @@ export declare class MintMarketTemplate {
             repay: (collateral: number | string, slippage?: number) => Promise<number>;
         };
     };
-    constructor(id: string, llamalend: Llamalend);
+    constructor(id: string, llammaData: ILlamma, llamalend: Llamalend);
     statsParameters: (() => Promise<{
         fee: string;
         admin_fee: string;

package/lib/mintMarkets/MintMarketTemplate.js

@@ -13,7 +13,7 @@ import { _getAddress, parseUnits, BN, toBN, fromBN, getBalances, ensureAllowance
 import { _getUserCollateralCrvUsd } from "../external-api.js";
 import { LeverageV2Module } from "./modules";
 export class MintMarketTemplate {
-    constructor(id, llamalend) {
+    constructor(id, llammaData, llamalend) {
         var _a;
         // ---------------- STATS ----------------
         this.statsParameters = memoize(() => __awaiter(this, void 0, void 0, function* () {
@@ -237,7 +237,6 @@ export class MintMarketTemplate {
             maxAge: 5 * 60 * 1000, // 5m
         });
         this.llamalend = llamalend;
-        const llammaData = this.llamalend.constants.LLAMMAS[id];
         this.id = id;
         this.address = llammaData.amm_address;
         this.controller = llammaData.controller_address;

package/lib/mintMarkets/mintMarketConstructor.js

@@ -1,4 +1,10 @@
 import { MintMarketTemplate } from "./MintMarketTemplate";
 export const getMintMarket = function (mintMarketId) {
-    return new MintMarketTemplate(mintMarketId, this);
+    if (!(mintMarketId in this.mintMarkets)) {
+        const llammaData = this.constants.LLAMMAS[mintMarketId];
+        if (!llammaData)
+            throw new Error(`No market with id ${mintMarketId} found`);
+        this.mintMarkets[mintMarketId] = new MintMarketTemplate(mintMarketId, llammaData, this);
+    }
+    return this.mintMarkets[mintMarketId];
 };

package/lib/mintMarkets/modules/leverageV2.js

@@ -93,7 +93,7 @@ export class LeverageV2Module {
             const key = `${inputCoinAddress}-${_amount}`;
             if (!(key in this.swapDataCache))
                 throw Error("You must call corresponding `expected` method first " +
-                    "(leverage.createLoanExpectedCollateral, leverage.borrowMoreExpectedCollateral or leverage.repayExpectedBorrowed)");
+                    "(leverageV2.createLoanExpectedCollateral, leverageV2.borrowMoreExpectedCollateral or leverageV2.repayExpectedBorrowed)");
             return this.swapDataCache[key];
         };
         this._leverageExpectedCollateral = (userCollateral, userBorrowed, debt, user) => __awaiter(this, void 0, void 0, function* () {
@@ -471,7 +471,7 @@ export class LeverageV2Module {
             const _debt = parseUnits(debt, this.market.coinDecimals[0]);
             const swapData = this._getSwapDataFromCache(this.market.coinAddresses[0], _debt + _userBorrowed);
             if (slippage !== swapData.slippage)
-                throw Error(`You must call leverage.createLoanExpectedCollateral() with slippage=${slippage} first`);
+                throw Error(`You must call leverageV2.createLoanExpectedCollateral() with slippage=${slippage} first`);
             const calldata = yield _assembleTxOdos.call(this.llamalend, swapData.pathId);
             const contract = this.llamalend.contracts[this.market.controller].contract;
             const gas = yield contract.create_loan_extended.estimateGas(_userCollateral, _debt, range, this.llamalend.constants.ALIASES.leverage_zap, [1, parseUnits(this._getMarketId(), 0), _userBorrowed], calldata, Object.assign({}, this.llamalend.constantOptions));
@@ -616,7 +616,7 @@ export class LeverageV2Module {
             const _debt = parseUnits(debt, this.market.coinDecimals[0]);
             const swapData = this._getSwapDataFromCache(this.market.coinAddresses[0], _debt + _userBorrowed);
             if (slippage !== swapData.slippage)
-                throw Error(`You must call leverage.borrowMoreExpectedCollateral() with slippage=${slippage} first`);
+                throw Error(`You must call leverageV2.borrowMoreExpectedCollateral() with slippage=${slippage} first`);
             const calldata = yield _assembleTxOdos.call(this.llamalend, swapData.pathId);
             const contract = this.llamalend.contracts[this.market.controller].contract;
             const gas = yield contract.borrow_more_extended.estimateGas(_userCollateral, _debt, this.llamalend.constants.ALIASES.leverage_zap, [1, parseUnits(this._getMarketId(), 0), _userBorrowed], calldata, Object.assign({}, this.llamalend.constantOptions));
@@ -757,7 +757,7 @@ export class LeverageV2Module {
             if (_stateCollateral + _userCollateral > BigInt(0)) {
                 const swapData = this._getSwapDataFromCache(this.market.coinAddresses[1], _stateCollateral + _userCollateral);
                 if (slippage !== swapData.slippage)
-                    throw Error(`You must call leverage.repayExpectedBorrowed() with slippage=${slippage} first`);
+                    throw Error(`You must call leverageV2.repayExpectedBorrowed() with slippage=${slippage} first`);
                 calldata = yield _assembleTxOdos.call(this.llamalend, swapData.pathId);
             }
             console.log('params', [1, parseUnits(this._getMarketId(), 0), _userCollateral, _userBorrowed], calldata);

package/package.json

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

package/src/lendMarkets/lendMarketConstructor.ts

@@ -2,6 +2,10 @@ import { LendMarketTemplate} from "./LendMarketTemplate.js";
 import type { Llamalend } from "../llamalend.js";
 
 export const getLendMarket = function (this: Llamalend, lendMarketId: string): LendMarketTemplate {
-    const marketData = this.constants.ONE_WAY_MARKETS[lendMarketId];
-    return new LendMarketTemplate(lendMarketId, marketData, this)
+    if (!(lendMarketId in this.lendMarkets)) {
+        const marketData = this.constants.ONE_WAY_MARKETS[lendMarketId];
+        if (!marketData) throw new Error(`Lend market with id ${lendMarketId} not found`);
+        this.lendMarkets[lendMarketId] = new LendMarketTemplate(lendMarketId, marketData, this);
+    }
+    return this.lendMarkets[lendMarketId];
 }

package/src/llamalend.ts

@@ -81,6 +81,8 @@ import {createCall, handleMultiCallResponse} from "./utils.js";
 import {cacheKey, cacheStats} from "./cache/index.js";
 import {_getMarketsData, _getHiddenPools} from "./external-api.js";
 import {extractDecimals} from "./constants/utils.js";
+import {MintMarketTemplate} from "./mintMarkets";
+import {LendMarketTemplate} from "./lendMarkets";
 
 export const NETWORK_CONSTANTS: { [index: number]: any } = {
     1: {
@@ -177,6 +179,8 @@ class Llamalend implements ILlamalend {
     signerAddress: string;
     chainId: IChainId;
     contracts: { [index: string]: ICurveContract };
+    mintMarkets: { [addres: string]: MintMarketTemplate };
+    lendMarkets: { [addres: string]: LendMarketTemplate };
     feeData: { gasPrice?: number, maxFeePerGas?: number, maxPriorityFeePerGas?: number };
     constantOptions: { gasLimit: number };
     options: { gasPrice?: number | bigint, maxFeePerGas?: number | bigint, maxPriorityFeePerGas?: number | bigint };
@@ -204,6 +208,8 @@ class Llamalend implements ILlamalend {
         this.chainId = 1;
         this.multicallProvider = null as unknown as MulticallProvider;
         this.contracts = {};
+        this.mintMarkets = {};
+        this.lendMarkets = {};
         this.feeData = {}
         this.constantOptions = { gasLimit: 12000000 }
         this.options = {};

package/src/mintMarkets/MintMarketTemplate.ts

@@ -20,7 +20,7 @@ import {
     _mulBy1_3,
     DIGas,
 } from "../utils";
-import {IDict, TGas} from "../interfaces";
+import {IDict, ILlamma, TGas} from "../interfaces";
 import {_getUserCollateralCrvUsd} from "../external-api.js";
 import { ILeverageV2 } from "./interfaces/leverage.js";
 import { LeverageV2Module } from "./modules";
@@ -126,10 +126,8 @@ export class MintMarketTemplate {
         }
     }
 
-    constructor(id: string, llamalend: Llamalend) {
+    constructor(id: string, llammaData: ILlamma, llamalend: Llamalend) {
         this.llamalend = llamalend;
-        const llammaData = this.llamalend.constants.LLAMMAS[id];
-
         this.id = id;
         this.address = llammaData.amm_address;
         this.controller = llammaData.controller_address;

package/src/mintMarkets/mintMarketConstructor.ts

@@ -2,5 +2,10 @@ import { MintMarketTemplate} from "./MintMarketTemplate";
 import type { Llamalend } from "../llamalend.js";
 
 export const getMintMarket = function (this: Llamalend, mintMarketId: string): MintMarketTemplate {
-    return new MintMarketTemplate(mintMarketId, this)
+    if (!(mintMarketId in this.mintMarkets)) {
+        const llammaData = this.constants.LLAMMAS[mintMarketId];
+        if (!llammaData) throw new Error(`No market with id ${mintMarketId} found`);
+        this.mintMarkets[mintMarketId] = new MintMarketTemplate(mintMarketId, llammaData, this)
+    }
+    return this.mintMarkets[mintMarketId]
 }

package/src/mintMarkets/modules/leverageV2.ts

@@ -238,9 +238,8 @@ export class LeverageV2Module {
         const key = `${inputCoinAddress}-${_amount}`;
         if (!(key in this.swapDataCache)) throw Error(
             "You must call corresponding `expected` method first " +
-            "(leverage.createLoanExpectedCollateral, leverage.borrowMoreExpectedCollateral or leverage.repayExpectedBorrowed)"
+            "(leverageV2.createLoanExpectedCollateral, leverageV2.borrowMoreExpectedCollateral or leverageV2.repayExpectedBorrowed)"
         );
-
         return this.swapDataCache[key]
     }
 
@@ -494,7 +493,7 @@ export class LeverageV2Module {
         const _userBorrowed = parseUnits(userBorrowed, this.market.coinDecimals[0]);
         const _debt = parseUnits(debt, this.market.coinDecimals[0]);
         const swapData = this._getSwapDataFromCache(this.market.coinAddresses[0], _debt + _userBorrowed);
-        if (slippage !== swapData.slippage) throw Error(`You must call leverage.createLoanExpectedCollateral() with slippage=${slippage} first`);
+        if (slippage !== swapData.slippage) throw Error(`You must call leverageV2.createLoanExpectedCollateral() with slippage=${slippage} first`);
         const calldata = await _assembleTxOdos.call(this.llamalend, swapData.pathId as string);
         const contract = this.llamalend.contracts[this.market.controller].contract;
         const gas = await contract.create_loan_extended.estimateGas(
@@ -666,7 +665,7 @@ export class LeverageV2Module {
         const _userBorrowed = parseUnits(userBorrowed, this.market.coinDecimals[0]);
         const _debt = parseUnits(debt, this.market.coinDecimals[0]);
         const swapData = this._getSwapDataFromCache(this.market.coinAddresses[0], _debt + _userBorrowed);
-        if (slippage !== swapData.slippage) throw Error(`You must call leverage.borrowMoreExpectedCollateral() with slippage=${slippage} first`)
+        if (slippage !== swapData.slippage) throw Error(`You must call leverageV2.borrowMoreExpectedCollateral() with slippage=${slippage} first`)
         const calldata = await _assembleTxOdos.call(this.llamalend, swapData.pathId as string);
         const contract = this.llamalend.contracts[this.market.controller].contract;
         const gas = await contract.borrow_more_extended.estimateGas(
@@ -894,7 +893,7 @@ export class LeverageV2Module {
         let calldata = "0x";
         if (_stateCollateral + _userCollateral > BigInt(0)) {
             const swapData = this._getSwapDataFromCache(this.market.coinAddresses[1], _stateCollateral + _userCollateral);
-            if (slippage !== swapData.slippage) throw Error(`You must call leverage.repayExpectedBorrowed() with slippage=${slippage} first`)
+            if (slippage !== swapData.slippage) throw Error(`You must call leverageV2.repayExpectedBorrowed() with slippage=${slippage} first`)
             calldata = await _assembleTxOdos.call(this.llamalend, swapData.pathId as string);
         }