@curvefi/llamalend-api 2.0.21 → 2.0.23

package/lib/mintMarkets/fetch/fetchMintMarkets.js

@@ -0,0 +1,135 @@
+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 { _getCrvUsdMarketsData } from "../../external-api.js";
+import ERC20ABI from '../../constants/abis/ERC20.json' with { type: 'json' };
+import llammaABI from "../../constants/abis/crvUSD/llamma.json" with { type: 'json' };
+import controllerABI from "../../constants/abis/crvUSD/controller.json" with { type: 'json' };
+import controllerV2ABI from "../../constants/abis/crvUSD/controller_v2.json";
+import FactoryABI from "../../constants/abis/crvUSD/Factory.json" with { type: 'json' };
+import MonetaryPolicy2ABI from "../../constants/abis/crvUSD/MonetaryPolicy2.json" with { type: 'json' };
+export const fetchMintMarketsByAPI = (llamalend) => __awaiter(void 0, void 0, void 0, function* () {
+    if (llamalend.chainId !== 1)
+        return;
+    const data = yield _getCrvUsdMarketsData();
+    const existingControllers = new Set(Object.values(llamalend.constants.LLAMMAS).map((l) => l.controller_address));
+    const newMarkets = data.filter((m) => !existingControllers.has(m.address.toLowerCase()));
+    if (newMarkets.length === 0)
+        return;
+    const N1 = Object.keys(llamalend.constants.LLAMMAS).length;
+    const controllers = newMarkets.map((m) => m.address.toLowerCase());
+    const amms = newMarkets.map((m) => m.llamma.toLowerCase());
+    const collaterals = newMarkets.map((m) => m.collateral_token.address.toLowerCase());
+    for (const collateral of collaterals)
+        llamalend.setContract(collateral, ERC20ABI);
+    for (const amm of amms)
+        llamalend.setContract(amm, llammaABI);
+    for (const controller of controllers)
+        llamalend.setContract(controller, controllerABI);
+    for (let i = 0; i < newMarkets.length; i++) {
+        const market = newMarkets[i];
+        const collateral_address = collaterals[i];
+        const is_eth = collateral_address === llamalend.constants.WETH;
+        const collateral_symbol = market.collateral_token.symbol;
+        const monetary_policy_address = market.monetary_policy_address.toLowerCase();
+        llamalend.setContract(monetary_policy_address, MonetaryPolicy2ABI);
+        const _llammaId = is_eth ? "eth" : collateral_symbol.toLowerCase();
+        let llammaId = _llammaId;
+        let j = 2;
+        while (llammaId in llamalend.constants.LLAMMAS)
+            llammaId = _llammaId + j++;
+        llamalend.constants.LLAMMAS[llammaId] = {
+            amm_address: amms[i],
+            controller_address: controllers[i],
+            monetary_policy_address,
+            collateral_address: is_eth ? "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" : collateral_address,
+            leverage_zap: llamalend.constants.ALIASES.leverage_zap,
+            deleverage_zap: "0x0000000000000000000000000000000000000000",
+            collateral_symbol: is_eth ? "ETH" : collateral_symbol,
+            collateral_decimals: market.collateral_token.decimals,
+            min_bands: 4,
+            max_bands: 50,
+            default_bands: 10,
+            A: market.amm_a,
+            monetary_policy_abi: MonetaryPolicy2ABI,
+            is_deleverage_supported: true,
+            index: N1 + i,
+        };
+    }
+});
+export const fetchMintMarketsByBlockchain = (llamalend) => __awaiter(void 0, void 0, void 0, function* () {
+    if (llamalend.chainId !== 1)
+        return;
+    llamalend.setContract(llamalend.constants.FACTORY, FactoryABI);
+    const factoryContract = llamalend.contracts[llamalend.constants.FACTORY].contract;
+    const factoryMulticallContract = llamalend.contracts[llamalend.constants.FACTORY].multicallContract;
+    const N1 = Object.keys(llamalend.constants.LLAMMAS).length;
+    const N2 = yield factoryContract.n_collaterals(llamalend.constantOptions);
+    let calls = [];
+    for (let i = N1; i < N2; i++) {
+        calls.push(factoryMulticallContract.collaterals(i), factoryMulticallContract.amms(i), factoryMulticallContract.controllers(i));
+    }
+    const res = (yield llamalend.multicallProvider.all(calls)).map((c) => c.toLowerCase());
+    const collaterals = res.filter((a, i) => i % 3 == 0);
+    const amms = res.filter((a, i) => i % 3 == 1);
+    const controllers = res.filter((a, i) => i % 3 == 2);
+    if (collaterals.length === 0)
+        return;
+    for (const collateral of collaterals)
+        llamalend.setContract(collateral, ERC20ABI);
+    calls = [];
+    for (const collateral of collaterals) {
+        calls.push(llamalend.contracts[collateral].multicallContract.symbol(), llamalend.contracts[collateral].multicallContract.decimals());
+    }
+    const collateralData = (yield llamalend.multicallProvider.all(calls)).map((x) => {
+        if (typeof x === "string")
+            return x.toLowerCase();
+        return x;
+    });
+    calls = [];
+    for (const amm of amms) {
+        llamalend.setContract(amm, llammaABI);
+        calls.push(llamalend.contracts[amm].multicallContract.A());
+    }
+    const AParams = (yield llamalend.multicallProvider.all(calls)).map((x) => Number(x));
+    for (let i = 0; i < collaterals.length; i++) {
+        const is_eth = collaterals[i] === llamalend.constants.WETH;
+        const [collateral_symbol, collateral_decimals] = collateralData.splice(0, 2);
+        if (i >= collaterals.length - 3) {
+            llamalend.setContract(controllers[i], controllerV2ABI);
+        }
+        else {
+            llamalend.setContract(controllers[i], controllerABI);
+        }
+        const monetary_policy_address = (yield llamalend.contracts[controllers[i]].contract.monetary_policy(llamalend.constantOptions)).toLowerCase();
+        llamalend.setContract(monetary_policy_address, MonetaryPolicy2ABI);
+        const _llammaId = is_eth ? "eth" : collateral_symbol.toLowerCase();
+        let llammaId = _llammaId;
+        let j = 2;
+        while (llammaId in llamalend.constants.LLAMMAS)
+            llammaId = _llammaId + j++;
+        llamalend.constants.LLAMMAS[llammaId] = {
+            amm_address: amms[i],
+            controller_address: controllers[i],
+            monetary_policy_address,
+            collateral_address: is_eth ? "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" : collaterals[i],
+            leverage_zap: llamalend.constants.ALIASES.leverage_zap,
+            deleverage_zap: "0x0000000000000000000000000000000000000000",
+            collateral_symbol: is_eth ? "ETH" : collateral_symbol,
+            collateral_decimals,
+            min_bands: 4,
+            max_bands: 50,
+            default_bands: 10,
+            A: AParams[i],
+            monetary_policy_abi: MonetaryPolicy2ABI,
+            is_deleverage_supported: true,
+            index: N1 + i,
+        };
+    }
+});

package/package.json

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

package/src/constants/abis/ControllerV2.json

@@ -1082,10 +1082,6 @@
         "name": "_for",
         "type": "address"
       },
-      {
-        "name": "_caller",
-        "type": "address"
-      },
       {
         "name": "_shrink",
         "type": "bool"

package/src/external-api.ts

@@ -169,6 +169,34 @@ export const _getMarketsData = memoize(
     }
 )
 
+export interface ICrvUsdMarketAPI {
+    address: string;
+    llamma: string;
+    amm_a: number;
+    monetary_policy_address: string;
+    collateral_token: {
+        symbol: string;
+        address: string;
+        decimals: number;
+    };
+}
+
+export const _getCrvUsdMarketsData = memoize(
+    async (): Promise<ICrvUsdMarketAPI[]> => {
+        const url = 'https://prices.curve.finance/v1/crvusd/markets/ethereum';
+        const response = await fetch(url, { headers: { "accept": "application/json" } });
+        if (response.status !== 200) {
+            throw Error(`Fetch error: ${response.status} ${response.statusText}`);
+        }
+        const { data } = await response.json() as { data: ICrvUsdMarketAPI[] };
+        return data;
+    },
+    {
+        promise: true,
+        maxAge: 10 * 1000, // 10s
+    }
+)
+
 // --- ODOS ---
 
 export async function _getQuoteOdos(this: Llamalend, fromToken: string, toToken: string, _amount: bigint, blacklist: string, pathVizImage: boolean, slippage = 0.5): Promise<IQuoteOdos> {
@@ -214,18 +242,6 @@ export async function _assembleTxOdos(this: Llamalend, pathId: string): Promise<
     return _assembleTxOdosMemoized(this.constants.ALIASES.leverage_zap, pathId);
 }
 
-export const _getHiddenPools = memoize(
-    async () => {
-        const response = await fetch(`https://api.curve.finance/api/getHiddenPools`)
-
-        return (await response.json() as any).data
-    },
-    {
-        promise: true,
-        maxAge: 5 * 60 * 1000, // 5m
-    }
-)
-
 async function fetchJson(url: string): Promise<any> {
     const response = await fetch(url);
     return await response.json() ?? {};

package/src/index.ts

@@ -86,12 +86,10 @@ export function createLlamalend() {
         getGasPriceFromL2: getGasPriceFromL2.bind(llamalend),
         getGasInfoForL2: getGasInfoForL2.bind(llamalend),
 
-        // Core methods
-        fetchStats: llamalend.fetchStats.bind(llamalend),
-
         // Market lists
         mintMarkets: {
             getMarketList: llamalend.getMintMarketList.bind(llamalend),
+            fetchMintMarkets: llamalend.fetchMintMarkets.bind(llamalend),
         },
         lendMarkets: {
             fetchMarkets: llamalend.fetchLendMarkets.bind(llamalend),

package/src/lendMarkets/fetch/fetchLendMarkets.ts

@@ -87,14 +87,6 @@ export const fetchOneWayMarketsByBlockchain = async (llamalend: Llamalend, versi
     }
 
     registerMarkets(llamalend, names, amms, controllers, borrowed_tokens, collateral_tokens, monetary_policies, vaults, gauges, COIN_DATA, version);
-
-    if (version === 'v2') {
-        llamalend.constants.ONE_WAY_MARKETS_V2 = await llamalend._filterHiddenMarkets(llamalend.constants.ONE_WAY_MARKETS_V2);
-    } else {
-        llamalend.constants.ONE_WAY_MARKETS = await llamalend._filterHiddenMarkets(llamalend.constants.ONE_WAY_MARKETS);
-    }
-
-    await llamalend.fetchStats(amms, controllers, vaults, borrowed_tokens, collateral_tokens, version);
 };
 
 export const fetchOneWayMarketsByAPI = async (llamalend: Llamalend, version: 'v1' | 'v2' = 'v1') => {
@@ -105,10 +97,4 @@ export const fetchOneWayMarketsByAPI = async (llamalend: Llamalend, version: 'v1
     }
 
     registerMarkets(llamalend, names, amms, controllers, borrowed_tokens, collateral_tokens, monetary_policies, vaults, gauges, COIN_DATA, version);
-
-    if (version === 'v2') {
-        llamalend.constants.ONE_WAY_MARKETS_V2 = await llamalend._filterHiddenMarkets(llamalend.constants.ONE_WAY_MARKETS_V2);
-    } else {
-        llamalend.constants.ONE_WAY_MARKETS = await llamalend._filterHiddenMarkets(llamalend.constants.ONE_WAY_MARKETS);
-    }
 };

package/src/lendMarkets/modules/v2/loanV2.ts

@@ -67,7 +67,7 @@ export class LoanV2Module extends LoanBaseModule implements ILoanV2 {
         const _debt = parseUnits(debt);
 
         const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-        const _health = await contract.repay_health_preview(0, _debt, address, address, shrink, full, this.llamalend.constantOptions) as bigint;
+        const _health = await contract.repay_health_preview(0, _debt, address, shrink, full, this.llamalend.constantOptions) as bigint;
 
         return formatUnits(_health * BigInt(100));
     }