@defisaver/positions-sdk 0.0.59 → 0.0.60

package/src/markets/compound/index.ts

@@ -1,142 +1,142 @@
-import { getConfigContractAddress } from '../../contracts';
-import { CompoundBulkerOptions, CompoundMarketData, CompoundVersions } from '../../types';
-import { NetworkNumber } from '../../types/common';
-import {
-  compoundV2CollateralAssets,
-  v3ETHCollAssets,
-  v3USDbCCollAssets,
-  v3USDCCollAssets,
-  v3USDCeCollAssets,
-} from './marketsAssets';
-
-const EMPTY_BULKER_OPTIONS: CompoundBulkerOptions = { supply: '', withdraw: '' };
-
-const STANDARD_BULKER_OPTIONS: CompoundBulkerOptions = {
-  supply: '0x414354494f4e5f535550504c595f4e41544956455f544f4b454e000000000000',
-  withdraw: '0x414354494f4e5f57495448445241575f4e41544956455f544f4b454e00000000',
-};
-
-const BULKER_OPTIONS: Record<NetworkNumber, Record<CompoundVersions, CompoundBulkerOptions>> = {
-  [NetworkNumber.Eth]: {
-    [CompoundVersions.CompoundV3USDC]: { supply: 2, withdraw: 5 },
-    [CompoundVersions.CompoundV3ETH]: STANDARD_BULKER_OPTIONS,
-
-    // Non-existing markets, keeping it because of typescript
-    [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
-  },
-  [NetworkNumber.Arb]: {
-    [CompoundVersions.CompoundV3USDC]: STANDARD_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3USDCe]: STANDARD_BULKER_OPTIONS,
-
-    // Non-existing markets, keeping it because of typescript
-    [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3ETH]: EMPTY_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
-  },
-  [NetworkNumber.Base]: {
-    [CompoundVersions.CompoundV3ETH]: STANDARD_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3USDbC]: STANDARD_BULKER_OPTIONS,
-
-    // Non-existing markets, keeping it because of typescript
-    [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3USDC]: EMPTY_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
-  },
-  [NetworkNumber.Opt]: { // Non-existing markets, keeping it because of typescript
-    [CompoundVersions.CompoundV3ETH]: EMPTY_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3USDC]: EMPTY_BULKER_OPTIONS,
-    [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
-  },
-};
-
-export const COMPOUND_V2: CompoundMarketData = {
-  chainIds: [NetworkNumber.Eth],
-  label: 'Compound V2',
-  shortLabel: 'v2',
-  value: CompoundVersions.CompoundV2,
-  baseAsset: '',
-  collAssets: compoundV2CollateralAssets.map(a => a.underlyingAsset),
-  baseMarket: '',
-  baseMarketAddress: '',
-  secondLabel: '',
-  bulkerName: '',
-  bulkerAddress: '',
-  bulkerOptions: BULKER_OPTIONS[NetworkNumber.Eth][CompoundVersions.CompoundV2],
-  // icon: SvgAdapter(protocolIcons.compound),
-};
-
-export const COMPOUND_V3_USDC = (networkId: NetworkNumber): CompoundMarketData => ({
-  chainIds: [NetworkNumber.Eth, NetworkNumber.Arb],
-  label: 'Compound V3 - USDC',
-  shortLabel: 'v3',
-  value: CompoundVersions.CompoundV3USDC,
-  baseAsset: 'USDC',
-  collAssets: networkId ? v3USDCCollAssets[networkId] : [],
-  baseMarket: 'cUSDCv3',
-  baseMarketAddress: getConfigContractAddress('cUSDCv3', networkId),
-  secondLabel: 'Market',
-  bulkerName: networkId === NetworkNumber.Arb ? 'CompV3USDCBulkerArb' : 'CompV3USDCBulker',
-  bulkerAddress: getConfigContractAddress(networkId === NetworkNumber.Arb ? 'CompV3USDCBulkerArb' : 'CompV3USDCBulker', networkId),
-  bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3USDC],
-  // icon: SvgAdapter(protocolIcons.compoundv3),
-});
-
-export const COMPOUND_V3_USDCe = (networkId: NetworkNumber): CompoundMarketData => ({
-  chainIds: [NetworkNumber.Arb],
-  label: 'Compound V3 - USDC.e',
-  shortLabel: 'v3',
-  value: CompoundVersions.CompoundV3USDCe,
-  baseAsset: 'USDC.e',
-  collAssets: networkId ? v3USDCeCollAssets[networkId] : [],
-  baseMarket: 'cUSDCev3',
-  baseMarketAddress: getConfigContractAddress('cUSDCev3', networkId),
-  secondLabel: 'Market',
-  bulkerName: 'CompV3USDCBulkerArb',
-  bulkerAddress: getConfigContractAddress('CompV3USDCBulkerArb', networkId),
-  bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3USDCe],
-  // icon: SvgAdapter(protocolIcons.compoundv3),
-});
-
-export const COMPOUND_V3_ETH = (networkId: NetworkNumber): CompoundMarketData => ({
-  chainIds: [NetworkNumber.Eth, NetworkNumber.Base],
-  label: 'Compound V3 - ETH',
-  shortLabel: 'v3',
-  value: CompoundVersions.CompoundV3ETH,
-  baseAsset: 'ETH',
-  collAssets: networkId ? v3ETHCollAssets[networkId] : [],
-  baseMarket: 'cETHv3',
-  baseMarketAddress: getConfigContractAddress('cETHv3', networkId),
-  secondLabel: 'Market',
-  bulkerName: 'CompV3ETHBulker',
-  bulkerAddress: getConfigContractAddress('CompV3ETHBulker', networkId),
-  bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3ETH],
-  // icon: SvgAdapter(protocolIcons.compoundv3),
-});
-
-export const COMPOUND_V3_USDBC = (networkId: NetworkNumber): CompoundMarketData => ({
-  chainIds: [NetworkNumber.Base],
-  label: 'Compound V3 - USDbC',
-  shortLabel: 'v3',
-  value: CompoundVersions.CompoundV3USDbC,
-  baseAsset: 'USDbC',
-  collAssets: networkId ? v3USDbCCollAssets[networkId] : [],
-  baseMarket: 'cUSDbCv3',
-  baseMarketAddress: getConfigContractAddress('cUSDbCv3', networkId),
-  secondLabel: 'Market',
-  bulkerName: 'CompV3USDbCBulker',
-  bulkerAddress: getConfigContractAddress('CompV3USDbCBulker', networkId),
-  bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3USDbC],
-  // icon: SvgAdapter(protocolIcons.compoundv3),
-});
-
-export const CompoundMarkets = (networkId: NetworkNumber) => ({
-  [CompoundVersions.CompoundV2]: COMPOUND_V2,
-  [CompoundVersions.CompoundV3ETH]: COMPOUND_V3_ETH(networkId),
-  [CompoundVersions.CompoundV3USDC]: COMPOUND_V3_USDC(networkId),
-  [CompoundVersions.CompoundV3USDbC]: COMPOUND_V3_USDBC(networkId),
-  [CompoundVersions.CompoundV3USDCe]: COMPOUND_V3_USDCe(networkId),
+import { getConfigContractAddress } from '../../contracts';
+import { CompoundBulkerOptions, CompoundMarketData, CompoundVersions } from '../../types';
+import { NetworkNumber } from '../../types/common';
+import {
+  compoundV2CollateralAssets,
+  v3ETHCollAssets,
+  v3USDbCCollAssets,
+  v3USDCCollAssets,
+  v3USDCeCollAssets,
+} from './marketsAssets';
+
+const EMPTY_BULKER_OPTIONS: CompoundBulkerOptions = { supply: '', withdraw: '' };
+
+const STANDARD_BULKER_OPTIONS: CompoundBulkerOptions = {
+  supply: '0x414354494f4e5f535550504c595f4e41544956455f544f4b454e000000000000',
+  withdraw: '0x414354494f4e5f57495448445241575f4e41544956455f544f4b454e00000000',
+};
+
+const BULKER_OPTIONS: Record<NetworkNumber, Record<CompoundVersions, CompoundBulkerOptions>> = {
+  [NetworkNumber.Eth]: {
+    [CompoundVersions.CompoundV3USDC]: { supply: 2, withdraw: 5 },
+    [CompoundVersions.CompoundV3ETH]: STANDARD_BULKER_OPTIONS,
+
+    // Non-existing markets, keeping it because of typescript
+    [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
+    [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
+    [CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
+  },
+  [NetworkNumber.Arb]: {
+    [CompoundVersions.CompoundV3USDC]: STANDARD_BULKER_OPTIONS,
+    [CompoundVersions.CompoundV3USDCe]: STANDARD_BULKER_OPTIONS,
+
+    // Non-existing markets, keeping it because of typescript
+    [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
+    [CompoundVersions.CompoundV3ETH]: EMPTY_BULKER_OPTIONS,
+    [CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
+  },
+  [NetworkNumber.Base]: {
+    [CompoundVersions.CompoundV3ETH]: STANDARD_BULKER_OPTIONS,
+    [CompoundVersions.CompoundV3USDbC]: STANDARD_BULKER_OPTIONS,
+
+    // Non-existing markets, keeping it because of typescript
+    [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
+    [CompoundVersions.CompoundV3USDC]: EMPTY_BULKER_OPTIONS,
+    [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
+  },
+  [NetworkNumber.Opt]: { // Non-existing markets, keeping it because of typescript
+    [CompoundVersions.CompoundV3ETH]: EMPTY_BULKER_OPTIONS,
+    [CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
+    [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
+    [CompoundVersions.CompoundV3USDC]: EMPTY_BULKER_OPTIONS,
+    [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
+  },
+};
+
+export const COMPOUND_V2: CompoundMarketData = {
+  chainIds: [NetworkNumber.Eth],
+  label: 'Compound V2',
+  shortLabel: 'v2',
+  value: CompoundVersions.CompoundV2,
+  baseAsset: '',
+  collAssets: compoundV2CollateralAssets.map(a => a.underlyingAsset),
+  baseMarket: '',
+  baseMarketAddress: '',
+  secondLabel: '',
+  bulkerName: '',
+  bulkerAddress: '',
+  bulkerOptions: BULKER_OPTIONS[NetworkNumber.Eth][CompoundVersions.CompoundV2],
+  // icon: SvgAdapter(protocolIcons.compound),
+};
+
+export const COMPOUND_V3_USDC = (networkId: NetworkNumber): CompoundMarketData => ({
+  chainIds: [NetworkNumber.Eth, NetworkNumber.Arb],
+  label: 'Compound V3 - USDC',
+  shortLabel: 'v3',
+  value: CompoundVersions.CompoundV3USDC,
+  baseAsset: 'USDC',
+  collAssets: networkId ? v3USDCCollAssets[networkId] : [],
+  baseMarket: 'cUSDCv3',
+  baseMarketAddress: getConfigContractAddress('cUSDCv3', networkId),
+  secondLabel: 'Market',
+  bulkerName: networkId === NetworkNumber.Arb ? 'CompV3USDCBulkerArb' : 'CompV3USDCBulker',
+  bulkerAddress: getConfigContractAddress(networkId === NetworkNumber.Arb ? 'CompV3USDCBulkerArb' : 'CompV3USDCBulker', networkId),
+  bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3USDC],
+  // icon: SvgAdapter(protocolIcons.compoundv3),
+});
+
+export const COMPOUND_V3_USDCe = (networkId: NetworkNumber): CompoundMarketData => ({
+  chainIds: [NetworkNumber.Arb],
+  label: 'Compound V3 - USDC.e',
+  shortLabel: 'v3',
+  value: CompoundVersions.CompoundV3USDCe,
+  baseAsset: 'USDC.e',
+  collAssets: networkId ? v3USDCeCollAssets[networkId] : [],
+  baseMarket: 'cUSDCev3',
+  baseMarketAddress: getConfigContractAddress('cUSDCev3', networkId),
+  secondLabel: 'Market',
+  bulkerName: 'CompV3USDCBulkerArb',
+  bulkerAddress: getConfigContractAddress('CompV3USDCBulkerArb', networkId),
+  bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3USDCe],
+  // icon: SvgAdapter(protocolIcons.compoundv3),
+});
+
+export const COMPOUND_V3_ETH = (networkId: NetworkNumber): CompoundMarketData => ({
+  chainIds: [NetworkNumber.Eth, NetworkNumber.Base],
+  label: 'Compound V3 - ETH',
+  shortLabel: 'v3',
+  value: CompoundVersions.CompoundV3ETH,
+  baseAsset: 'ETH',
+  collAssets: networkId ? v3ETHCollAssets[networkId] : [],
+  baseMarket: 'cETHv3',
+  baseMarketAddress: getConfigContractAddress('cETHv3', networkId),
+  secondLabel: 'Market',
+  bulkerName: 'CompV3ETHBulker',
+  bulkerAddress: getConfigContractAddress('CompV3ETHBulker', networkId),
+  bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3ETH],
+  // icon: SvgAdapter(protocolIcons.compoundv3),
+});
+
+export const COMPOUND_V3_USDBC = (networkId: NetworkNumber): CompoundMarketData => ({
+  chainIds: [NetworkNumber.Base],
+  label: 'Compound V3 - USDbC',
+  shortLabel: 'v3',
+  value: CompoundVersions.CompoundV3USDbC,
+  baseAsset: 'USDbC',
+  collAssets: networkId ? v3USDbCCollAssets[networkId] : [],
+  baseMarket: 'cUSDbCv3',
+  baseMarketAddress: getConfigContractAddress('cUSDbCv3', networkId),
+  secondLabel: 'Market',
+  bulkerName: 'CompV3USDbCBulker',
+  bulkerAddress: getConfigContractAddress('CompV3USDbCBulker', networkId),
+  bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3USDbC],
+  // icon: SvgAdapter(protocolIcons.compoundv3),
+});
+
+export const CompoundMarkets = (networkId: NetworkNumber) => ({
+  [CompoundVersions.CompoundV2]: COMPOUND_V2,
+  [CompoundVersions.CompoundV3ETH]: COMPOUND_V3_ETH(networkId),
+  [CompoundVersions.CompoundV3USDC]: COMPOUND_V3_USDC(networkId),
+  [CompoundVersions.CompoundV3USDbC]: COMPOUND_V3_USDBC(networkId),
+  [CompoundVersions.CompoundV3USDCe]: COMPOUND_V3_USDCe(networkId),
 }) as const;

package/src/markets/compound/marketsAssets.ts

@@ -1,49 +1,49 @@
-import { getAssetInfo } from '@defisaver/tokens';
-import { NetworkNumber } from '../../types/common';
-
-export const compoundV2CollateralAssets = [
-  'cETH', 'cDAI', 'cBAT', 'cZRX', 'cUSDC', 'cWBTC Legacy', 'cWBTC', 'cUSDT',
-  'cTUSD', 'cLINK', 'cUSDP', 'cUNI', 'cCOMP', 'cMKR', 'cSUSHI', 'cAAVE', 'cYFI',
-].map((symbol) => getAssetInfo(symbol));
-
-export const v3USDCCollAssetsEth = ['ETH', 'COMP', 'WBTC', 'UNI', 'LINK'];
-export const v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC'];
-
-// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
-export const v3USDCCollAssets = {
-  [NetworkNumber.Eth]: v3USDCCollAssetsEth,
-  [NetworkNumber.Opt]: [],
-  [NetworkNumber.Arb]: v3USDCCollAssetsArb,
-  [NetworkNumber.Base]: [],
-} as const;
-
-export const v3USDCeCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC'];
-
-// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
-export const v3USDCeCollAssets = {
-  [NetworkNumber.Eth]: [],
-  [NetworkNumber.Opt]: [],
-  [NetworkNumber.Arb]: v3USDCeCollAssetsArb,
-  [NetworkNumber.Base]: [],
-} as const;
-
-export const v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH'];
-export const v3ETHCollAssetsBase = ['cbETH'];
-
-// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
-export const v3ETHCollAssets = {
-  [NetworkNumber.Eth]: v3ETHCollAssetsEth,
-  [NetworkNumber.Opt]: [],
-  [NetworkNumber.Arb]: [],
-  [NetworkNumber.Base]: v3ETHCollAssetsBase,
-} as const;
-
-export const v3USDbCCollAssetsBase = ['ETH', 'cbETH'];
-
-// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
-export const v3USDbCCollAssets = {
-  [NetworkNumber.Eth]: [],
-  [NetworkNumber.Opt]: [],
-  [NetworkNumber.Arb]: [],
-  [NetworkNumber.Base]: v3USDbCCollAssetsBase,
+import { getAssetInfo } from '@defisaver/tokens';
+import { NetworkNumber } from '../../types/common';
+
+export const compoundV2CollateralAssets = [
+  'cETH', 'cDAI', 'cBAT', 'cZRX', 'cUSDC', 'cWBTC Legacy', 'cWBTC', 'cUSDT',
+  'cTUSD', 'cLINK', 'cUSDP', 'cUNI', 'cCOMP', 'cMKR', 'cSUSHI', 'cAAVE', 'cYFI',
+].map((symbol) => getAssetInfo(symbol));
+
+export const v3USDCCollAssetsEth = ['ETH', 'COMP', 'WBTC', 'UNI', 'LINK'];
+export const v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC'];
+
+// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
+export const v3USDCCollAssets = {
+  [NetworkNumber.Eth]: v3USDCCollAssetsEth,
+  [NetworkNumber.Opt]: [],
+  [NetworkNumber.Arb]: v3USDCCollAssetsArb,
+  [NetworkNumber.Base]: [],
+} as const;
+
+export const v3USDCeCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC'];
+
+// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
+export const v3USDCeCollAssets = {
+  [NetworkNumber.Eth]: [],
+  [NetworkNumber.Opt]: [],
+  [NetworkNumber.Arb]: v3USDCeCollAssetsArb,
+  [NetworkNumber.Base]: [],
+} as const;
+
+export const v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH'];
+export const v3ETHCollAssetsBase = ['cbETH'];
+
+// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
+export const v3ETHCollAssets = {
+  [NetworkNumber.Eth]: v3ETHCollAssetsEth,
+  [NetworkNumber.Opt]: [],
+  [NetworkNumber.Arb]: [],
+  [NetworkNumber.Base]: v3ETHCollAssetsBase,
+} as const;
+
+export const v3USDbCCollAssetsBase = ['ETH', 'cbETH'];
+
+// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
+export const v3USDbCCollAssets = {
+  [NetworkNumber.Eth]: [],
+  [NetworkNumber.Opt]: [],
+  [NetworkNumber.Arb]: [],
+  [NetworkNumber.Base]: v3USDbCCollAssetsBase,
 };

package/src/markets/curveUsd/index.ts

@@ -1,70 +1,70 @@
-import { getConfigContractAddress } from '../../contracts';
-import { CrvUSDMarketData, CrvUSDVersions } from '../../types';
-import { NetworkNumber } from '../../types/common';
-
-export const CRVUSD_WSTETH_MARKET = (networkId: NetworkNumber): CrvUSDMarketData => ({
-  chainIds: [1],
-  label: 'CurveUSD - wstETH',
-  shortLabel: 'wstETH',
-  value: CrvUSDVersions.crvUSDwstETH,
-  collAsset: 'wstETH',
-  baseAsset: 'crvUSD',
-  controllerAddress: getConfigContractAddress('crvUSDwstETHController', networkId),
-  ammAddress: getConfigContractAddress('crvUSDwstETHAmm', networkId),
-  createCollAssets: ['wstETH', 'ETH'],
-});
-export const CRVUSD_ETH_MARKET = (networkId: NetworkNumber): CrvUSDMarketData => ({
-  chainIds: [1],
-  label: 'CurveUSD - ETH',
-  shortLabel: 'ETH',
-  value: CrvUSDVersions.crvUSDETH,
-  collAsset: 'ETH',
-  baseAsset: 'crvUSD',
-  controllerAddress: getConfigContractAddress('crvUSDETHController', networkId),
-  ammAddress: getConfigContractAddress('crvUSDETHAmm', networkId),
-  createCollAssets: ['ETH'],
-});
-export const CRVUSD_WBTC_MARKET = (networkId: NetworkNumber): CrvUSDMarketData => ({
-  chainIds: [1],
-  label: 'CurveUSD - WBTC',
-  shortLabel: 'WBTC',
-  value: CrvUSDVersions.crvUSDWBTC,
-  collAsset: 'WBTC',
-  baseAsset: 'crvUSD',
-  controllerAddress: getConfigContractAddress('crvUSDWBTCController', networkId),
-  ammAddress: getConfigContractAddress('crvUSDWBTCAmm', networkId),
-  createCollAssets: ['WBTC'],
-});
-
-export const CRVUSD_TBTC_MARKET = (networkId: NetworkNumber): CrvUSDMarketData => ({
-  chainIds: [1],
-  label: 'CurveUSD - tBTC',
-  shortLabel: 'tBTC',
-  value: CrvUSDVersions.crvUSDtBTC,
-  collAsset: 'tBTC',
-  baseAsset: 'crvUSD',
-  controllerAddress: getConfigContractAddress('crvUSDtBTCController', networkId),
-  ammAddress: getConfigContractAddress('crvUSDtBTCAmm', networkId),
-  createCollAssets: ['tBTC'],
-});
-
-export const CRVUSD_SFRXETH_MARKET = (networkId: NetworkNumber): CrvUSDMarketData => ({
-  chainIds: [1],
-  label: 'CurveUSD - sfrxETH',
-  shortLabel: 'sfrxETH',
-  value: CrvUSDVersions.crvUSDsfrxETH,
-  collAsset: 'sfrxETH',
-  baseAsset: 'crvUSD',
-  controllerAddress: getConfigContractAddress('crvUSDsfrxETHController', networkId),
-  ammAddress: getConfigContractAddress('crvUSDsfrxETHAmm', networkId),
-  createCollAssets: ['sfrxETH'],
-});
-
-
-export const CrvUsdMarkets = (networkId: NetworkNumber) => ({
-  [CrvUSDVersions.crvUSDwstETH]: CRVUSD_WSTETH_MARKET(networkId),
-  [CrvUSDVersions.crvUSDETH]: CRVUSD_ETH_MARKET(networkId),
-  [CrvUSDVersions.crvUSDWBTC]: CRVUSD_WBTC_MARKET(networkId),
-  [CrvUSDVersions.crvUSDtBTC]: CRVUSD_TBTC_MARKET(networkId),
-  [CrvUSDVersions.crvUSDsfrxETH]: CRVUSD_SFRXETH_MARKET(networkId),
+import { getConfigContractAddress } from '../../contracts';
+import { CrvUSDMarketData, CrvUSDVersions } from '../../types';
+import { NetworkNumber } from '../../types/common';
+
+export const CRVUSD_WSTETH_MARKET = (networkId: NetworkNumber): CrvUSDMarketData => ({
+  chainIds: [1],
+  label: 'CurveUSD - wstETH',
+  shortLabel: 'wstETH',
+  value: CrvUSDVersions.crvUSDwstETH,
+  collAsset: 'wstETH',
+  baseAsset: 'crvUSD',
+  controllerAddress: getConfigContractAddress('crvUSDwstETHController', networkId),
+  ammAddress: getConfigContractAddress('crvUSDwstETHAmm', networkId),
+  createCollAssets: ['wstETH', 'ETH'],
+});
+export const CRVUSD_ETH_MARKET = (networkId: NetworkNumber): CrvUSDMarketData => ({
+  chainIds: [1],
+  label: 'CurveUSD - ETH',
+  shortLabel: 'ETH',
+  value: CrvUSDVersions.crvUSDETH,
+  collAsset: 'ETH',
+  baseAsset: 'crvUSD',
+  controllerAddress: getConfigContractAddress('crvUSDETHController', networkId),
+  ammAddress: getConfigContractAddress('crvUSDETHAmm', networkId),
+  createCollAssets: ['ETH'],
+});
+export const CRVUSD_WBTC_MARKET = (networkId: NetworkNumber): CrvUSDMarketData => ({
+  chainIds: [1],
+  label: 'CurveUSD - WBTC',
+  shortLabel: 'WBTC',
+  value: CrvUSDVersions.crvUSDWBTC,
+  collAsset: 'WBTC',
+  baseAsset: 'crvUSD',
+  controllerAddress: getConfigContractAddress('crvUSDWBTCController', networkId),
+  ammAddress: getConfigContractAddress('crvUSDWBTCAmm', networkId),
+  createCollAssets: ['WBTC'],
+});
+
+export const CRVUSD_TBTC_MARKET = (networkId: NetworkNumber): CrvUSDMarketData => ({
+  chainIds: [1],
+  label: 'CurveUSD - tBTC',
+  shortLabel: 'tBTC',
+  value: CrvUSDVersions.crvUSDtBTC,
+  collAsset: 'tBTC',
+  baseAsset: 'crvUSD',
+  controllerAddress: getConfigContractAddress('crvUSDtBTCController', networkId),
+  ammAddress: getConfigContractAddress('crvUSDtBTCAmm', networkId),
+  createCollAssets: ['tBTC'],
+});
+
+export const CRVUSD_SFRXETH_MARKET = (networkId: NetworkNumber): CrvUSDMarketData => ({
+  chainIds: [1],
+  label: 'CurveUSD - sfrxETH',
+  shortLabel: 'sfrxETH',
+  value: CrvUSDVersions.crvUSDsfrxETH,
+  collAsset: 'sfrxETH',
+  baseAsset: 'crvUSD',
+  controllerAddress: getConfigContractAddress('crvUSDsfrxETHController', networkId),
+  ammAddress: getConfigContractAddress('crvUSDsfrxETHAmm', networkId),
+  createCollAssets: ['sfrxETH'],
+});
+
+
+export const CrvUsdMarkets = (networkId: NetworkNumber) => ({
+  [CrvUSDVersions.crvUSDwstETH]: CRVUSD_WSTETH_MARKET(networkId),
+  [CrvUSDVersions.crvUSDETH]: CRVUSD_ETH_MARKET(networkId),
+  [CrvUSDVersions.crvUSDWBTC]: CRVUSD_WBTC_MARKET(networkId),
+  [CrvUSDVersions.crvUSDtBTC]: CRVUSD_TBTC_MARKET(networkId),
+  [CrvUSDVersions.crvUSDsfrxETH]: CRVUSD_SFRXETH_MARKET(networkId),
 }) as const;

package/src/markets/index.ts

@@ -1,6 +1,6 @@
-export { AaveMarkets } from './aave';
-export { CompoundMarkets } from './compound';
-export { SparkMarkets } from './spark';
-export { CrvUsdMarkets } from './curveUsd';
-export { MorphoBlueMarkets } from './morphoBlue';
+export { AaveMarkets } from './aave';
+export { CompoundMarkets } from './compound';
+export { SparkMarkets } from './spark';
+export { CrvUsdMarkets } from './curveUsd';
+export { MorphoBlueMarkets } from './morphoBlue';
 export { LlamaLendMarkets } from './llamaLend';