@curvefi/llamalend-api 1.0.32 → 1.0.34

package/README.md

@@ -34,7 +34,7 @@ import { useState, useMemo } from 'react'
 import { providers } from 'ethers'
 import Onboard from 'bnc-onboard'
 import type { Wallet } from 'bnc-onboard/dist/src/interfaces'
-import llamalend from '@curvefi/lending-api'
+import llamalend from '@curvefi/llamalend-api'
     ...
 
 const WalletProvider: FunctionComponent = ({ children }) => {
@@ -79,7 +79,7 @@ import { useState, useMemo, useEffect } from 'react'
 import { providers } from 'ethers'
 import Onboard from 'bnc-onboard'
 import type { Wallet } from 'bnc-onboard/dist/src/interfaces'
-import llamalend from '@curvefi/lending-api'
+import llamalend from '@curvefi/llamalend-api'
 
     ...
 

package/lib/cached.d.ts

@@ -0,0 +1,2 @@
+import { IDict, INetworkName } from "./interfaces.js";
+export declare const _getUsdPricesFromApi: (network: INetworkName) => Promise<IDict<number>>;

package/lib/cached.js

@@ -0,0 +1,75 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { createUsdPricesDict, uncached_getAllPoolsFromApi } from './external-api.js';
+/**
+ * Memoizes a function that returns a promise.
+ * Custom function instead of `memoizee` because we want to be able to set the cache manually based on server data.
+ * @param fn The function that returns a promise and will be memoized
+ * @param maxAge The maximum age of the cache in milliseconds
+ * @param createKey A function that creates a key for the cache based on the arguments passed to the function
+ * @returns A memoized `fn` function that includes a `set` method to set the cache manually
+ */
+const memoize = (fn, { maxAge, createKey = (list) => list.toString(), }) => {
+    const cache = {};
+    const timeouts = {};
+    const setCache = (key, promise) => {
+        if (promise) {
+            cache[key] = promise;
+        }
+        else if (key in cache) {
+            delete cache[key];
+        }
+        if (key in timeouts) {
+            clearTimeout(timeouts[key]);
+            delete timeouts[key];
+        }
+    };
+    const scheduleCleanup = (key) => timeouts[key] = setTimeout(() => {
+        delete timeouts[key];
+        delete cache[key];
+    }, maxAge);
+    const cachedFn = (...args) => __awaiter(void 0, void 0, void 0, function* () {
+        const key = createKey(args);
+        if (key in cache) {
+            return cache[key];
+        }
+        const promise = fn(...args);
+        setCache(key, promise);
+        try {
+            const result = yield promise;
+            scheduleCleanup(key);
+            return result;
+        }
+        catch (e) {
+            delete cache[key];
+            throw e;
+        }
+    });
+    cachedFn.set = (result, ...args) => {
+        const key = createKey(args);
+        setCache(key, Promise.resolve(result));
+        scheduleCleanup(key);
+    };
+    return cachedFn;
+};
+const createCache = (poolsDict) => {
+    const poolLists = Object.values(poolsDict);
+    const usdPrices = createUsdPricesDict(poolLists);
+    return { poolsDict, poolLists, usdPrices };
+};
+/**
+ * This function is used to cache the data fetched from the API and the data derived from it.
+ * Note: do not expose this function to the outside world, instead encapsulate it in a function that returns the data you need.
+ */
+const _getCachedData = memoize((network) => __awaiter(void 0, void 0, void 0, function* () { return createCache(yield uncached_getAllPoolsFromApi(network)); }), { maxAge: 1000 * 60 * 5 /* 5 minutes */ });
+export const _getUsdPricesFromApi = (network) => __awaiter(void 0, void 0, void 0, function* () {
+    const { usdPrices } = yield _getCachedData(network);
+    return usdPrices;
+});

package/lib/external-api.d.ts

@@ -1,7 +1,8 @@
 import memoize from "memoizee";
 import type { Llamalend } from "./llamalend.js";
-import { IDict, IMarketData, INetworkName, IQuoteOdos } from "./interfaces";
-export declare function _getUsdPricesFromApi(this: Llamalend): Promise<IDict<number>>;
+import { IDict, IExtendedPoolDataFromApi, IMarketData, INetworkName, IQuoteOdos, IPoolType } from "./interfaces";
+export declare const uncached_getAllPoolsFromApi: (network: INetworkName) => Promise<Record<IPoolType, IExtendedPoolDataFromApi>>;
+export declare const createUsdPricesDict: (allTypesExtendedPoolData: IExtendedPoolDataFromApi[]) => IDict<number>;
 type UserCollateral = {
     total_deposit_precise: string;
     total_deposit_from_user: number;

package/lib/external-api.js

@@ -9,105 +9,87 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { ethers } from "ethers";
 import memoize from "memoizee";
-const _getPoolsFromApi = memoize((network, poolFactory) => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield fetch(`https://api.curve.finance/api/getPools/${network}/${poolFactory}`);
-    const { data } = yield response.json();
-    return data !== null && data !== void 0 ? data : { poolData: [], tvl: 0, tvlAll: 0 };
-}), {
-    promise: true,
-    maxAge: 5 * 60 * 1000, // 5m
+const uncached_getPoolsFromApi = (network, poolType) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const api = "https://api.curve.finance/api";
+    const url = `${api}/getPools/${network}/${poolType}`;
+    return (_a = yield fetchData(url)) !== null && _a !== void 0 ? _a : { poolData: [], tvl: 0, tvlAll: 0 };
 });
-const _getAllPoolsFromApi = (network) => __awaiter(void 0, void 0, void 0, function* () {
-    return yield Promise.all([
-        _getPoolsFromApi(network, "main"),
-        _getPoolsFromApi(network, "crypto"),
-        _getPoolsFromApi(network, "factory"),
-        _getPoolsFromApi(network, "factory-crvusd"),
-        _getPoolsFromApi(network, "factory-crypto"),
-        _getPoolsFromApi(network, "factory-twocrypto"),
-        _getPoolsFromApi(network, "factory-tricrypto"),
-        _getPoolsFromApi(network, "factory-stable-ng"),
-    ]);
+const getPoolTypes = () => ["main", "crypto", "factory", "factory-crvusd", "factory-crypto", "factory-twocrypto", "factory-tricrypto", "factory-stable-ng"];
+export const uncached_getAllPoolsFromApi = (network) => __awaiter(void 0, void 0, void 0, function* () {
+    return Object.fromEntries(yield Promise.all(getPoolTypes().map((poolType) => __awaiter(void 0, void 0, void 0, function* () {
+        const data = yield uncached_getPoolsFromApi(network, poolType);
+        return [poolType, data];
+    }))));
 });
-export function _getUsdPricesFromApi() {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const network = this.constants.NETWORK_NAME;
-        const allTypesExtendedPoolData = yield _getAllPoolsFromApi(network);
-        const priceDict = {};
-        const priceDictByMaxTvl = {};
-        for (const extendedPoolData of allTypesExtendedPoolData) {
-            for (const pool of extendedPoolData.poolData) {
-                const lpTokenAddress = (_a = pool.lpTokenAddress) !== null && _a !== void 0 ? _a : pool.address;
-                const totalSupply = pool.totalSupply / (Math.pow(10, 18));
-                if (lpTokenAddress.toLowerCase() in priceDict) {
-                    priceDict[lpTokenAddress.toLowerCase()].push({
-                        price: pool.usdTotal && totalSupply ? pool.usdTotal / totalSupply : 0,
-                        tvl: pool.usdTotal,
-                    });
-                }
-                else {
-                    priceDict[lpTokenAddress.toLowerCase()] = [];
-                    priceDict[lpTokenAddress.toLowerCase()].push({
-                        price: pool.usdTotal && totalSupply ? pool.usdTotal / totalSupply : 0,
-                        tvl: pool.usdTotal,
-                    });
-                }
-                for (const coin of pool.coins) {
-                    if (typeof coin.usdPrice === "number") {
-                        if (coin.address.toLowerCase() in priceDict) {
-                            priceDict[coin.address.toLowerCase()].push({
-                                price: coin.usdPrice,
-                                tvl: pool.usdTotal,
-                            });
-                        }
-                        else {
-                            priceDict[coin.address.toLowerCase()] = [];
-                            priceDict[coin.address.toLowerCase()].push({
-                                price: coin.usdPrice,
-                                tvl: pool.usdTotal,
-                            });
-                        }
+export const createUsdPricesDict = (allTypesExtendedPoolData) => {
+    var _a, _b;
+    const priceDict = {};
+    const priceDictByMaxTvl = {};
+    for (const extendedPoolData of allTypesExtendedPoolData) {
+        for (const pool of extendedPoolData.poolData) {
+            const lpTokenAddress = (_a = pool.lpTokenAddress) !== null && _a !== void 0 ? _a : pool.address;
+            const totalSupply = pool.totalSupply / (Math.pow(10, 18));
+            if (lpTokenAddress.toLowerCase() in priceDict) {
+                priceDict[lpTokenAddress.toLowerCase()].push({
+                    price: pool.usdTotal && totalSupply ? pool.usdTotal / totalSupply : 0,
+                    tvl: pool.usdTotal,
+                });
+            }
+            else {
+                priceDict[lpTokenAddress.toLowerCase()] = [];
+                priceDict[lpTokenAddress.toLowerCase()].push({
+                    price: pool.usdTotal && totalSupply ? pool.usdTotal / totalSupply : 0,
+                    tvl: pool.usdTotal,
+                });
+            }
+            for (const coin of pool.coins) {
+                if (typeof coin.usdPrice === "number") {
+                    if (coin.address.toLowerCase() in priceDict) {
+                        priceDict[coin.address.toLowerCase()].push({
+                            price: coin.usdPrice,
+                            tvl: pool.usdTotal,
+                        });
                     }
-                }
-                for (const coin of (_b = pool.gaugeRewards) !== null && _b !== void 0 ? _b : []) {
-                    if (typeof coin.tokenPrice === "number") {
-                        if (coin.tokenAddress.toLowerCase() in priceDict) {
-                            priceDict[coin.tokenAddress.toLowerCase()].push({
-                                price: coin.tokenPrice,
-                                tvl: pool.usdTotal,
-                            });
-                        }
-                        else {
-                            priceDict[coin.tokenAddress.toLowerCase()] = [];
-                            priceDict[coin.tokenAddress.toLowerCase()].push({
-                                price: coin.tokenPrice,
-                                tvl: pool.usdTotal,
-                            });
-                        }
+                    else {
+                        priceDict[coin.address.toLowerCase()] = [];
+                        priceDict[coin.address.toLowerCase()].push({
+                            price: coin.usdPrice,
+                            tvl: pool.usdTotal,
+                        });
                     }
                 }
             }
-        }
-        for (const address in priceDict) {
-            if (priceDict[address].length > 0) {
-                const maxTvlItem = priceDict[address].reduce((prev, current) => {
-                    if (+current.tvl > +prev.tvl) {
-                        return current;
+            for (const coin of (_b = pool.gaugeRewards) !== null && _b !== void 0 ? _b : []) {
+                if (typeof coin.tokenPrice === "number") {
+                    if (coin.tokenAddress.toLowerCase() in priceDict) {
+                        priceDict[coin.tokenAddress.toLowerCase()].push({
+                            price: coin.tokenPrice,
+                            tvl: pool.usdTotal,
+                        });
                     }
                     else {
-                        return prev;
+                        priceDict[coin.tokenAddress.toLowerCase()] = [];
+                        priceDict[coin.tokenAddress.toLowerCase()].push({
+                            price: coin.tokenPrice,
+                            tvl: pool.usdTotal,
+                        });
                     }
-                });
-                priceDictByMaxTvl[address] = maxTvlItem.price;
-            }
-            else {
-                priceDictByMaxTvl[address] = 0;
+                }
             }
         }
-        return priceDictByMaxTvl;
-    });
-}
+    }
+    for (const address in priceDict) {
+        if (priceDict[address].length) {
+            const maxTvlItem = priceDict[address].reduce((prev, current) => +current.tvl > +prev.tvl ? current : prev);
+            priceDictByMaxTvl[address] = maxTvlItem.price;
+        }
+        else {
+            priceDictByMaxTvl[address] = 0;
+        }
+    }
+    return priceDictByMaxTvl;
+};
 export const _getUserCollateral = memoize((network, controller, user) => __awaiter(void 0, void 0, void 0, function* () {
     const url = `https://prices.curve.finance/v1/lending/collateral_events/${network}/${controller}/${user}`;
     const response = yield fetch(url);
@@ -199,3 +181,16 @@ export const _getHiddenPools = memoize(() => __awaiter(void 0, void 0, void 0, f
     promise: true,
     maxAge: 5 * 60 * 1000, // 5m
 });
+function fetchJson(url) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const response = yield fetch(url);
+        return (_a = yield response.json()) !== null && _a !== void 0 ? _a : {};
+    });
+}
+function fetchData(url) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { data } = yield fetchJson(url);
+        return data;
+    });
+}

package/lib/interfaces.d.ts

@@ -6,6 +6,7 @@ export interface IDict<T> {
 export type INetworkName = "ethereum" | "optimism" | "bsc" | "xdai" | "polygon" | 'sonic' | "x-layer" | "fantom" | "fraxtal" | "zksync" | "moonbeam" | "kava" | "mantle" | "base" | "arbitrum" | "celo" | "avalanche" | "aurora";
 export type IChainId = 1 | 10 | 56 | 100 | 137 | 146 | 196 | 250 | 252 | 324 | 1284 | 2222 | 5000 | 8453 | 42161 | 42220 | 43114 | 1313161554;
 export type IPoolFactory = "main" | "crypto" | "factory" | "factory-crvusd" | "factory-crypto" | "factory-twocrypto" | "factory-tricrypto" | "factory-stable-ng";
+export type IPoolType = "main" | "crypto" | IPoolFactory;
 export interface ICurveContract {
     contract: Contract;
     multicallContract: MulticallContract;

package/lib/mintMarkets/MintMarketTemplate.d.ts

@@ -47,6 +47,7 @@ export declare class MintMarketTemplate {
             fee: string;
             admin_fee: string;
             rate: string;
+            future_rate: string;
             liquidation_discount: string;
             loan_discount: string;
         }>;

package/lib/utils.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { ethers } from "ethers";
 import BigNumber from 'bignumber.js';
-import { _getUsdPricesFromApi } from "./external-api.js";
+import { _getUsdPricesFromApi } from "./cached.js";
 import { L2Networks } from "./constants/L2Networks.js";
 import memoize from "memoizee";
 export const MAX_ALLOWANCE = BigInt("115792089237316195423570985008687907853269984665640564039457584007913129639935"); // 2**256 - 1
@@ -264,7 +264,7 @@ export const _getUsdRate = function (assetId) {
         var _a, _c;
         if (this.chainId === 1 && assetId.toLowerCase() === '0x8762db106b2c2a0bccb3a80d1ed41273552616e8')
             return 0; // RSR
-        const pricesFromApi = yield _getUsdPricesFromApi.call(this);
+        const pricesFromApi = yield _getUsdPricesFromApi(this.constants.NETWORK_NAME);
         if (assetId.toLowerCase() in pricesFromApi)
             return pricesFromApi[assetId.toLowerCase()];
         if (assetId === 'USD' || (this.chainId === 137 && (assetId.toLowerCase() === this.constants.COINS.am3crv.toLowerCase())))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/llamalend-api",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "description": "JavaScript library for Curve Lending",
   "main": "lib/index.js",
   "author": "Macket",
@@ -8,10 +8,10 @@
   "private": false,
   "repository": {
     "type": "git",
-    "url": "https://github.com/curvefi/curve-lending-js.git"
+    "url": "https://github.com/curvefi/curve-llamalend.js.git"
   },
   "bugs": {
-    "url": "https://github.com/curvefi/curve-lending-js/issues"
+    "url": "https://github.com/curvefi/curve-llamalend.js/issues"
   },
   "scripts": {
     "build": "rm -rf lib && tsc --project tsconfig.build.json",
@@ -41,9 +41,9 @@
     "vue-eslint-parser": "^10.1.3"
   },
   "dependencies": {
-    "@curvefi/ethcall": "6.0.15",
-    "bignumber.js": "^9.3.0",
-    "ethers": "^6.14.3",
-    "memoizee": "^0.4.17"
+    "@curvefi/ethcall": "6.0.16",
+    "bignumber.js": "9.3.1",
+    "ethers": "6.15.0",
+    "memoizee": "0.4.17"
   }
 }

package/src/cached.ts

@@ -0,0 +1,82 @@
+import {IDict, IExtendedPoolDataFromApi, INetworkName, IPoolType} from "./interfaces.js";
+import {createUsdPricesDict, uncached_getAllPoolsFromApi} from './external-api.js'
+
+/**
+ * Memoizes a function that returns a promise.
+ * Custom function instead of `memoizee` because we want to be able to set the cache manually based on server data.
+ * @param fn The function that returns a promise and will be memoized
+ * @param maxAge The maximum age of the cache in milliseconds
+ * @param createKey A function that creates a key for the cache based on the arguments passed to the function
+ * @returns A memoized `fn` function that includes a `set` method to set the cache manually
+ */
+const memoize = <TResult, TParams extends any[], TFunc extends (...args: TParams) => Promise<TResult>>(fn: TFunc, {
+    maxAge,
+    createKey = (list) => list.toString(),
+}: {
+    maxAge: number,
+    createKey?: (args: TParams) => string
+}) => {
+    const cache: Record<string, Promise<TResult>> = {};
+    const timeouts: Record<string, ReturnType<typeof setTimeout>> = {};
+
+    const setCache = (key: string, promise?: Promise<TResult>) => {
+        if (promise) {
+            cache[key] = promise;
+        } else if (key in cache) {
+            delete cache[key];
+        }
+        if (key in timeouts) {
+            clearTimeout(timeouts[key]);
+            delete timeouts[key]
+        }
+    };
+
+    const scheduleCleanup = (key: string) => timeouts[key] = setTimeout(() => {
+        delete timeouts[key];
+        delete cache[key];
+    }, maxAge);
+
+    const cachedFn = async (...args: TParams): Promise<TResult> => {
+        const key = createKey(args);
+        if (key in cache) {
+            return cache[key];
+        }
+        const promise = fn(...args);
+        setCache(key, promise);
+        try {
+            const result = await promise;
+            scheduleCleanup(key)
+            return result;
+        } catch (e) {
+            delete cache[key];
+            throw e;
+        }
+    };
+
+    cachedFn.set = (result: TResult, ...args: TParams) => {
+        const key = createKey(args);
+        setCache(key, Promise.resolve(result));
+        scheduleCleanup(key);
+    }
+
+    return cachedFn as TFunc & { set: (result: TResult, ...args: TParams) => void };
+}
+
+const createCache = (poolsDict: Record<IPoolType, IExtendedPoolDataFromApi>) => {
+    const poolLists = Object.values(poolsDict)
+    const usdPrices = createUsdPricesDict(poolLists);
+    return {poolsDict, poolLists, usdPrices};
+};
+
+/**
+ * This function is used to cache the data fetched from the API and the data derived from it.
+ * Note: do not expose this function to the outside world, instead encapsulate it in a function that returns the data you need.
+ */
+const _getCachedData = memoize(async (network: INetworkName) =>
+    createCache(await uncached_getAllPoolsFromApi(network)), {maxAge: 1000 * 60 * 5 /* 5 minutes */})
+
+export const _getUsdPricesFromApi = async (network:INetworkName): Promise<IDict<number>> => {
+    const {usdPrices} = await _getCachedData(network);
+    return usdPrices
+}
+

package/src/external-api.ts

@@ -6,40 +6,27 @@ import {
     IExtendedPoolDataFromApi,
     IMarketData,
     INetworkName,
-    IPoolFactory,
     IQuoteOdos,
     IResponseApi,
+    IPoolType,
 } from "./interfaces";
 
-
-const _getPoolsFromApi = memoize(
-    async (network: INetworkName, poolFactory: IPoolFactory ): Promise<IExtendedPoolDataFromApi> => {
-        const response = await fetch(`https://api.curve.finance/api/getPools/${network}/${poolFactory}`);
-        const { data } = await response.json() as { data?: IExtendedPoolDataFromApi, success: boolean };
-        return data ?? { poolData: [], tvl: 0, tvlAll: 0 };
-    },
-    {
-        promise: true,
-        maxAge: 5 * 60 * 1000, // 5m
-    }
-)
-
-const _getAllPoolsFromApi = async (network: INetworkName): Promise<IExtendedPoolDataFromApi[]> => {
-    return await Promise.all([
-        _getPoolsFromApi(network, "main"),
-        _getPoolsFromApi(network, "crypto"),
-        _getPoolsFromApi(network, "factory"),
-        _getPoolsFromApi(network, "factory-crvusd"),
-        _getPoolsFromApi(network, "factory-crypto"),
-        _getPoolsFromApi(network, "factory-twocrypto"),
-        _getPoolsFromApi(network, "factory-tricrypto"),
-        _getPoolsFromApi(network, "factory-stable-ng"),
-    ]);
+const uncached_getPoolsFromApi = async (network: INetworkName, poolType: IPoolType): Promise<IExtendedPoolDataFromApi> => {
+    const api = "https://api.curve.finance/api";
+    const url = `${api}/getPools/${network}/${poolType}`;
+    return await fetchData(url) ?? { poolData: [], tvl: 0, tvlAll: 0 };
 }
 
-export async function _getUsdPricesFromApi(this: Llamalend): Promise<IDict<number>> {
-    const network = this.constants.NETWORK_NAME;
-    const allTypesExtendedPoolData = await _getAllPoolsFromApi(network);
+const getPoolTypes = () => ["main", "crypto", "factory", "factory-crvusd", "factory-crypto", "factory-twocrypto", "factory-tricrypto", "factory-stable-ng"] as const;
+export const uncached_getAllPoolsFromApi = async (network: INetworkName): Promise<Record<IPoolType, IExtendedPoolDataFromApi>> =>
+    Object.fromEntries(
+        await Promise.all(getPoolTypes().map(async (poolType) => {
+            const data = await uncached_getPoolsFromApi(network, poolType);
+            return [poolType, data];
+        }))
+    )
+
+export const createUsdPricesDict = (allTypesExtendedPoolData:  IExtendedPoolDataFromApi[]): IDict<number> => {
     const priceDict: IDict<Record<string, number>[]> = {};
     const priceDictByMaxTvl: IDict<number> = {};
 
@@ -97,24 +84,18 @@ export async function _getUsdPricesFromApi(this: Llamalend): Promise<IDict<numbe
     }
 
     for(const address in priceDict) {
-        if(priceDict[address].length > 0) {
-            const maxTvlItem = priceDict[address].reduce((prev, current) => {
-                if (+current.tvl > +prev.tvl) {
-                    return current;
-                } else {
-                    return prev;
-                }
-            });
+        if (priceDict[address].length) {
+            const maxTvlItem = priceDict[address].reduce((prev, current) => +current.tvl > +prev.tvl ? current : prev);
             priceDictByMaxTvl[address] = maxTvlItem.price
         } else {
             priceDictByMaxTvl[address] = 0
         }
-
     }
 
     return priceDictByMaxTvl
 }
 
+
 type UserCollateral = { total_deposit_precise: string, total_deposit_from_user: number, total_deposit_usd_value: number , total_borrowed: number, total_deposit_from_user_precise: number, total_deposit_from_user_usd_value: number}
 export const _getUserCollateral = memoize(
     async (network: INetworkName, controller: string, user: string): Promise<UserCollateral> => {
@@ -232,3 +213,13 @@ export const _getHiddenPools = memoize(
         maxAge: 5 * 60 * 1000, // 5m
     }
 )
+
+async function fetchJson(url: string): Promise<any> {
+    const response = await fetch(url);
+    return await response.json() ?? {};
+}
+
+async function fetchData(url: string) {
+    const {data} = await fetchJson(url);
+    return data;
+}

package/src/interfaces.ts

@@ -8,6 +8,8 @@ export interface IDict<T> {
 export type INetworkName = "ethereum" | "optimism" | "bsc" | "xdai" | "polygon" | 'sonic' | "x-layer" | "fantom" | "fraxtal" | "zksync" | "moonbeam" | "kava" | "mantle" | "base" | "arbitrum" | "celo" | "avalanche" | "aurora";
 export type IChainId = 1 | 10 | 56 | 100 | 137 | 146 | 196 | 250 | 252 | 324 | 1284 | 2222 | 5000 | 8453 | 42161 | 42220 | 43114 | 1313161554;
 export type IPoolFactory = "main" | "crypto" | "factory" | "factory-crvusd" | "factory-crypto" | "factory-twocrypto" | "factory-tricrypto" | "factory-stable-ng";
+export type IPoolType = "main" | "crypto" | IPoolFactory;
+
 export interface ICurveContract {
     contract: Contract,
     multicallContract: MulticallContract,

package/src/mintMarkets/MintMarketTemplate.ts

@@ -71,6 +71,7 @@ export class MintMarketTemplate {
             fee: string, // %
             admin_fee: string, // %
             rate: string, // %
+            future_rate: string, // %
             liquidation_discount: string, // %
             loan_discount: string, // %
         }>,

package/src/utils.ts

@@ -2,7 +2,7 @@ import { ethers,  BigNumberish, Numeric } from "ethers";
 import { Call } from "@curvefi/ethcall";
 import BigNumber from 'bignumber.js';
 import { ICurveContract, IDict, TGas } from "./interfaces.js";
-import { _getUsdPricesFromApi } from "./external-api.js";
+import { _getUsdPricesFromApi } from "./cached.js";
 import type { Llamalend } from "./llamalend.js";
 import { JsonFragment } from "ethers/lib.esm";
 import { L2Networks } from "./constants/L2Networks.js";
@@ -286,7 +286,7 @@ export const ensureAllowance = async function (this: Llamalend, coins: string[],
 const _usdRatesCache: IDict<{ rate: number, time: number }> = {}
 export const _getUsdRate = async function (this: Llamalend, assetId: string): Promise<number> {
     if (this.chainId === 1 && assetId.toLowerCase() === '0x8762db106b2c2a0bccb3a80d1ed41273552616e8') return 0; // RSR
-    const pricesFromApi = await _getUsdPricesFromApi.call(this);
+    const pricesFromApi = await _getUsdPricesFromApi(this.constants.NETWORK_NAME);
     if (assetId.toLowerCase() in pricesFromApi) return pricesFromApi[assetId.toLowerCase()];
 
     if (assetId === 'USD' || (this.chainId === 137 && (assetId.toLowerCase() === this.constants.COINS.am3crv.toLowerCase()))) return 1