@curvefi/llamalend-api 1.0.4 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/llamalend-api",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "JavaScript library for Curve Lending",
   "main": "lib/index.js",
   "author": "Macket",
@@ -17,26 +17,31 @@
     "build": "rm -rf lib && tsc -p tsconfig.build.json",
     "lint": "eslint src --ext .ts"
   },
+  "engines": {
+    "node": "^22.0.0"
+  },
   "type": "module",
   "devDependencies": {
-    "@types/chai": "^4.2.18",
-    "@types/memoizee": "^0.4.7",
-    "@types/mocha": "^8.2.2",
-    "@types/node": "^14.14.37",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.20.0",
+    "@eslint/eslintrc": "^3.3.1",
+    "@eslint/js": "^9.23.0",
+    "@types/chai": "^5.2.1",
+    "@types/memoizee": "^0.4.12",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^22.13.13",
+    "@typescript-eslint/eslint-plugin": "^8.28.0",
+    "@typescript-eslint/parser": "^8.28.0",
     "babel-eslint": "^10.1.0",
-    "chai": "^4.3.4",
-    "eslint": "^7.32.0",
-    "mocha": "^8.4.0",
-    "typescript": "^4.5.2",
-    "vue-eslint-parser": "^7.6.0"
+    "chai": "^5.2.0",
+    "eslint": "^9.23.0",
+    "globals": "^16.0.0",
+    "mocha": "^11.1.0",
+    "typescript": "^5.8.2",
+    "vue-eslint-parser": "^10.1.1"
   },
   "dependencies": {
-    "axios": "^0.21.1",
-    "bignumber.js": "^9.0.1",
     "@curvefi/ethcall": "6.0.13",
-    "ethers": "^6.10.0",
-    "memoizee": "^0.4.15"
+    "bignumber.js": "^9.1.2",
+    "ethers": "^6.13.5",
+    "memoizee": "^0.4.17"
   }
 }

package/src/cache/index.ts

@@ -1,4 +1,5 @@
 class Cache {
+    // eslint-disable-next-line no-use-before-define
     private static instance: Cache;
     readonly cache: Map<string, any>;
 

package/src/external-api.ts

@@ -1,24 +1,22 @@
-import axios from "axios";
-import { ethers } from "ethers";
+import {ethers} from "ethers";
 import memoize from "memoizee";
-import BigNumber from 'bignumber.js';
-import { llamalend } from "./llamalend.js";
+import {llamalend} from "./llamalend.js";
 import {
+    IDict,
     IExtendedPoolDataFromApi,
+    IMarketData,
     INetworkName,
     IPoolFactory,
-    I1inchSwapData,
-    IDict,
-    IMarketData,
     IQuoteOdos,
+    IResponseApi,
 } from "./interfaces";
 
 
 const _getPoolsFromApi = memoize(
     async (network: INetworkName, poolFactory: IPoolFactory ): Promise<IExtendedPoolDataFromApi> => {
-        const url = `https://api.curve.fi/api/getPools/${network}/${poolFactory}`;
-        const response = await axios.get(url, { validateStatus: () => true });
-        return response.data.data ?? { poolData: [], tvl: 0, tvlAll: 0 };
+        const response = await fetch(`https://api.curve.fi/api/getPools/${network}/${poolFactory}`);
+        const { data } = await response.json() as { data?: IExtendedPoolDataFromApi, success: boolean };
+        return data ?? { poolData: [], tvl: 0, tvlAll: 0 };
     },
     {
         promise: true,
@@ -117,14 +115,16 @@ export const _getUsdPricesFromApi = async (): Promise<IDict<number>> => {
     return priceDictByMaxTvl
 }
 
+type UserCollateral = { total_deposit_precise: string, total_deposit_from_user: number, total_deposit_usd_value: number }
 export const _getUserCollateral = memoize(
-    async (network: INetworkName, controller: string, user: string): Promise<Record<string, any>> => {
+    async (network: INetworkName, controller: string, user: string): Promise<UserCollateral> => {
         const url = `https://prices.curve.fi/v1/lending/collateral_events/${network}/${controller}/${user}`;
-        const response = await axios.get(url, { validateStatus: () => true });
+        const response = await fetch(url);
+        const data = await response.json() as UserCollateral;
         return {
-            total_deposit_precise: response.data.total_deposit_precise,
-            total_deposit_from_user: response.data.total_deposit_from_user,
-            total_deposit_usd_value: response.data.total_deposit_usd_value,
+            total_deposit_precise: data.total_deposit_precise,
+            total_deposit_from_user: data.total_deposit_from_user,
+            total_deposit_usd_value: data.total_deposit_usd_value,
         }
     },
     {
@@ -136,8 +136,9 @@ export const _getUserCollateral = memoize(
 export const _getUserCollateralCrvUsd = memoize(
     async (network: INetworkName, controller: string, user: string): Promise<string> => {
         const url = `https://prices.curve.fi/v1/crvusd/collateral_events/${network}/${controller}/${user}`;
-        const response = await axios.get(url, { validateStatus: () => true });
-        return response.data.total_deposit;
+        const response = await fetch(url);
+        const { total_deposit } = await response.json() as { total_deposit: string };
+        return total_deposit;
     },
     {
         promise: true,
@@ -148,16 +149,12 @@ export const _getUserCollateralCrvUsd = memoize(
 export const _getMarketsData = memoize(
     async (network: INetworkName): Promise<IMarketData> => {
         const url = `https://api.curve.fi/api/getLendingVaults/${network}/oneway`;
-        const response = await axios.get(
-            url,
-            {
-                headers: {"accept": "application/json"},
-                validateStatus: () => true,
-            });
+        const response = await fetch(url, { headers: {"accept": "application/json"} });
         if (response.status !== 200) {
             throw Error(`Fetch error: ${response.status} ${response.statusText}`);
         }
-        return response.data.data;
+
+        return (await response.json() as IResponseApi).data as IMarketData;
     },
     {
         promise: true,
@@ -177,17 +174,12 @@ export const _getQuoteOdos = async (fromToken: string, toToken: string, _amount:
         `&to_address=${ethers.getAddress(toToken)}&amount=${_amount.toString()}&slippage=${slippage}&pathVizImage=${pathVizImage}` +
         `&caller_address=${ethers.getAddress(llamalend.constants.ALIASES.leverage_zap)}&blacklist=${ethers.getAddress(blacklist)}`;
 
-    const response = await axios.get(
-        url,
-        {
-            headers: {"accept": "application/json"},
-            validateStatus: () => true,
-        });
+    const response = await fetch(url, {  headers: {"accept": "application/json"} });
     if (response.status !== 200) {
         throw Error(`Odos quote error - ${response.status} ${response.statusText}`);
     }
-
-    return { ...response.data, slippage };
+    const data = await response.json() as Omit<IQuoteOdos, 'slippage'>;
+    return { ...data, slippage };
 }
 
 export const _getExpectedOdos = async (fromToken: string, toToken: string, _amount: bigint, blacklist: string) => {
@@ -198,125 +190,12 @@ export const _assembleTxOdos = memoize(
     async (pathId: string): Promise<string> => {
         const url = `https://prices.curve.fi/odos/assemble?user=${ethers.getAddress(llamalend.constants.ALIASES.leverage_zap)}&path_id=${pathId}`;
 
-        const response = await axios.get(
-            url,
-            {
-                headers: {'Content-Type': 'application/json'},
-                validateStatus: () => true,
-            });
+        const response = await fetch(url, { headers: {'Content-Type': 'application/json'} });
         if (response.status !== 200) {
             throw Error(`Odos assemble error - ${response.status} ${response.statusText}`);
         }
-
-        return response.data['transaction']['data'];
-    },
-    {
-        promise: true,
-        maxAge: 10 * 1000, // 10s
-    }
-)
-
-export const _getSpotPriceOdos = memoize(
-    async (fromToken: string, toToken: string): Promise<string | undefined> => {
-        fromToken = ethers.getAddress(fromToken);
-        toToken = ethers.getAddress(toToken);
-        const url = `https://prices.curve.fi/odos/prices?chain_id=${llamalend.chainId}&tokens=${fromToken},${toToken}`;
-        const response = await axios.get(
-            url,
-            {
-                headers: {"accept": "application/json"},
-                validateStatus: () => true,
-            });
-        if (response.status !== 200) {
-            throw Error(`Odos spot prices error - ${response.status} ${response.statusText}`);
-        }
-
-        const pricesFromOdos = response.data.tokenPrices;
-        const pricesFromApi: IDict<string> = {};
-        for (const coin of [fromToken, toToken]) {
-            if (pricesFromOdos[coin] !== 0) continue;
-            const _pricesFromApi = await _getUsdPricesFromApi();
-            pricesFromApi[coin] = String(_pricesFromApi[coin] || 0);
-        }
-        const prices = { ...pricesFromOdos, ...pricesFromApi };
-        if (BigNumber(prices[fromToken]).eq(0) || BigNumber(prices[toToken]).eq( 0)) return undefined;
-
-        return (new BigNumber(prices[toToken])).div(prices[fromToken]).toString()
-    },
-    {
-        promise: true,
-        maxAge: 10 * 1000, // 10s
-    }
-)
-
-// --- 1INCH ---
-
-export const _getExpected1inch = memoize(
-    async (fromToken: string, toToken: string, _amount: bigint): Promise<string> => {
-        if (_amount === BigInt(0)) return "0.0";
-        const url = `https://prices.curve.fi/1inch/swap/v6.0/${llamalend.chainId}/quote?src=${fromToken}&dst=${toToken}&amount=${_amount}&excludedProtocols=${llamalend.constants.EXCLUDED_PROTOCOLS_1INCH}&includeTokensInfo=true&includeProtocols=true`;
-        const response = await axios.get(
-            url,
-            {
-                headers: {"accept": "application/json"},
-                validateStatus: () => true,
-            });
-        if (response.status !== 200) {
-            throw Error(`1inch error: ${response.status} ${response.statusText}`);
-        }
-        return response.data.dstAmount;
-
-    },
-    {
-        promise: true,
-        maxAge: 10 * 1000, // 10s
-    }
-)
-
-export const _getSwapData1inch = memoize(
-    async (fromToken: string, toToken: string, _amount: bigint, slippage: number): Promise<I1inchSwapData> => {
-        if (_amount === BigInt(0)) throw Error("Amount must be > 0");
-        const url = `https://prices.curve.fi/1inch/swap/v6.0/${llamalend.chainId}/swap?src=${fromToken}&dst=${toToken}&amount=${_amount}&from_=${llamalend.constants.ALIASES.leverage_zap}&slippage=${slippage}&excludedProtocols=${llamalend.constants.EXCLUDED_PROTOCOLS_1INCH}&includeTokensInfo=true&includeProtocols=true&disableEstimate=true`;
-        const response = await axios.get(
-            url,
-            {
-                headers: {"accept": "application/json"},
-                validateStatus: () => true,
-            });
-        if (response.status !== 200) {
-            throw Error(`1inch error: ${response.status} ${response.statusText}`);
-        }
-        return response.data;
-
-    },
-    {
-        promise: true,
-        maxAge: 10 * 1000, // 10s
-    }
-)
-
-export const _getSpotPrice1inch = memoize(
-    async (fromToken: string, toToken: string): Promise<string | undefined> => {
-        const url = `https://prices.curve.fi/1inch/price/v1.1/${llamalend.chainId}?tokens=${fromToken},${toToken}&currency=USD`;
-        const response = await axios.get(
-            url,
-            {
-                headers: {"accept": "application/json"},
-                validateStatus: () => true,
-            });
-        if (response.status !== 200) {
-            throw Error(`1inch error: ${response.status} ${response.statusText}`);
-        }
-        const pricesFromApi: IDict<string> = {};
-        for (const coin in response.data) {
-            if (response.data[coin] !== "0") continue;
-            const _pricesFromApi = await _getUsdPricesFromApi();
-            pricesFromApi[coin] = String(_pricesFromApi[coin] || 0);
-        }
-        const prices = { ...response.data, ...pricesFromApi };
-        if (prices[fromToken] === '0' || prices[toToken] === '0') return undefined;
-
-        return (new BigNumber(prices[toToken])).div(prices[fromToken]).toString()
+        const { transaction } = await response.json() as { transaction: { data: string } };
+        return transaction.data;
     },
     {
         promise: true,

package/src/index.ts

@@ -83,7 +83,9 @@ const llamalend = {
     getGasPriceFromL2,
     getGasInfoForL2,
     fetchStats: _llamalend.fetchStats,
-    getLlammaList: _llamalend.getMintMarketList,
+    mintMarkets: {
+        getMarketList :_llamalend.getMintMarketList,
+    },
     lendMarkets: {
         fetchMarkets:  _llamalend.fetchLendMarkets,
         getMarketList: _llamalend.getLendMarketList,

package/src/interfaces.ts

@@ -123,25 +123,6 @@ export interface IReward {
     apy: number
 }
 
-export type T1inchRouteStep = {
-    name: string,
-    part: number,
-    fromTokenAddress: string,
-    toTokenAddress: string,
-}[]
-
-export interface I1inchRoute {
-    part: number,
-    hops: T1inchRouteStep[],
-}
-
-export interface I1inchSwapData {
-    tx: { data: string },
-    dstAmount: string,
-    protocols: I1inchRoute[],
-    slippage: number,
-}
-
 interface Rates {
     borrowApr: number;
     borrowApy: number;
@@ -235,3 +216,7 @@ export interface ILlamma {
     A: number,
     monetary_policy_abi: any
 }
+
+export interface IResponseApi {
+    data: any
+}

package/src/lendMarkets/LendMarketTemplate.ts

@@ -700,7 +700,7 @@ export class LendMarketTemplate {
         return [baseApyBN.times(100).toNumber(), boostedApyBN.times(100).toNumber()]
     }
 
-    private async vaultCrvApr(useApi = true): Promise<[baseApy: number, boostedApy: number]> {
+    private async vaultCrvApr(): Promise<[baseApy: number, boostedApy: number]> {
         if (this.vaultRewardsOnly()) throw Error(`${this.name} has Rewards-Only Gauge. Use stats.rewardsApy instead`);
 
         // const isDisabledChain = [1313161554].includes(llamalend.chainId); // Disable Aurora
@@ -765,7 +765,7 @@ export class LendMarketTemplate {
         return await this._vaultClaimCrv(false) as string;
     }
 
-    private vaultRewardTokens = memoize(async (useApi = true): Promise<{token: string, symbol: string, decimals: number}[]> => {
+    private vaultRewardTokens = memoize(async (): Promise<{token: string, symbol: string, decimals: number}[]> => {
         if (this.addresses.gauge === llamalend.constants.ZERO_ADDRESS) return []
 
         // if (useApi) {
@@ -828,7 +828,7 @@ export class LendMarketTemplate {
             // }
 
             const apy: IReward[] = [];
-            const rewardTokens = await this.vaultRewardTokens(false);
+            const rewardTokens = await this.vaultRewardTokens();
             for (const rewardToken of rewardTokens) {
                 const gaugeContract = llamalend.contracts[this.addresses.gauge].multicallContract;
                 const lpTokenContract = llamalend.contracts[this.addresses.vault].multicallContract;
@@ -1863,7 +1863,7 @@ export class LendMarketTemplate {
 
         const _debt = parseUnits(debt);
         const contract = llamalend.contracts[this.addresses.controller].contract;
-        const [_, n1] = await this.userBands(address);
+        const [, n1] = await this.userBands(address);
         const { borrowed } = await this.userState(address);
         const n = (BN(borrowed).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, llamalend.constantOptions);
@@ -2859,7 +2859,7 @@ export class LendMarketTemplate {
         try {
             _n1 = await llamalend.contracts[this.addresses.controller].contract.calculate_debt_n1(_stateCollateral - _stateRepayCollateral, _stateDebt - _repayExpected, _N);
             _n2 = _n1 + (_N - BigInt(1));
-        } catch (e) {
+        } catch {
             console.log("Full repayment");
         }
 

package/src/llamalend.ts

@@ -288,7 +288,7 @@ class Llamalend implements ILlamalend {
             } else if (!providerSettings.url?.startsWith("https://rpc.gnosischain.com")) {
                 try {
                     this.signer = await this.provider.getSigner();
-                } catch (e) {
+                } catch {
                     this.signer = null;
                 }
             }
@@ -335,7 +335,7 @@ class Llamalend implements ILlamalend {
         if (this.signer) {
             try {
                 this.signerAddress = await this.signer.getAddress();
-            } catch (err) {
+            } catch {
                 this.signer = null;
             }
         } else {

package/src/mintMarkets/MintMarketTemplate.ts

@@ -237,8 +237,8 @@ export class MintMarketTemplate {
             .map((x) => formatUnits(x * BigInt(100)));
 
         // (1+rate)**(365*86400)-1 ~= (e**(rate*365*86400))-1
-        const rate = String(((2.718281828459 ** (toBN(_rate).times(365).times(86400)).toNumber()) - 1) * 100);
-        const future_rate = String(((2.718281828459 ** (toBN(_mp_rate).times(365).times(86400)).toNumber()) - 1) * 100);
+        const rate = String(((2.718281828459 ** Number((toBN(_rate).times(365).times(86400)))) - 1) * 100);
+        const future_rate = String(((2.718281828459 ** Number((toBN(_mp_rate).times(365).times(86400)))) - 1) * 100);
 
         return { fee, admin_fee, rate, future_rate, liquidation_discount, loan_discount }
     },
@@ -273,7 +273,7 @@ export class MintMarketTemplate {
             llammaContract.min_band(),
         ]
 
-        return (await llamalend.multicallProvider.all(calls1) as BigNumber[]).map((_b) => _b.toNumber()) as [number, number];
+        return (await llamalend.multicallProvider.all(calls1) as BigNumber[]).map((_b) => Number(_b)) as [number, number];
     },
     {
         promise: true,
@@ -281,7 +281,7 @@ export class MintMarketTemplate {
     });
 
     private statsActiveBand = memoize(async (): Promise<number> => {
-        return (await llamalend.contracts[this.address].contract.active_band_with_skip()).toNumber()
+        return Number((await llamalend.contracts[this.address].contract.active_band_with_skip()))
     },
     {
         promise: true,
@@ -430,7 +430,7 @@ export class MintMarketTemplate {
         address = _getAddress(address);
         const _bands = await llamalend.contracts[this.address].contract.read_user_tick_numbers(address, llamalend.constantOptions) as BigNumber[];
 
-        return _bands.map((_t) => _t.toNumber()).reverse();
+        return _bands.map((_t) => Number(_t)).reverse();
     }
 
     public async userRange(address = ""): Promise<number> {
@@ -1057,7 +1057,7 @@ export class MintMarketTemplate {
 
         const _debt = parseUnits(debt);
         const contract = llamalend.contracts[this.controller].contract;
-        const [_, n1] = await this.userBands(address);
+        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);
@@ -1693,7 +1693,7 @@ export class MintMarketTemplate {
         try {
             _n1 = await llamalend.contracts[this.deleverageZap].contract.calculate_debt_n1(_collateral, routeIdx, address);
             _n2 = _n1 + BigInt(N - 1);
-        } catch (e) {
+        } catch {
             console.log("Full repayment");
         }
 

package/src/utils.ts

@@ -1,4 +1,3 @@
-import axios from "axios";
 import { ethers,  BigNumberish, Numeric } from "ethers";
 import { Call } from "@curvefi/ethcall";
 import BigNumber from 'bignumber.js';
@@ -359,10 +358,11 @@ export const _getUsdRate = async (assetId: string): Promise<number> => {
         const url = [nativeTokenName, 'ethereum', 'bitcoin', 'link', 'curve-dao-token', 'stasis-eurs'].includes(assetId.toLowerCase()) ?
             `https://api.coingecko.com/api/v3/simple/price?ids=${assetId}&vs_currencies=usd` :
             `https://api.coingecko.com/api/v3/simple/token_price/${chainName}?contract_addresses=${assetId}&vs_currencies=usd`
-        const response = await axios.get(url);
+        const response = await fetch(url);
+        const data = await response.json() as Record<string, { usd: number }>;
         try {
-            _usdRatesCache[assetId] = {'rate': response.data[assetId]['usd'] ?? 0, 'time': Date.now()};
-        } catch (err) { // TODO pay attention!
+            _usdRatesCache[assetId] = {'rate': data[assetId]['usd'] ?? 0, 'time': Date.now()};
+        } catch { // TODO pay attention!
             _usdRatesCache[assetId] = {'rate': 0, 'time': Date.now()};
         }
     }
@@ -457,8 +457,8 @@ export const getLsdApy = memoize(async(name: 'wstETH' | 'sfrxETH'): Promise<{
         baseApy: number,
         apyMean30d: number,
     }> => {
-    const response = await axios.get('https://yields.llama.fi/pools');
-    const {data} = response as { data: { chain: string, project: string, symbol: string, apy: number, apyBase: number, apyMean30d: number }[] };
+    const response = await fetch('https://yields.llama.fi/pools');
+    const {data} = await response.json() as { data: { chain: string, project: string, symbol: string, apy: number, apyBase: number, apyMean30d: number }[] };
 
     const params = {
         'wstETH': {

package/tsconfig.json

@@ -4,7 +4,7 @@
 
     /* Basic Options */
     // "incremental": true,                         /* Enable incremental compilation */
-    "target": "es5",                                /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
+    "target": "es6",                                /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
     "module": "ESNext",                           /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
     "lib": ["ES2020"],                              /* Specify library files to be included in the compilation. */
     // "allowJs": true,                             /* Allow javascript files to be compiled. */

package/.eslintrc.json

@@ -1,40 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "es6": true
-  },
-  "extends": "eslint:recommended",
-  "parser": "vue-eslint-parser",
-  "parserOptions": {
-    "parser": "babel-eslint",
-    "sourceType": "module",
-    "allowImportExportEverywhere": false
-  },
-  "rules": {
-    "func-names": 0,
-    "no-nested-ternary": 0,
-    "max-len": 0,
-    "arrow-parens": ["error", "always"],
-    "no-underscore-dangle": 0,
-    "comma-dangle": ["error", {
-      "arrays": "always-multiline",
-      "objects": "always-multiline",
-      "imports": "always-multiline",
-      "exports": "always-multiline",
-      "functions": "never"
-    }],
-    "no-use-before-define": ["error", "nofunc"],
-    "no-empty": ["error", { "allowEmptyCatch": true }],
-    "no-mixed-operators": ["error", { "allowSamePrecedence": true }],
-    "indent": ["error", 4, { "flatTernaryExpressions": true, "SwitchCase": 1 }]
-  },
-  "overrides": [{
-    "files": ["**/*.ts"],
-    "parser": "@typescript-eslint/parser",
-    "plugins": ["@typescript-eslint"],
-    "extends": ["plugin:@typescript-eslint/eslint-recommended", "plugin:@typescript-eslint/recommended"],
-    "rules": {
-      "@typescript-eslint/ban-ts-comment": "off"
-    }
-  }]
-}