@defisaver/positions-sdk 0.0.186 → 0.0.188-dev-markets

package/esm/helpers/morphoBlueHelpers/index.d.ts

@@ -8,7 +8,48 @@ export declare const getMorphoBlueAggregatedPositionData: ({ usedAssets, assetsD
 }) => MorphoBlueAggregatedPositionData;
 export declare const getSupplyRate: (totalSupplyAssets: string, totalBorrowAssets: string, borrowRate: string, fee: string) => string;
 export declare const getBorrowRate: (borrowRate: string, totalBorrowShares: string) => string;
-export declare const getApyAfterValuesEstimation: (selectedMarket: MorphoBlueMarketData, action: string, amount: string, asset: string, web3: Web3, network: NetworkNumber) => Promise<{
+export declare const getApyAfterValuesEstimation: (selectedMarket: MorphoBlueMarketData, actions: {
+    action: string;
+    amount: string;
+    asset: string;
+}[], web3: Web3, network: NetworkNumber) => Promise<{
     borrowRate: string;
     supplyRate: string;
 }>;
+/**
+ * Get reallocatable liquidity to a given market and target borrow utilization
+ * @param marketId - Unique key of the market liquidity is reallocated to
+ * @param network - The network number
+ * @returns The reallocatable liquidity and target borrow utilization
+*/
+export declare const getReallocatableLiquidity: (marketId: string, network?: NetworkNumber) => Promise<{
+    reallocatableLiquidity: string;
+    targetBorrowUtilization: string;
+}>;
+/**
+ * Get liquidity to allocate for a given amount to borrow.
+ * First, the function will try to calculate the amount of liquidity to allocate to be able to
+ * hit the target utilization. If it is not possible to allocate enough liquidity to hit the
+ * target utilization, the function will allocate the amount of liquidity needed to be able to
+ * borrow the selected amount.
+ * @param amountToBorrow - The amount to borrow
+ * @param totalBorrow - The total amount borrowed from market
+ * @param totalSupply - The total amount supplied to market
+ * @param targetBorrowUtilization - The target borrow utilization of market
+ * @param reallocatableLiquidityAssets - The amount of liquidity that can be reallocated from other markets
+ * @returns The amount of liquidity to allocate
+*/
+export declare const getLiquidityToAllocate: (amountToBorrow: string, totalBorrow: string, totalSupply: string, targetBorrowUtilization: string, reallocatableLiquidityAssets: string) => string;
+/**
+ * Get the vaults and withdrawals needed to reallocate liquidity for a given amount to borrow.
+ * Amount to be reallocated is calculated in `getLiquidityToAllocate`
+ * @param market - The market data
+ * @param assetsData - The assets data
+ * @param amountToBorrow - Amount being borrowed (not the amount being reallocated)
+ * @param network - The network number
+ * @returns The vaults and withdrawals needed to reallocate liquidity
+ */
+export declare const getReallocation: (market: MorphoBlueMarketData, assetsData: MorphoBlueAssetsData, amountToBorrow: string, network?: NetworkNumber) => Promise<{
+    vaults: string[];
+    withdrawals: (string | string[])[][][];
+}>;

package/esm/helpers/morphoBlueHelpers/index.js

@@ -8,11 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
-import { assetAmountInWei } from '@defisaver/tokens';
+import { assetAmountInWei, getAssetInfoByAddress } from '@defisaver/tokens';
 import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
+import { NetworkNumber } from '../../types/common';
 import { borrowOperations, SECONDS_PER_YEAR, WAD } from '../../constants';
 import { MorphoBlueViewContract } from '../../contracts';
+import { compareAddresses } from '../../services/utils';
 export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }) => {
     var _a, _b, _c, _d, _e, _f;
     const payload = {};
@@ -74,29 +76,207 @@ export const getBorrowRate = (borrowRate, totalBorrowShares) => {
     }
     return new Dec(compound(borrowRate)).div(1e18).mul(100).toString();
 };
-export const getApyAfterValuesEstimation = (selectedMarket, action, amount, asset, web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+export const getApyAfterValuesEstimation = (selectedMarket, actions, web3, network) => __awaiter(void 0, void 0, void 0, function* () {
     const morphoBlueViewContract = MorphoBlueViewContract(web3, network);
     const lltvInWei = assetAmountInWei(selectedMarket.lltv, 'ETH');
     const marketData = [selectedMarket.loanToken, selectedMarket.collateralToken, selectedMarket.oracle, selectedMarket.irm, lltvInWei];
-    const isBorrowOperation = borrowOperations.includes(action);
-    const amountInWei = assetAmountInWei(amount, asset);
-    let liquidityAdded;
-    let liquidityRemoved;
-    if (isBorrowOperation) {
-        liquidityAdded = action === 'payback' ? amountInWei : '0';
-        liquidityRemoved = action === 'borrow' ? amountInWei : '0';
-    }
-    else {
-        liquidityAdded = action === 'collateral' ? amountInWei : '0';
-        liquidityRemoved = action === 'withdraw' ? amountInWei : '0';
-    }
-    const data = yield morphoBlueViewContract.methods.getApyAfterValuesEstimation([
-        marketData,
-        isBorrowOperation,
-        liquidityAdded,
-        liquidityRemoved,
-    ]).call();
+    const params = actions.map(({ action, asset, amount }) => {
+        const isBorrowOperation = borrowOperations.includes(action);
+        const amountInWei = assetAmountInWei(amount, asset);
+        let liquidityAdded;
+        let liquidityRemoved;
+        if (isBorrowOperation) {
+            liquidityAdded = action === 'payback' ? amountInWei : '0';
+            liquidityRemoved = action === 'borrow' ? amountInWei : '0';
+        }
+        else {
+            liquidityAdded = action === 'collateral' ? amountInWei : '0';
+            liquidityRemoved = action === 'withdraw' ? amountInWei : '0';
+        }
+        return {
+            liquidityAdded,
+            liquidityRemoved,
+            isBorrowOperation,
+        };
+    });
+    const data = yield morphoBlueViewContract.methods.getApyAfterValuesEstimation(marketData, params).call();
     const borrowRate = getBorrowRate(data.borrowRate, data.market.totalBorrowShares);
     const supplyRate = getSupplyRate(data.market.totalSupplyAssets, data.market.totalBorrowAssets, data.borrowRate, data.market.fee);
     return { borrowRate, supplyRate };
 });
+const API_URL = 'https://blue-api.morpho.org/graphql';
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
+`;
+/**
+ * Get reallocatable liquidity to a given market and target borrow utilization
+ * @param marketId - Unique key of the market liquidity is reallocated to
+ * @param network - The network number
+ * @returns The reallocatable liquidity and target borrow utilization
+*/
+export const getReallocatableLiquidity = (marketId, network = NetworkNumber.Eth) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const response = yield fetch(API_URL, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+            query: MARKET_QUERY,
+            variables: { uniqueKey: marketId, chainId: network },
+        }),
+    });
+    const data = yield response.json();
+    const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketByUniqueKey;
+    if (!marketData)
+        throw new Error('Market data not found');
+    return { reallocatableLiquidity: marketData.reallocatableLiquidityAssets, targetBorrowUtilization: marketData.targetBorrowUtilization };
+});
+/**
+ * Get liquidity to allocate for a given amount to borrow.
+ * First, the function will try to calculate the amount of liquidity to allocate to be able to
+ * hit the target utilization. If it is not possible to allocate enough liquidity to hit the
+ * target utilization, the function will allocate the amount of liquidity needed to be able to
+ * borrow the selected amount.
+ * @param amountToBorrow - The amount to borrow
+ * @param totalBorrow - The total amount borrowed from market
+ * @param totalSupply - The total amount supplied to market
+ * @param targetBorrowUtilization - The target borrow utilization of market
+ * @param reallocatableLiquidityAssets - The amount of liquidity that can be reallocated from other markets
+ * @returns The amount of liquidity to allocate
+*/
+export const getLiquidityToAllocate = (amountToBorrow, totalBorrow, totalSupply, targetBorrowUtilization, reallocatableLiquidityAssets) => {
+    const newTotalBorrowAssets = new Dec(totalBorrow).add(amountToBorrow).toString();
+    const leftToBorrow = new Dec(totalSupply).sub(totalBorrow).toString();
+    let liquidityToAllocate = new Dec(newTotalBorrowAssets).div(targetBorrowUtilization).mul(1e18).sub(totalSupply)
+        .toFixed(0)
+        .toString();
+    if (new Dec(reallocatableLiquidityAssets).lt(liquidityToAllocate) || new Dec(liquidityToAllocate).lt('0')) {
+        liquidityToAllocate = new Dec(amountToBorrow).lt(leftToBorrow) ? '0' : new Dec(amountToBorrow).sub(leftToBorrow).toString();
+        if (new Dec(reallocatableLiquidityAssets).lt(liquidityToAllocate))
+            throw new Error('Not enough liquidity available to allocate');
+    }
+    return liquidityToAllocate;
+};
+/**
+ * Get the vaults and withdrawals needed to reallocate liquidity for a given amount to borrow.
+ * Amount to be reallocated is calculated in `getLiquidityToAllocate`
+ * @param market - The market data
+ * @param assetsData - The assets data
+ * @param amountToBorrow - Amount being borrowed (not the amount being reallocated)
+ * @param network - The network number
+ * @returns The vaults and withdrawals needed to reallocate liquidity
+ */
+export const getReallocation = (market, assetsData, amountToBorrow, network = NetworkNumber.Eth) => __awaiter(void 0, void 0, void 0, function* () {
+    var _b, _c, _d;
+    const { marketId, loanToken } = market;
+    const response = yield fetch(API_URL, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+            query: MARKET_QUERY,
+            variables: { uniqueKey: marketId, chainId: network },
+        }),
+    });
+    const data = yield response.json();
+    const marketData = (_b = data === null || data === void 0 ? void 0 : data.data) === null || _b === void 0 ? void 0 : _b.marketByUniqueKey;
+    if (!marketData)
+        throw new Error('Market data not found');
+    const loanAssetInfo = getAssetInfoByAddress(loanToken, network);
+    const { totalBorrow, totalSupply } = assetsData[loanAssetInfo.symbol] || { totalBorrow: '0', totalSupply: '0' };
+    const totalBorrowWei = assetAmountInWei(totalBorrow, loanAssetInfo.symbol);
+    const totalSupplyWei = assetAmountInWei(totalSupply, loanAssetInfo.symbol);
+    const newTotalBorrowAssets = new Dec(totalBorrowWei).add(amountToBorrow).toString();
+    const newUtil = new Dec(newTotalBorrowAssets).div(totalSupplyWei).toString();
+    const newUtilScaled = new Dec(newUtil).mul(1e18).toString();
+    if (new Dec(newUtilScaled).lt(marketData.targetBorrowUtilization))
+        return { vaults: [], withdrawals: [] };
+    const liquidityToAllocate = getLiquidityToAllocate(amountToBorrow, totalBorrowWei, totalSupplyWei, marketData.targetBorrowUtilization, marketData.reallocatableLiquidityAssets);
+    const vaultTotalAssets = marketData.publicAllocatorSharedLiquidity.reduce((acc, item) => {
+        const vaultAddress = item.vault.address;
+        acc[vaultAddress] = new Dec(acc[vaultAddress] || '0').add(item.assets).toString();
+        return acc;
+    }, {});
+    const sortedVaults = Object.entries(vaultTotalAssets).sort(([, a], [, b]) => new Dec(b || '0').sub(a || '0').toNumber());
+    const withdrawalsPerVault = {};
+    let totalReallocated = '0';
+    for (const [vaultAddress] of sortedVaults) {
+        if (new Dec(totalReallocated).gte(liquidityToAllocate))
+            break;
+        const vaultAllocations = marketData.publicAllocatorSharedLiquidity.filter((item) => compareAddresses(item.vault.address, vaultAddress));
+        for (const item of vaultAllocations) {
+            if (new Dec(totalReallocated).gte(liquidityToAllocate))
+                break;
+            const itemAmount = item.assets;
+            const leftToAllocate = new Dec(liquidityToAllocate).sub(totalReallocated).toString();
+            const amountToTake = new Dec(itemAmount).lt(leftToAllocate) ? itemAmount : leftToAllocate;
+            totalReallocated = new Dec(totalReallocated).add(amountToTake).toString();
+            const withdrawal = [
+                [
+                    item.allocationMarket.loanAsset.address,
+                    (_c = item.allocationMarket.collateralAsset) === null || _c === void 0 ? void 0 : _c.address,
+                    (_d = item.allocationMarket.oracle) === null || _d === void 0 ? void 0 : _d.address,
+                    item.allocationMarket.irmAddress,
+                    item.allocationMarket.lltv,
+                ],
+                amountToTake.toString(),
+                item.allocationMarket.uniqueKey,
+            ];
+            if (!withdrawalsPerVault[vaultAddress]) {
+                withdrawalsPerVault[vaultAddress] = [];
+            }
+            withdrawalsPerVault[vaultAddress].push(withdrawal);
+        }
+    }
+    const vaults = Object.keys(withdrawalsPerVault);
+    const withdrawals = vaults.map((vaultAddress) => withdrawalsPerVault[vaultAddress].sort((a, b) => a[2].localeCompare(b[2])).map(w => [w[0], w[1]]));
+    return {
+        vaults,
+        withdrawals,
+    };
+});

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

@@ -8,6 +8,8 @@ export declare const COMPOUND_V3_USDCe: (networkId: NetworkNumber) => CompoundMa
 export declare const COMPOUND_V3_ETH: (networkId: NetworkNumber) => CompoundMarketData;
 export declare const COMPOUND_V3_USDBC: (networkId: NetworkNumber) => CompoundMarketData;
 export declare const COMPOUND_V3_USDT: (networkId: NetworkNumber) => CompoundMarketData;
+export declare const COMPOUND_V3_WSTETH: (networkId: NetworkNumber) => CompoundMarketData;
+export declare const COMPOUND_V3_USDS: (networkId: NetworkNumber) => CompoundMarketData;
 export declare const CompoundMarkets: (networkId: NetworkNumber) => {
     readonly v2: CompoundMarketData;
     readonly "v3-ETH": CompoundMarketData;
@@ -15,4 +17,6 @@ export declare const CompoundMarkets: (networkId: NetworkNumber) => {
     readonly "v3-USDbC": CompoundMarketData;
     readonly "v3-USDC.e": CompoundMarketData;
     readonly "v3-USDT": CompoundMarketData;
+    readonly "v3-wstETH": CompoundMarketData;
+    readonly "v3-USDS": CompoundMarketData;
 };

package/esm/markets/compound/index.js

@@ -1,7 +1,7 @@
 import { getConfigContractAddress } from '../../contracts';
 import { CompoundVersions } from '../../types';
 import { NetworkNumber } from '../../types/common';
-import { compoundV2CollateralAssets, v3ETHCollAssets, v3USDbCCollAssets, v3USDCCollAssets, v3USDCeCollAssets, v3USDTCollAssets, } from './marketsAssets';
+import { compoundV2CollateralAssets, v3ETHCollAssets, v3USDbCCollAssets, v3USDCCollAssets, v3USDCeCollAssets, v3USDSCollAssets, v3USDTCollAssets, v3wstETHCollAssets, } from './marketsAssets';
 export { compoundV2CollateralAssets, v3ETHCollAssets, v3USDbCCollAssets, v3USDCCollAssets, v3USDCeCollAssets, v3USDTCollAssets, };
 const EMPTY_BULKER_OPTIONS = { supply: '', withdraw: '' };
 const STANDARD_BULKER_OPTIONS = {
@@ -13,6 +13,8 @@ const BULKER_OPTIONS = {
         [CompoundVersions.CompoundV3USDC]: { supply: 2, withdraw: 5 },
         [CompoundVersions.CompoundV3ETH]: STANDARD_BULKER_OPTIONS,
         [CompoundVersions.CompoundV3USDT]: STANDARD_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3wstETH]: STANDARD_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDS]: STANDARD_BULKER_OPTIONS,
         // Non-existing markets, keeping it because of typescript
         [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
         [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
@@ -26,6 +28,8 @@ const BULKER_OPTIONS = {
         // Non-existing markets, keeping it because of typescript
         [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
         [CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3wstETH]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDS]: EMPTY_BULKER_OPTIONS,
     },
     [NetworkNumber.Base]: {
         [CompoundVersions.CompoundV3ETH]: STANDARD_BULKER_OPTIONS,
@@ -35,6 +39,8 @@ const BULKER_OPTIONS = {
         [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
         [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
         [CompoundVersions.CompoundV3USDT]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3wstETH]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDS]: EMPTY_BULKER_OPTIONS,
     },
     [NetworkNumber.Opt]: {
         [CompoundVersions.CompoundV3USDC]: STANDARD_BULKER_OPTIONS,
@@ -44,6 +50,8 @@ const BULKER_OPTIONS = {
         [CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
         [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
         [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3wstETH]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDS]: EMPTY_BULKER_OPTIONS,
     },
 };
 export const COMPOUND_V2 = {
@@ -136,6 +144,34 @@ export const COMPOUND_V3_USDT = (networkId) => ({
     bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3USDT],
     // icon: SvgAdapter(protocolIcons.compoundv3),
 });
+export const COMPOUND_V3_WSTETH = (networkId) => ({
+    chainIds: [NetworkNumber.Eth],
+    label: 'Compound V3 - wstETH',
+    shortLabel: 'v3',
+    value: CompoundVersions.CompoundV3wstETH,
+    baseAsset: 'wstETH',
+    collAssets: networkId ? v3wstETHCollAssets[networkId] : [],
+    baseMarket: 'cWstETHv3',
+    baseMarketAddress: getConfigContractAddress('cWstETHv3', networkId),
+    secondLabel: 'Market',
+    bulkerName: networkId === NetworkNumber.Eth ? 'CompV3BulkerMainnetETH' : 'CompV3BulkerL2',
+    bulkerAddress: getConfigContractAddress(networkId === NetworkNumber.Eth ? 'CompV3BulkerMainnetETH' : 'CompV3BulkerL2', networkId),
+    bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3wstETH],
+});
+export const COMPOUND_V3_USDS = (networkId) => ({
+    chainIds: [NetworkNumber.Eth],
+    label: 'Compound V3 - USDS',
+    shortLabel: 'v3',
+    value: CompoundVersions.CompoundV3USDS,
+    baseAsset: 'USDS',
+    collAssets: networkId ? v3USDSCollAssets[networkId] : [],
+    baseMarket: 'cUSDSv3',
+    baseMarketAddress: getConfigContractAddress('cUSDSv3', networkId),
+    secondLabel: 'Market',
+    bulkerName: networkId === NetworkNumber.Eth ? 'CompV3BulkerMainnetETH' : 'CompV3BulkerL2',
+    bulkerAddress: getConfigContractAddress(networkId === NetworkNumber.Eth ? 'CompV3BulkerMainnetETH' : 'CompV3BulkerL2', networkId),
+    bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3USDS],
+});
 export const CompoundMarkets = (networkId) => ({
     [CompoundVersions.CompoundV2]: COMPOUND_V2,
     [CompoundVersions.CompoundV3ETH]: COMPOUND_V3_ETH(networkId),
@@ -143,4 +179,6 @@ export const CompoundMarkets = (networkId) => ({
     [CompoundVersions.CompoundV3USDbC]: COMPOUND_V3_USDBC(networkId),
     [CompoundVersions.CompoundV3USDCe]: COMPOUND_V3_USDCe(networkId),
     [CompoundVersions.CompoundV3USDT]: COMPOUND_V3_USDT(networkId),
+    [CompoundVersions.CompoundV3wstETH]: COMPOUND_V3_WSTETH(networkId),
+    [CompoundVersions.CompoundV3USDS]: COMPOUND_V3_USDS(networkId),
 });

package/esm/markets/compound/marketsAssets.d.ts

@@ -42,3 +42,17 @@ export declare const v3USDTCollAssets: {
     42161: string[];
     8453: never[];
 };
+export declare const v3USDSCollAssetsEth: string[];
+export declare const v3USDSCollAssets: {
+    1: string[];
+    10: never[];
+    42161: never[];
+    8453: never[];
+};
+export declare const v3wstETHCollAssetsEth: string[];
+export declare const v3wstETHCollAssets: {
+    1: string[];
+    10: never[];
+    42161: never[];
+    8453: never[];
+};

package/esm/markets/compound/marketsAssets.js

@@ -5,7 +5,7 @@ export const compoundV2CollateralAssets = [
     'cTUSD', 'cLINK', 'cUSDP', 'cUNI', 'cCOMP', 'cMKR', 'cSUSHI', 'cAAVE', 'cYFI',
 ].map((symbol) => getAssetInfo(symbol));
 export const v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC'];
-export const v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC', 'wstETH', 'ezETH'];
+export const v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC', 'wstETH', 'ezETH', 'wUSDM'];
 export const v3USDCCollAssetsBase = ['ETH', 'cbETH', 'wstETH', 'cbBTC'];
 export const v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC', 'wstETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
@@ -42,7 +42,7 @@ export const v3USDbCCollAssets = {
     [NetworkNumber.Arb]: [],
     [NetworkNumber.Base]: v3USDbCCollAssetsBase,
 };
-export const v3USDTCollAssetsEth = ['COMP', 'ETH', 'WBTC', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'wUSDM', 'sFRAX'];
+export const v3USDTCollAssetsEth = ['COMP', 'ETH', 'WBTC', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'wUSDM', 'sFRAX', 'mETH'];
 export const v3USDTCollAssetsArb = ['ETH', 'WBTC', 'wstETH', 'ARB', 'GMX'];
 export const v3USDTCollAssetsOpt = ['ETH', 'WBTC', 'OP', 'wstETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
@@ -52,3 +52,17 @@ export const v3USDTCollAssets = {
     [NetworkNumber.Arb]: v3USDTCollAssetsArb,
     [NetworkNumber.Base]: [],
 };
+export const v3USDSCollAssetsEth = ['wstETH', 'ETH', 'sUSDS', 'cbETH', 'tBTC', 'USDe'];
+export const v3USDSCollAssets = {
+    [NetworkNumber.Eth]: v3USDSCollAssetsEth,
+    [NetworkNumber.Opt]: [],
+    [NetworkNumber.Arb]: [],
+    [NetworkNumber.Base]: [],
+};
+export const v3wstETHCollAssetsEth = ['rsETH', 'ezETH'];
+export const v3wstETHCollAssets = {
+    [NetworkNumber.Eth]: v3wstETHCollAssetsEth,
+    [NetworkNumber.Opt]: [],
+    [NetworkNumber.Arb]: [],
+    [NetworkNumber.Base]: [],
+};

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

@@ -48,6 +48,10 @@ export declare const MORPHO_BLUE_RETH_ETH_945_BASE: (networkId?: NetworkNumber)
 export declare const MORPHO_BLUE_CBBTC_ETH_915_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBBTC_USDC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_LBTC_WBTC_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_LBTC_CBBTC_945_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_WSTETH_EURC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_CBBTC_EURC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluewstethusdc: MorphoBlueMarketData;
     readonly morphobluesdaiusdc: MorphoBlueMarketData;
@@ -72,6 +76,7 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluecbbtcusdc: MorphoBlueMarketData;
     readonly morphoblueretheth_945: MorphoBlueMarketData;
     readonly morphobluesusdeusdc_915: MorphoBlueMarketData;
+    readonly morphobluelbtcwbtc_945: MorphoBlueMarketData;
     readonly morphobluewstetheth_945: MorphoBlueMarketData;
     readonly morphobluewstetheth_945_exchange_rate: MorphoBlueMarketData;
     readonly morphobluewstetheth_965_exchange_rate: MorphoBlueMarketData;
@@ -92,6 +97,9 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphoblueretheth_945_base: MorphoBlueMarketData;
     readonly morphobluecbbtceth_915_base: MorphoBlueMarketData;
     readonly morphobluecbbtcusdc_860_base: MorphoBlueMarketData;
+    readonly morphobluecbbtceurc_860_base: MorphoBlueMarketData;
+    readonly morphobluewstetheurc_860_base: MorphoBlueMarketData;
+    readonly morphobluelbtccbbtc_945_base: MorphoBlueMarketData;
     readonly morphobluewsuperoethbweth_915_base: MorphoBlueMarketData;
     readonly morphobluecbetheth_945_base: MorphoBlueMarketData;
     readonly morphobluecbetheth_965_base: MorphoBlueMarketData;

package/esm/markets/morphoBlue/index.js

@@ -715,7 +715,7 @@ export const MORPHO_BLUE_CBBTC_USDC_860_BASE = (networkId = NetworkNumber.Eth) =
 export const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Base],
     label: 'Morpho',
-    shortLabel: 'wsuperOETHb/WETH',
+    shortLabel: 'wsuperOETHb/ETH',
     value: MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base,
     url: 'wsuperoethbweth-144bf18d',
     loanToken: '0x4200000000000000000000000000000000000006',
@@ -727,6 +727,66 @@ export const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = (networkId = NetworkNumber.
     marketId: '0x144bf18d6bf4c59602548a825034f73bf1d20177fc5f975fc69d5a5eba929b45',
     protocolName: 'morpho-blue',
 });
+export const MORPHO_BLUE_LBTC_WBTC_945 = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Eth],
+    label: 'Morpho',
+    shortLabel: 'LBTC/WBTC',
+    value: MorphoBlueVersions.MorphoBlueLBTCWBTC_945,
+    url: 'lbtcwbtc-f6a05662',
+    loanToken: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
+    collateralToken: '0x8236a87084f8B84306f72007F36F2618A5634494',
+    oracle: '0xa98105B8227E0f2157816Feb7A331364A9B74F80',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.945,
+    marketId: '0xf6a056627a51e511ec7f48332421432ea6971fc148d8f3c451e14ea108026549',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_LBTC_CBBTC_945_BASE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Base],
+    label: 'Morpho',
+    shortLabel: 'LBTC/cbBTC',
+    value: MorphoBlueVersions.MorphoBlueLBTCCbBTC_945_Base,
+    url: 'lbtccbbtc-30767836',
+    loanToken: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf',
+    collateralToken: '0xecAc9C5F704e954931349Da37F60E39f515c11c1',
+    oracle: '0x9Ae0E86e88AEE94B700240eBE0BD17D969BAD0EA',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.945,
+    marketId: '0x30767836635facec1282e6ef4a5981406ed4e72727b3a63a3a72c74e8279a8d7',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_WSTETH_EURC_860_BASE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Base],
+    label: 'Morpho',
+    shortLabel: 'wstETH/EURC',
+    value: MorphoBlueVersions.MorphoBlueWstEthEURC_860_Base,
+    url: 'wstetheurc-f7e40290',
+    loanToken: '0x60a3E35Cc302bFA44Cb288Bc5a4F316Fdb1adb42',
+    collateralToken: '0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452',
+    oracle: '0xa54122f0E0766258377Ffe732e454A3248f454F4',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.86,
+    marketId: '0xf7e40290f8ca1d5848b3c129502599aa0f0602eb5f5235218797a34242719561',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_CBBTC_EURC_860_BASE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Base],
+    label: 'Morpho',
+    shortLabel: 'cbBTC/EURC',
+    value: MorphoBlueVersions.MorphoBlueCbBTCEURC_860_Base,
+    url: 'cbbtceurc-67ebd84b',
+    loanToken: '0x60a3E35Cc302bFA44Cb288Bc5a4F316Fdb1adb42',
+    collateralToken: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf',
+    oracle: '0xA857411CB2231a6A87a3bEF987a4cED8A067d799',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.86,
+    marketId: '0x67ebd84b2fb39e3bc5a13d97e4c07abe1ea617e40654826e9abce252e95f049e',
+    protocolName: 'morpho-blue',
+});
 export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueWstEthUSDC]: MORPHO_BLUE_WSTETH_USDC(networkId),
     [MorphoBlueVersions.MorphoBlueSDAIUSDC]: MORPHO_BLUE_SDAI_USDC(networkId),
@@ -751,6 +811,7 @@ export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueCbBTCUSDC_860]: MORPHO_BLUE_CBBTC_USDC_860(networkId),
     [MorphoBlueVersions.MorphoBlueREthEth_945]: MORPHO_BLUE_RETH_ETH_945(networkId),
     [MorphoBlueVersions.MorphoBlueSUSDeUSDC_915]: MORPHO_BLUE_SUSDE_USDC_915(networkId),
+    [MorphoBlueVersions.MorphoBlueLBTCWBTC_945]: MORPHO_BLUE_LBTC_WBTC_945(networkId),
     // wstETH/WETH
     [MorphoBlueVersions.MorphoBlueWstEthEth_945]: MORPHO_BLUE_WSTETH_ETH_945(networkId),
     [MorphoBlueVersions.MorphoBlueWstEthEth_945_Exchange_Rate]: MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE(networkId),
@@ -775,6 +836,9 @@ export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueREthEth_945_Base]: MORPHO_BLUE_RETH_ETH_945_BASE(networkId),
     [MorphoBlueVersions.MorphoBlueCbBTCEth_915_Base]: MORPHO_BLUE_CBBTC_ETH_915_BASE(networkId),
     [MorphoBlueVersions.MorphoBlueCbBTCUSDC_860_Base]: MORPHO_BLUE_CBBTC_USDC_860_BASE(networkId),
+    [MorphoBlueVersions.MorphoBlueCbBTCEURC_860_Base]: MORPHO_BLUE_CBBTC_EURC_860_BASE(networkId),
+    [MorphoBlueVersions.MorphoBlueWstEthEURC_860_Base]: MORPHO_BLUE_WSTETH_EURC_860_BASE(networkId),
+    [MorphoBlueVersions.MorphoBlueLBTCCbBTC_945_Base]: MORPHO_BLUE_LBTC_CBBTC_945_BASE(networkId),
     // wsuperOETHb/WETH Base
     [MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base]: MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE(networkId),
     // cbETH/WETH Base

package/esm/morphoBlue/index.js

@@ -8,30 +8,47 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
-import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
 import { NetworkNumber, } from '../types/common';
-import { FeedRegistryContract, MorphoBlueViewContract, } from '../contracts';
-import { WAD, USD_QUOTE } from '../constants';
+import { DFSFeedRegistryContract, FeedRegistryContract, MorphoBlueViewContract } from '../contracts';
+import { USD_QUOTE, WAD } from '../constants';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { wethToEth } from '../services/utils';
 import { getBorrowRate, getMorphoBlueAggregatedPositionData, getSupplyRate } from '../helpers/morphoBlueHelpers';
+import { getChainlinkAssetAddress } from '../services/priceService';
+const isMainnetNetwork = (network) => network === NetworkNumber.Eth;
 export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
     return __awaiter(this, void 0, void 0, function* () {
         const { loanToken, collateralToken, oracle, irm, lltv, oracleType, } = selectedMarket;
         const lltvInWei = new Dec(lltv).mul(WAD).toString();
         const loanTokenInfo = getAssetInfoByAddress(loanToken, network);
         const collateralTokenInfo = getAssetInfoByAddress(collateralToken, network);
-        let loanTokenFeedAddress = loanTokenInfo.addresses[NetworkNumber.Eth];
-        if (loanTokenInfo.symbol === 'WETH') {
-            const ethAddress = getAssetInfo('ETH').address;
-            loanTokenFeedAddress = ethAddress;
-        }
-        const feedRegistryContract = FeedRegistryContract(mainnetWeb3, NetworkNumber.Eth);
+        const loanTokenFeedAddress = getChainlinkAssetAddress(loanTokenInfo.symbol, network);
         const morphoBlueViewContract = MorphoBlueViewContract(web3, network);
-        const [loanTokenPrice, marketInfo] = yield Promise.all([
-            loanTokenInfo.symbol === 'USDA' ? '100000000' : feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, USD_QUOTE).call(),
-            morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
-        ]);
+        let marketInfo;
+        let loanTokenPrice;
+        const isTokenUSDA = loanTokenInfo.symbol === 'USDA';
+        const isMainnet = isMainnetNetwork(network);
+        if (isMainnet) {
+            const feedRegistryContract = FeedRegistryContract(mainnetWeb3, NetworkNumber.Eth);
+            const [_loanTokenPrice, _marketInfo] = yield Promise.all([
+                isTokenUSDA ? Promise.resolve('100000000') : feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, USD_QUOTE).call(),
+                morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
+            ]);
+            marketInfo = _marketInfo;
+            loanTokenPrice = _loanTokenPrice;
+        }
+        else {
+            // Currently only base network is supported
+            const feedRegistryContract = DFSFeedRegistryContract(web3, network);
+            const [loanTokenPriceRound, _marketInfo] = yield Promise.all([
+                isTokenUSDA ? Promise.resolve({ answer: '100000000' }) // Normalize to match the expected object structure
+                    : feedRegistryContract.methods.latestRoundData(loanTokenFeedAddress, USD_QUOTE).call(),
+                morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
+            ]);
+            marketInfo = _marketInfo;
+            loanTokenPrice = loanTokenPriceRound.answer;
+        }
         const supplyRate = getSupplyRate(marketInfo.totalSupplyAssets, marketInfo.totalBorrowAssets, marketInfo.borrowRate, marketInfo.fee);
         const compoundedBorrowRate = getBorrowRate(marketInfo.borrowRate, marketInfo.totalBorrowShares);
         const utillization = new Dec(marketInfo.totalBorrowAssets).div(marketInfo.totalSupplyAssets).mul(100).toString();

package/esm/services/priceService.d.ts

@@ -1,4 +1,7 @@
 import Web3 from 'web3';
+import { NetworkNumber } from '../types/common';
 export declare const getEthPrice: (web3: Web3) => Promise<string>;
 export declare const getUSDCPrice: (web3: Web3) => Promise<string>;
 export declare const getCompPrice: (web3: Web3) => Promise<string>;
+export declare const getWstETHPrice: (web3: Web3) => Promise<string>;
+export declare const getChainlinkAssetAddress: (symbol: string, network: NetworkNumber) => string;