@defisaver/positions-sdk 2.1.22-dev-savings-4 → 2.1.23-dev-sena

package/src/markets/aave/index.ts

@@ -1,116 +1,116 @@
-// @ts-nocheck
-import { getConfigContractAddress } from '../../contracts';
-import { compareAddresses } from '../../services/utils';
-import {
-  AaveMarketInfo, AaveVersions,
-} from '../../types';
-import { NetworkNumber } from '../../types/common';
-import {
-  aaveV1AssetsDefaultMarket, aaveV2AssetsDefaultMarket, aaveV3AssetsDefaultMarket, aaveV3AssetsEtherfiMarket, aaveV3AssetsLidoMarket,
-} from './marketAssets';
-
-export {
-  aaveV1AssetsDefaultMarket,
-  aaveV2AssetsDefaultMarket,
-  aaveV3AssetsDefaultMarket,
-  aaveV3AssetsLidoMarket,
-};
-
-export const AAVE_V1: AaveMarketInfo = {
-  chainIds: [NetworkNumber.Eth],
-  label: 'Aave v1',
-  shortLabel: 'v1',
-  url: '',
-  value: AaveVersions.AaveV1,
-  assets: aaveV1AssetsDefaultMarket.map((a) => a.underlyingAsset),
-  provider: '',
-  providerAddress: '',
-  lendingPool: '',
-  lendingPoolAddress: '',
-  protocolData: '',
-  protocolDataAddress: '',
-  // icon: SvgAdapter(protocolIcons.aave),
-  disabled: true,
-  protocolName: 'aave',
-};
-
-export const AAVE_V2: AaveMarketInfo = {
-  chainIds: [NetworkNumber.Eth],
-  label: 'Aave v2',
-  shortLabel: 'v2',
-  value: AaveVersions.AaveV2,
-  url: 'default',
-  assets: aaveV2AssetsDefaultMarket,
-  provider: 'LendingPoolAddressesProvider',
-  providerAddress: getConfigContractAddress('LendingPoolAddressesProvider', 1), // rename
-  lendingPool: 'AaveLendingPoolV2',
-  lendingPoolAddress: getConfigContractAddress('AaveLendingPoolV2', 1),
-  protocolData: 'AaveProtocolDataProvider',
-  protocolDataAddress: getConfigContractAddress('AaveProtocolDataProvider', 1),
-  // icon: SvgAdapter(protocolIcons.aave),
-  protocolName: 'aave',
-};
-
-export const AAVE_V3 = (networkId: NetworkNumber): AaveMarketInfo => ({
-  chainIds: [NetworkNumber.Eth, NetworkNumber.Opt, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Linea, NetworkNumber.Plasma],
-  label: networkId === NetworkNumber.Eth ? 'Aave v3 Core' : 'Aave v3',
-  shortLabel: 'v3',
-  value: AaveVersions.AaveV3,
-  url: 'default',
-  assets: networkId ? aaveV3AssetsDefaultMarket[networkId] : [],
-  provider: 'AaveV3PoolAddressesProvider',
-  providerAddress: getConfigContractAddress('AaveV3PoolAddressesProvider', networkId),
-  lendingPool: 'AaveV3LendingPool',
-  lendingPoolAddress: getConfigContractAddress('AaveV3LendingPool', networkId),
-  protocolData: 'AaveV3ProtocolDataProvider',
-  protocolDataAddress: getConfigContractAddress('AaveV3ProtocolDataProvider', networkId),
-  // icon: SvgAdapter(protocolIcons.aave),
-  protocolName: 'aave',
-});
-
-export const AAVE_V3_LIDO = (networkId: NetworkNumber): AaveMarketInfo => ({
-  chainIds: [NetworkNumber.Eth],
-  label: 'Aave v3 Prime',
-  shortLabel: 'v3',
-  value: AaveVersions.AaveV3Lido,
-  url: 'lido',
-  assets: networkId ? aaveV3AssetsLidoMarket[networkId] : [],
-  provider: 'AaveV3LidoPoolAddressesProvider',
-  providerAddress: getConfigContractAddress('AaveV3LidoPoolAddressesProvider', networkId),
-  lendingPool: 'AaveV3LidoLendingPool',
-  lendingPoolAddress: getConfigContractAddress('AaveV3LidoLendingPool', networkId),
-  protocolData: 'AaveV3LidoProtocolDataProvider',
-  protocolDataAddress: getConfigContractAddress('AaveV3LidoProtocolDataProvider', networkId),
-  // icon: SvgAdapter(protocolIcons.aave),
-  protocolName: 'aave',
-});
-
-export const AAVE_V3_ETHERFI = (networkId: NetworkNumber): AaveMarketInfo => ({
-  chainIds: [NetworkNumber.Eth],
-  label: 'Aave v3 EtherFi',
-  shortLabel: 'v3',
-  value: AaveVersions.AaveV3Etherfi,
-  url: 'etherfi',
-  assets: networkId ? aaveV3AssetsEtherfiMarket[networkId] : [],
-  provider: 'AaveV3EtherfiPoolAddressesProvider',
-  providerAddress: getConfigContractAddress('AaveV3EtherfiPoolAddressesProvider', networkId),
-  lendingPool: 'AaveV3EtherfiLendingPool',
-  lendingPoolAddress: getConfigContractAddress('AaveV3EtherfiLendingPool', networkId),
-  protocolData: 'AaveV3EtherfiProtocolDataProvider',
-  protocolDataAddress: getConfigContractAddress('AaveV3EtherfiProtocolDataProvider', networkId),
-  // icon: SvgAdapter(protocolIcons.aave),
-  protocolName: 'aave',
-});
-
-export const AaveMarkets = (networkId: NetworkNumber) => ({
-  [AaveVersions.AaveV1]: AAVE_V1,
-  [AaveVersions.AaveV2]: AAVE_V2,
-  [AaveVersions.AaveV3]: AAVE_V3(networkId),
-  [AaveVersions.AaveV3Lido]: AAVE_V3_LIDO(networkId),
-  [AaveVersions.AaveV3Etherfi]: AAVE_V3_ETHERFI(networkId),
-}) as const;
-
-export const getAaveV3MarketByMarketAddress = (marketAddress: string, network = NetworkNumber.Eth): AaveMarketInfo | undefined => {
-  const markets = AaveMarkets(network);
-  return Object.values(markets).find((m) => compareAddresses(m.providerAddress, marketAddress));
-};
+// @ts-nocheck
+import { getConfigContractAddress } from '../../contracts';
+import { compareAddresses } from '../../services/utils';
+import {
+  AaveMarketInfo, AaveVersions,
+} from '../../types';
+import { NetworkNumber } from '../../types/common';
+import {
+  aaveV1AssetsDefaultMarket, aaveV2AssetsDefaultMarket, aaveV3AssetsDefaultMarket, aaveV3AssetsEtherfiMarket, aaveV3AssetsLidoMarket,
+} from './marketAssets';
+
+export {
+  aaveV1AssetsDefaultMarket,
+  aaveV2AssetsDefaultMarket,
+  aaveV3AssetsDefaultMarket,
+  aaveV3AssetsLidoMarket,
+};
+
+export const AAVE_V1: AaveMarketInfo = {
+  chainIds: [NetworkNumber.Eth],
+  label: 'Aave v1',
+  shortLabel: 'v1',
+  url: '',
+  value: AaveVersions.AaveV1,
+  assets: aaveV1AssetsDefaultMarket.map((a) => a.underlyingAsset),
+  provider: '',
+  providerAddress: '',
+  lendingPool: '',
+  lendingPoolAddress: '',
+  protocolData: '',
+  protocolDataAddress: '',
+  // icon: SvgAdapter(protocolIcons.aave),
+  disabled: true,
+  protocolName: 'aave',
+};
+
+export const AAVE_V2: AaveMarketInfo = {
+  chainIds: [NetworkNumber.Eth],
+  label: 'Aave v2',
+  shortLabel: 'v2',
+  value: AaveVersions.AaveV2,
+  url: 'default',
+  assets: aaveV2AssetsDefaultMarket,
+  provider: 'LendingPoolAddressesProvider',
+  providerAddress: getConfigContractAddress('LendingPoolAddressesProvider', 1), // rename
+  lendingPool: 'AaveLendingPoolV2',
+  lendingPoolAddress: getConfigContractAddress('AaveLendingPoolV2', 1),
+  protocolData: 'AaveProtocolDataProvider',
+  protocolDataAddress: getConfigContractAddress('AaveProtocolDataProvider', 1),
+  // icon: SvgAdapter(protocolIcons.aave),
+  protocolName: 'aave',
+};
+
+export const AAVE_V3 = (networkId: NetworkNumber): AaveMarketInfo => ({
+  chainIds: [NetworkNumber.Eth, NetworkNumber.Opt, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Linea, NetworkNumber.Plasma],
+  label: networkId === NetworkNumber.Eth ? 'Aave v3 Core' : 'Aave v3',
+  shortLabel: 'v3',
+  value: AaveVersions.AaveV3,
+  url: 'default',
+  assets: networkId ? aaveV3AssetsDefaultMarket[networkId] : [],
+  provider: 'AaveV3PoolAddressesProvider',
+  providerAddress: getConfigContractAddress('AaveV3PoolAddressesProvider', networkId),
+  lendingPool: 'AaveV3LendingPool',
+  lendingPoolAddress: getConfigContractAddress('AaveV3LendingPool', networkId),
+  protocolData: 'AaveV3ProtocolDataProvider',
+  protocolDataAddress: getConfigContractAddress('AaveV3ProtocolDataProvider', networkId),
+  // icon: SvgAdapter(protocolIcons.aave),
+  protocolName: 'aave',
+});
+
+export const AAVE_V3_LIDO = (networkId: NetworkNumber): AaveMarketInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Aave v3 Prime',
+  shortLabel: 'v3',
+  value: AaveVersions.AaveV3Lido,
+  url: 'lido',
+  assets: networkId ? aaveV3AssetsLidoMarket[networkId] : [],
+  provider: 'AaveV3LidoPoolAddressesProvider',
+  providerAddress: getConfigContractAddress('AaveV3LidoPoolAddressesProvider', networkId),
+  lendingPool: 'AaveV3LidoLendingPool',
+  lendingPoolAddress: getConfigContractAddress('AaveV3LidoLendingPool', networkId),
+  protocolData: 'AaveV3LidoProtocolDataProvider',
+  protocolDataAddress: getConfigContractAddress('AaveV3LidoProtocolDataProvider', networkId),
+  // icon: SvgAdapter(protocolIcons.aave),
+  protocolName: 'aave',
+});
+
+export const AAVE_V3_ETHERFI = (networkId: NetworkNumber): AaveMarketInfo => ({
+  chainIds: [NetworkNumber.Eth],
+  label: 'Aave v3 EtherFi',
+  shortLabel: 'v3',
+  value: AaveVersions.AaveV3Etherfi,
+  url: 'etherfi',
+  assets: networkId ? aaveV3AssetsEtherfiMarket[networkId] : [],
+  provider: 'AaveV3EtherfiPoolAddressesProvider',
+  providerAddress: getConfigContractAddress('AaveV3EtherfiPoolAddressesProvider', networkId),
+  lendingPool: 'AaveV3EtherfiLendingPool',
+  lendingPoolAddress: getConfigContractAddress('AaveV3EtherfiLendingPool', networkId),
+  protocolData: 'AaveV3EtherfiProtocolDataProvider',
+  protocolDataAddress: getConfigContractAddress('AaveV3EtherfiProtocolDataProvider', networkId),
+  // icon: SvgAdapter(protocolIcons.aave),
+  protocolName: 'aave',
+});
+
+export const AaveMarkets = (networkId: NetworkNumber) => ({
+  [AaveVersions.AaveV1]: AAVE_V1,
+  [AaveVersions.AaveV2]: AAVE_V2,
+  [AaveVersions.AaveV3]: AAVE_V3(networkId),
+  [AaveVersions.AaveV3Lido]: AAVE_V3_LIDO(networkId),
+  [AaveVersions.AaveV3Etherfi]: AAVE_V3_ETHERFI(networkId),
+}) as const;
+
+export const getAaveV3MarketByMarketAddress = (marketAddress: string, network = NetworkNumber.Eth): AaveMarketInfo | undefined => {
+  const markets = AaveMarkets(network);
+  return Object.values(markets).find((m) => compareAddresses(m.providerAddress, marketAddress));
+};

package/src/markets/aave/marketAssets.ts

@@ -1,55 +1,55 @@
-import { AssetData, getAssetInfo } from '@defisaver/tokens';
-import { NetworkNumber } from '../../types/common';
-
-export const aaveV1AssetsDefaultMarket: AssetData[] = [
-  'aETH', 'aDAI', 'aUSDC', 'aSUSD', 'aTUSD', 'aUSDT', 'aBUSD', 'aBAT', 'aLEND',
-  'aLINK', 'aMANA', 'aMKR', 'aREP', 'aSNX', 'aWBTC', 'aZRX', 'aENJ', 'aREN', 'aYFI', 'aUNI', 'aAAVE',
-].map((symbol) => getAssetInfo(symbol));
-
-export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
-
-export const aaveV3AssetsDefaultMarketEth = [
-  'ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH', 'LBTC', 'eBTC', 'RLUSD', 'PT eUSDe May', 'PT sUSDe July', 'USDtb',
-  'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov',
-];
-export const aaveV3AssetsDefaultMarketOpt = [
-  'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
-];
-export const aaveV3AssetsDefaultMarketArb = ['DAI', 'LINK', 'USDC.e', 'WBTC', 'ETH', 'USDT', 'AAVE', 'EURS', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC', 'FRAX', 'ARB', 'weETH', 'GHO', 'ezETH', 'rsETH', 'tBTC'];
-export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC', 'ezETH', 'GHO', 'wrsETH', 'LBTC', 'EURC', 'AAVE', 'tBTC'];
-
-export const aaveV3AssetsDefaultMarketLinea = ['ETH', 'USDC', 'weETH', 'ezETH', 'USDT', 'wstETH', 'wrsETH', 'WBTC'];
-
-export const aaveV3AssetsDefaultMarketPlasma = ['ETH', 'USDT', 'sUSDe', 'USDe', 'weETH', 'XAUt', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT'];
-
-// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
-export const aaveV3AssetsDefaultMarket = {
-  [NetworkNumber.Eth]: aaveV3AssetsDefaultMarketEth,
-  [NetworkNumber.Opt]: aaveV3AssetsDefaultMarketOpt,
-  [NetworkNumber.Arb]: aaveV3AssetsDefaultMarketArb,
-  [NetworkNumber.Base]: aaveV3AssetsDefaultMarketBase,
-  [NetworkNumber.Linea]: aaveV3AssetsDefaultMarketLinea,
-  [NetworkNumber.Plasma]: aaveV3AssetsDefaultMarketPlasma,
-} as const;
-
-export const aaveV3AssetsLidoMarketEth = ['ETH', 'wstETH', 'USDS', 'USDC', 'ezETH', 'sUSDe', 'GHO', 'rsETH', 'tETH'];
-
-export const aaveV3AssetsLidoMarket = {
-  [NetworkNumber.Eth]: aaveV3AssetsLidoMarketEth,
-  [NetworkNumber.Opt]: [],
-  [NetworkNumber.Arb]: [],
-  [NetworkNumber.Base]: [],
-  [NetworkNumber.Linea]: [],
-  [NetworkNumber.Plasma]: [],
-} as const;
-
-export const aaveV3AssetsEtherfiMarketEth = ['weETH', 'USDC', 'PYUSD', 'FRAX'];
-
-export const aaveV3AssetsEtherfiMarket = {
-  [NetworkNumber.Eth]: aaveV3AssetsEtherfiMarketEth,
-  [NetworkNumber.Opt]: [],
-  [NetworkNumber.Arb]: [],
-  [NetworkNumber.Base]: [],
-  [NetworkNumber.Linea]: [],
-  [NetworkNumber.Plasma]: [],
+import { AssetData, getAssetInfo } from '@defisaver/tokens';
+import { NetworkNumber } from '../../types/common';
+
+export const aaveV1AssetsDefaultMarket: AssetData[] = [
+  'aETH', 'aDAI', 'aUSDC', 'aSUSD', 'aTUSD', 'aUSDT', 'aBUSD', 'aBAT', 'aLEND',
+  'aLINK', 'aMANA', 'aMKR', 'aREP', 'aSNX', 'aWBTC', 'aZRX', 'aENJ', 'aREN', 'aYFI', 'aUNI', 'aAAVE',
+].map((symbol) => getAssetInfo(symbol));
+
+export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
+
+export const aaveV3AssetsDefaultMarketEth = [
+  'ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH', 'LBTC', 'eBTC', 'RLUSD', 'PT eUSDe May', 'PT sUSDe July', 'USDtb',
+  'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov',
+];
+export const aaveV3AssetsDefaultMarketOpt = [
+  'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
+];
+export const aaveV3AssetsDefaultMarketArb = ['DAI', 'LINK', 'USDC.e', 'WBTC', 'ETH', 'USDT', 'AAVE', 'EURS', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC', 'FRAX', 'ARB', 'weETH', 'GHO', 'ezETH', 'rsETH', 'tBTC'];
+export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH', 'cbBTC', 'ezETH', 'GHO', 'wrsETH', 'LBTC', 'EURC', 'AAVE', 'tBTC'];
+
+export const aaveV3AssetsDefaultMarketLinea = ['ETH', 'USDC', 'weETH', 'ezETH', 'USDT', 'wstETH', 'wrsETH', 'WBTC'];
+
+export const aaveV3AssetsDefaultMarketPlasma = ['ETH', 'USDT', 'sUSDe', 'USDe', 'weETH', 'XAUt', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT'];
+
+// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
+export const aaveV3AssetsDefaultMarket = {
+  [NetworkNumber.Eth]: aaveV3AssetsDefaultMarketEth,
+  [NetworkNumber.Opt]: aaveV3AssetsDefaultMarketOpt,
+  [NetworkNumber.Arb]: aaveV3AssetsDefaultMarketArb,
+  [NetworkNumber.Base]: aaveV3AssetsDefaultMarketBase,
+  [NetworkNumber.Linea]: aaveV3AssetsDefaultMarketLinea,
+  [NetworkNumber.Plasma]: aaveV3AssetsDefaultMarketPlasma,
+} as const;
+
+export const aaveV3AssetsLidoMarketEth = ['ETH', 'wstETH', 'USDS', 'USDC', 'ezETH', 'sUSDe', 'GHO', 'rsETH', 'tETH'];
+
+export const aaveV3AssetsLidoMarket = {
+  [NetworkNumber.Eth]: aaveV3AssetsLidoMarketEth,
+  [NetworkNumber.Opt]: [],
+  [NetworkNumber.Arb]: [],
+  [NetworkNumber.Base]: [],
+  [NetworkNumber.Linea]: [],
+  [NetworkNumber.Plasma]: [],
+} as const;
+
+export const aaveV3AssetsEtherfiMarketEth = ['weETH', 'USDC', 'PYUSD', 'FRAX'];
+
+export const aaveV3AssetsEtherfiMarket = {
+  [NetworkNumber.Eth]: aaveV3AssetsEtherfiMarketEth,
+  [NetworkNumber.Opt]: [],
+  [NetworkNumber.Arb]: [],
+  [NetworkNumber.Base]: [],
+  [NetworkNumber.Linea]: [],
+  [NetworkNumber.Plasma]: [],
 } as const;