@defisaver/positions-sdk 0.0.185-dev-1 → 0.0.185-dev-4

package/cjs/compoundV3/index.js

@@ -188,14 +188,9 @@ const getCompoundV3AccountData = (web3, network, address, proxyAddress, extracte
     if (loanData.borrowAmount.toString() !== '0') {
         usedAssets[baseAssetSymbol].isBorrowed = true;
         usedAssets[baseAssetSymbol].borrowed = (0, tokens_1.assetAmountInEth)(loanData.borrowAmount, baseAssetInfo.symbol);
-        if (selectedMarket.value === (0, compound_1.COMPOUND_V3_ETH)(network).value) {
-            usedAssets[baseAssetSymbol].borrowedUsd = new decimal_js_1.default((0, tokens_1.assetAmountInEth)(loanData.borrowValue, baseAssetInfo.symbol))
-                .mul(assetsData[baseAssetSymbol].price)
-                .toString();
-        }
-        else {
-            usedAssets[baseAssetSymbol].borrowedUsd = (0, tokens_1.assetAmountInEth)(loanData.borrowValue, baseAssetInfo.symbol);
-        }
+        usedAssets[baseAssetSymbol].borrowedUsd = new decimal_js_1.default((0, tokens_1.assetAmountInEth)(loanData.borrowValue, baseAssetInfo.symbol))
+            .mul(assetsData[baseAssetSymbol].price)
+            .toString();
     }
     const supportedAssetsAddresses = getSupportedAssetsAddressesForMarket(selectedMarket, network);
     loanData.collAddr.forEach((coll, i) => {

package/cjs/config/contracts.d.ts

@@ -6810,13 +6810,43 @@ export namespace FeedRegistry {
     };
     export { networks_77 as networks };
 }
-export namespace LlamaLendView {
+export namespace DFSFeedRegistry {
     let abi_78: ({
         inputs: never[];
         name: string;
         type: string;
         outputs?: undefined;
         stateMutability?: undefined;
+    } | {
+        inputs: {
+            internalType: string;
+            name: string;
+            type: string;
+        }[];
+        name: string;
+        outputs: {
+            internalType: string;
+            name: string;
+            type: string;
+        }[];
+        stateMutability: string;
+        type: string;
+    })[];
+    export { abi_78 as abi };
+    let networks_78: {
+        "8453": {
+            address: string;
+        };
+    };
+    export { networks_78 as networks };
+}
+export namespace LlamaLendView {
+    let abi_79: ({
+        inputs: never[];
+        name: string;
+        type: string;
+        outputs?: undefined;
+        stateMutability?: undefined;
     } | {
         inputs: {
             internalType: string;
@@ -6861,8 +6891,8 @@ export namespace LlamaLendView {
         stateMutability: string;
         type: string;
     })[];
-    export { abi_78 as abi };
-    let networks_78: {
+    export { abi_79 as abi };
+    let networks_79: {
         "1": {
             address: string;
         };
@@ -6870,10 +6900,10 @@ export namespace LlamaLendView {
             address: string;
         };
     };
-    export { networks_78 as networks };
+    export { networks_79 as networks };
 }
 export namespace LlamaLendControllerAbi {
-    let abi_79: ({
+    let abi_80: ({
         name: string;
         inputs: {
             name: string;
@@ -6925,12 +6955,12 @@ export namespace LlamaLendControllerAbi {
         }[];
         anonymous?: undefined;
     })[];
-    export { abi_79 as abi };
-    let networks_79: {};
-    export { networks_79 as networks };
+    export { abi_80 as abi };
+    let networks_80: {};
+    export { networks_80 as networks };
 }
 export namespace EulerV2View {
-    let abi_80: ({
+    let abi_81: ({
         inputs: {
             internalType: string;
             name: string;
@@ -6993,11 +7023,11 @@ export namespace EulerV2View {
         stateMutability: string;
         type: string;
     })[];
-    export { abi_80 as abi };
-    let networks_80: {
+    export { abi_81 as abi };
+    let networks_81: {
         "1": {
             address: string;
         };
     };
-    export { networks_80 as networks };
+    export { networks_81 as networks };
 }

package/cjs/config/contracts.js

@@ -1045,6 +1045,12 @@ module.exports = {
             "1": { "address": "0x47Fb2585D2C56Fe188D0E6ec628a38b74fCeeeDf" },
         }
     },
+    "DFSFeedRegistry": {
+        "abi": [{ "inputs": [], "name": "NonContractCall", "type": "error" }, { "inputs": [], "name": "SenderNotAdmin", "type": "error" }, { "inputs": [], "name": "SenderNotOwner", "type": "error" }, { "inputs": [], "name": "adminVault", "outputs": [{ "internalType": "contract AdminVault", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "", "type": "address" }, { "internalType": "address", "name": "", "type": "address" }], "name": "aggregators", "outputs": [{ "internalType": "address", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "base", "type": "address" }, { "internalType": "address", "name": "quote", "type": "address" }], "name": "getFeed", "outputs": [{ "internalType": "address", "name": "aggregator", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "kill", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "base", "type": "address" }, { "internalType": "address", "name": "quote", "type": "address" }], "name": "latestRoundData", "outputs": [{ "internalType": "uint80", "name": "roundId", "type": "uint80" }, { "internalType": "int256", "name": "answer", "type": "int256" }, { "internalType": "uint256", "name": "startedAt", "type": "uint256" }, { "internalType": "uint256", "name": "updatedAt", "type": "uint256" }, { "internalType": "uint80", "name": "answeredInRound", "type": "uint80" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "base", "type": "address" }, { "internalType": "address", "name": "quote", "type": "address" }, { "internalType": "address", "name": "aggregator", "type": "address" }], "name": "setFeed", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address[]", "name": "bases", "type": "address[]" }, { "internalType": "address[]", "name": "quotes", "type": "address[]" }, { "internalType": "address[]", "name": "aggregator", "type": "address[]" }], "name": "setFeeds", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "_token", "type": "address" }, { "internalType": "address", "name": "_receiver", "type": "address" }, { "internalType": "uint256", "name": "_amount", "type": "uint256" }], "name": "withdrawStuckFunds", "outputs": [], "stateMutability": "nonpayable", "type": "function" }],
+        "networks": {
+            "8453": { "address": "0x7dFF34190d0307fC234fc7E8C152C9715083eB02" },
+        }
+    },
     "LlamaLendView": {
         "abi": [{ "inputs": [], "name": "InvalidLlamaLendController", "type": "error" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }, { "internalType": "uint256", "name": "collateral", "type": "uint256" }, { "internalType": "uint256", "name": "debt", "type": "uint256" }, { "internalType": "uint256", "name": "N", "type": "uint256" }], "name": "createLoanData", "outputs": [{ "components": [{ "internalType": "int256", "name": "health", "type": "int256" }, { "internalType": "uint256", "name": "minColl", "type": "uint256" }, { "internalType": "uint256", "name": "maxBorrow", "type": "uint256" }, { "components": [{ "internalType": "int256", "name": "id", "type": "int256" }, { "internalType": "uint256", "name": "lowPrice", "type": "uint256" }, { "internalType": "uint256", "name": "highPrice", "type": "uint256" }, { "internalType": "uint256", "name": "collAmount", "type": "uint256" }, { "internalType": "uint256", "name": "debtAmount", "type": "uint256" }], "internalType": "struct LlamaLendView.Band[]", "name": "bands", "type": "tuple[]" }], "internalType": "struct LlamaLendView.CreateLoanData", "name": "", "type": "tuple" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }, { "internalType": "int256", "name": "n", "type": "int256" }], "name": "getBandData", "outputs": [{ "components": [{ "internalType": "int256", "name": "id", "type": "int256" }, { "internalType": "uint256", "name": "lowPrice", "type": "uint256" }, { "internalType": "uint256", "name": "highPrice", "type": "uint256" }, { "internalType": "uint256", "name": "collAmount", "type": "uint256" }, { "internalType": "uint256", "name": "debtAmount", "type": "uint256" }], "internalType": "struct LlamaLendView.Band", "name": "", "type": "tuple" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }, { "internalType": "int256", "name": "from", "type": "int256" }, { "internalType": "int256", "name": "to", "type": "int256" }], "name": "getBandsData", "outputs": [{ "components": [{ "internalType": "int256", "name": "id", "type": "int256" }, { "internalType": "uint256", "name": "lowPrice", "type": "uint256" }, { "internalType": "uint256", "name": "highPrice", "type": "uint256" }, { "internalType": "uint256", "name": "collAmount", "type": "uint256" }, { "internalType": "uint256", "name": "debtAmount", "type": "uint256" }], "internalType": "struct LlamaLendView.Band[]", "name": "", "type": "tuple[]" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }, { "internalType": "uint256", "name": "collateral", "type": "uint256" }, { "internalType": "uint256", "name": "debt", "type": "uint256" }, { "internalType": "uint256", "name": "N", "type": "uint256" }], "name": "getBandsDataForPosition", "outputs": [{ "components": [{ "internalType": "int256", "name": "id", "type": "int256" }, { "internalType": "uint256", "name": "lowPrice", "type": "uint256" }, { "internalType": "uint256", "name": "highPrice", "type": "uint256" }, { "internalType": "uint256", "name": "collAmount", "type": "uint256" }, { "internalType": "uint256", "name": "debtAmount", "type": "uint256" }], "internalType": "struct LlamaLendView.Band[]", "name": "bands", "type": "tuple[]" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "_controllerAddress", "type": "address" }, { "internalType": "address", "name": "_user", "type": "address" }], "name": "getCollAmountsFromAMM", "outputs": [{ "internalType": "uint256", "name": "debtAssetCollAmount", "type": "uint256" }, { "internalType": "uint256", "name": "collAssetCollAmount", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "_user", "type": "address" }, { "internalType": "address", "name": "_controllerAddr", "type": "address" }], "name": "getCollateralRatio", "outputs": [{ "internalType": "uint256", "name": "collRatio", "type": "uint256" }, { "internalType": "bool", "name": "isInSoftLiquidation", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }], "name": "globalData", "outputs": [{ "components": [{ "internalType": "address", "name": "collateralToken", "type": "address" }, { "internalType": "address", "name": "debtToken", "type": "address" }, { "internalType": "uint256", "name": "decimals", "type": "uint256" }, { "internalType": "int256", "name": "activeBand", "type": "int256" }, { "internalType": "uint256", "name": "A", "type": "uint256" }, { "internalType": "uint256", "name": "totalDebt", "type": "uint256" }, { "internalType": "uint256", "name": "ammPrice", "type": "uint256" }, { "internalType": "uint256", "name": "basePrice", "type": "uint256" }, { "internalType": "uint256", "name": "oraclePrice", "type": "uint256" }, { "internalType": "uint256", "name": "minted", "type": "uint256" }, { "internalType": "uint256", "name": "redeemed", "type": "uint256" }, { "internalType": "uint256", "name": "monetaryPolicyRate", "type": "uint256" }, { "internalType": "uint256", "name": "ammRate", "type": "uint256" }, { "internalType": "int256", "name": "minBand", "type": "int256" }, { "internalType": "int256", "name": "maxBand", "type": "int256" }, { "internalType": "uint256", "name": "borrowApr", "type": "uint256" }, { "internalType": "uint256", "name": "lendApr", "type": "uint256" }, { "internalType": "uint256", "name": "debtTokenTotalSupply", "type": "uint256" }, { "internalType": "uint256", "name": "debtTokenLeftToBorrow", "type": "uint256" }, { "internalType": "uint256", "name": "loanDiscount", "type": "uint256" }], "internalType": "struct LlamaLendView.GlobalData", "name": "", "type": "tuple" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }, { "internalType": "int256", "name": "collChange", "type": "int256" }, { "internalType": "int256", "name": "debtChange", "type": "int256" }, { "internalType": "bool", "name": "isFull", "type": "bool" }, { "internalType": "uint256", "name": "numBands", "type": "uint256" }], "name": "healthCalculator", "outputs": [{ "internalType": "int256", "name": "health", "type": "int256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "_controllerAddr", "type": "address" }, { "internalType": "uint256", "name": "_controllerId", "type": "uint256" }], "name": "isControllerValid", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }, { "internalType": "uint256", "name": "collateral", "type": "uint256" }, { "internalType": "uint256", "name": "N", "type": "uint256" }], "name": "maxBorrow", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }, { "internalType": "uint256", "name": "debt", "type": "uint256" }, { "internalType": "uint256", "name": "N", "type": "uint256" }], "name": "minCollateral", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "userData", "outputs": [{ "components": [{ "internalType": "bool", "name": "loanExists", "type": "bool" }, { "internalType": "uint256", "name": "collateralPrice", "type": "uint256" }, { "internalType": "uint256", "name": "marketCollateralAmount", "type": "uint256" }, { "internalType": "uint256", "name": "debtTokenCollateralAmount", "type": "uint256" }, { "internalType": "uint256", "name": "debtAmount", "type": "uint256" }, { "internalType": "uint256", "name": "N", "type": "uint256" }, { "internalType": "uint256", "name": "priceLow", "type": "uint256" }, { "internalType": "uint256", "name": "priceHigh", "type": "uint256" }, { "internalType": "uint256", "name": "liquidationDiscount", "type": "uint256" }, { "internalType": "int256", "name": "health", "type": "int256" }, { "internalType": "int256[2]", "name": "bandRange", "type": "int256[2]" }, { "internalType": "uint256[][2]", "name": "usersBands", "type": "uint256[][2]" }, { "internalType": "uint256", "name": "collRatio", "type": "uint256" }, { "internalType": "bool", "name": "isInSoftLiquidation", "type": "bool" }, { "internalType": "uint256", "name": "debtTokenSuppliedShares", "type": "uint256" }, { "internalType": "uint256", "name": "debtTokenSuppliedAssets", "type": "uint256" }], "internalType": "struct LlamaLendView.UserData", "name": "", "type": "tuple" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "_controllerAddress", "type": "address" }, { "internalType": "address", "name": "_user", "type": "address" }], "name": "userMaxWithdraw", "outputs": [{ "internalType": "uint256", "name": "maxWithdraw", "type": "uint256" }], "stateMutability": "view", "type": "function" }],
         "networks": {

package/cjs/contracts.d.ts

@@ -44,6 +44,7 @@ export declare const COMPPriceFeedContract: (web3: Web3, network: NetworkNumber,
 export declare const USDCPriceFeedContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.USDCPriceFeed;
 export declare const WstETHPriceFeedContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.WstETHPriceFeed;
 export declare const FeedRegistryContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.FeedRegistry;
+export declare const DFSFeedRegistryContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.DFSFeedRegistry;
 export declare const MorphoBlueViewContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.MorphoBlueView;
 export declare const LlamaLendViewContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.LlamaLendView;
 export declare const EulerV2ViewContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.EulerV2View;

package/cjs/contracts.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EulerV2ViewContract = exports.LlamaLendViewContract = exports.MorphoBlueViewContract = exports.FeedRegistryContract = exports.WstETHPriceFeedContract = exports.USDCPriceFeedContract = exports.COMPPriceFeedContract = exports.ETHPriceFeedContract = exports.ChickenBondsManagerContract = exports.ChickenBondsViewContract = exports.McdVatContract = exports.McdJugContract = exports.McdDogContract = exports.McdSpotterContract = exports.McdViewContract = exports.LiquityActivePoolContract = exports.LiquityPriceFeedContract = exports.LiquityTroveManagerContract = exports.LiquityCollSurplusPoolContract = exports.LiquityViewContract = exports.CrvUSDFactoryContract = exports.CrvUSDViewContract = exports.SparkViewContract = exports.SparkIncentiveDataProviderContract = exports.MorphoAaveV2ViewContract = exports.PotContract = exports.ComptrollerContract = exports.CompoundLoanInfoContract = exports.AaveLoanInfoV2Contract = exports.wstETHContract = exports.CompV3ViewContract = exports.BalanceScannerContract = exports.REthContract = exports.CbEthContract = exports.LidoContract = exports.GhoTokenContract = exports.AaveIncentiveDataProviderV3Contract = exports.AaveV3ViewContract = exports.UniMulticallContract = exports.createContractWrapper = exports.getErc20Contract = exports.getConfigContractAbi = exports.getConfigContractAddress = void 0;
+exports.EulerV2ViewContract = exports.LlamaLendViewContract = exports.MorphoBlueViewContract = exports.DFSFeedRegistryContract = exports.FeedRegistryContract = exports.WstETHPriceFeedContract = exports.USDCPriceFeedContract = exports.COMPPriceFeedContract = exports.ETHPriceFeedContract = exports.ChickenBondsManagerContract = exports.ChickenBondsViewContract = exports.McdVatContract = exports.McdJugContract = exports.McdDogContract = exports.McdSpotterContract = exports.McdViewContract = exports.LiquityActivePoolContract = exports.LiquityPriceFeedContract = exports.LiquityTroveManagerContract = exports.LiquityCollSurplusPoolContract = exports.LiquityViewContract = exports.CrvUSDFactoryContract = exports.CrvUSDViewContract = exports.SparkViewContract = exports.SparkIncentiveDataProviderContract = exports.MorphoAaveV2ViewContract = exports.PotContract = exports.ComptrollerContract = exports.CompoundLoanInfoContract = exports.AaveLoanInfoV2Contract = exports.wstETHContract = exports.CompV3ViewContract = exports.BalanceScannerContract = exports.REthContract = exports.CbEthContract = exports.LidoContract = exports.GhoTokenContract = exports.AaveIncentiveDataProviderV3Contract = exports.AaveV3ViewContract = exports.UniMulticallContract = exports.createContractWrapper = exports.getErc20Contract = exports.getConfigContractAbi = exports.getConfigContractAddress = void 0;
 const contracts_1 = __importDefault(require("./config/contracts"));
 const contractConfig = contracts_1.default;
 const getConfigContractAddress = (name, network, block) => {
@@ -86,6 +86,7 @@ exports.COMPPriceFeedContract = createContractFromConfigFunc('COMPPriceFeed');
 exports.USDCPriceFeedContract = createContractFromConfigFunc('USDCPriceFeed');
 exports.WstETHPriceFeedContract = createContractFromConfigFunc('WstETHPriceFeed');
 exports.FeedRegistryContract = createContractFromConfigFunc('FeedRegistry');
+exports.DFSFeedRegistryContract = createContractFromConfigFunc('DFSFeedRegistry');
 exports.MorphoBlueViewContract = createContractFromConfigFunc('MorphoBlueView');
 exports.LlamaLendViewContract = createContractFromConfigFunc('LlamaLendView');
 exports.EulerV2ViewContract = createContractFromConfigFunc('EulerV2View');

package/cjs/markets/morphoBlue/index.js

@@ -766,7 +766,7 @@ exports.MORPHO_BLUE_CBBTC_USDC_860_BASE = MORPHO_BLUE_CBBTC_USDC_860_BASE;
 const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Base],
     label: 'Morpho',
-    shortLabel: 'wsuperOETHb/WETH',
+    shortLabel: 'wsuperOETHb/ETH',
     value: types_1.MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base,
     url: 'wsuperoethbweth-144bf18d',
     loanToken: '0x4200000000000000000000000000000000000006',

package/cjs/morphoBlue/index.js

@@ -21,23 +21,40 @@ const constants_1 = require("../constants");
 const staking_1 = require("../staking");
 const utils_1 = require("../services/utils");
 const morphoBlueHelpers_1 = require("../helpers/morphoBlueHelpers");
+const priceService_1 = require("../services/priceService");
+const isMainnetNetwork = (network) => network === common_1.NetworkNumber.Eth;
 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 decimal_js_1.default(lltv).mul(constants_1.WAD).toString();
         const loanTokenInfo = (0, tokens_1.getAssetInfoByAddress)(loanToken, network);
         const collateralTokenInfo = (0, tokens_1.getAssetInfoByAddress)(collateralToken, network);
-        let loanTokenFeedAddress = loanTokenInfo.addresses[common_1.NetworkNumber.Eth];
-        if (loanTokenInfo.symbol === 'WETH') {
-            const ethAddress = (0, tokens_1.getAssetInfo)('ETH').address;
-            loanTokenFeedAddress = ethAddress;
-        }
-        const feedRegistryContract = (0, contracts_1.FeedRegistryContract)(mainnetWeb3, common_1.NetworkNumber.Eth);
+        const loanTokenFeedAddress = (0, priceService_1.getChainlinkAssetAddress)(loanTokenInfo.symbol, network);
         const morphoBlueViewContract = (0, contracts_1.MorphoBlueViewContract)(web3, network);
-        const [loanTokenPrice, marketInfo] = yield Promise.all([
-            loanTokenInfo.symbol === 'USDA' ? '100000000' : feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, constants_1.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 = (0, contracts_1.FeedRegistryContract)(mainnetWeb3, common_1.NetworkNumber.Eth);
+            const [_loanTokenPrice, _marketInfo] = yield Promise.all([
+                isTokenUSDA ? Promise.resolve('100000000') : feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, constants_1.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 = (0, contracts_1.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, constants_1.USD_QUOTE).call(),
+                morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
+            ]);
+            marketInfo = _marketInfo;
+            loanTokenPrice = loanTokenPriceRound.answer;
+        }
         const supplyRate = (0, morphoBlueHelpers_1.getSupplyRate)(marketInfo.totalSupplyAssets, marketInfo.totalBorrowAssets, marketInfo.borrowRate, marketInfo.fee);
         const compoundedBorrowRate = (0, morphoBlueHelpers_1.getBorrowRate)(marketInfo.borrowRate, marketInfo.totalBorrowShares);
         const utillization = new decimal_js_1.default(marketInfo.totalBorrowAssets).div(marketInfo.totalSupplyAssets).mul(100).toString();

package/cjs/services/priceService.d.ts

@@ -1,5 +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;

package/cjs/services/priceService.js

@@ -12,8 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWstETHPrice = exports.getCompPrice = exports.getUSDCPrice = exports.getEthPrice = void 0;
+exports.getChainlinkAssetAddress = exports.getWstETHPrice = exports.getCompPrice = exports.getUSDCPrice = exports.getEthPrice = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
+const tokens_1 = require("@defisaver/tokens");
 const contracts_1 = require("../contracts");
 const common_1 = require("../types/common");
 const multicall_1 = require("../multicall");
@@ -56,3 +57,12 @@ const getWstETHPrice = (web3) => __awaiter(void 0, void 0, void 0, function* ()
     return new decimal_js_1.default(ethPrice).mul(wstETHRate).toString();
 });
 exports.getWstETHPrice = getWstETHPrice;
+// chainlink price feed available only on mainnet
+const getChainlinkAssetAddress = (symbol, network) => {
+    if (['WBTC', 'RENBTC'].includes(symbol === null || symbol === void 0 ? void 0 : symbol.toUpperCase()))
+        return '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB';
+    if ((symbol === null || symbol === void 0 ? void 0 : symbol.toUpperCase()) === 'WETH')
+        return (0, tokens_1.getAssetInfo)('ETH').addresses[network];
+    return (0, tokens_1.getAssetInfo)(symbol).addresses[network];
+};
+exports.getChainlinkAssetAddress = getChainlinkAssetAddress;

package/cjs/types/contracts/generated/DFSFeedRegistry.d.ts

@@ -0,0 +1,40 @@
+/// <reference types="node" />
+import type BN from "bn.js";
+import type { ContractOptions } from "web3-eth-contract";
+import type { EventLog } from "web3-core";
+import type { EventEmitter } from "events";
+import type { Callback, NonPayableTransactionObject, BlockType, BaseContract } from "./types";
+export interface EventOptions {
+    filter?: object;
+    fromBlock?: BlockType;
+    topics?: string[];
+}
+export interface DFSFeedRegistry extends BaseContract {
+    constructor(jsonInterface: any[], address?: string, options?: ContractOptions): DFSFeedRegistry;
+    clone(): DFSFeedRegistry;
+    methods: {
+        adminVault(): NonPayableTransactionObject<string>;
+        aggregators(arg0: string, arg1: string): NonPayableTransactionObject<string>;
+        getFeed(base: string, quote: string): NonPayableTransactionObject<string>;
+        kill(): NonPayableTransactionObject<void>;
+        latestRoundData(base: string, quote: string): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        setFeed(base: string, quote: string, aggregator: string): NonPayableTransactionObject<void>;
+        setFeeds(bases: string[], quotes: string[], aggregator: string[]): NonPayableTransactionObject<void>;
+        withdrawStuckFunds(_token: string, _receiver: string, _amount: number | string | BN): NonPayableTransactionObject<void>;
+    };
+    events: {
+        allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;
+    };
+}

package/cjs/types/contracts/generated/DFSFeedRegistry.js

@@ -0,0 +1,5 @@
+"use strict";
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -24,6 +24,7 @@ export type { CompV3BulkerMainnetUSDC } from "./CompV3BulkerMainnetUSDC";
 export type { CompV3View } from "./CompV3View";
 export type { CompoundLoanInfo } from "./CompoundLoanInfo";
 export type { Comptroller } from "./Comptroller";
+export type { DFSFeedRegistry } from "./DFSFeedRegistry";
 export type { ETHPriceFeed } from "./ETHPriceFeed";
 export type { Erc20 } from "./Erc20";
 export type { EulerV2View } from "./EulerV2View";

package/esm/compoundV3/index.js

@@ -180,14 +180,9 @@ export const getCompoundV3AccountData = (web3, network, address, proxyAddress, e
     if (loanData.borrowAmount.toString() !== '0') {
         usedAssets[baseAssetSymbol].isBorrowed = true;
         usedAssets[baseAssetSymbol].borrowed = assetAmountInEth(loanData.borrowAmount, baseAssetInfo.symbol);
-        if (selectedMarket.value === COMPOUND_V3_ETH(network).value) {
-            usedAssets[baseAssetSymbol].borrowedUsd = new Dec(assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol))
-                .mul(assetsData[baseAssetSymbol].price)
-                .toString();
-        }
-        else {
-            usedAssets[baseAssetSymbol].borrowedUsd = assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol);
-        }
+        usedAssets[baseAssetSymbol].borrowedUsd = new Dec(assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol))
+            .mul(assetsData[baseAssetSymbol].price)
+            .toString();
     }
     const supportedAssetsAddresses = getSupportedAssetsAddressesForMarket(selectedMarket, network);
     loanData.collAddr.forEach((coll, i) => {

package/esm/config/contracts.d.ts

@@ -6810,13 +6810,43 @@ export namespace FeedRegistry {
     };
     export { networks_77 as networks };
 }
-export namespace LlamaLendView {
+export namespace DFSFeedRegistry {
     let abi_78: ({
         inputs: never[];
         name: string;
         type: string;
         outputs?: undefined;
         stateMutability?: undefined;
+    } | {
+        inputs: {
+            internalType: string;
+            name: string;
+            type: string;
+        }[];
+        name: string;
+        outputs: {
+            internalType: string;
+            name: string;
+            type: string;
+        }[];
+        stateMutability: string;
+        type: string;
+    })[];
+    export { abi_78 as abi };
+    let networks_78: {
+        "8453": {
+            address: string;
+        };
+    };
+    export { networks_78 as networks };
+}
+export namespace LlamaLendView {
+    let abi_79: ({
+        inputs: never[];
+        name: string;
+        type: string;
+        outputs?: undefined;
+        stateMutability?: undefined;
     } | {
         inputs: {
             internalType: string;
@@ -6861,8 +6891,8 @@ export namespace LlamaLendView {
         stateMutability: string;
         type: string;
     })[];
-    export { abi_78 as abi };
-    let networks_78: {
+    export { abi_79 as abi };
+    let networks_79: {
         "1": {
             address: string;
         };
@@ -6870,10 +6900,10 @@ export namespace LlamaLendView {
             address: string;
         };
     };
-    export { networks_78 as networks };
+    export { networks_79 as networks };
 }
 export namespace LlamaLendControllerAbi {
-    let abi_79: ({
+    let abi_80: ({
         name: string;
         inputs: {
             name: string;
@@ -6925,12 +6955,12 @@ export namespace LlamaLendControllerAbi {
         }[];
         anonymous?: undefined;
     })[];
-    export { abi_79 as abi };
-    let networks_79: {};
-    export { networks_79 as networks };
+    export { abi_80 as abi };
+    let networks_80: {};
+    export { networks_80 as networks };
 }
 export namespace EulerV2View {
-    let abi_80: ({
+    let abi_81: ({
         inputs: {
             internalType: string;
             name: string;
@@ -6993,11 +7023,11 @@ export namespace EulerV2View {
         stateMutability: string;
         type: string;
     })[];
-    export { abi_80 as abi };
-    let networks_80: {
+    export { abi_81 as abi };
+    let networks_81: {
         "1": {
             address: string;
         };
     };
-    export { networks_80 as networks };
+    export { networks_81 as networks };
 }

package/esm/config/contracts.js

@@ -1044,6 +1044,12 @@ module.exports = {
             "1": { "address": "0x47Fb2585D2C56Fe188D0E6ec628a38b74fCeeeDf" },
         }
     },
+    "DFSFeedRegistry": {
+        "abi": [{ "inputs": [], "name": "NonContractCall", "type": "error" }, { "inputs": [], "name": "SenderNotAdmin", "type": "error" }, { "inputs": [], "name": "SenderNotOwner", "type": "error" }, { "inputs": [], "name": "adminVault", "outputs": [{ "internalType": "contract AdminVault", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "", "type": "address" }, { "internalType": "address", "name": "", "type": "address" }], "name": "aggregators", "outputs": [{ "internalType": "address", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "base", "type": "address" }, { "internalType": "address", "name": "quote", "type": "address" }], "name": "getFeed", "outputs": [{ "internalType": "address", "name": "aggregator", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "kill", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "base", "type": "address" }, { "internalType": "address", "name": "quote", "type": "address" }], "name": "latestRoundData", "outputs": [{ "internalType": "uint80", "name": "roundId", "type": "uint80" }, { "internalType": "int256", "name": "answer", "type": "int256" }, { "internalType": "uint256", "name": "startedAt", "type": "uint256" }, { "internalType": "uint256", "name": "updatedAt", "type": "uint256" }, { "internalType": "uint80", "name": "answeredInRound", "type": "uint80" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "base", "type": "address" }, { "internalType": "address", "name": "quote", "type": "address" }, { "internalType": "address", "name": "aggregator", "type": "address" }], "name": "setFeed", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address[]", "name": "bases", "type": "address[]" }, { "internalType": "address[]", "name": "quotes", "type": "address[]" }, { "internalType": "address[]", "name": "aggregator", "type": "address[]" }], "name": "setFeeds", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "_token", "type": "address" }, { "internalType": "address", "name": "_receiver", "type": "address" }, { "internalType": "uint256", "name": "_amount", "type": "uint256" }], "name": "withdrawStuckFunds", "outputs": [], "stateMutability": "nonpayable", "type": "function" }],
+        "networks": {
+            "8453": { "address": "0x7dFF34190d0307fC234fc7E8C152C9715083eB02" },
+        }
+    },
     "LlamaLendView": {
         "abi": [{ "inputs": [], "name": "InvalidLlamaLendController", "type": "error" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }, { "internalType": "uint256", "name": "collateral", "type": "uint256" }, { "internalType": "uint256", "name": "debt", "type": "uint256" }, { "internalType": "uint256", "name": "N", "type": "uint256" }], "name": "createLoanData", "outputs": [{ "components": [{ "internalType": "int256", "name": "health", "type": "int256" }, { "internalType": "uint256", "name": "minColl", "type": "uint256" }, { "internalType": "uint256", "name": "maxBorrow", "type": "uint256" }, { "components": [{ "internalType": "int256", "name": "id", "type": "int256" }, { "internalType": "uint256", "name": "lowPrice", "type": "uint256" }, { "internalType": "uint256", "name": "highPrice", "type": "uint256" }, { "internalType": "uint256", "name": "collAmount", "type": "uint256" }, { "internalType": "uint256", "name": "debtAmount", "type": "uint256" }], "internalType": "struct LlamaLendView.Band[]", "name": "bands", "type": "tuple[]" }], "internalType": "struct LlamaLendView.CreateLoanData", "name": "", "type": "tuple" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }, { "internalType": "int256", "name": "n", "type": "int256" }], "name": "getBandData", "outputs": [{ "components": [{ "internalType": "int256", "name": "id", "type": "int256" }, { "internalType": "uint256", "name": "lowPrice", "type": "uint256" }, { "internalType": "uint256", "name": "highPrice", "type": "uint256" }, { "internalType": "uint256", "name": "collAmount", "type": "uint256" }, { "internalType": "uint256", "name": "debtAmount", "type": "uint256" }], "internalType": "struct LlamaLendView.Band", "name": "", "type": "tuple" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }, { "internalType": "int256", "name": "from", "type": "int256" }, { "internalType": "int256", "name": "to", "type": "int256" }], "name": "getBandsData", "outputs": [{ "components": [{ "internalType": "int256", "name": "id", "type": "int256" }, { "internalType": "uint256", "name": "lowPrice", "type": "uint256" }, { "internalType": "uint256", "name": "highPrice", "type": "uint256" }, { "internalType": "uint256", "name": "collAmount", "type": "uint256" }, { "internalType": "uint256", "name": "debtAmount", "type": "uint256" }], "internalType": "struct LlamaLendView.Band[]", "name": "", "type": "tuple[]" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }, { "internalType": "uint256", "name": "collateral", "type": "uint256" }, { "internalType": "uint256", "name": "debt", "type": "uint256" }, { "internalType": "uint256", "name": "N", "type": "uint256" }], "name": "getBandsDataForPosition", "outputs": [{ "components": [{ "internalType": "int256", "name": "id", "type": "int256" }, { "internalType": "uint256", "name": "lowPrice", "type": "uint256" }, { "internalType": "uint256", "name": "highPrice", "type": "uint256" }, { "internalType": "uint256", "name": "collAmount", "type": "uint256" }, { "internalType": "uint256", "name": "debtAmount", "type": "uint256" }], "internalType": "struct LlamaLendView.Band[]", "name": "bands", "type": "tuple[]" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "_controllerAddress", "type": "address" }, { "internalType": "address", "name": "_user", "type": "address" }], "name": "getCollAmountsFromAMM", "outputs": [{ "internalType": "uint256", "name": "debtAssetCollAmount", "type": "uint256" }, { "internalType": "uint256", "name": "collAssetCollAmount", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "_user", "type": "address" }, { "internalType": "address", "name": "_controllerAddr", "type": "address" }], "name": "getCollateralRatio", "outputs": [{ "internalType": "uint256", "name": "collRatio", "type": "uint256" }, { "internalType": "bool", "name": "isInSoftLiquidation", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }], "name": "globalData", "outputs": [{ "components": [{ "internalType": "address", "name": "collateralToken", "type": "address" }, { "internalType": "address", "name": "debtToken", "type": "address" }, { "internalType": "uint256", "name": "decimals", "type": "uint256" }, { "internalType": "int256", "name": "activeBand", "type": "int256" }, { "internalType": "uint256", "name": "A", "type": "uint256" }, { "internalType": "uint256", "name": "totalDebt", "type": "uint256" }, { "internalType": "uint256", "name": "ammPrice", "type": "uint256" }, { "internalType": "uint256", "name": "basePrice", "type": "uint256" }, { "internalType": "uint256", "name": "oraclePrice", "type": "uint256" }, { "internalType": "uint256", "name": "minted", "type": "uint256" }, { "internalType": "uint256", "name": "redeemed", "type": "uint256" }, { "internalType": "uint256", "name": "monetaryPolicyRate", "type": "uint256" }, { "internalType": "uint256", "name": "ammRate", "type": "uint256" }, { "internalType": "int256", "name": "minBand", "type": "int256" }, { "internalType": "int256", "name": "maxBand", "type": "int256" }, { "internalType": "uint256", "name": "borrowApr", "type": "uint256" }, { "internalType": "uint256", "name": "lendApr", "type": "uint256" }, { "internalType": "uint256", "name": "debtTokenTotalSupply", "type": "uint256" }, { "internalType": "uint256", "name": "debtTokenLeftToBorrow", "type": "uint256" }, { "internalType": "uint256", "name": "loanDiscount", "type": "uint256" }], "internalType": "struct LlamaLendView.GlobalData", "name": "", "type": "tuple" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }, { "internalType": "int256", "name": "collChange", "type": "int256" }, { "internalType": "int256", "name": "debtChange", "type": "int256" }, { "internalType": "bool", "name": "isFull", "type": "bool" }, { "internalType": "uint256", "name": "numBands", "type": "uint256" }], "name": "healthCalculator", "outputs": [{ "internalType": "int256", "name": "health", "type": "int256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "_controllerAddr", "type": "address" }, { "internalType": "uint256", "name": "_controllerId", "type": "uint256" }], "name": "isControllerValid", "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }, { "internalType": "uint256", "name": "collateral", "type": "uint256" }, { "internalType": "uint256", "name": "N", "type": "uint256" }], "name": "maxBorrow", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }, { "internalType": "uint256", "name": "debt", "type": "uint256" }, { "internalType": "uint256", "name": "N", "type": "uint256" }], "name": "minCollateral", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "market", "type": "address" }, { "internalType": "address", "name": "user", "type": "address" }], "name": "userData", "outputs": [{ "components": [{ "internalType": "bool", "name": "loanExists", "type": "bool" }, { "internalType": "uint256", "name": "collateralPrice", "type": "uint256" }, { "internalType": "uint256", "name": "marketCollateralAmount", "type": "uint256" }, { "internalType": "uint256", "name": "debtTokenCollateralAmount", "type": "uint256" }, { "internalType": "uint256", "name": "debtAmount", "type": "uint256" }, { "internalType": "uint256", "name": "N", "type": "uint256" }, { "internalType": "uint256", "name": "priceLow", "type": "uint256" }, { "internalType": "uint256", "name": "priceHigh", "type": "uint256" }, { "internalType": "uint256", "name": "liquidationDiscount", "type": "uint256" }, { "internalType": "int256", "name": "health", "type": "int256" }, { "internalType": "int256[2]", "name": "bandRange", "type": "int256[2]" }, { "internalType": "uint256[][2]", "name": "usersBands", "type": "uint256[][2]" }, { "internalType": "uint256", "name": "collRatio", "type": "uint256" }, { "internalType": "bool", "name": "isInSoftLiquidation", "type": "bool" }, { "internalType": "uint256", "name": "debtTokenSuppliedShares", "type": "uint256" }, { "internalType": "uint256", "name": "debtTokenSuppliedAssets", "type": "uint256" }], "internalType": "struct LlamaLendView.UserData", "name": "", "type": "tuple" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "_controllerAddress", "type": "address" }, { "internalType": "address", "name": "_user", "type": "address" }], "name": "userMaxWithdraw", "outputs": [{ "internalType": "uint256", "name": "maxWithdraw", "type": "uint256" }], "stateMutability": "view", "type": "function" }],
         "networks": {

package/esm/contracts.d.ts

@@ -44,6 +44,7 @@ export declare const COMPPriceFeedContract: (web3: Web3, network: NetworkNumber,
 export declare const USDCPriceFeedContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.USDCPriceFeed;
 export declare const WstETHPriceFeedContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.WstETHPriceFeed;
 export declare const FeedRegistryContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.FeedRegistry;
+export declare const DFSFeedRegistryContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.DFSFeedRegistry;
 export declare const MorphoBlueViewContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.MorphoBlueView;
 export declare const LlamaLendViewContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.LlamaLendView;
 export declare const EulerV2ViewContract: (web3: Web3, network: NetworkNumber, block?: Blockish) => ContractTypes.EulerV2View;

package/esm/contracts.js

@@ -76,6 +76,7 @@ export const COMPPriceFeedContract = createContractFromConfigFunc('COMPPriceFeed
 export const USDCPriceFeedContract = createContractFromConfigFunc('USDCPriceFeed');
 export const WstETHPriceFeedContract = createContractFromConfigFunc('WstETHPriceFeed');
 export const FeedRegistryContract = createContractFromConfigFunc('FeedRegistry');
+export const DFSFeedRegistryContract = createContractFromConfigFunc('DFSFeedRegistry');
 export const MorphoBlueViewContract = createContractFromConfigFunc('MorphoBlueView');
 export const LlamaLendViewContract = createContractFromConfigFunc('LlamaLendView');
 export const EulerV2ViewContract = createContractFromConfigFunc('EulerV2View');

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',

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,5 +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;

package/esm/services/priceService.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
+import { getAssetInfo } from '@defisaver/tokens';
 import { COMPPriceFeedContract, ETHPriceFeedContract, USDCPriceFeedContract, WstETHPriceFeedContract, } from '../contracts';
 import { NetworkNumber } from '../types/common';
 import { multicall } from '../multicall';
@@ -46,3 +47,11 @@ export const getWstETHPrice = (web3) => __awaiter(void 0, void 0, void 0, functi
     const wstETHRate = new Dec(multicallRes[1].answer).div(1e8);
     return new Dec(ethPrice).mul(wstETHRate).toString();
 });
+// chainlink price feed available only on mainnet
+export const getChainlinkAssetAddress = (symbol, network) => {
+    if (['WBTC', 'RENBTC'].includes(symbol === null || symbol === void 0 ? void 0 : symbol.toUpperCase()))
+        return '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB';
+    if ((symbol === null || symbol === void 0 ? void 0 : symbol.toUpperCase()) === 'WETH')
+        return getAssetInfo('ETH').addresses[network];
+    return getAssetInfo(symbol).addresses[network];
+};

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

@@ -0,0 +1,40 @@
+/// <reference types="node" />
+import type BN from "bn.js";
+import type { ContractOptions } from "web3-eth-contract";
+import type { EventLog } from "web3-core";
+import type { EventEmitter } from "events";
+import type { Callback, NonPayableTransactionObject, BlockType, BaseContract } from "./types";
+export interface EventOptions {
+    filter?: object;
+    fromBlock?: BlockType;
+    topics?: string[];
+}
+export interface DFSFeedRegistry extends BaseContract {
+    constructor(jsonInterface: any[], address?: string, options?: ContractOptions): DFSFeedRegistry;
+    clone(): DFSFeedRegistry;
+    methods: {
+        adminVault(): NonPayableTransactionObject<string>;
+        aggregators(arg0: string, arg1: string): NonPayableTransactionObject<string>;
+        getFeed(base: string, quote: string): NonPayableTransactionObject<string>;
+        kill(): NonPayableTransactionObject<void>;
+        latestRoundData(base: string, quote: string): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        setFeed(base: string, quote: string, aggregator: string): NonPayableTransactionObject<void>;
+        setFeeds(bases: string[], quotes: string[], aggregator: string[]): NonPayableTransactionObject<void>;
+        withdrawStuckFunds(_token: string, _receiver: string, _amount: number | string | BN): NonPayableTransactionObject<void>;
+    };
+    events: {
+        allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;
+    };
+}

package/esm/types/contracts/generated/DFSFeedRegistry.js

@@ -0,0 +1,4 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+export {};

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

@@ -24,6 +24,7 @@ export type { CompV3BulkerMainnetUSDC } from "./CompV3BulkerMainnetUSDC";
 export type { CompV3View } from "./CompV3View";
 export type { CompoundLoanInfo } from "./CompoundLoanInfo";
 export type { Comptroller } from "./Comptroller";
+export type { DFSFeedRegistry } from "./DFSFeedRegistry";
 export type { ETHPriceFeed } from "./ETHPriceFeed";
 export type { Erc20 } from "./Erc20";
 export type { EulerV2View } from "./EulerV2View";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.185-dev-1",
+  "version": "0.0.185-dev-4",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/compoundV3/index.ts

@@ -234,15 +234,11 @@ export const getCompoundV3AccountData = async (
   if (loanData.borrowAmount.toString() !== '0') {
     usedAssets[baseAssetSymbol].isBorrowed = true;
     usedAssets[baseAssetSymbol].borrowed = assetAmountInEth(loanData.borrowAmount, baseAssetInfo.symbol);
-    if (selectedMarket.value === COMPOUND_V3_ETH(network).value) {
-      usedAssets[baseAssetSymbol].borrowedUsd = new Dec(
-        assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol),
-      )
-        .mul(assetsData[baseAssetSymbol].price)
-        .toString();
-    } else {
-      usedAssets[baseAssetSymbol].borrowedUsd = assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol);
-    }
+    usedAssets[baseAssetSymbol].borrowedUsd = new Dec(
+      assetAmountInEth(loanData.borrowValue, baseAssetInfo.symbol),
+    )
+      .mul(assetsData[baseAssetSymbol].price)
+      .toString();
   }
   const supportedAssetsAddresses = getSupportedAssetsAddressesForMarket(selectedMarket, network);
 

package/src/config/contracts.js

@@ -1045,6 +1045,12 @@ module.exports = {
       "1": { "address": "0x47Fb2585D2C56Fe188D0E6ec628a38b74fCeeeDf" },
     }
   },
+  "DFSFeedRegistry": {
+    "abi": [{"inputs":[],"name":"NonContractCall","type":"error"},{"inputs":[],"name":"SenderNotAdmin","type":"error"},{"inputs":[],"name":"SenderNotOwner","type":"error"},{"inputs":[],"name":"adminVault","outputs":[{"internalType":"contract AdminVault","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"address","name":"","type":"address"}],"name":"aggregators","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"getFeed","outputs":[{"internalType":"address","name":"aggregator","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"kill","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"}],"name":"latestRoundData","outputs":[{"internalType":"uint80","name":"roundId","type":"uint80"},{"internalType":"int256","name":"answer","type":"int256"},{"internalType":"uint256","name":"startedAt","type":"uint256"},{"internalType":"uint256","name":"updatedAt","type":"uint256"},{"internalType":"uint80","name":"answeredInRound","type":"uint80"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"base","type":"address"},{"internalType":"address","name":"quote","type":"address"},{"internalType":"address","name":"aggregator","type":"address"}],"name":"setFeed","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address[]","name":"bases","type":"address[]"},{"internalType":"address[]","name":"quotes","type":"address[]"},{"internalType":"address[]","name":"aggregator","type":"address[]"}],"name":"setFeeds","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_token","type":"address"},{"internalType":"address","name":"_receiver","type":"address"},{"internalType":"uint256","name":"_amount","type":"uint256"}],"name":"withdrawStuckFunds","outputs":[],"stateMutability":"nonpayable","type":"function"}],
+    "networks": {
+      "8453": { "address": "0x7dFF34190d0307fC234fc7E8C152C9715083eB02" },
+    }
+  },
   "LlamaLendView": {
     "abi": [{"inputs":[],"name":"InvalidLlamaLendController","type":"error"},{"inputs":[{"internalType":"address","name":"market","type":"address"},{"internalType":"uint256","name":"collateral","type":"uint256"},{"internalType":"uint256","name":"debt","type":"uint256"},{"internalType":"uint256","name":"N","type":"uint256"}],"name":"createLoanData","outputs":[{"components":[{"internalType":"int256","name":"health","type":"int256"},{"internalType":"uint256","name":"minColl","type":"uint256"},{"internalType":"uint256","name":"maxBorrow","type":"uint256"},{"components":[{"internalType":"int256","name":"id","type":"int256"},{"internalType":"uint256","name":"lowPrice","type":"uint256"},{"internalType":"uint256","name":"highPrice","type":"uint256"},{"internalType":"uint256","name":"collAmount","type":"uint256"},{"internalType":"uint256","name":"debtAmount","type":"uint256"}],"internalType":"struct LlamaLendView.Band[]","name":"bands","type":"tuple[]"}],"internalType":"struct LlamaLendView.CreateLoanData","name":"","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"market","type":"address"},{"internalType":"int256","name":"n","type":"int256"}],"name":"getBandData","outputs":[{"components":[{"internalType":"int256","name":"id","type":"int256"},{"internalType":"uint256","name":"lowPrice","type":"uint256"},{"internalType":"uint256","name":"highPrice","type":"uint256"},{"internalType":"uint256","name":"collAmount","type":"uint256"},{"internalType":"uint256","name":"debtAmount","type":"uint256"}],"internalType":"struct LlamaLendView.Band","name":"","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"market","type":"address"},{"internalType":"int256","name":"from","type":"int256"},{"internalType":"int256","name":"to","type":"int256"}],"name":"getBandsData","outputs":[{"components":[{"internalType":"int256","name":"id","type":"int256"},{"internalType":"uint256","name":"lowPrice","type":"uint256"},{"internalType":"uint256","name":"highPrice","type":"uint256"},{"internalType":"uint256","name":"collAmount","type":"uint256"},{"internalType":"uint256","name":"debtAmount","type":"uint256"}],"internalType":"struct LlamaLendView.Band[]","name":"","type":"tuple[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"market","type":"address"},{"internalType":"uint256","name":"collateral","type":"uint256"},{"internalType":"uint256","name":"debt","type":"uint256"},{"internalType":"uint256","name":"N","type":"uint256"}],"name":"getBandsDataForPosition","outputs":[{"components":[{"internalType":"int256","name":"id","type":"int256"},{"internalType":"uint256","name":"lowPrice","type":"uint256"},{"internalType":"uint256","name":"highPrice","type":"uint256"},{"internalType":"uint256","name":"collAmount","type":"uint256"},{"internalType":"uint256","name":"debtAmount","type":"uint256"}],"internalType":"struct LlamaLendView.Band[]","name":"bands","type":"tuple[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_controllerAddress","type":"address"},{"internalType":"address","name":"_user","type":"address"}],"name":"getCollAmountsFromAMM","outputs":[{"internalType":"uint256","name":"debtAssetCollAmount","type":"uint256"},{"internalType":"uint256","name":"collAssetCollAmount","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_user","type":"address"},{"internalType":"address","name":"_controllerAddr","type":"address"}],"name":"getCollateralRatio","outputs":[{"internalType":"uint256","name":"collRatio","type":"uint256"},{"internalType":"bool","name":"isInSoftLiquidation","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"market","type":"address"}],"name":"globalData","outputs":[{"components":[{"internalType":"address","name":"collateralToken","type":"address"},{"internalType":"address","name":"debtToken","type":"address"},{"internalType":"uint256","name":"decimals","type":"uint256"},{"internalType":"int256","name":"activeBand","type":"int256"},{"internalType":"uint256","name":"A","type":"uint256"},{"internalType":"uint256","name":"totalDebt","type":"uint256"},{"internalType":"uint256","name":"ammPrice","type":"uint256"},{"internalType":"uint256","name":"basePrice","type":"uint256"},{"internalType":"uint256","name":"oraclePrice","type":"uint256"},{"internalType":"uint256","name":"minted","type":"uint256"},{"internalType":"uint256","name":"redeemed","type":"uint256"},{"internalType":"uint256","name":"monetaryPolicyRate","type":"uint256"},{"internalType":"uint256","name":"ammRate","type":"uint256"},{"internalType":"int256","name":"minBand","type":"int256"},{"internalType":"int256","name":"maxBand","type":"int256"},{"internalType":"uint256","name":"borrowApr","type":"uint256"},{"internalType":"uint256","name":"lendApr","type":"uint256"},{"internalType":"uint256","name":"debtTokenTotalSupply","type":"uint256"},{"internalType":"uint256","name":"debtTokenLeftToBorrow","type":"uint256"},{"internalType":"uint256","name":"loanDiscount","type":"uint256"}],"internalType":"struct LlamaLendView.GlobalData","name":"","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"market","type":"address"},{"internalType":"address","name":"user","type":"address"},{"internalType":"int256","name":"collChange","type":"int256"},{"internalType":"int256","name":"debtChange","type":"int256"},{"internalType":"bool","name":"isFull","type":"bool"},{"internalType":"uint256","name":"numBands","type":"uint256"}],"name":"healthCalculator","outputs":[{"internalType":"int256","name":"health","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_controllerAddr","type":"address"},{"internalType":"uint256","name":"_controllerId","type":"uint256"}],"name":"isControllerValid","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"market","type":"address"},{"internalType":"uint256","name":"collateral","type":"uint256"},{"internalType":"uint256","name":"N","type":"uint256"}],"name":"maxBorrow","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"market","type":"address"},{"internalType":"uint256","name":"debt","type":"uint256"},{"internalType":"uint256","name":"N","type":"uint256"}],"name":"minCollateral","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"market","type":"address"},{"internalType":"address","name":"user","type":"address"}],"name":"userData","outputs":[{"components":[{"internalType":"bool","name":"loanExists","type":"bool"},{"internalType":"uint256","name":"collateralPrice","type":"uint256"},{"internalType":"uint256","name":"marketCollateralAmount","type":"uint256"},{"internalType":"uint256","name":"debtTokenCollateralAmount","type":"uint256"},{"internalType":"uint256","name":"debtAmount","type":"uint256"},{"internalType":"uint256","name":"N","type":"uint256"},{"internalType":"uint256","name":"priceLow","type":"uint256"},{"internalType":"uint256","name":"priceHigh","type":"uint256"},{"internalType":"uint256","name":"liquidationDiscount","type":"uint256"},{"internalType":"int256","name":"health","type":"int256"},{"internalType":"int256[2]","name":"bandRange","type":"int256[2]"},{"internalType":"uint256[][2]","name":"usersBands","type":"uint256[][2]"},{"internalType":"uint256","name":"collRatio","type":"uint256"},{"internalType":"bool","name":"isInSoftLiquidation","type":"bool"},{"internalType":"uint256","name":"debtTokenSuppliedShares","type":"uint256"},{"internalType":"uint256","name":"debtTokenSuppliedAssets","type":"uint256"}],"internalType":"struct LlamaLendView.UserData","name":"","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_controllerAddress","type":"address"},{"internalType":"address","name":"_user","type":"address"}],"name":"userMaxWithdraw","outputs":[{"internalType":"uint256","name":"maxWithdraw","type":"uint256"}],"stateMutability":"view","type":"function"}],
     "networks": {

package/src/contracts.ts

@@ -123,6 +123,7 @@ export const USDCPriceFeedContract = createContractFromConfigFunc<ContractTypes.
 export const WstETHPriceFeedContract = createContractFromConfigFunc<ContractTypes.WstETHPriceFeed>('WstETHPriceFeed');
 
 export const FeedRegistryContract = createContractFromConfigFunc<ContractTypes.FeedRegistry>('FeedRegistry');
+export const DFSFeedRegistryContract = createContractFromConfigFunc<ContractTypes.DFSFeedRegistry>('DFSFeedRegistry');
 
 export const MorphoBlueViewContract = createContractFromConfigFunc<ContractTypes.MorphoBlueView>('MorphoBlueView');
 

package/src/markets/morphoBlue/index.ts

@@ -723,7 +723,7 @@ export const MORPHO_BLUE_CBBTC_USDC_860_BASE = (networkId: NetworkNumber = Netwo
 export const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
   chainIds: [NetworkNumber.Base],
   label: 'Morpho',
-  shortLabel: 'wsuperOETHb/WETH',
+  shortLabel: 'wsuperOETHb/ETH',
   value: MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base,
   url: 'wsuperoethbweth-144bf18d',
   loanToken: '0x4200000000000000000000000000000000000006',

package/src/morphoBlue/index.ts

@@ -1,41 +1,60 @@
 import Web3 from 'web3';
 import Dec from 'decimal.js';
-import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import {
+  assetAmountInEth, AssetData, getAssetInfo, getAssetInfoByAddress,
+} from '@defisaver/tokens';
 import {
   Blockish, EthAddress, MMUsedAssets, NetworkNumber, PositionBalances,
 } from '../types/common';
-import {
-  FeedRegistryContract,
-  MorphoBlueViewContract,
-} from '../contracts';
+import { DFSFeedRegistryContract, FeedRegistryContract, MorphoBlueViewContract } from '../contracts';
 import {
   MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData,
 } from '../types';
-import { WAD, USD_QUOTE } from '../constants';
+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: NetworkNumber) => network === NetworkNumber.Eth;
 
 export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber, selectedMarket: MorphoBlueMarketData, mainnetWeb3: Web3): Promise<MorphoBlueMarketInfo> {
   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] = await 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] = await 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] = await 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);

package/src/services/priceService.ts

@@ -1,5 +1,6 @@
 import Web3 from 'web3';
 import Dec from 'decimal.js';
+import { getAssetInfo } from '@defisaver/tokens';
 import {
   COMPPriceFeedContract,
   ETHPriceFeedContract,
@@ -50,4 +51,11 @@ export const getWstETHPrice = async (web3: Web3) => {
   const wstETHRate = new Dec(multicallRes[1].answer).div(1e8);
 
   return new Dec(ethPrice).mul(wstETHRate).toString();
-};
+};
+
+// chainlink price feed available only on mainnet
+export const getChainlinkAssetAddress = (symbol: string, network: NetworkNumber) => {
+  if (['WBTC', 'RENBTC'].includes(symbol?.toUpperCase())) return '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB';
+  if (symbol?.toUpperCase() === 'WETH') return getAssetInfo('ETH').addresses[network];
+  return getAssetInfo(symbol).addresses[network];
+};

package/src/types/contracts/generated/DFSFeedRegistry.ts

@@ -0,0 +1,77 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import type BN from "bn.js";
+import type { ContractOptions } from "web3-eth-contract";
+import type { EventLog } from "web3-core";
+import type { EventEmitter } from "events";
+import type {
+  Callback,
+  PayableTransactionObject,
+  NonPayableTransactionObject,
+  BlockType,
+  ContractEventLog,
+  BaseContract,
+} from "./types";
+
+export interface EventOptions {
+  filter?: object;
+  fromBlock?: BlockType;
+  topics?: string[];
+}
+
+export interface DFSFeedRegistry extends BaseContract {
+  constructor(
+    jsonInterface: any[],
+    address?: string,
+    options?: ContractOptions
+  ): DFSFeedRegistry;
+  clone(): DFSFeedRegistry;
+  methods: {
+    adminVault(): NonPayableTransactionObject<string>;
+
+    aggregators(
+      arg0: string,
+      arg1: string
+    ): NonPayableTransactionObject<string>;
+
+    getFeed(base: string, quote: string): NonPayableTransactionObject<string>;
+
+    kill(): NonPayableTransactionObject<void>;
+
+    latestRoundData(
+      base: string,
+      quote: string
+    ): NonPayableTransactionObject<
+      [string, string, string, string, string] & {
+        roundId: string;
+        answer: string;
+        startedAt: string;
+        updatedAt: string;
+        answeredInRound: string;
+      }
+    >;
+
+    setFeed(
+      base: string,
+      quote: string,
+      aggregator: string
+    ): NonPayableTransactionObject<void>;
+
+    setFeeds(
+      bases: string[],
+      quotes: string[],
+      aggregator: string[]
+    ): NonPayableTransactionObject<void>;
+
+    withdrawStuckFunds(
+      _token: string,
+      _receiver: string,
+      _amount: number | string | BN
+    ): NonPayableTransactionObject<void>;
+  };
+  events: {
+    allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;
+  };
+}

package/src/types/contracts/generated/index.ts

@@ -27,6 +27,7 @@ export type { CompV3BulkerMainnetUSDC } from "./CompV3BulkerMainnetUSDC";
 export type { CompV3View } from "./CompV3View";
 export type { CompoundLoanInfo } from "./CompoundLoanInfo";
 export type { Comptroller } from "./Comptroller";
+export type { DFSFeedRegistry } from "./DFSFeedRegistry";
 export type { ETHPriceFeed } from "./ETHPriceFeed";
 export type { Erc20 } from "./Erc20";
 export type { EulerV2View } from "./EulerV2View";