@defisaver/positions-sdk 0.0.62 → 0.0.63-dev1

package/cjs/markets/compound/marketsAssets.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.v3USDbCCollAssets = exports.v3USDbCCollAssetsBase = exports.v3ETHCollAssets = exports.v3ETHCollAssetsBase = exports.v3ETHCollAssetsEth = exports.v3USDCeCollAssets = exports.v3USDCeCollAssetsArb = exports.v3USDCCollAssets = exports.v3USDCCollAssetsBase = exports.v3USDCCollAssetsArb = exports.v3USDCCollAssetsEth = exports.compoundV2CollateralAssets = void 0;
+exports.v3USDbCCollAssets = exports.v3USDbCCollAssetsBase = exports.v3ETHCollAssets = exports.v3ETHCollAssetsBase = exports.v3ETHCollAssetsEth = exports.v3USDCeCollAssets = exports.v3USDCeCollAssetsArb = exports.v3USDCCollAssets = exports.v3USDCCollAssetsOpt = exports.v3USDCCollAssetsBase = exports.v3USDCCollAssetsArb = exports.v3USDCCollAssetsEth = exports.compoundV2CollateralAssets = void 0;
 const tokens_1 = require("@defisaver/tokens");
 const common_1 = require("../../types/common");
 exports.compoundV2CollateralAssets = [
@@ -10,10 +10,11 @@ exports.compoundV2CollateralAssets = [
 exports.v3USDCCollAssetsEth = ['ETH', 'COMP', 'WBTC', 'UNI', 'LINK'];
 exports.v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC'];
 exports.v3USDCCollAssetsBase = ['ETH', 'cbETH'];
+exports.v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 exports.v3USDCCollAssets = {
     [common_1.NetworkNumber.Eth]: exports.v3USDCCollAssetsEth,
-    [common_1.NetworkNumber.Opt]: [],
+    [common_1.NetworkNumber.Opt]: exports.v3USDCCollAssetsOpt,
     [common_1.NetworkNumber.Arb]: exports.v3USDCCollAssetsArb,
     [common_1.NetworkNumber.Base]: exports.v3USDCCollAssetsBase,
 };

package/cjs/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/cjs/markets/llamaLend/contractAddresses.js

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

package/cjs/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/cjs/markets/llamaLend/index.js

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

package/cjs/types/contracts/generated/{LlamaLendCRVCrvUSDController.d.ts → LlamaLendControllerAbi.d.ts}

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

package/cjs/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/cjs/types/contracts/generated/index.d.ts

@@ -29,11 +29,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/cjs/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/cjs/types/llamaLend.js

@@ -1,13 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LlamaLendStatus = exports.LlamaLendVersions = void 0;
-var LlamaLendVersions;
-(function (LlamaLendVersions) {
-    LlamaLendVersions["LlamaLendwstETHcrvUSD"] = "llamaLendwstETHcrvUSD";
-    LlamaLendVersions["LlamaLendCRVcrvUSD"] = "llamaLendCRVcrvUSD";
-    LlamaLendVersions["LlamaLendcrvUSDCRV"] = "llamaLendcrvUSDCRV";
-    LlamaLendVersions["LlamaLendTBTCcrvUSD"] = "llamaLendTBTCcrvUSD";
-})(LlamaLendVersions || (exports.LlamaLendVersions = LlamaLendVersions = {}));
+exports.LlamaLendStatus = exports.LlamaLendVersions = exports.LLVersionsArb = exports.LLVersionsEth = void 0;
+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 || (exports.LLVersionsEth = LLVersionsEth = {}));
+var LLVersionsArb;
+(function (LLVersionsArb) {
+    //long only
+    LLVersionsArb["LLArbCrvusd"] = "llamaLendArbcrvUSD";
+    LLVersionsArb["LLFxnCrvusd"] = "llamaLendFXNcrvUSD";
+    LLVersionsArb["LLWbtcCrvusd"] = "llamaLendWBTCcrvUSD";
+    LLVersionsArb["LLCrvCrvusd"] = "llamaLendCRVcrvUSD";
+    LLVersionsArb["LLWethCrvusd"] = "llamaLendWETHcrvUSD";
+})(LLVersionsArb || (exports.LLVersionsArb = LLVersionsArb = {}));
+exports.LlamaLendVersions = Object.assign(Object.assign({}, LLVersionsEth), LLVersionsArb);
 var LlamaLendStatus;
 (function (LlamaLendStatus) {
     LlamaLendStatus["Nonexistant"] = "Nonexistant";