@curvefi/llamalend-api 2.0.23 → 2.0.26

package/docs/MARKET_DATA_INPUTS.md

@@ -0,0 +1,64 @@
+# Market Data Inputs
+
+Data shapes required by the "by-data" constructors:
+
+| Function                | Input type      |
+|-------------------------|-----------------|
+| `getMintMarketByData`   | `ILlamma`       |
+| `getLendMarketByData`   | `IOneWayMarket` |
+
+---
+
+## `ILlamma` — for `getMintMarketByData`
+
+```ts
+interface ILlamma {
+    amm_address:              string;   // LLAMMA AMM address
+    controller_address:       string;   // Controller address
+    monetary_policy_address:  string;   // Monetary policy address
+    collateral_address:       string;   // Collateral ERC-20 (use 0xeee...eee for native ETH)
+    leverage_zap:             string;   // Leverage zap (ZERO_ADDRESS if unsupported)
+    deleverage_zap:           string;   // Deleverage zap (ZERO_ADDRESS if unsupported)
+    health_calculator_zap?:   string;   // Optional health-calc helper
+    collateral_symbol:        string;   // e.g. "ETH", "wstETH"
+    collateral_decimals:      number;   // Collateral decimals
+    min_bands:                number;   // Min bands (prod: 4)
+    max_bands:                number;   // Max bands (prod: 50)
+    default_bands:            number;   // Default bands (prod: 10)
+    A:                        number;   // LLAMMA amplification (prod: 100)
+    is_deleverage_supported?: boolean;  // Defaults to false
+    index?:                   number;   // Sequential factory index
+}
+```
+
+---
+
+## `IOneWayMarket` — for `getLendMarketByData`
+
+```ts
+interface IOneWayMarket {
+    name:    string;              // Empty → auto: "<collateral>/<borrowed>"
+    version: "v1" | "v2";         // Selects controller ABI & module set
+    addresses: {
+        amm:              string;
+        controller:       string;
+        borrowed_token:   string;
+        collateral_token: string;
+        monetary_policy:  string;
+        vault:            string;
+        gauge:            string; // ZERO_ADDRESS if none
+    };
+    borrowed_token: {
+        address:  string;         // Must match addresses.borrowed_token
+        name:     string;         // e.g. "Curve.Fi USD Stablecoin"
+        symbol:   string;         // e.g. "crvUSD"
+        decimals: number;         // Token decimals
+    };
+    collateral_token: {
+        address:  string;         // Must match addresses.collateral_token
+        name:     string;         // e.g. "Wrapped Ether"
+        symbol:   string;         // e.g. "WETH"
+        decimals: number;         // Token decimals
+    };
+}
+```

package/lib/constants/abis/ControllerV2.json

@@ -670,78 +670,6 @@
         "stateMutability": "nonpayable",
         "type": "function"
     },
-    {
-        "inputs": [
-            {
-                "name": "_user",
-                "type": "address"
-            },
-            {
-                "name": "_min_x",
-                "type": "uint256"
-            },
-            {
-                "name": "_frac",
-                "type": "uint256"
-            }
-        ],
-        "name": "liquidate",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "name": "_user",
-                "type": "address"
-            },
-            {
-                "name": "_min_x",
-                "type": "uint256"
-            },
-            {
-                "name": "_frac",
-                "type": "uint256"
-            },
-            {
-                "name": "_callbacker",
-                "type": "address"
-            }
-        ],
-        "name": "liquidate",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
-    {
-        "inputs": [
-            {
-                "name": "_user",
-                "type": "address"
-            },
-            {
-                "name": "_min_x",
-                "type": "uint256"
-            },
-            {
-                "name": "_frac",
-                "type": "uint256"
-            },
-            {
-                "name": "_callbacker",
-                "type": "address"
-            },
-            {
-                "name": "_calldata",
-                "type": "bytes"
-            }
-        ],
-        "name": "liquidate",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
     {
         "inputs": [],
         "name": "save_rate",
@@ -1263,27 +1191,6 @@
         "stateMutability": "view",
         "type": "function"
     },
-    {
-        "inputs": [
-            {
-                "name": "_user",
-                "type": "address"
-            },
-            {
-                "name": "_frac",
-                "type": "uint256"
-            }
-        ],
-        "name": "tokens_to_liquidate",
-        "outputs": [
-            {
-                "name": "",
-                "type": "uint256"
-            }
-        ],
-        "stateMutability": "view",
-        "type": "function"
-    },
     {
         "inputs": [
             {

package/lib/constants/llammas.js

@@ -1,5 +1,3 @@
-import MonetaryPolicyABI from './abis/crvUSD/MonetaryPolicy.json' with { type: 'json' };
-import MonetaryPolicy2ABI from './abis/crvUSD/MonetaryPolicy2.json' with { type: 'json' };
 import { lowerCaseLlammasAddresses } from "./utils.js";
 export const LLAMMAS = lowerCaseLlammasAddresses({
     sfrxeth: {
@@ -15,7 +13,6 @@ export const LLAMMAS = lowerCaseLlammasAddresses({
         max_bands: 50,
         default_bands: 10,
         A: 100,
-        monetary_policy_abi: MonetaryPolicyABI,
     },
     wsteth: {
         amm_address: '0x37417b2238aa52d0dd2d6252d989e728e8f706e4',
@@ -30,7 +27,6 @@ export const LLAMMAS = lowerCaseLlammasAddresses({
         max_bands: 50,
         default_bands: 10,
         A: 100,
-        monetary_policy_abi: MonetaryPolicy2ABI,
     },
     wbtc: {
         amm_address: '0xe0438eb3703bf871e31ce639bd351109c88666ea',
@@ -46,7 +42,6 @@ export const LLAMMAS = lowerCaseLlammasAddresses({
         max_bands: 50,
         default_bands: 10,
         A: 100,
-        monetary_policy_abi: MonetaryPolicy2ABI,
     },
     eth: {
         amm_address: '0x1681195c176239ac5e72d9aebacf5b2492e0c4ee',
@@ -61,7 +56,6 @@ export const LLAMMAS = lowerCaseLlammasAddresses({
         max_bands: 50,
         default_bands: 10,
         A: 100,
-        monetary_policy_abi: MonetaryPolicy2ABI,
     },
     sfrxeth2: {
         amm_address: '0xfa96ad0a9e64261db86950e2da362f5572c5c6fd',
@@ -76,7 +70,6 @@ export const LLAMMAS = lowerCaseLlammasAddresses({
         max_bands: 50,
         default_bands: 10,
         A: 100,
-        monetary_policy_abi: MonetaryPolicy2ABI,
     },
     tbtc: {
         amm_address: '0xf9bd9da2427a50908c4c6d1599d8e62837c2bcb0',
@@ -91,6 +84,5 @@ export const LLAMMAS = lowerCaseLlammasAddresses({
         max_bands: 50,
         default_bands: 10,
         A: 100,
-        monetary_policy_abi: MonetaryPolicy2ABI,
     },
 });

package/lib/index.d.ts

@@ -28,6 +28,8 @@ export declare function createLlamalend(): {
     MintMarketTemplate: typeof MintMarketTemplate;
     getLendMarket: (lendMarketId: string) => LendMarketTemplate<"v1"> | LendMarketTemplate<"v2">;
     getMintMarket: (mintMarketId: string) => MintMarketTemplate;
+    getLendMarketByData: (id: string, marketData: import("./interfaces.js").IOneWayMarket) => LendMarketTemplate<"v1"> | LendMarketTemplate<"v2">;
+    getMintMarketByData: (id: string, llammaData: import("./interfaces.js").ILlamma) => MintMarketTemplate;
     totalSupply: () => Promise<{
         total: string;
         minted: string;
@@ -132,6 +134,8 @@ declare const _default: {
     MintMarketTemplate: typeof MintMarketTemplate;
     getLendMarket: (lendMarketId: string) => LendMarketTemplate<"v1"> | LendMarketTemplate<"v2">;
     getMintMarket: (mintMarketId: string) => MintMarketTemplate;
+    getLendMarketByData: (id: string, marketData: import("./interfaces.js").IOneWayMarket) => LendMarketTemplate<"v1"> | LendMarketTemplate<"v2">;
+    getMintMarketByData: (id: string, llammaData: import("./interfaces.js").ILlamma) => MintMarketTemplate;
     totalSupply: () => Promise<{
         total: string;
         minted: string;

package/lib/index.js

@@ -12,6 +12,8 @@ import { MintMarketTemplate, getMintMarket } from "./mintMarkets/index.js";
 import { Llamalend } from "./llamalend.js";
 import { getBalances, getAllowance, hasAllowance, ensureAllowanceEstimateGas, ensureAllowance, getUsdRate, getGasPriceFromL2, getGasInfoForL2, getGasPriceFromL1, totalSupply, getLsdApy, } from "./utils.js";
 import { convertToAssets, convertToShares, userBalances, totalSupplyAndCrvUSDLocked, maxDeposit, previewDeposit, depositIsApproved, depositAllowance, depositApproveEstimateGas, depositApprove, depositEstimateGas, deposit, maxMint, previewMint, mintIsApproved, mintAllowance, mintApproveEstimateGas, mintApprove, mintEstimateGas, mint, maxWithdraw, previewWithdraw, withdrawEstimateGas, withdraw, maxRedeem, previewRedeem, redeemEstimateGas, redeem, } from "./st-crvUSD.js";
+import { getMintMarketByData } from "./mintMarkets/mintMarketConstructor.js";
+import { getLendMarketByData } from "./lendMarkets/lendMarketConstructor.js";
 export function createLlamalend() {
     const llamalend = new Llamalend();
     return {
@@ -32,6 +34,8 @@ export function createLlamalend() {
         // Market constructors
         getLendMarket: getLendMarket.bind(llamalend),
         getMintMarket: getMintMarket.bind(llamalend),
+        getLendMarketByData: getLendMarketByData.bind(llamalend),
+        getMintMarketByData: getMintMarketByData.bind(llamalend),
         // Utility functions
         totalSupply: totalSupply.bind(llamalend),
         getLsdApy: getLsdApy.bind(llamalend),

package/lib/interfaces.d.ts

@@ -34,7 +34,6 @@ export interface ILlamma {
     max_bands: number;
     default_bands: number;
     A: number;
-    monetary_policy_abi: any;
     is_deleverage_supported?: boolean;
     index?: number;
 }
@@ -215,7 +214,6 @@ export interface ILlamma {
     max_bands: number;
     default_bands: number;
     A: number;
-    monetary_policy_abi: any;
 }
 export interface IResponseApi {
     data: any;

package/lib/lendMarkets/fetch/fetchLendMarkets.js

@@ -8,26 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { getFactoryMarketDataV1, getFactoryMarketDataV2, getFactoryMarketDataByAPI } from "./fetchFactoryData.js";
-import LlammaABI from '../../constants/abis/Llamma.json' with { type: 'json' };
-import ControllerABI from '../../constants/abis/Controller.json' with { type: 'json' };
-import ControllerV2ABI from '../../constants/abis/ControllerV2.json' with { type: 'json' };
-import MonetaryPolicyABI from '../../constants/abis/MonetaryPolicy.json' with { type: 'json' };
-import VaultABI from '../../constants/abis/Vault.json' with { type: 'json' };
-import GaugeABI from '../../constants/abis/GaugeV5.json' with { type: 'json' };
-import SidechainGaugeABI from '../../constants/abis/SidechainGauge.json' with { type: 'json' };
-const controllerAbiMap = {
-    'v1': ControllerABI,
-    'v2': ControllerV2ABI,
-};
+import { setupLendMarketContracts } from "../setupContracts.js";
 const registerMarkets = (llamalend, names, amms, controllers, borrowed_tokens, collateral_tokens, monetary_policies, vaults, gauges, COIN_DATA, version) => {
     amms.forEach((amm, index) => {
-        llamalend.setContract(amms[index], LlammaABI);
-        llamalend.setContract(controllers[index], controllerAbiMap[version]);
-        llamalend.setContract(monetary_policies[index], MonetaryPolicyABI);
-        llamalend.setContract(vaults[index], VaultABI);
-        if (gauges[index]) {
-            llamalend.setContract(gauges[index], llamalend.chainId === 1 ? GaugeABI : SidechainGaugeABI);
-        }
         COIN_DATA[vaults[index]] = {
             address: vaults[index],
             decimals: 18,
@@ -40,8 +23,6 @@ const registerMarkets = (llamalend, names, amms, controllers, borrowed_tokens, c
             name: "curve.finance " + COIN_DATA[borrowed_tokens[index]].name + " Gauge Deposit",
             symbol: "cv" + COIN_DATA[borrowed_tokens[index]].symbol + "-gauge",
         };
-        llamalend.constants.DECIMALS[vaults[index]] = 18;
-        llamalend.constants.DECIMALS[gauges[index]] = 18;
         const marketData = {
             name: names[index] || `${COIN_DATA[collateral_tokens[index]].symbol}/${COIN_DATA[borrowed_tokens[index]].symbol}`,
             version: version,
@@ -57,6 +38,7 @@ const registerMarkets = (llamalend, names, amms, controllers, borrowed_tokens, c
             borrowed_token: COIN_DATA[borrowed_tokens[index]],
             collateral_token: COIN_DATA[collateral_tokens[index]],
         };
+        setupLendMarketContracts(llamalend, marketData);
         if (version === 'v2') {
             llamalend.constants.ONE_WAY_MARKETS_V2[`one-way-market-v2-${index}`] = marketData;
         }

package/lib/lendMarkets/lendMarketConstructor.d.ts

@@ -1,3 +1,5 @@
 import { LendMarketTemplate } from "./LendMarketTemplate.js";
+import type { IOneWayMarket } from "../interfaces.js";
 import type { Llamalend } from "../llamalend.js";
 export declare const getLendMarket: (this: Llamalend, lendMarketId: string) => LendMarketTemplate<"v1"> | LendMarketTemplate<"v2">;
+export declare const getLendMarketByData: (this: Llamalend, id: string, marketData: IOneWayMarket) => LendMarketTemplate<"v1"> | LendMarketTemplate<"v2">;

package/lib/lendMarkets/lendMarketConstructor.js

@@ -1,4 +1,5 @@
 import { LendMarketTemplate } from "./LendMarketTemplate.js";
+import { setupLendMarketContracts } from "./setupContracts.js";
 export const getLendMarket = function (lendMarketId) {
     if (!(lendMarketId in this.lendMarkets)) {
         const marketData = this.constants.ONE_WAY_MARKETS[lendMarketId] || this.constants.ONE_WAY_MARKETS_V2[lendMarketId];
@@ -13,3 +14,13 @@ export const getLendMarket = function (lendMarketId) {
     }
     return this.lendMarkets[lendMarketId];
 };
+export const getLendMarketByData = function (id, marketData) {
+    setupLendMarketContracts(this, marketData);
+    if (marketData.version === 'v2') {
+        this.lendMarkets[id] = new LendMarketTemplate(id, marketData, this);
+    }
+    else {
+        this.lendMarkets[id] = new LendMarketTemplate(id, marketData, this);
+    }
+    return this.lendMarkets[id];
+};

package/lib/lendMarkets/setupContracts.d.ts

@@ -0,0 +1,3 @@
+import type { Llamalend } from "../llamalend.js";
+import type { IOneWayMarket } from "../interfaces.js";
+export declare const setupLendMarketContracts: (llamalend: Llamalend, marketData: IOneWayMarket) => void;

package/lib/lendMarkets/setupContracts.js

@@ -0,0 +1,30 @@
+import LlammaABI from '../constants/abis/Llamma.json' with { type: 'json' };
+import ControllerABI from '../constants/abis/Controller.json' with { type: 'json' };
+import ControllerV2ABI from '../constants/abis/ControllerV2.json' with { type: 'json' };
+import MonetaryPolicyABI from '../constants/abis/MonetaryPolicy.json' with { type: 'json' };
+import VaultABI from '../constants/abis/Vault.json' with { type: 'json' };
+import GaugeABI from '../constants/abis/GaugeV5.json' with { type: 'json' };
+import SidechainGaugeABI from '../constants/abis/SidechainGauge.json' with { type: 'json' };
+import ERC20ABI from '../constants/abis/ERC20.json' with { type: 'json' };
+const controllerAbiMap = {
+    v1: ControllerABI,
+    v2: ControllerV2ABI,
+};
+const VAULT_DECIMALS = 18;
+const GAUGE_DECIMALS = 18;
+export const setupLendMarketContracts = (llamalend, marketData) => {
+    const { addresses, borrowed_token, collateral_token, version } = marketData;
+    llamalend.setContract(addresses.amm, LlammaABI);
+    llamalend.setContract(addresses.controller, controllerAbiMap[version]);
+    llamalend.setContract(addresses.monetary_policy, MonetaryPolicyABI);
+    llamalend.setContract(addresses.vault, VaultABI);
+    llamalend.setContract(addresses.gauge, llamalend.chainId === 1 ? GaugeABI : SidechainGaugeABI);
+    llamalend.setContract(borrowed_token.address, ERC20ABI);
+    llamalend.setContract(collateral_token.address, ERC20ABI);
+    llamalend.constants.DECIMALS[borrowed_token.address] = borrowed_token.decimals;
+    llamalend.constants.DECIMALS[collateral_token.address] = collateral_token.decimals;
+    llamalend.constants.DECIMALS[addresses.vault] = VAULT_DECIMALS;
+    if (addresses.gauge && addresses.gauge !== llamalend.constants.ZERO_ADDRESS) {
+        llamalend.constants.DECIMALS[addresses.gauge] = GAUGE_DECIMALS;
+    }
+};

package/lib/llamalend.js

@@ -31,10 +31,10 @@ import DeleverageZapABI from "./constants/abis/crvUSD/DeleverageZap.json" with {
 import { ALIASES_ETHEREUM, ALIASES_OPTIMISM, ALIASES_ARBITRUM, ALIASES_FRAXTAL, ALIASES_SONIC, } from "./constants/aliases.js";
 import { COINS_ETHEREUM, COINS_OPTIMISM, COINS_ARBITRUM, COINS_FRAXTAL, COINS_SONIC, } from "./constants/coins.js";
 import { LLAMMAS } from "./constants/llammas.js";
+import { resolveMonetaryPolicyAbi } from "./mintMarkets/monetaryPolicyAbi.js";
 import { L2Networks } from "./constants/L2Networks.js";
 import { createCall, handleMultiCallResponse } from "./utils.js";
 import { _getMarketsData, _getCrvUsdMarketsData } from "./external-api.js";
-import { extractDecimals } from "./constants/utils.js";
 import { fetchOneWayMarketsByBlockchain, fetchOneWayMarketsByAPI } from "./lendMarkets/fetch/fetchLendMarkets.js";
 import { fetchMintMarketsByBlockchain, fetchMintMarketsByAPI } from "./mintMarkets/fetch/fetchMintMarkets.js";
 const memoizeByAddress = (factory) => {
@@ -313,7 +313,12 @@ class Llamalend {
                     this.setContract(this.constants.ALIASES.gauge_factory, GaugeFactorySidechainABI);
                 }
             }
-            this.constants.DECIMALS = Object.assign(Object.assign({}, extractDecimals(this.constants.LLAMMAS)), { [this.crvUsdAddress]: 18, [this.constants.ALIASES.crv]: 18, [this.constants.ALIASES.crvUSD]: 18, [this.constants.ALIASES.st_crvUSD]: 18 });
+            this.constants.DECIMALS = {
+                [this.crvUsdAddress]: 18,
+                [this.constants.ALIASES.crv]: 18,
+                [this.constants.ALIASES.crvUSD]: 18,
+                [this.constants.ALIASES.st_crvUSD]: 18,
+            };
             if (L2Networks.includes(this.chainId)) {
                 // eslint-disable-next-line @typescript-eslint/no-this-alias
                 const lendingInstance = this;
@@ -402,7 +407,7 @@ class Llamalend {
                 llammas.forEach((llamma, i) => { llamma.monetary_policy_address = monetaryPolicies[i]; });
             }
             for (const llamma of llammas) {
-                this.setContract(llamma.monetary_policy_address, llamma.monetary_policy_abi);
+                this.setContract(llamma.monetary_policy_address, resolveMonetaryPolicyAbi(llamma.monetary_policy_address));
                 if (llamma.collateral_address === "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee") {
                     this.setContract(this.constants.WETH, ERC20ABI);
                 }

package/lib/mintMarkets/fetch/fetchMintMarkets.js

@@ -13,7 +13,9 @@ import llammaABI from "../../constants/abis/crvUSD/llamma.json" with { type: 'js
 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' };
+import { extractDecimals } from "../../constants/utils.js";
+import { handleMultiCallResponse } from "../../utils.js";
+import { resolveMonetaryPolicyAbi } from "../monetaryPolicyAbi.js";
 export const fetchMintMarketsByAPI = (llamalend) => __awaiter(void 0, void 0, void 0, function* () {
     if (llamalend.chainId !== 1)
         return;
@@ -38,7 +40,7 @@ export const fetchMintMarketsByAPI = (llamalend) => __awaiter(void 0, void 0, vo
         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);
+        llamalend.setContract(monetary_policy_address, resolveMonetaryPolicyAbi(monetary_policy_address));
         const _llammaId = is_eth ? "eth" : collateral_symbol.toLowerCase();
         let llammaId = _llammaId;
         let j = 2;
@@ -57,11 +59,11 @@ export const fetchMintMarketsByAPI = (llamalend) => __awaiter(void 0, void 0, vo
             max_bands: 50,
             default_bands: 10,
             A: market.amm_a,
-            monetary_policy_abi: MonetaryPolicy2ABI,
             is_deleverage_supported: true,
             index: N1 + i,
         };
     }
+    llamalend.constants.DECIMALS = Object.assign(Object.assign({}, llamalend.constants.DECIMALS), extractDecimals(llamalend.constants.LLAMMAS));
 });
 export const fetchMintMarketsByBlockchain = (llamalend) => __awaiter(void 0, void 0, void 0, function* () {
     if (llamalend.chainId !== 1)
@@ -71,44 +73,37 @@ export const fetchMintMarketsByBlockchain = (llamalend) => __awaiter(void 0, voi
     const factoryMulticallContract = llamalend.contracts[llamalend.constants.FACTORY].multicallContract;
     const N1 = Object.keys(llamalend.constants.LLAMMAS).length;
     const N2 = yield factoryContract.n_collaterals(llamalend.constantOptions);
+    const coreCallsMap = ['collaterals', 'amms', 'controllers'];
     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);
+    const coreAddresses = (yield llamalend.multicallProvider.all(calls)).map((c) => c.toLowerCase());
+    const { collaterals, amms, controllers } = handleMultiCallResponse(coreCallsMap, coreAddresses);
     if (collaterals.length === 0)
         return;
+    const N = collaterals.length;
     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());
+    for (const amm of amms)
+        llamalend.setContract(amm, llammaABI);
+    for (let i = 0; i < N; i++) {
+        llamalend.setContract(controllers[i], i >= N - 3 ? controllerV2ABI : controllerABI);
     }
-    const collateralData = (yield llamalend.multicallProvider.all(calls)).map((x) => {
-        if (typeof x === "string")
-            return x.toLowerCase();
-        return x;
-    });
+    const detailsCallsMap = ['symbols', 'decimals', 'amm_a', 'monetary_policies'];
     calls = [];
-    for (const amm of amms) {
-        llamalend.setContract(amm, llammaABI);
-        calls.push(llamalend.contracts[amm].multicallContract.A());
+    for (let i = 0; i < N; i++) {
+        calls.push(llamalend.contracts[collaterals[i]].multicallContract.symbol(), llamalend.contracts[collaterals[i]].multicallContract.decimals(), llamalend.contracts[amms[i]].multicallContract.A(), llamalend.contracts[controllers[i]].multicallContract.monetary_policy());
     }
-    const AParams = (yield llamalend.multicallProvider.all(calls)).map((x) => Number(x));
-    for (let i = 0; i < collaterals.length; i++) {
+    const flat = (yield llamalend.multicallProvider.all(calls)).map((x) => typeof x === "string" ? x.toLowerCase() : x);
+    const { symbols, decimals, amm_a, monetary_policies } = handleMultiCallResponse(detailsCallsMap, flat);
+    for (const mp of monetary_policies)
+        llamalend.setContract(mp, resolveMonetaryPolicyAbi(mp));
+    for (let i = 0; i < N; 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 collateral_symbol = symbols[i];
+        const collateral_decimals = Number(decimals[i]);
+        const monetary_policy_address = monetary_policies[i];
         const _llammaId = is_eth ? "eth" : collateral_symbol.toLowerCase();
         let llammaId = _llammaId;
         let j = 2;
@@ -126,10 +121,10 @@ export const fetchMintMarketsByBlockchain = (llamalend) => __awaiter(void 0, voi
             min_bands: 4,
             max_bands: 50,
             default_bands: 10,
-            A: AParams[i],
-            monetary_policy_abi: MonetaryPolicy2ABI,
+            A: Number(amm_a[i]),
             is_deleverage_supported: true,
             index: N1 + i,
         };
     }
+    llamalend.constants.DECIMALS = Object.assign(Object.assign({}, llamalend.constants.DECIMALS), extractDecimals(llamalend.constants.LLAMMAS));
 });

package/lib/mintMarkets/mintMarketConstructor.d.ts

@@ -1,3 +1,5 @@
 import { MintMarketTemplate } from "./MintMarketTemplate.js";
+import type { ILlamma } from "../interfaces.js";
 import type { Llamalend } from "../llamalend.js";
 export declare const getMintMarket: (this: Llamalend, mintMarketId: string) => MintMarketTemplate;
+export declare const getMintMarketByData: (this: Llamalend, id: string, llammaData: ILlamma) => MintMarketTemplate;

package/lib/mintMarkets/mintMarketConstructor.js

@@ -1,4 +1,5 @@
 import { MintMarketTemplate } from "./MintMarketTemplate.js";
+import { setupMintMarketContracts } from "./setupContracts.js";
 export const getMintMarket = function (mintMarketId) {
     if (!(mintMarketId in this.mintMarkets)) {
         const llammaData = this.constants.LLAMMAS[mintMarketId];
@@ -8,3 +9,8 @@ export const getMintMarket = function (mintMarketId) {
     }
     return this.mintMarkets[mintMarketId];
 };
+export const getMintMarketByData = function (id, llammaData) {
+    setupMintMarketContracts(this, llammaData);
+    this.mintMarkets[id] = new MintMarketTemplate(id, llammaData, this);
+    return this.mintMarkets[id];
+};

package/lib/mintMarkets/monetaryPolicyAbi.d.ts

@@ -0,0 +1 @@
+export declare const resolveMonetaryPolicyAbi: (monetaryPolicyAddress: string) => any;

package/lib/mintMarkets/monetaryPolicyAbi.js

@@ -0,0 +1,10 @@
+import MonetaryPolicyABI from "../constants/abis/crvUSD/MonetaryPolicy.json" with { type: "json" };
+import MonetaryPolicy2ABI from "../constants/abis/crvUSD/MonetaryPolicy2.json" with { type: "json" };
+const LEGACY_MONETARY_POLICIES = new Set([
+    "0xc684432fd6322c6d58b6bc5d28b18569aa0ad0a1",
+]);
+export const resolveMonetaryPolicyAbi = (monetaryPolicyAddress) => {
+    return LEGACY_MONETARY_POLICIES.has(monetaryPolicyAddress.toLowerCase())
+        ? MonetaryPolicyABI
+        : MonetaryPolicy2ABI;
+};

package/lib/mintMarkets/setupContracts.d.ts

@@ -0,0 +1,3 @@
+import type { Llamalend } from "../llamalend.js";
+import type { ILlamma } from "../interfaces.js";
+export declare const setupMintMarketContracts: (llamalend: Llamalend, llammaData: ILlamma) => void;

package/lib/mintMarkets/setupContracts.js

@@ -0,0 +1,27 @@
+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" with { type: "json" };
+import LeverageZapCrvUSDABI from "../constants/abis/crvUSD/LeverageZap.json" with { type: "json" };
+import DeleverageZapABI from "../constants/abis/crvUSD/DeleverageZap.json" with { type: "json" };
+import HealthCalculatorZapABI from "../constants/abis/crvUSD/HealthCalculatorZap.json" with { type: "json" };
+import { resolveMonetaryPolicyAbi } from "./monetaryPolicyAbi.js";
+const NATIVE_ETH_PLACEHOLDER = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+export const setupMintMarketContracts = (llamalend, llammaData) => {
+    const isV2Controller = llammaData.is_deleverage_supported === true;
+    llamalend.setContract(llammaData.amm_address, llammaABI);
+    llamalend.setContract(llammaData.controller_address, isV2Controller ? controllerV2ABI : controllerABI);
+    llamalend.setContract(llammaData.monetary_policy_address, resolveMonetaryPolicyAbi(llammaData.monetary_policy_address));
+    if (llammaData.collateral_address === NATIVE_ETH_PLACEHOLDER) {
+        llamalend.setContract(llamalend.constants.WETH, ERC20ABI);
+    }
+    else {
+        llamalend.setContract(llammaData.collateral_address, ERC20ABI);
+    }
+    llamalend.setContract(llammaData.leverage_zap, LeverageZapCrvUSDABI);
+    llamalend.setContract(llammaData.deleverage_zap, DeleverageZapABI);
+    if (llammaData.health_calculator_zap && llammaData.health_calculator_zap !== llamalend.constants.ZERO_ADDRESS) {
+        llamalend.setContract(llammaData.health_calculator_zap, HealthCalculatorZapABI);
+    }
+    llamalend.constants.DECIMALS[llammaData.collateral_address] = llammaData.collateral_decimals;
+};

package/package.json

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

package/src/constants/abis/ControllerV2.json

@@ -670,78 +670,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "name": "_user",
-        "type": "address"
-      },
-      {
-        "name": "_min_x",
-        "type": "uint256"
-      },
-      {
-        "name": "_frac",
-        "type": "uint256"
-      }
-    ],
-    "name": "liquidate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "name": "_user",
-        "type": "address"
-      },
-      {
-        "name": "_min_x",
-        "type": "uint256"
-      },
-      {
-        "name": "_frac",
-        "type": "uint256"
-      },
-      {
-        "name": "_callbacker",
-        "type": "address"
-      }
-    ],
-    "name": "liquidate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "name": "_user",
-        "type": "address"
-      },
-      {
-        "name": "_min_x",
-        "type": "uint256"
-      },
-      {
-        "name": "_frac",
-        "type": "uint256"
-      },
-      {
-        "name": "_callbacker",
-        "type": "address"
-      },
-      {
-        "name": "_calldata",
-        "type": "bytes"
-      }
-    ],
-    "name": "liquidate",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [],
     "name": "save_rate",
@@ -1263,27 +1191,6 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "name": "_user",
-        "type": "address"
-      },
-      {
-        "name": "_frac",
-        "type": "uint256"
-      }
-    ],
-    "name": "tokens_to_liquidate",
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [
       {

package/src/constants/llammas.ts

@@ -1,6 +1,4 @@
 import { IDict, ILlamma } from "../interfaces.js";
-import MonetaryPolicyABI from './abis/crvUSD/MonetaryPolicy.json' with {type: 'json'};
-import MonetaryPolicy2ABI from './abis/crvUSD/MonetaryPolicy2.json' with {type: 'json'};
 import { lowerCaseLlammasAddresses } from "./utils.js";
 
 
@@ -18,7 +16,6 @@ export const LLAMMAS: IDict<ILlamma> = lowerCaseLlammasAddresses({
         max_bands: 50,
         default_bands: 10,
         A: 100,
-        monetary_policy_abi: MonetaryPolicyABI,
     },
     wsteth: {
         amm_address: '0x37417b2238aa52d0dd2d6252d989e728e8f706e4',
@@ -33,7 +30,6 @@ export const LLAMMAS: IDict<ILlamma> = lowerCaseLlammasAddresses({
         max_bands: 50,
         default_bands: 10,
         A: 100,
-        monetary_policy_abi: MonetaryPolicy2ABI,
     },
     wbtc: {
         amm_address: '0xe0438eb3703bf871e31ce639bd351109c88666ea',
@@ -49,7 +45,6 @@ export const LLAMMAS: IDict<ILlamma> = lowerCaseLlammasAddresses({
         max_bands: 50,
         default_bands: 10,
         A: 100,
-        monetary_policy_abi: MonetaryPolicy2ABI,
     },
     eth: {
         amm_address: '0x1681195c176239ac5e72d9aebacf5b2492e0c4ee',
@@ -64,7 +59,6 @@ export const LLAMMAS: IDict<ILlamma> = lowerCaseLlammasAddresses({
         max_bands: 50,
         default_bands: 10,
         A: 100,
-        monetary_policy_abi: MonetaryPolicy2ABI,
     },
     sfrxeth2: {
         amm_address: '0xfa96ad0a9e64261db86950e2da362f5572c5c6fd',
@@ -79,7 +73,6 @@ export const LLAMMAS: IDict<ILlamma> = lowerCaseLlammasAddresses({
         max_bands: 50,
         default_bands: 10,
         A: 100,
-        monetary_policy_abi: MonetaryPolicy2ABI,
     },
     tbtc: {
         amm_address: '0xf9bd9da2427a50908c4c6d1599d8e62837c2bcb0',
@@ -94,6 +87,5 @@ export const LLAMMAS: IDict<ILlamma> = lowerCaseLlammasAddresses({
         max_bands: 50,
         default_bands: 10,
         A: 100,
-        monetary_policy_abi: MonetaryPolicy2ABI,
     },
 });

package/src/index.ts

@@ -45,6 +45,8 @@ import {
     redeemEstimateGas,
     redeem,
 } from "./st-crvUSD.js";
+import {getMintMarketByData} from "./mintMarkets/mintMarketConstructor.js";
+import {getLendMarketByData} from "./lendMarkets/lendMarketConstructor.js";
 
 
 export function createLlamalend() {
@@ -73,6 +75,8 @@ export function createLlamalend() {
         // Market constructors
         getLendMarket: getLendMarket.bind(llamalend),
         getMintMarket: getMintMarket.bind(llamalend),
+        getLendMarketByData: getLendMarketByData.bind(llamalend),
+        getMintMarketByData: getMintMarketByData.bind(llamalend),
 
         // Utility functions
         totalSupply: totalSupply.bind(llamalend),

package/src/interfaces.ts

@@ -40,7 +40,6 @@ export interface ILlamma {
     max_bands: number,
     default_bands: number,
     A: number,
-    monetary_policy_abi: any
     is_deleverage_supported?: boolean
     index?: number
 }
@@ -226,7 +225,6 @@ export interface ILlamma {
     max_bands: number,
     default_bands: number,
     A: number,
-    monetary_policy_abi: any
 }
 
 export interface IResponseApi {

package/src/lendMarkets/fetch/fetchLendMarkets.ts

@@ -1,19 +1,7 @@
 import type { Llamalend } from "../../llamalend.js";
 import type { ICoin, IDict } from "../../interfaces.js";
 import { getFactoryMarketDataV1, getFactoryMarketDataV2, getFactoryMarketDataByAPI } from "./fetchFactoryData.js";
-
-import LlammaABI from '../../constants/abis/Llamma.json' with {type: 'json'};
-import ControllerABI from '../../constants/abis/Controller.json' with {type: 'json'};
-import ControllerV2ABI from '../../constants/abis/ControllerV2.json' with {type: 'json'};
-import MonetaryPolicyABI from '../../constants/abis/MonetaryPolicy.json' with {type: 'json'};
-import VaultABI from '../../constants/abis/Vault.json' with {type: 'json'};
-import GaugeABI from '../../constants/abis/GaugeV5.json' with {type: 'json'};
-import SidechainGaugeABI from '../../constants/abis/SidechainGauge.json' with {type: 'json'};
-
-const controllerAbiMap = {
-    'v1' : ControllerABI,
-    'v2' : ControllerV2ABI,
-}
+import { setupLendMarketContracts } from "../setupContracts.js";
 
 const registerMarkets = (
     llamalend: Llamalend,
@@ -29,13 +17,6 @@ const registerMarkets = (
     version: 'v1' | 'v2'
 ) => {
     amms.forEach((amm: string, index: number) => {
-        llamalend.setContract(amms[index], LlammaABI);
-        llamalend.setContract(controllers[index], controllerAbiMap[version]);
-        llamalend.setContract(monetary_policies[index], MonetaryPolicyABI);
-        llamalend.setContract(vaults[index], VaultABI);
-        if (gauges[index]) {
-            llamalend.setContract(gauges[index], llamalend.chainId === 1 ? GaugeABI : SidechainGaugeABI);
-        }
         COIN_DATA[vaults[index]] = {
             address: vaults[index],
             decimals: 18,
@@ -48,8 +29,6 @@ const registerMarkets = (
             name: "curve.finance " + COIN_DATA[borrowed_tokens[index]].name + " Gauge Deposit",
             symbol: "cv" + COIN_DATA[borrowed_tokens[index]].symbol + "-gauge",
         };
-        llamalend.constants.DECIMALS[vaults[index]] = 18;
-        llamalend.constants.DECIMALS[gauges[index]] = 18;
 
         const marketData = {
             name: names[index] || `${COIN_DATA[collateral_tokens[index]].symbol}/${COIN_DATA[borrowed_tokens[index]].symbol}`,
@@ -67,6 +46,8 @@ const registerMarkets = (
             collateral_token: COIN_DATA[collateral_tokens[index]],
         };
 
+        setupLendMarketContracts(llamalend, marketData);
+
         if (version === 'v2') {
             llamalend.constants.ONE_WAY_MARKETS_V2[`one-way-market-v2-${index}`] = marketData;
         } else {

package/src/lendMarkets/lendMarketConstructor.ts

@@ -1,5 +1,7 @@
 import { LendMarketTemplate} from "./LendMarketTemplate.js";
+import type { IOneWayMarket } from "../interfaces.js";
 import type { Llamalend } from "../llamalend.js";
+import { setupLendMarketContracts } from "./setupContracts.js";
 
 export const getLendMarket = function (this: Llamalend, lendMarketId: string): LendMarketTemplate<'v1'> | LendMarketTemplate<'v2'> {
     if (!(lendMarketId in this.lendMarkets)) {
@@ -13,3 +15,15 @@ export const getLendMarket = function (this: Llamalend, lendMarketId: string): L
     }
     return this.lendMarkets[lendMarketId];
 }
+
+export const getLendMarketByData = function (this: Llamalend, id: string, marketData: IOneWayMarket): LendMarketTemplate<'v1'> | LendMarketTemplate<'v2'> {
+    setupLendMarketContracts(this, marketData);
+
+    if (marketData.version === 'v2') {
+        this.lendMarkets[id] = new LendMarketTemplate<'v2'>(id, marketData, this);
+    } else {
+        this.lendMarkets[id] = new LendMarketTemplate<'v1'>(id, marketData, this);
+    }
+
+    return this.lendMarkets[id];
+}

package/src/lendMarkets/setupContracts.ts

@@ -0,0 +1,39 @@
+import type { Llamalend } from "../llamalend.js";
+import type { IOneWayMarket } from "../interfaces.js";
+
+import LlammaABI from '../constants/abis/Llamma.json' with {type: 'json'};
+import ControllerABI from '../constants/abis/Controller.json' with {type: 'json'};
+import ControllerV2ABI from '../constants/abis/ControllerV2.json' with {type: 'json'};
+import MonetaryPolicyABI from '../constants/abis/MonetaryPolicy.json' with {type: 'json'};
+import VaultABI from '../constants/abis/Vault.json' with {type: 'json'};
+import GaugeABI from '../constants/abis/GaugeV5.json' with {type: 'json'};
+import SidechainGaugeABI from '../constants/abis/SidechainGauge.json' with {type: 'json'};
+import ERC20ABI from '../constants/abis/ERC20.json' with {type: 'json'};
+
+const controllerAbiMap = {
+    v1: ControllerABI,
+    v2: ControllerV2ABI,
+};
+
+const VAULT_DECIMALS = 18;
+const GAUGE_DECIMALS = 18;
+
+export const setupLendMarketContracts = (llamalend: Llamalend, marketData: IOneWayMarket): void => {
+    const { addresses, borrowed_token, collateral_token, version } = marketData;
+
+    llamalend.setContract(addresses.amm, LlammaABI);
+    llamalend.setContract(addresses.controller, controllerAbiMap[version]);
+    llamalend.setContract(addresses.monetary_policy, MonetaryPolicyABI);
+    llamalend.setContract(addresses.vault, VaultABI);
+    llamalend.setContract(addresses.gauge, llamalend.chainId === 1 ? GaugeABI : SidechainGaugeABI);
+
+    llamalend.setContract(borrowed_token.address, ERC20ABI);
+    llamalend.setContract(collateral_token.address, ERC20ABI);
+
+    llamalend.constants.DECIMALS[borrowed_token.address] = borrowed_token.decimals;
+    llamalend.constants.DECIMALS[collateral_token.address] = collateral_token.decimals;
+    llamalend.constants.DECIMALS[addresses.vault] = VAULT_DECIMALS;
+    if (addresses.gauge && addresses.gauge !== llamalend.constants.ZERO_ADDRESS) {
+        llamalend.constants.DECIMALS[addresses.gauge] = GAUGE_DECIMALS;
+    }
+};

package/src/llamalend.ts

@@ -45,10 +45,10 @@ import {
     COINS_SONIC,
 } from "./constants/coins.js";
 import {LLAMMAS} from "./constants/llammas.js";
+import {resolveMonetaryPolicyAbi} from "./mintMarkets/monetaryPolicyAbi.js";
 import {L2Networks} from "./constants/L2Networks.js";
 import {createCall, handleMultiCallResponse} from "./utils.js";
 import {_getMarketsData, _getCrvUsdMarketsData} from "./external-api.js";
-import {extractDecimals} from "./constants/utils.js";
 import {MintMarketTemplate} from "./mintMarkets";
 import {LendMarketTemplate} from "./lendMarkets";
 import {fetchOneWayMarketsByBlockchain, fetchOneWayMarketsByAPI} from "./lendMarkets/fetch/fetchLendMarkets.js";
@@ -310,7 +310,6 @@ class Llamalend implements ILlamalend {
 
 
         this.constants.DECIMALS = {
-            ...extractDecimals(this.constants.LLAMMAS),
             [this.crvUsdAddress]: 18,
             [this.constants.ALIASES.crv]: 18,
             [this.constants.ALIASES.crvUSD]: 18,
@@ -416,7 +415,7 @@ class Llamalend implements ILlamalend {
         }
 
         for (const llamma of llammas) {
-            this.setContract(llamma.monetary_policy_address, llamma.monetary_policy_abi);
+            this.setContract(llamma.monetary_policy_address, resolveMonetaryPolicyAbi(llamma.monetary_policy_address));
             if (llamma.collateral_address === "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee") {
                 this.setContract(this.constants.WETH, ERC20ABI);
             } else {

package/src/mintMarkets/fetch/fetchMintMarkets.ts

@@ -5,7 +5,9 @@ import llammaABI from "../../constants/abis/crvUSD/llamma.json" with {type: 'jso
 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'};
+import {extractDecimals} from "../../constants/utils.js";
+import {handleMultiCallResponse} from "../../utils.js";
+import {resolveMonetaryPolicyAbi} from "../monetaryPolicyAbi.js";
 
 export const fetchMintMarketsByAPI = async (llamalend: Llamalend): Promise<void> => {
     if (llamalend.chainId !== 1) return;
@@ -35,7 +37,7 @@ export const fetchMintMarketsByAPI = async (llamalend: Llamalend): Promise<void>
         const collateral_symbol = market.collateral_token.symbol;
         const monetary_policy_address = market.monetary_policy_address.toLowerCase();
 
-        llamalend.setContract(monetary_policy_address, MonetaryPolicy2ABI);
+        llamalend.setContract(monetary_policy_address, resolveMonetaryPolicyAbi(monetary_policy_address));
 
         const _llammaId = is_eth ? "eth" : collateral_symbol.toLowerCase();
         let llammaId = _llammaId;
@@ -55,11 +57,12 @@ export const fetchMintMarketsByAPI = async (llamalend: Llamalend): Promise<void>
             max_bands: 50,
             default_bands: 10,
             A: market.amm_a,
-            monetary_policy_abi: MonetaryPolicy2ABI,
             is_deleverage_supported: true,
             index: N1 + i,
         };
     }
+
+    llamalend.constants.DECIMALS = {...llamalend.constants.DECIMALS, ...extractDecimals(llamalend.constants.LLAMMAS)}
 };
 
 export const fetchMintMarketsByBlockchain = async (llamalend: Llamalend): Promise<void> => {
@@ -71,6 +74,8 @@ export const fetchMintMarketsByBlockchain = async (llamalend: Llamalend): Promis
 
     const N1 = Object.keys(llamalend.constants.LLAMMAS).length;
     const N2 = await factoryContract.n_collaterals(llamalend.constantOptions);
+
+    const coreCallsMap = ['collaterals', 'amms', 'controllers'];
     let calls = [];
     for (let i = N1; i < N2; i++) {
         calls.push(
@@ -79,46 +84,47 @@ export const fetchMintMarketsByBlockchain = async (llamalend: Llamalend): Promis
             factoryMulticallContract.controllers(i)
         );
     }
-    const res: string[] = (await llamalend.multicallProvider.all(calls) as string[]).map((c) => c.toLowerCase());
-    const collaterals = res.filter((a, i) => i % 3 == 0) as string[];
-    const amms = res.filter((a, i) => i % 3 == 1) as string[];
-    const controllers = res.filter((a, i) => i % 3 == 2) as string[];
+
+    const coreAddresses = (await llamalend.multicallProvider.all(calls) as string[]).map((c) => c.toLowerCase());
+    const { collaterals, amms, controllers } = handleMultiCallResponse(coreCallsMap, coreAddresses) as {
+        collaterals: string[]; amms: string[]; controllers: string[];
+    };
 
     if (collaterals.length === 0) return;
 
+    const N = collaterals.length;
+
     for (const collateral of collaterals) llamalend.setContract(collateral, ERC20ABI);
+    for (const amm of amms) llamalend.setContract(amm, llammaABI);
+    for (let i = 0; i < N; i++) {
+        llamalend.setContract(controllers[i], i >= N - 3 ? controllerV2ABI : controllerABI);
+    }
 
+    const detailsCallsMap = ['symbols', 'decimals', 'amm_a', 'monetary_policies'];
     calls = [];
-    for (const collateral of collaterals) {
+    for (let i = 0; i < N; i++) {
         calls.push(
-            llamalend.contracts[collateral].multicallContract.symbol(),
-            llamalend.contracts[collateral].multicallContract.decimals()
+            llamalend.contracts[collaterals[i]].multicallContract.symbol(),
+            llamalend.contracts[collaterals[i]].multicallContract.decimals(),
+            llamalend.contracts[amms[i]].multicallContract.A(),
+            llamalend.contracts[controllers[i]].multicallContract.monetary_policy()
         );
     }
-    const collateralData = (await 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 = (await 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) as [string, number];
+    const flat = (await llamalend.multicallProvider.all(calls)).map((x) =>
+        typeof x === "string" ? x.toLowerCase() : x
+    );
+    const { symbols, decimals, amm_a, monetary_policies } = handleMultiCallResponse(detailsCallsMap, flat) as {
+        symbols: string[]; decimals: unknown[]; amm_a: unknown[]; monetary_policies: string[];
+    };
 
-        if (i >= collaterals.length - 3) {
-            llamalend.setContract(controllers[i], controllerV2ABI);
-        } else {
-            llamalend.setContract(controllers[i], controllerABI);
-        }
+    for (const mp of monetary_policies) llamalend.setContract(mp, resolveMonetaryPolicyAbi(mp));
 
-        const monetary_policy_address = (await llamalend.contracts[controllers[i]].contract.monetary_policy(llamalend.constantOptions)).toLowerCase();
-        llamalend.setContract(monetary_policy_address, MonetaryPolicy2ABI);
+    for (let i = 0; i < N; i++) {
+        const is_eth = collaterals[i] === llamalend.constants.WETH;
+        const collateral_symbol = symbols[i];
+        const collateral_decimals = Number(decimals[i]);
+        const monetary_policy_address = monetary_policies[i];
 
         const _llammaId: string = is_eth ? "eth" : collateral_symbol.toLowerCase();
         let llammaId = _llammaId;
@@ -137,10 +143,11 @@ export const fetchMintMarketsByBlockchain = async (llamalend: Llamalend): Promis
             min_bands: 4,
             max_bands: 50,
             default_bands: 10,
-            A: AParams[i],
-            monetary_policy_abi: MonetaryPolicy2ABI,
+            A: Number(amm_a[i]),
             is_deleverage_supported: true,
             index: N1 + i,
         };
     }
+
+    llamalend.constants.DECIMALS = {...llamalend.constants.DECIMALS, ...extractDecimals(llamalend.constants.LLAMMAS)}
 };

package/src/mintMarkets/mintMarketConstructor.ts

@@ -1,5 +1,7 @@
 import { MintMarketTemplate} from "./MintMarketTemplate.js";
+import type { ILlamma } from "../interfaces.js";
 import type { Llamalend } from "../llamalend.js";
+import { setupMintMarketContracts } from "./setupContracts.js";
 
 export const getMintMarket = function (this: Llamalend, mintMarketId: string): MintMarketTemplate {
     if (!(mintMarketId in this.mintMarkets)) {
@@ -9,3 +11,10 @@ export const getMintMarket = function (this: Llamalend, mintMarketId: string): M
     }
     return this.mintMarkets[mintMarketId]
 }
+
+export const getMintMarketByData = function (this: Llamalend, id: string, llammaData: ILlamma): MintMarketTemplate {
+    setupMintMarketContracts(this, llammaData);
+    this.mintMarkets[id] = new MintMarketTemplate(id, llammaData, this);
+
+    return this.mintMarkets[id];
+}

package/src/mintMarkets/monetaryPolicyAbi.ts

@@ -0,0 +1,12 @@
+import MonetaryPolicyABI from "../constants/abis/crvUSD/MonetaryPolicy.json" with { type: "json" };
+import MonetaryPolicy2ABI from "../constants/abis/crvUSD/MonetaryPolicy2.json" with { type: "json" };
+
+const LEGACY_MONETARY_POLICIES: ReadonlySet<string> = new Set([
+    "0xc684432fd6322c6d58b6bc5d28b18569aa0ad0a1",
+]);
+
+export const resolveMonetaryPolicyAbi = (monetaryPolicyAddress: string): any => {
+    return LEGACY_MONETARY_POLICIES.has(monetaryPolicyAddress.toLowerCase())
+        ? MonetaryPolicyABI
+        : MonetaryPolicy2ABI;
+};

package/src/mintMarkets/setupContracts.ts

@@ -0,0 +1,35 @@
+import type { Llamalend } from "../llamalend.js";
+import type { ILlamma } from "../interfaces.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" with { type: "json" };
+import LeverageZapCrvUSDABI from "../constants/abis/crvUSD/LeverageZap.json" with { type: "json" };
+import DeleverageZapABI from "../constants/abis/crvUSD/DeleverageZap.json" with { type: "json" };
+import HealthCalculatorZapABI from "../constants/abis/crvUSD/HealthCalculatorZap.json" with { type: "json" };
+import { resolveMonetaryPolicyAbi } from "./monetaryPolicyAbi.js";
+
+const NATIVE_ETH_PLACEHOLDER = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+
+export const setupMintMarketContracts = (llamalend: Llamalend, llammaData: ILlamma): void => {
+    const isV2Controller = llammaData.is_deleverage_supported === true;
+
+    llamalend.setContract(llammaData.amm_address, llammaABI);
+    llamalend.setContract(llammaData.controller_address, isV2Controller ? controllerV2ABI : controllerABI);
+    llamalend.setContract(llammaData.monetary_policy_address, resolveMonetaryPolicyAbi(llammaData.monetary_policy_address));
+
+    if (llammaData.collateral_address === NATIVE_ETH_PLACEHOLDER) {
+        llamalend.setContract(llamalend.constants.WETH, ERC20ABI);
+    } else {
+        llamalend.setContract(llammaData.collateral_address, ERC20ABI);
+    }
+
+    llamalend.setContract(llammaData.leverage_zap, LeverageZapCrvUSDABI);
+    llamalend.setContract(llammaData.deleverage_zap, DeleverageZapABI);
+    if (llammaData.health_calculator_zap && llammaData.health_calculator_zap !== llamalend.constants.ZERO_ADDRESS) {
+        llamalend.setContract(llammaData.health_calculator_zap, HealthCalculatorZapABI);
+    }
+
+    llamalend.constants.DECIMALS[llammaData.collateral_address] = llammaData.collateral_decimals;
+};