@defisaver/positions-sdk 0.0.60 → 0.0.61-dev

package/esm/llamaLend/index.js

@@ -10,13 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
 import { LlamaLendStatus, } from '../types';
-import { multicall } from '../multicall';
 import { NetworkNumber, } from '../types/common';
-import { getConfigContractAbi, getConfigContractAddress, LlamaLendViewContract } from '../contracts';
+import { LlamaLendViewContract } from '../contracts';
 import { getLlamaLendAggregatedData } from '../helpers/llamaLendHelpers';
-import { getAbiItem, getEthAmountForDecimals, wethToEth } from '../services/utils';
-import { LlamaLendMarkets } from '../markets/llamaLend';
-import { USD_QUOTE } from '../constants';
+import { getEthAmountForDecimals, wethToEth } from '../services/utils';
+import { getLlamaLendMarketFromControllerAddress } from "../markets/llamaLend";
 const getAndFormatBands = (web3, network, selectedMarket, _minBand, _maxBand) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = LlamaLendViewContract(web3, network);
     const minBand = parseInt(_minBand, 10);
@@ -55,34 +53,19 @@ const getAndFormatBands = (web3, network, selectedMarket, _minBand, _maxBand) =>
 });
 export const getLlamaLendGlobalData = (web3, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = LlamaLendViewContract(web3, network);
-    const FeedRegistryAddress = getConfigContractAddress('FeedRegistry', network);
-    const FeedRegistryAbi = getConfigContractAbi('FeedRegistry');
     const collAsset = selectedMarket.collAsset;
     const debtAsset = selectedMarket.baseAsset;
-    // if something else is needed
-    const multicallData = [
-        {
-            target: FeedRegistryAddress,
-            abiItem: getAbiItem(FeedRegistryAbi, 'latestAnswer'),
-            params: [getAssetInfo(debtAsset).address, USD_QUOTE],
-        },
-        {
-            target: contract.options.address,
-            abiItem: contract.options.jsonInterface.find(({ name }) => name === 'globalData'),
-            params: [selectedMarket.controllerAddress],
-        },
-    ];
-    const multiRes = yield multicall(multicallData, web3, network);
-    const data = multiRes[1][0];
-    const debtUsdPrice = getEthAmountForDecimals(multiRes[0][0], 8);
+    const data = yield contract.methods.globalData(selectedMarket.controllerAddress).call();
     // all prices are in 18 decimals
+    const oraclePrice = getEthAmountForDecimals(data.oraclePrice, 18);
+    const collPriceUsd = collAsset === 'crvUSD' ? '1' : new Dec(1).mul(oraclePrice).toDP(18).toString();
+    const debtPriceUsd = debtAsset === 'crvUSD' ? '1' : new Dec(1).div(oraclePrice).toDP(18).toString();
     const totalDebt = assetAmountInEth(data.totalDebt, debtAsset);
     const totalDebtSupplied = assetAmountInEth(data.debtTokenTotalSupply, debtAsset);
     const utilization = new Dec(totalDebtSupplied).gt(0)
-        ? new Dec(totalDebt).div(totalDebtSupplied).mul(100)
-        : 0;
+        ? new Dec(totalDebt).div(totalDebtSupplied).mul(100).toString()
+        : '0';
     const ammPrice = assetAmountInEth(data.ammPrice, debtAsset);
-    const oraclePrice = getEthAmountForDecimals(data.oraclePrice, 18);
     const rate = assetAmountInEth(data.ammRate);
     const futureRate = assetAmountInEth(data.monetaryPolicyRate);
     const exponentRate = new Dec(rate).mul(365).mul(86400);
@@ -100,7 +83,7 @@ export const getLlamaLendGlobalData = (web3, network, selectedMarket) => __await
     assetsData[debtAsset] = {
         symbol: debtAsset,
         address: data.debtToken,
-        price: debtUsdPrice,
+        price: debtPriceUsd,
         supplyRate: lendRate,
         borrowRate,
         canBeSupplied: true,
@@ -109,19 +92,35 @@ export const getLlamaLendGlobalData = (web3, network, selectedMarket) => __await
     assetsData[collAsset] = {
         symbol: collAsset,
         address: data.collateralToken,
-        price: new Dec(debtUsdPrice).mul(oraclePrice).toString(),
+        price: collPriceUsd,
         supplyRate: '0',
         borrowRate: '0',
         canBeSupplied: true,
         canBeBorrowed: false,
     };
-    return Object.assign(Object.assign({}, data), { assetsData,
+    return {
+        A: data.A,
+        loanDiscount: data.loanDiscount,
+        activeBand: data.activeBand,
+        monetaryPolicyRate: data.monetaryPolicyRate,
+        ammRate: data.ammRate,
+        minBand: data.minBand,
+        maxBand: data.maxBand,
+        assetsData,
         totalDebt,
         totalDebtSupplied,
         utilization,
-        ammPrice, oraclePrice: assetAmountInEth(data.oraclePrice, debtAsset), basePrice: assetAmountInEth(data.basePrice, debtAsset), minted: assetAmountInEth(data.minted, debtAsset), redeemed: assetAmountInEth(data.redeemed, debtAsset), borrowRate,
+        ammPrice,
+        oraclePrice: assetAmountInEth(data.oraclePrice, debtAsset),
+        basePrice: assetAmountInEth(data.basePrice, debtAsset),
+        minted: assetAmountInEth(data.minted, debtAsset),
+        redeemed: assetAmountInEth(data.redeemed, debtAsset),
+        borrowRate,
         lendRate,
-        futureBorrowRate, bands: bandsData, leftToBorrow });
+        futureBorrowRate,
+        bands: bandsData,
+        leftToBorrow,
+    };
 });
 const getStatusForUser = (bandRange, activeBand, debtSupplied, collSupplied, healthPercent) => {
     // if bands are equal, that can only be [0,0] which means user doesn't have loan (min number of bands is 4)
@@ -149,7 +148,7 @@ export const getLlamaLendAccountBalances = (web3, network, block, addressMapping
         return balances;
     }
     const contract = LlamaLendViewContract(web3, network, block);
-    const selectedMarket = Object.values(LlamaLendMarkets(network)).find(i => i.controllerAddress.toLowerCase() === controllerAddress.toLowerCase());
+    const selectedMarket = getLlamaLendMarketFromControllerAddress(controllerAddress, network);
     const data = yield contract.methods.userData(selectedMarket.controllerAddress, address).call({}, block);
     balances = {
         collateral: {

package/esm/markets/llamaLend/contractAddresses.d.ts

@@ -0,0 +1,9 @@
+import { LlamaLendVersionsType } from "../../types";
+import { NetworkNumber } from "../../types/common";
+type LLAddresses = {
+    controllerAddress: string;
+    vaultAddress: string;
+    controllerId: number;
+};
+export declare const getLLamaLendAddresses: (networkId: NetworkNumber, version: LlamaLendVersionsType) => LLAddresses;
+export {};

package/esm/markets/llamaLend/contractAddresses.js

@@ -0,0 +1,84 @@
+import { LlamaLendVersions } from "../../types";
+import { NetworkNumber } from "../../types/common";
+const ethAddresses = {
+    [LlamaLendVersions.LLWstethCrvusd]: {
+        controllerId: 0,
+        controllerAddress: '0x1E0165DbD2019441aB7927C018701f3138114D71',
+        vaultAddress: '0x8cf1DE26729cfB7137AF1A6B2a665e099EC319b5',
+    },
+    [LlamaLendVersions.LLSusdeCrvusd]: {
+        controllerId: 7,
+        controllerAddress: '0x98fc283d6636f6dcff5a817a00ac69a3add96907',
+        vaultAddress: '0x52096539ed1391CB50C6b9e4Fd18aFd2438ED23b',
+    },
+    [LlamaLendVersions.LLCrvCrvusd]: {
+        controllerId: 3,
+        controllerAddress: '0xEdA215b7666936DEd834f76f3fBC6F323295110A',
+        vaultAddress: '0xCeA18a8752bb7e7817F9AE7565328FE415C0f2cA',
+    },
+    [LlamaLendVersions.LLCrvusdCrv]: {
+        controllerId: 4,
+        controllerAddress: '0xC510d73Ad34BeDECa8978B6914461aA7b50CF3Fc',
+        vaultAddress: '0x4D2f44B0369f3C20c3d670D2C26b048985598450',
+    },
+    [LlamaLendVersions.LLTbtcCrvusd]: {
+        controllerId: 2,
+        controllerAddress: '0x413FD2511BAD510947a91f5c6c79EBD8138C29Fc',
+        vaultAddress: '0xb2b23C87a4B6d1b03Ba603F7C3EB9A81fDC0AAC9',
+    },
+    [LlamaLendVersions.LLCrvusdTbtc]: {
+        controllerId: 6,
+        controllerAddress: '0xe438658874b0acf4d81c24172e137f0ee00621b8',
+        vaultAddress: '0x99Cff9Dc26A44dc2496B4448ebE415b5E894bd30',
+    },
+    [LlamaLendVersions.LLWethCrvusd]: {
+        controllerId: 1,
+        controllerAddress: '0xaade9230aa9161880e13a38c83400d3d1995267b',
+        vaultAddress: '0x5AE28c9197a4a6570216fC7e53E7e0221D7A0FEF',
+    },
+    [LlamaLendVersions.LLCrvusdWeth]: {
+        controllerId: 5,
+        controllerAddress: '0xa5d9137d2a1ee912469d911a8e74b6c77503bac8',
+        vaultAddress: '0x46196C004de85c7a75C8b1bB9d54Afb0f8654A45',
+    },
+};
+const arbAddresses = {
+    [LlamaLendVersions.LLArbCrvusd]: {
+        controllerId: 5,
+        controllerAddress: '0x76709bc0da299ab0234eec51385e900922ae98f5',
+        vaultAddress: '0x65592b1F12c07D434e95c7BF87F4f2f464e950e4',
+    },
+    [LlamaLendVersions.LLFxnCrvusd]: {
+        controllerId: 7,
+        controllerAddress: '0x7adcc491f0b7f9bc12837b8f5edf0e580d176f1f',
+        vaultAddress: '0xebA51f6472F4cE1C47668c2474ab8f84B32E1ae7',
+    },
+    [LlamaLendVersions.LLWbtcCrvusd]: {
+        controllerId: 1,
+        controllerAddress: '0x013be86e1cdb0f384daf24bd974fe75edffe6b68',
+        vaultAddress: '0x60D38b12d22BF423F28082bf396ff8F28cC506B1',
+    },
+    [LlamaLendVersions.LLCrvCrvusd]: {
+        controllerId: 4,
+        controllerAddress: '0x88f88e937db48bbfe8e3091718576430704e47ab',
+        vaultAddress: '0xeEaF2ccB73A01deb38Eca2947d963D64CfDe6A32',
+    },
+    [LlamaLendVersions.LLWethCrvusd]: {
+        controllerId: 0,
+        controllerAddress: '0xb5b6f0e69c283aa32425fa18220e64283b51f0a4',
+        vaultAddress: '0x49014A8eB1585cBee6A7a9A50C3b81017BF6Cc4d',
+    }
+};
+export const getLLamaLendAddresses = (networkId, version) => {
+    let addresses;
+    if (networkId === NetworkNumber.Eth) {
+        addresses = ethAddresses[version];
+    }
+    else if (networkId === NetworkNumber.Arb) {
+        addresses = arbAddresses[version];
+    }
+    else {
+        throw new Error(`Invalid LlamaLend network ${networkId} for version ${version}`);
+    }
+    return addresses;
+};

package/esm/markets/llamaLend/index.d.ts

@@ -1,14 +1,16 @@
-import { LlamaLendMarketData, LlamaLendVersions } from '../../types';
+import { LlamaLendMarketData, LlamaLendVersionsType } from '../../types';
 import { NetworkNumber } from '../../types/common';
 export declare const LLAMALEND_WSTETH_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
-export declare const LLAMALEND_CRVUSD_CRV_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_SUSDE_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_CRV_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_CRVUSD_CRV_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
 export declare const LLAMALEND_TBTC_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
-export declare const LlamaLendMarkets: (networkId: NetworkNumber) => {
-    readonly llamaLendwstETHcrvUSD: LlamaLendMarketData;
-    readonly llamaLendcrvUSDCRV: LlamaLendMarketData;
-    readonly llamaLendCRVcrvUSD: LlamaLendMarketData;
-    readonly llamaLendTBTCcrvUSD: LlamaLendMarketData;
-};
-export declare const LLAMALEND_ALL_VERSIONS: LlamaLendVersions[];
-export declare const getLlamaLendMarketData: (market: LlamaLendVersions, network?: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_CRVUSD_TBTC_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_WETH_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_CRVUSD_WETH_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_ARB_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_FXN_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LLAMALEND_WBTC_CRVUSD_MARKET: (networkId: NetworkNumber) => LlamaLendMarketData;
+export declare const LlamaLendMarkets: (networkId: NetworkNumber) => Record<LlamaLendVersionsType, LlamaLendMarketData>;
+export declare const getLlamaLendMarketData: (market: LlamaLendVersionsType, network?: NetworkNumber) => LlamaLendMarketData;
+export declare const getLlamaLendMarketFromControllerAddress: (controllerAddress: string, network: NetworkNumber) => LlamaLendMarketData;

package/esm/markets/llamaLend/index.js

@@ -1,59 +1,35 @@
-import { getConfigContractAddress } from '../../contracts';
 import { LlamaLendVersions } from '../../types';
-export const LLAMALEND_WSTETH_CRVUSD_MARKET = (networkId) => ({
-    chainIds: [1],
-    label: 'LlamaLend - wstETH/crvUSD',
-    shortLabel: 'wstETH/crvUSD',
-    value: LlamaLendVersions.LlamaLendwstETHcrvUSD,
-    collAsset: 'wstETH',
-    baseAsset: 'crvUSD',
-    controllerAddress: getConfigContractAddress('LlamaLendWstETHCrvUSDController', networkId),
-    vaultAddress: '0x8cf1DE26729cfB7137AF1A6B2a665e099EC319b5',
-    url: 'wstethcrvusd',
-});
-export const LLAMALEND_CRVUSD_CRV_MARKET = (networkId) => ({
-    chainIds: [1],
-    label: 'LlamaLend - crvUSD/CRV',
-    shortLabel: 'crvUSD/CRV',
-    value: LlamaLendVersions.LlamaLendcrvUSDCRV,
-    collAsset: 'crvUSD',
-    baseAsset: 'CRV',
-    controllerAddress: getConfigContractAddress('LlamaLendCrvUSDCRVController', networkId),
-    vaultAddress: '0x4D2f44B0369f3C20c3d670D2C26b048985598450',
-    url: 'crvusdcrv',
-});
-export const LLAMALEND_CRV_CRVUSD_MARKET = (networkId) => ({
-    chainIds: [1],
-    label: 'LlamaLend - CRV/crvUSD',
-    shortLabel: 'CRV/crvUSD',
-    value: LlamaLendVersions.LlamaLendCRVcrvUSD,
-    collAsset: 'CRV',
-    baseAsset: 'crvUSD',
-    controllerAddress: getConfigContractAddress('LlamaLendCRVCrvUSDController', networkId),
-    vaultAddress: '0xCeA18a8752bb7e7817F9AE7565328FE415C0f2cA',
-    url: 'crvcrvusd',
-});
-export const LLAMALEND_TBTC_CRVUSD_MARKET = (networkId) => ({
-    chainIds: [1],
-    label: 'LlamaLend - TBTC/crvUSD',
-    shortLabel: 'TBTC/crvUSD',
-    value: LlamaLendVersions.LlamaLendTBTCcrvUSD,
-    collAsset: 'tBTC',
-    baseAsset: 'crvUSD',
-    controllerAddress: getConfigContractAddress('LlamaLendTBTCCrvUSDController', networkId),
-    vaultAddress: '0xb2b23C87a4B6d1b03Ba603F7C3EB9A81fDC0AAC9',
-    url: 'tbtccrvusd',
-});
+import { NetworkNumber } from '../../types/common';
+import { getLLamaLendAddresses } from "./contractAddresses";
+export const LLAMALEND_WSTETH_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - wstETH/crvUSD', shortLabel: 'wstETH/crvUSD', value: LlamaLendVersions.LLWstethCrvusd, collAsset: 'wstETH', baseAsset: 'crvUSD', url: 'wstethcrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLWstethCrvusd)));
+export const LLAMALEND_SUSDE_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - sUSDe/crvUSD', shortLabel: 'sUSDe/crvUSD', value: LlamaLendVersions.LLSusdeCrvusd, collAsset: 'sUSDe', baseAsset: 'crvUSD', url: 'susdecrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLSusdeCrvusd)));
+export const LLAMALEND_CRV_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth, NetworkNumber.Arb], label: 'LlamaLend - CRV/crvUSD', shortLabel: 'CRV/crvUSD', value: LlamaLendVersions.LLCrvCrvusd, collAsset: 'CRV', baseAsset: 'crvUSD', url: 'crvcrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLCrvCrvusd)));
+export const LLAMALEND_CRVUSD_CRV_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - crvUSD/CRV', shortLabel: 'crvUSD/CRV', value: LlamaLendVersions.LLCrvusdCrv, collAsset: 'crvUSD', baseAsset: 'CRV', url: 'crvusdcrv' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLCrvusdCrv)));
+export const LLAMALEND_TBTC_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - TBTC/crvUSD', shortLabel: 'TBTC/crvUSD', value: LlamaLendVersions.LLTbtcCrvusd, collAsset: 'tBTC', baseAsset: 'crvUSD', url: 'tbtccrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLTbtcCrvusd)));
+export const LLAMALEND_CRVUSD_TBTC_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - crvUSD/TBTC', shortLabel: 'crvUSD/TBTC', value: LlamaLendVersions.LLCrvusdTbtc, collAsset: 'crvUSD', baseAsset: 'tBTC', url: 'crvusdtbtc' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLCrvusdTbtc)));
+export const LLAMALEND_WETH_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth, NetworkNumber.Arb], label: 'LlamaLend - ETH/crvUSD', shortLabel: 'ETH/crvUSD', value: LlamaLendVersions.LLWethCrvusd, collAsset: 'ETH', baseAsset: 'crvUSD', url: 'wethcrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLWethCrvusd)));
+export const LLAMALEND_CRVUSD_WETH_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Eth], label: 'LlamaLend - crvUSD/WETH', shortLabel: 'crvUSD/WETH', value: LlamaLendVersions.LLCrvusdWeth, collAsset: 'crvUSD', baseAsset: 'WETH', url: 'crvusdweth' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLCrvusdWeth)));
+export const LLAMALEND_ARB_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Arb], label: 'LlamaLend - ARB/crvUSD', shortLabel: 'ARB/crvUSD', value: LlamaLendVersions.LLArbCrvusd, collAsset: 'ARB', baseAsset: 'crvUSD', url: 'arbcrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLArbCrvusd)));
+export const LLAMALEND_FXN_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Arb], label: 'LlamaLend - FXN/crvUSD', shortLabel: 'FXN/crvUSD', value: LlamaLendVersions.LLFxnCrvusd, collAsset: 'FXN', baseAsset: 'crvUSD', url: 'fxncrvusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLFxnCrvusd)));
+export const LLAMALEND_WBTC_CRVUSD_MARKET = (networkId) => (Object.assign({ chainIds: [NetworkNumber.Arb], label: 'LlamaLend - WBTC/crvUSD', shortLabel: 'WBTC/crvUSD', value: LlamaLendVersions.LLWbtcCrvusd, collAsset: 'WBTC', baseAsset: 'crvUSD', url: 'wbtcusd' }, getLLamaLendAddresses(networkId, LlamaLendVersions.LLWbtcCrvusd)));
 export const LlamaLendMarkets = (networkId) => ({
-    [LlamaLendVersions.LlamaLendwstETHcrvUSD]: LLAMALEND_WSTETH_CRVUSD_MARKET(networkId),
-    [LlamaLendVersions.LlamaLendcrvUSDCRV]: LLAMALEND_CRVUSD_CRV_MARKET(networkId),
-    [LlamaLendVersions.LlamaLendCRVcrvUSD]: LLAMALEND_CRV_CRVUSD_MARKET(networkId),
-    [LlamaLendVersions.LlamaLendTBTCcrvUSD]: LLAMALEND_TBTC_CRVUSD_MARKET(networkId),
+    [LlamaLendVersions.LLWstethCrvusd]: LLAMALEND_WSTETH_CRVUSD_MARKET(networkId),
+    [LlamaLendVersions.LLCrvusdCrv]: LLAMALEND_CRVUSD_CRV_MARKET(networkId),
+    [LlamaLendVersions.LLCrvCrvusd]: LLAMALEND_CRV_CRVUSD_MARKET(networkId),
+    [LlamaLendVersions.LLTbtcCrvusd]: LLAMALEND_TBTC_CRVUSD_MARKET(networkId),
+    [LlamaLendVersions.LLCrvusdTbtc]: LLAMALEND_CRVUSD_TBTC_MARKET(networkId),
+    [LlamaLendVersions.LLWethCrvusd]: LLAMALEND_WETH_CRVUSD_MARKET(networkId),
+    [LlamaLendVersions.LLCrvusdWeth]: LLAMALEND_CRVUSD_WETH_MARKET(networkId),
+    [LlamaLendVersions.LLArbCrvusd]: LLAMALEND_ARB_CRVUSD_MARKET(networkId),
+    [LlamaLendVersions.LLFxnCrvusd]: LLAMALEND_FXN_CRVUSD_MARKET(networkId),
+    [LlamaLendVersions.LLWbtcCrvusd]: LLAMALEND_WBTC_CRVUSD_MARKET(networkId),
+    [LlamaLendVersions.LLSusdeCrvusd]: LLAMALEND_SUSDE_CRVUSD_MARKET(networkId),
 });
-export const LLAMALEND_ALL_VERSIONS = [
-    LlamaLendVersions.LlamaLendwstETHcrvUSD,
-    LlamaLendVersions.LlamaLendcrvUSDCRV,
-    LlamaLendVersions.LlamaLendCRVcrvUSD,
-    LlamaLendVersions.LlamaLendTBTCcrvUSD,
-];
 export const getLlamaLendMarketData = (market, network = 1) => LlamaLendMarkets(network)[market];
+export const getLlamaLendMarketFromControllerAddress = (controllerAddress, network) => {
+    const markets = LlamaLendMarkets(network);
+    const market = Object.values(markets).find((market) => market.controllerAddress === controllerAddress);
+    if (!market)
+        throw new Error('Market not found');
+    return market;
+};

package/esm/types/contracts/generated/{LlamaLendCrvUSDCRVController.d.ts → LlamaLendControllerAbi.d.ts}

@@ -73,9 +73,9 @@ export type CollectFees = ContractEventLog<{
     0: string;
     1: string;
 }>;
-export interface LlamaLendCrvUSDCRVController extends BaseContract {
-    constructor(jsonInterface: any[], address?: string, options?: ContractOptions): LlamaLendCrvUSDCRVController;
-    clone(): LlamaLendCrvUSDCRVController;
+export interface LlamaLendControllerAbi extends BaseContract {
+    constructor(jsonInterface: any[], address?: string, options?: ContractOptions): LlamaLendControllerAbi;
+    clone(): LlamaLendControllerAbi;
     methods: {
         factory(): NonPayableTransactionObject<string>;
         amm(): NonPayableTransactionObject<string>;

package/esm/types/contracts/generated/LlamaLendView.d.ts

@@ -75,6 +75,7 @@ export declare namespace LlamaLendView {
         number | string | BN,
         number | string | BN,
         number | string | BN,
+        number | string | BN,
         number | string | BN
     ] | {
         collateralToken: string;
@@ -96,6 +97,7 @@ export declare namespace LlamaLendView {
         lendApr: number | string | BN;
         debtTokenTotalSupply: number | string | BN;
         debtTokenLeftToBorrow: number | string | BN;
+        loanDiscount: number | string | BN;
     };
     type GlobalDataStructOutputArray = [
         string,
@@ -116,6 +118,7 @@ export declare namespace LlamaLendView {
         string,
         string,
         string,
+        string,
         string
     ];
     type GlobalDataStructOutputStruct = {
@@ -138,6 +141,7 @@ export declare namespace LlamaLendView {
         lendApr: string;
         debtTokenTotalSupply: string;
         debtTokenLeftToBorrow: string;
+        loanDiscount: string;
     };
     type GlobalDataStructOutput = GlobalDataStructOutputArray & GlobalDataStructOutputStruct;
     type UserDataStruct = [
@@ -249,6 +253,7 @@ export interface LlamaLendView extends BaseContract {
         }>;
         globalData(market: string): NonPayableTransactionObject<LlamaLendView.GlobalDataStructOutput>;
         healthCalculator(market: string, user: string, collChange: number | string | BN, debtChange: number | string | BN, isFull: boolean, numBands: number | string | BN): NonPayableTransactionObject<string>;
+        isControllerValid(_controllerAddr: string, _controllerId: number | string | BN): NonPayableTransactionObject<boolean>;
         maxBorrow(market: string, collateral: number | string | BN, N: number | string | BN): NonPayableTransactionObject<string>;
         minCollateral(market: string, debt: number | string | BN, N: number | string | BN): NonPayableTransactionObject<string>;
         userData(market: string, user: string): NonPayableTransactionObject<LlamaLendView.UserDataStructOutput>;

package/esm/types/contracts/generated/index.d.ts

@@ -30,11 +30,8 @@ export type { LendingPoolAddressesProvider } from "./LendingPoolAddressesProvide
 export type { Lido } from "./Lido";
 export type { LiquityActivePool } from "./LiquityActivePool";
 export type { LiquityView } from "./LiquityView";
-export type { LlamaLendCRVCrvUSDController } from "./LlamaLendCRVCrvUSDController";
-export type { LlamaLendCrvUSDCRVController } from "./LlamaLendCrvUSDCRVController";
-export type { LlamaLendTBTCCrvUSDController } from "./LlamaLendTBTCCrvUSDController";
+export type { LlamaLendControllerAbi } from "./LlamaLendControllerAbi";
 export type { LlamaLendView } from "./LlamaLendView";
-export type { LlamaLendWstETHCrvUSDController } from "./LlamaLendWstETHCrvUSDController";
 export type { McdDog } from "./McdDog";
 export type { McdJug } from "./McdJug";
 export type { McdSpotter } from "./McdSpotter";

package/esm/types/llamaLend.d.ts

@@ -1,11 +1,36 @@
 import { EthAddress, NetworkNumber } from './common';
 import { BandData, UserBandData } from './curveUsd';
-export declare enum LlamaLendVersions {
-    'LlamaLendwstETHcrvUSD' = "llamaLendwstETHcrvUSD",
-    'LlamaLendCRVcrvUSD' = "llamaLendCRVcrvUSD",
-    'LlamaLendcrvUSDCRV' = "llamaLendcrvUSDCRV",
-    'LlamaLendTBTCcrvUSD' = "llamaLendTBTCcrvUSD"
+export declare enum LLVersionsEth {
+    LLWstethCrvusd = "llamaLendwstETHcrvUSD",
+    LLSusdeCrvusd = "llamaLendsUSDecrvUSD",
+    LLCrvCrvusd = "llamaLendCRVcrvUSD",
+    LLCrvusdCrv = "llamaLendcrvUSDCRV",
+    LLTbtcCrvusd = "llamaLendTBTCcrvUSD",
+    LLCrvusdTbtc = "llamaLendcrvUSDTBTC",
+    LLWethCrvusd = "llamaLendWETHcrvUSD",
+    LLCrvusdWeth = "llamaLendcrvUSDWETH"
 }
+export declare enum LLVersionsArb {
+    LLArbCrvusd = "llamaLendArbcrvUSD",
+    LLFxnCrvusd = "llamaLendFXNcrvUSD",
+    LLWbtcCrvusd = "llamaLendWBTCcrvUSD",
+    LLCrvCrvusd = "llamaLendCRVcrvUSD",
+    LLWethCrvusd = "llamaLendWETHcrvUSD"
+}
+export declare const LlamaLendVersions: {
+    readonly LLArbCrvusd: LLVersionsArb.LLArbCrvusd;
+    readonly LLFxnCrvusd: LLVersionsArb.LLFxnCrvusd;
+    readonly LLWbtcCrvusd: LLVersionsArb.LLWbtcCrvusd;
+    readonly LLCrvCrvusd: LLVersionsArb.LLCrvCrvusd;
+    readonly LLWethCrvusd: LLVersionsArb.LLWethCrvusd;
+    readonly LLWstethCrvusd: LLVersionsEth.LLWstethCrvusd;
+    readonly LLSusdeCrvusd: LLVersionsEth.LLSusdeCrvusd;
+    readonly LLCrvusdCrv: LLVersionsEth.LLCrvusdCrv;
+    readonly LLTbtcCrvusd: LLVersionsEth.LLTbtcCrvusd;
+    readonly LLCrvusdTbtc: LLVersionsEth.LLCrvusdTbtc;
+    readonly LLCrvusdWeth: LLVersionsEth.LLCrvusdWeth;
+};
+export type LlamaLendVersionsType = typeof LlamaLendVersions[keyof typeof LlamaLendVersions];
 export declare enum LlamaLendStatus {
     Nonexistant = "Nonexistant",
     Safe = "Safe",
@@ -17,7 +42,7 @@ export interface LlamaLendMarketData {
     chainIds: NetworkNumber[];
     label: string;
     shortLabel: string;
-    value: LlamaLendVersions;
+    value: LlamaLendVersionsType;
     collAsset: string;
     baseAsset: string;
     controllerAddress: string;
@@ -40,10 +65,12 @@ export type LlamaLendAssetsData = {
     [key: string]: LlamaLendAssetData;
 };
 export interface LlamaLendGlobalMarketData {
-    collateral: string;
-    decimals: string;
+    A: string;
+    loanDiscount: string;
     activeBand: string;
     totalDebt: string;
+    totalDebtSupplied: string;
+    utilization: string;
     ammPrice: string;
     basePrice: string;
     oraclePrice: string;
@@ -53,7 +80,6 @@ export interface LlamaLendGlobalMarketData {
     ammRate: string;
     minBand: string;
     maxBand: string;
-    debtCeiling: string;
     borrowRate: string;
     lendRate: string;
     futureBorrowRate: string;

package/esm/types/llamaLend.js

@@ -1,10 +1,28 @@
-export var LlamaLendVersions;
-(function (LlamaLendVersions) {
-    LlamaLendVersions["LlamaLendwstETHcrvUSD"] = "llamaLendwstETHcrvUSD";
-    LlamaLendVersions["LlamaLendCRVcrvUSD"] = "llamaLendCRVcrvUSD";
-    LlamaLendVersions["LlamaLendcrvUSDCRV"] = "llamaLendcrvUSDCRV";
-    LlamaLendVersions["LlamaLendTBTCcrvUSD"] = "llamaLendTBTCcrvUSD";
-})(LlamaLendVersions || (LlamaLendVersions = {}));
+export var LLVersionsEth;
+(function (LLVersionsEth) {
+    //long only
+    LLVersionsEth["LLWstethCrvusd"] = "llamaLendwstETHcrvUSD";
+    LLVersionsEth["LLSusdeCrvusd"] = "llamaLendsUSDecrvUSD";
+    // long and short crv
+    LLVersionsEth["LLCrvCrvusd"] = "llamaLendCRVcrvUSD";
+    LLVersionsEth["LLCrvusdCrv"] = "llamaLendcrvUSDCRV";
+    // long and short tbtc
+    LLVersionsEth["LLTbtcCrvusd"] = "llamaLendTBTCcrvUSD";
+    LLVersionsEth["LLCrvusdTbtc"] = "llamaLendcrvUSDTBTC";
+    // long and short weth
+    LLVersionsEth["LLWethCrvusd"] = "llamaLendWETHcrvUSD";
+    LLVersionsEth["LLCrvusdWeth"] = "llamaLendcrvUSDWETH";
+})(LLVersionsEth || (LLVersionsEth = {}));
+export var LLVersionsArb;
+(function (LLVersionsArb) {
+    //long only
+    LLVersionsArb["LLArbCrvusd"] = "llamaLendArbcrvUSD";
+    LLVersionsArb["LLFxnCrvusd"] = "llamaLendFXNcrvUSD";
+    LLVersionsArb["LLWbtcCrvusd"] = "llamaLendWBTCcrvUSD";
+    LLVersionsArb["LLCrvCrvusd"] = "llamaLendCRVcrvUSD";
+    LLVersionsArb["LLWethCrvusd"] = "llamaLendWETHcrvUSD";
+})(LLVersionsArb || (LLVersionsArb = {}));
+export const LlamaLendVersions = Object.assign(Object.assign({}, LLVersionsEth), LLVersionsArb);
 export var LlamaLendStatus;
 (function (LlamaLendStatus) {
     LlamaLendStatus["Nonexistant"] = "Nonexistant";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.60",
+  "version": "0.0.61-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -19,7 +19,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.5.9",
+    "@defisaver/tokens": "^1.5.11",
     "@ethersproject/bignumber": "^5.7.0",
     "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
     "decimal.js": "^10.4.3"