@curvefi/llamalend-api 1.0.21 → 1.0.22-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/llamalend-api",
-  "version": "1.0.21",
+  "version": "1.0.22-beta.1",
   "description": "JavaScript library for Curve Lending",
   "main": "lib/index.js",
   "author": "Macket",
@@ -25,25 +25,25 @@
   "type": "module",
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "^9.23.0",
-    "@types/chai": "^5.2.1",
+    "@eslint/js": "^9.28.0",
+    "@types/chai": "^5.2.2",
     "@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",
+    "@types/node": "^24.0.1",
+    "@typescript-eslint/eslint-plugin": "^8.34.0",
+    "@typescript-eslint/parser": "^8.34.0",
     "babel-eslint": "^10.1.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"
+    "eslint": "^9.28.0",
+    "globals": "^16.2.0",
+    "mocha": "^11.6.0",
+    "typescript": "^5.8.3",
+    "vue-eslint-parser": "^10.1.3"
   },
   "dependencies": {
-    "@curvefi/ethcall": "6.0.13",
-    "bignumber.js": "^9.1.2",
-    "ethers": "^6.13.5",
+    "@curvefi/ethcall": "6.0.15",
+    "bignumber.js": "^9.3.0",
+    "ethers": "^6.14.3",
     "memoizee": "^0.4.17"
   }
 }

package/src/external-api.ts

@@ -1,6 +1,6 @@
 import {ethers} from "ethers";
 import memoize from "memoizee";
-import {llamalend} from "./llamalend.js";
+import type { Llamalend } from "./llamalend.js";
 import {
     IDict,
     IExtendedPoolDataFromApi,
@@ -37,8 +37,8 @@ const _getAllPoolsFromApi = async (network: INetworkName): Promise<IExtendedPool
     ]);
 }
 
-export const _getUsdPricesFromApi = async (): Promise<IDict<number>> => {
-    const network = llamalend.constants.NETWORK_NAME;
+export async function _getUsdPricesFromApi(this: Llamalend): Promise<IDict<number>> {
+    const network = this.constants.NETWORK_NAME;
     const allTypesExtendedPoolData = await _getAllPoolsFromApi(network);
     const priceDict: IDict<Record<string, number>[]> = {};
     const priceDictByMaxTvl: IDict<number> = {};
@@ -167,15 +167,15 @@ export const _getMarketsData = memoize(
 
 // --- ODOS ---
 
-export const _getQuoteOdos = async (fromToken: string, toToken: string, _amount: bigint, blacklist: string, pathVizImage: boolean, slippage = 0.5): Promise<IQuoteOdos> => {
+export async function _getQuoteOdos(this: Llamalend, fromToken: string, toToken: string, _amount: bigint, blacklist: string, pathVizImage: boolean, slippage = 0.5): Promise<IQuoteOdos> {
     if (_amount === BigInt(0)) return { outAmounts: ["0.0"], pathId: '', pathVizImage: '', priceImpact: 0, slippage };
 
     if (ethers.getAddress(fromToken) == "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE") fromToken = "0x0000000000000000000000000000000000000000";
     if (ethers.getAddress(toToken) == "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE") toToken = "0x0000000000000000000000000000000000000000";
 
-    const url = `https://prices.curve.finance/odos/quote?chain_id=${llamalend.chainId}&from_address=${ethers.getAddress(fromToken)}` +
+    const url = `https://prices.curve.finance/odos/quote?chain_id=${this.chainId}&from_address=${ethers.getAddress(fromToken)}` +
         `&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)}`;
+        `&caller_address=${ethers.getAddress(this.constants.ALIASES.leverage_zap)}&blacklist=${ethers.getAddress(blacklist)}`;
 
     const response = await fetch(url, {  headers: {"accept": "application/json"} });
     if (response.status !== 200) {
@@ -185,13 +185,13 @@ export const _getQuoteOdos = async (fromToken: string, toToken: string, _amount:
     return { ...data, slippage };
 }
 
-export const _getExpectedOdos = async (fromToken: string, toToken: string, _amount: bigint, blacklist: string) => {
-    return (await _getQuoteOdos(fromToken, toToken, _amount, blacklist, false)).outAmounts[0]
+export async function _getExpectedOdos(this: Llamalend, fromToken: string, toToken: string, _amount: bigint, blacklist: string) {
+    return (await _getQuoteOdos.call(this, fromToken, toToken, _amount, blacklist, false)).outAmounts[0]
 }
 
-export const _assembleTxOdos = memoize(
-    async (pathId: string): Promise<string> => {
-        const url = `https://prices.curve.finance/odos/assemble?user=${ethers.getAddress(llamalend.constants.ALIASES.leverage_zap)}&path_id=${pathId}`;
+const _assembleTxOdosMemoized = memoize(
+    async function (leverageZapAddress: string, pathId: string): Promise<string> {
+        const url = `https://prices.curve.finance/odos/assemble?user=${ethers.getAddress(leverageZapAddress)}&path_id=${pathId}`;
 
         const response = await fetch(url, { headers: {'Content-Type': 'application/json'} });
         if (response.status !== 200) {
@@ -204,4 +204,8 @@ export const _assembleTxOdos = memoize(
         promise: true,
         maxAge: 10 * 1000, // 10s
     }
-)
+);
+
+export async function _assembleTxOdos(this: Llamalend, pathId: string): Promise<string> {
+    return _assembleTxOdosMemoized(this.constants.ALIASES.leverage_zap, pathId);
+}

package/src/index.ts

@@ -1,7 +1,7 @@
 import { ethers, Networkish } from "ethers";
 import { LendMarketTemplate, getLendMarket } from "./lendMarkets/index.js";
 import { MintMarketTemplate, getMintMarket} from "./mintMarkets/index.js";
-import { llamalend as _llamalend} from "./llamalend.js";
+import { Llamalend } from "./llamalend.js";
 import {
     getBalances,
     getAllowance,
@@ -47,84 +47,96 @@ import {
 } from "./st-crvUSD.js";
 
 
-async function init (
-    providerType: 'JsonRpc' | 'Web3' | 'Infura' | 'Alchemy',
-    providerSettings: { url?: string, privateKey?: string, batchMaxCount? : number } | { externalProvider: ethers.Eip1193Provider } | { network?: Networkish, apiKey?: string },
-    options: { gasPrice?: number, maxFeePerGas?: number, maxPriorityFeePerGas?: number, chainId?: number } = {}
-): Promise<void> {
-    await _llamalend.init(providerType, providerSettings, options);
-    // @ts-ignore
-    this.signerAddress = _llamalend.signerAddress;
-    // @ts-ignore
-    this.chainId = _llamalend.chainId;
-}
+export function createLlamalend() {
+    const llamalend = new Llamalend();
+    return {
+        // Init and config
+        async init(
+            providerType: 'JsonRpc' | 'Web3' | 'Infura' | 'Alchemy',
+            providerSettings: { url?: string, privateKey?: string, batchMaxCount? : number } | { externalProvider: ethers.Eip1193Provider } | { network?: Networkish, apiKey?: string },
+            options: { gasPrice?: number, maxFeePerGas?: number, maxPriorityFeePerGas?: number, chainId?: number } = {}
+        ): Promise<void> {
+            await llamalend.init(providerType, providerSettings, options);
+        },
 
-function setCustomFeeData (customFeeData: { gasPrice?: number, maxFeePerGas?: number, maxPriorityFeePerGas?: number }): void {
-    _llamalend.setCustomFeeData(customFeeData);
-}
+        setCustomFeeData(customFeeData: { gasPrice?: number, maxFeePerGas?: number, maxPriorityFeePerGas?: number }): void {
+            llamalend.setCustomFeeData(customFeeData);
+        },
 
-const llamalend = {
-    init,
-    chainId: 0,
-    signerAddress: '',
-    LendMarketTemplate,
-    getLendMarket,
-    MintMarketTemplate,
-    getMintMarket,
-    totalSupply,
-    getLsdApy,
-    setCustomFeeData,
-    getBalances,
-    getAllowance,
-    hasAllowance,
-    ensureAllowance,
-    getUsdRate,
-    getGasPriceFromL1,
-    getGasPriceFromL2,
-    getGasInfoForL2,
-    fetchStats: _llamalend.fetchStats,
-    mintMarkets: {
-        getMarketList :_llamalend.getMintMarketList,
-    },
-    lendMarkets: {
-        fetchMarkets:  _llamalend.fetchLendMarkets,
-        getMarketList: _llamalend.getLendMarketList,
-    },
-    estimateGas: {
-        ensureAllowance: ensureAllowanceEstimateGas,
-    },
-    st_crvUSD: {
-        convertToAssets,
-        convertToShares,
-        userBalances,
-        totalSupplyAndCrvUSDLocked,
-        maxDeposit,
-        previewDeposit,
-        depositIsApproved,
-        depositAllowance,
-        depositApprove,
-        deposit,
-        maxMint,
-        previewMint,
-        mintIsApproved,
-        mintAllowance,
-        mintApprove,
-        mint,
-        maxWithdraw,
-        previewWithdraw,
-        withdraw,
-        maxRedeem,
-        previewRedeem,
-        redeem,
+        get chainId(): number { return llamalend.chainId; },
+        get signerAddress(): string { return llamalend.signerAddress; },
+
+        // Market templates
+        LendMarketTemplate,
+        MintMarketTemplate,
+
+        // Market constructors
+        getLendMarket: getLendMarket.bind(llamalend),
+        getMintMarket: getMintMarket.bind(llamalend),
+
+        // Utility functions
+        totalSupply: totalSupply.bind(llamalend),
+        getLsdApy: getLsdApy.bind(llamalend),
+        getBalances: getBalances.bind(llamalend),
+        getAllowance: getAllowance.bind(llamalend),
+        hasAllowance: hasAllowance.bind(llamalend),
+        ensureAllowance: ensureAllowance.bind(llamalend),
+        getUsdRate: getUsdRate.bind(llamalend),
+        getGasPriceFromL1: getGasPriceFromL1.bind(llamalend),
+        getGasPriceFromL2: getGasPriceFromL2.bind(llamalend),
+        getGasInfoForL2: getGasInfoForL2.bind(llamalend),
+
+        // Core methods
+        fetchStats: llamalend.fetchStats.bind(llamalend),
+
+        // Market lists
+        mintMarkets: {
+            getMarketList: llamalend.getMintMarketList.bind(llamalend),
+        },
+        lendMarkets: {
+            fetchMarkets: llamalend.fetchLendMarkets.bind(llamalend),
+            getMarketList: llamalend.getLendMarketList.bind(llamalend),
+        },
+
+        // Gas estimation
         estimateGas: {
-            depositApprove: depositApproveEstimateGas,
-            deposit: depositEstimateGas,
-            mintApprove: mintApproveEstimateGas,
-            mint: mintEstimateGas,
-            withdraw: withdrawEstimateGas,
-            redeem: redeemEstimateGas,
+            ensureAllowance: ensureAllowanceEstimateGas.bind(llamalend),
+        },
+
+        // st-crvUSD methods
+        st_crvUSD: {
+            convertToAssets: convertToAssets.bind(llamalend),
+            convertToShares: convertToShares.bind(llamalend),
+            userBalances: userBalances.bind(llamalend),
+            totalSupplyAndCrvUSDLocked: totalSupplyAndCrvUSDLocked.bind(llamalend),
+            maxDeposit: maxDeposit.bind(llamalend),
+            previewDeposit: previewDeposit.bind(llamalend),
+            depositIsApproved: depositIsApproved.bind(llamalend),
+            depositAllowance: depositAllowance.bind(llamalend),
+            depositApprove: depositApprove.bind(llamalend),
+            deposit: deposit.bind(llamalend),
+            maxMint: maxMint.bind(llamalend),
+            previewMint: previewMint.bind(llamalend),
+            mintIsApproved: mintIsApproved.bind(llamalend),
+            mintAllowance: mintAllowance.bind(llamalend),
+            mintApprove: mintApprove.bind(llamalend),
+            mint: mint.bind(llamalend),
+            maxWithdraw: maxWithdraw.bind(llamalend),
+            previewWithdraw: previewWithdraw.bind(llamalend),
+            withdraw: withdraw.bind(llamalend),
+            maxRedeem: maxRedeem.bind(llamalend),
+            previewRedeem: previewRedeem.bind(llamalend),
+            redeem: redeem.bind(llamalend),
+            estimateGas: {
+                depositApprove: depositApproveEstimateGas.bind(llamalend),
+                deposit: depositEstimateGas.bind(llamalend),
+                mintApprove: mintApproveEstimateGas.bind(llamalend),
+                mint: mintEstimateGas.bind(llamalend),
+                withdraw: withdrawEstimateGas.bind(llamalend),
+                redeem: redeemEstimateGas.bind(llamalend),
+            },
         },
-    },
+    };
 }
 
-export default llamalend;
+export default createLlamalend();