@defisaver/positions-sdk 2.1.127-midnight-dev → 2.1.127-uniswap-dev

package/cjs/contracts.js

@@ -33,8 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UUPSViem = exports.LiquityStabilityPoolViem = exports.LiquityLQTYStakingViem = exports.AaveUmbrellaViewViem = exports.AaveIncentivesControllerViem = exports.FluidViewContractViem = exports.LiquityV2LegacyViewContractViem = exports.LiquityV2ViewContractViem = exports.LiquityActivePoolContractViem = exports.LiquityPriceFeedContractViem = exports.LiquityTroveManagerContractViem = exports.LiquityCollSurplusPoolContractViem = exports.LiquityViewContractViem = exports.BTCPriceFeedContractViem = exports.WeETHPriceFeedContractViem = exports.ComptrollerContractViem = exports.CompoundLoanInfoContractViem = exports.McdJugContractViem = exports.McdDogContractViem = exports.McdSpotterContractViem = exports.McdVatContractViem = exports.McdViewContractViem = exports.McdGetCdpsContractViem = exports.LlamaLendViewContractViem = exports.CrvUSDFactoryContractViem = exports.CrvUSDViewContractViem = exports.EulerV2ViewContractViem = exports.SparkIncentiveDataProviderContractViem = exports.SparkViewContractViem = exports.CompV3ViewContractViem = exports.WstETHPriceFeedContractViem = exports.USDCPriceFeedContractViem = exports.ETHPriceFeedContractViem = exports.COMPPriceFeedContractViem = exports.DFSFeedRegistryContractViem = exports.FeedRegistryContractViem = exports.AaveIncentiveDataProviderV3ContractViem = exports.AaveV3ViewContractViem = exports.AaveLoanInfoV2ContractViem = exports.MorphoMidnightViewContractViem = exports.MorphoBlueViewContractViem = exports.getYearnV3VaultContractViem = exports.getErc4626ContractViem = exports.getErc20ContractViem = exports.getSparkSavingsVaultContractViem = exports.getYearnVaultContractViem = exports.getMorphoVaultContractViem = exports.createViemContractFromConfigFunc = exports.getConfigContractAbi = exports.getConfigContractAddress = void 0;
-exports.AaveV4ViewContractViem = exports.SkySavingsContractView = exports.MakerDsrContractViem = exports.YearnViewContractViem = exports.StkAAVEViem = exports.LiquityV2sBoldVaultViem = exports.AaveRewardsControllerViem = exports.SparkRewardsControllerViem = void 0;
+exports.SparkRewardsControllerViem = exports.UUPSViem = exports.LiquityStabilityPoolViem = exports.LiquityLQTYStakingViem = exports.AaveUmbrellaViewViem = exports.AaveIncentivesControllerViem = exports.FluidViewContractViem = exports.LiquityV2LegacyViewContractViem = exports.LiquityV2ViewContractViem = exports.LiquityActivePoolContractViem = exports.LiquityPriceFeedContractViem = exports.LiquityTroveManagerContractViem = exports.LiquityCollSurplusPoolContractViem = exports.LiquityViewContractViem = exports.BTCPriceFeedContractViem = exports.WeETHPriceFeedContractViem = exports.ComptrollerContractViem = exports.CompoundLoanInfoContractViem = exports.McdJugContractViem = exports.McdDogContractViem = exports.McdSpotterContractViem = exports.McdVatContractViem = exports.McdViewContractViem = exports.McdGetCdpsContractViem = exports.LlamaLendViewContractViem = exports.CrvUSDFactoryContractViem = exports.CrvUSDViewContractViem = exports.EulerV2ViewContractViem = exports.SparkIncentiveDataProviderContractViem = exports.SparkViewContractViem = exports.CompV3ViewContractViem = exports.WstETHPriceFeedContractViem = exports.USDCPriceFeedContractViem = exports.ETHPriceFeedContractViem = exports.COMPPriceFeedContractViem = exports.DFSFeedRegistryContractViem = exports.FeedRegistryContractViem = exports.AaveIncentiveDataProviderV3ContractViem = exports.AaveV3ViewContractViem = exports.AaveLoanInfoV2ContractViem = exports.MorphoBlueViewContractViem = exports.getYearnV3VaultContractViem = exports.getErc4626ContractViem = exports.getErc20ContractViem = exports.getSparkSavingsVaultContractViem = exports.getYearnVaultContractViem = exports.getMorphoVaultContractViem = exports.createViemContractFromConfigFunc = exports.getConfigContractAbi = exports.getConfigContractAddress = void 0;
+exports.UniswapTokenDistributorViem = exports.AaveV4ViewContractViem = exports.SkySavingsContractView = exports.MakerDsrContractViem = exports.YearnViewContractViem = exports.StkAAVEViem = exports.LiquityV2sBoldVaultViem = exports.AaveRewardsControllerViem = void 0;
 const viem_1 = require("viem");
 const configRaw = __importStar(require("./config/contracts"));
 // @ts-ignore
@@ -140,7 +140,6 @@ const getYearnV3VaultContractViem = (client, address) => {
 };
 exports.getYearnV3VaultContractViem = getYearnV3VaultContractViem;
 exports.MorphoBlueViewContractViem = (0, exports.createViemContractFromConfigFunc)('MorphoBlueView');
-exports.MorphoMidnightViewContractViem = (0, exports.createViemContractFromConfigFunc)('MidnightView');
 exports.AaveLoanInfoV2ContractViem = (0, exports.createViemContractFromConfigFunc)('AaveLoanInfoV2');
 exports.AaveV3ViewContractViem = (0, exports.createViemContractFromConfigFunc)('AaveV3View');
 exports.AaveIncentiveDataProviderV3ContractViem = (0, exports.createViemContractFromConfigFunc)('AaveUiIncentiveDataProviderV3');
@@ -188,3 +187,4 @@ exports.YearnViewContractViem = (0, exports.createViemContractFromConfigFunc)('Y
 exports.MakerDsrContractViem = (0, exports.createViemContractFromConfigFunc)('MakerDsr');
 exports.SkySavingsContractView = (0, exports.createViemContractFromConfigFunc)('SkySavings');
 exports.AaveV4ViewContractViem = (0, exports.createViemContractFromConfigFunc)('AaveV4View');
+exports.UniswapTokenDistributorViem = (0, exports.createViemContractFromConfigFunc)('UniswapTokenDistributor');

package/cjs/helpers/index.d.ts

@@ -4,7 +4,6 @@ export * as sparkHelpers from './sparkHelpers';
 export * as curveUsdHelpers from './curveUsdHelpers';
 export * as makerHelpers from './makerHelpers';
 export * as morphoBlueHelpers from './morphoBlueHelpers';
-export * as morphoMidnightHelpers from './morphoMidnightHelpers';
 export * as llamaLendHelpers from './llamaLendHelpers';
 export * as liquityV2Helpers from './liquityV2Helpers';
 export * as eulerV2Helpers from './eulerHelpers';

package/cjs/helpers/index.js

@@ -33,14 +33,13 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aaveV4Helpers = exports.fluidHelpers = exports.eulerV2Helpers = exports.liquityV2Helpers = exports.llamaLendHelpers = exports.morphoMidnightHelpers = exports.morphoBlueHelpers = exports.makerHelpers = exports.curveUsdHelpers = exports.sparkHelpers = exports.compoundHelpers = exports.aaveHelpers = void 0;
+exports.aaveV4Helpers = exports.fluidHelpers = exports.eulerV2Helpers = exports.liquityV2Helpers = exports.llamaLendHelpers = exports.morphoBlueHelpers = exports.makerHelpers = exports.curveUsdHelpers = exports.sparkHelpers = exports.compoundHelpers = exports.aaveHelpers = void 0;
 exports.aaveHelpers = __importStar(require("./aaveHelpers"));
 exports.compoundHelpers = __importStar(require("./compoundHelpers"));
 exports.sparkHelpers = __importStar(require("./sparkHelpers"));
 exports.curveUsdHelpers = __importStar(require("./curveUsdHelpers"));
 exports.makerHelpers = __importStar(require("./makerHelpers"));
 exports.morphoBlueHelpers = __importStar(require("./morphoBlueHelpers"));
-exports.morphoMidnightHelpers = __importStar(require("./morphoMidnightHelpers"));
 exports.llamaLendHelpers = __importStar(require("./llamaLendHelpers"));
 exports.liquityV2Helpers = __importStar(require("./liquityV2Helpers"));
 exports.eulerV2Helpers = __importStar(require("./eulerHelpers"));

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -361,6 +361,7 @@ const getRewardsForMarket = (marketId_1, ...args_1) => __awaiter(void 0, [market
             query: REWARDS_QUERY,
             variables: { marketId, chainId: network },
         }),
+        signal: AbortSignal.timeout(utils_1.LONGER_TIMEOUT),
     });
     const data = yield response.json();
     const marketData = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.marketById;

package/cjs/index.d.ts

@@ -16,11 +16,10 @@ import * as markets from './markets';
 import * as helpers from './helpers';
 import * as exchange from './exchange';
 import * as morphoBlue from './morphoBlue';
-import * as morphoMidnight from './morphoMidnight';
 import * as llamaLend from './llamaLend';
 import * as eulerV2 from './eulerV2';
 import * as portfolio from './portfolio';
 import * as claiming from './claiming';
 import * as savings from './savings';
 export * from './types';
-export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, morphoMidnight, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };

package/cjs/index.js

@@ -36,7 +36,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.savings = exports.claiming = exports.portfolio = exports.fluid = exports.eulerV2 = exports.llamaLend = exports.morphoMidnight = exports.morphoBlue = exports.helpers = exports.markets = exports.moneymarket = exports.staking = exports.exchange = exports.maker = exports.liquityV2 = exports.liquity = exports.curveUsd = exports.spark = exports.compoundV3 = exports.compoundV2 = exports.aaveV4 = exports.aaveV3 = exports.aaveV2 = void 0;
+exports.savings = exports.claiming = exports.portfolio = exports.fluid = exports.eulerV2 = exports.llamaLend = exports.morphoBlue = exports.helpers = exports.markets = exports.moneymarket = exports.staking = exports.exchange = exports.maker = exports.liquityV2 = exports.liquity = exports.curveUsd = exports.spark = exports.compoundV3 = exports.compoundV2 = exports.aaveV4 = exports.aaveV3 = exports.aaveV2 = void 0;
 require("./setup");
 const fluid = __importStar(require("./fluid"));
 exports.fluid = fluid;
@@ -72,8 +72,6 @@ const exchange = __importStar(require("./exchange"));
 exports.exchange = exchange;
 const morphoBlue = __importStar(require("./morphoBlue"));
 exports.morphoBlue = morphoBlue;
-const morphoMidnight = __importStar(require("./morphoMidnight"));
-exports.morphoMidnight = morphoMidnight;
 const llamaLend = __importStar(require("./llamaLend"));
 exports.llamaLend = llamaLend;
 const eulerV2 = __importStar(require("./eulerV2"));

package/cjs/markets/index.d.ts

@@ -3,7 +3,6 @@ export { CompoundMarkets, compoundV2CollateralAssets, v3ETHCollAssets, v3USDbCCo
 export { SparkMarkets } from './spark';
 export { CrvUsdMarkets } from './curveUsd';
 export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
-export { MorphoMidnightMarkets, findMorphoMidnightMarket } from './morphoMidnight';
 export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
 export { EulerV2Markets } from './euler';

package/cjs/markets/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAaveV4SpokeByAddress = exports.AaveV4Spokes = exports.getFluidMarketInfoByAddress = exports.getFTokenAddress = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.EulerV2Markets = exports.findLiquityV2MarketByAddress = exports.LiquityV2Markets = exports.LlamaLendMarkets = exports.findMorphoMidnightMarket = exports.MorphoMidnightMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
+exports.findAaveV4SpokeByAddress = exports.AaveV4Spokes = exports.getFluidMarketInfoByAddress = exports.getFTokenAddress = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.EulerV2Markets = exports.findLiquityV2MarketByAddress = exports.LiquityV2Markets = exports.LlamaLendMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
 var aave_1 = require("./aave");
 Object.defineProperty(exports, "AaveMarkets", { enumerable: true, get: function () { return aave_1.AaveMarkets; } });
 Object.defineProperty(exports, "aaveV1AssetsDefaultMarket", { enumerable: true, get: function () { return aave_1.aaveV1AssetsDefaultMarket; } });
@@ -22,9 +22,6 @@ Object.defineProperty(exports, "CrvUsdMarkets", { enumerable: true, get: functio
 var morphoBlue_1 = require("./morphoBlue");
 Object.defineProperty(exports, "MorphoBlueMarkets", { enumerable: true, get: function () { return morphoBlue_1.MorphoBlueMarkets; } });
 Object.defineProperty(exports, "findMorphoBlueMarket", { enumerable: true, get: function () { return morphoBlue_1.findMorphoBlueMarket; } });
-var morphoMidnight_1 = require("./morphoMidnight");
-Object.defineProperty(exports, "MorphoMidnightMarkets", { enumerable: true, get: function () { return morphoMidnight_1.MorphoMidnightMarkets; } });
-Object.defineProperty(exports, "findMorphoMidnightMarket", { enumerable: true, get: function () { return morphoMidnight_1.findMorphoMidnightMarket; } });
 var llamaLend_1 = require("./llamaLend");
 Object.defineProperty(exports, "LlamaLendMarkets", { enumerable: true, get: function () { return llamaLend_1.LlamaLendMarkets; } });
 var liquityV2_1 = require("./liquityV2");

package/cjs/morphoBlue/index.d.ts

@@ -1,14 +1,16 @@
 import { Client } from 'viem';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
-import { MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData } from '../types';
+import { MorphoBlueEarnData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBlueMarketRewards, MorphoBluePositionData } from '../types';
+export declare const addMorphoBlueRewardsToMarketInfo: (marketInfo: MorphoBlueMarketInfo, rewards: MorphoBlueMarketRewards) => MorphoBlueMarketInfo;
 export declare function _getMorphoBlueMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;
+export declare function _getMorphoBluePortfolioMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;
 export declare function getMorphoBlueMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;
+export declare function getMorphoBluePortfolioMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;
+export declare const getMorphoBluePositionDataWithMarketInfo: (data: MorphoBluePositionData, marketInfo: MorphoBlueMarketInfo) => MorphoBluePositionData;
+export declare const getMorphoEarnDataWithMarketInfo: (data: MorphoBlueEarnData, marketInfo: MorphoBlueMarketInfo) => MorphoBlueEarnData;
+export declare function getMorphoBlueMarketRewards(network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketRewards>;
 export declare const _getMorphoBlueAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoBlueMarketData) => Promise<PositionBalances>;
 export declare const getMorphoBlueAccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoBlueMarketData) => Promise<PositionBalances>;
 export declare function _getMorphoBlueAccountData(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData>;
 export declare function getMorphoBlueAccountData(provider: EthereumProvider, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData>;
-export declare function getMorphoEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<{
-    apy: string;
-    amount: string;
-    amountUsd: string;
-}>;
+export declare function getMorphoEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBlueEarnData>;

package/cjs/morphoBlue/index.js

@@ -12,9 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMorphoBlueAccountBalances = exports._getMorphoBlueAccountBalances = void 0;
+exports.getMorphoBlueAccountBalances = exports._getMorphoBlueAccountBalances = exports.getMorphoEarnDataWithMarketInfo = exports.getMorphoBluePositionDataWithMarketInfo = exports.addMorphoBlueRewardsToMarketInfo = void 0;
 exports._getMorphoBlueMarketData = _getMorphoBlueMarketData;
+exports._getMorphoBluePortfolioMarketData = _getMorphoBluePortfolioMarketData;
 exports.getMorphoBlueMarketData = getMorphoBlueMarketData;
+exports.getMorphoBluePortfolioMarketData = getMorphoBluePortfolioMarketData;
+exports.getMorphoBlueMarketRewards = getMorphoBlueMarketRewards;
 exports._getMorphoBlueAccountData = _getMorphoBlueAccountData;
 exports.getMorphoBlueAccountData = getMorphoBlueAccountData;
 exports.getMorphoEarn = getMorphoEarn;
@@ -29,7 +32,21 @@ const morphoBlueHelpers_1 = require("../helpers/morphoBlueHelpers");
 const priceService_1 = require("../services/priceService");
 const viem_1 = require("../services/viem");
 const HARDCODED_USD_STABLE_PRICE = '100000000'; // $1 with 8 decimals
-function _getMorphoBlueMarketData(provider, network, selectedMarket) {
+const getMorphoRewardIncentives = (apy) => [{
+        token: 'MORPHO',
+        apy,
+        incentiveKind: common_1.IncentiveKind.Reward,
+        description: 'Eligible for protocol-level MORPHO incentives.',
+    }];
+const addMorphoBlueRewardsToMarketInfo = (marketInfo, rewards) => (Object.assign(Object.assign({}, marketInfo), { assetsData: Object.assign(Object.assign({}, marketInfo.assetsData), { [marketInfo.loanToken]: Object.assign(Object.assign({}, marketInfo.assetsData[marketInfo.loanToken]), { supplyIncentives: [
+                ...marketInfo.assetsData[marketInfo.loanToken].supplyIncentives.filter(({ token }) => token !== 'MORPHO'),
+                ...getMorphoRewardIncentives(rewards.supplyApy),
+            ], borrowIncentives: [
+                ...marketInfo.assetsData[marketInfo.loanToken].borrowIncentives.filter(({ token }) => token !== 'MORPHO'),
+                ...getMorphoRewardIncentives(rewards.borrowApy),
+            ] }) }) }));
+exports.addMorphoBlueRewardsToMarketInfo = addMorphoBlueRewardsToMarketInfo;
+function getMorphoBlueMarketDataInternal(provider, network, selectedMarket) {
     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();
@@ -61,16 +78,6 @@ function _getMorphoBlueMarketData(provider, network, selectedMarket) {
             marketInfo = _marketInfo;
             loanTokenPrice = loanTokenPriceRound[1].toString();
         }
-        let morphoSupplyApy = '0';
-        let morphoBorrowApy = '0';
-        try {
-            const { supplyApy: _morphoSupplyApy, borrowApy: _morphoBorrowApy } = yield (0, morphoBlueHelpers_1.getRewardsForMarket)(selectedMarket.marketId, network);
-            morphoSupplyApy = _morphoSupplyApy;
-            morphoBorrowApy = _morphoBorrowApy;
-        }
-        catch (e) {
-            console.error(e);
-        }
         const supplyRate = (0, morphoBlueHelpers_1.getSupplyRate)(marketInfo.totalSupplyAssets.toString(), marketInfo.totalBorrowAssets.toString(), marketInfo.borrowRate.toString(), marketInfo.fee.toString());
         const compoundedBorrowRate = (0, morphoBlueHelpers_1.getBorrowRate)(marketInfo.borrowRate.toString(), marketInfo.totalBorrowShares.toString());
         const utillization = new decimal_js_1.default(marketInfo.totalBorrowAssets.toString()).div(marketInfo.totalSupplyAssets.toString()).mul(100).toString();
@@ -89,18 +96,8 @@ function _getMorphoBlueMarketData(provider, network, selectedMarket) {
             totalBorrow: new decimal_js_1.default(marketInfo.totalBorrowAssets.toString()).div(scale).toString(),
             canBeSupplied: true,
             canBeBorrowed: true,
-            supplyIncentives: [{
-                    token: 'MORPHO',
-                    apy: morphoSupplyApy,
-                    incentiveKind: common_1.IncentiveKind.Reward,
-                    description: 'Eligible for protocol-level MORPHO incentives.',
-                }],
-            borrowIncentives: [{
-                    token: 'MORPHO',
-                    apy: morphoBorrowApy,
-                    incentiveKind: common_1.IncentiveKind.Reward,
-                    description: 'Eligible for protocol-level MORPHO incentives.',
-                }],
+            supplyIncentives: [],
+            borrowIncentives: [],
         };
         assetsData[(0, utils_1.wethToEth)(collateralTokenInfo.symbol)] = {
             symbol: (0, utils_1.wethToEth)(collateralTokenInfo.symbol),
@@ -135,11 +132,56 @@ function _getMorphoBlueMarketData(provider, network, selectedMarket) {
         };
     });
 }
+function _getMorphoBlueMarketData(provider, network, selectedMarket) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const marketInfo = yield getMorphoBlueMarketDataInternal(provider, network, selectedMarket);
+        try {
+            const rewards = yield (0, morphoBlueHelpers_1.getRewardsForMarket)(selectedMarket.marketId, network);
+            return (0, exports.addMorphoBlueRewardsToMarketInfo)(marketInfo, rewards);
+        }
+        catch (error) {
+            console.error(error);
+            return (0, exports.addMorphoBlueRewardsToMarketInfo)(marketInfo, { supplyApy: '0', borrowApy: '0' });
+        }
+    });
+}
+function _getMorphoBluePortfolioMarketData(provider, network, selectedMarket) {
+    return getMorphoBlueMarketDataInternal(provider, network, selectedMarket);
+}
 function getMorphoBlueMarketData(provider, network, selectedMarket) {
     return __awaiter(this, void 0, void 0, function* () {
         return _getMorphoBlueMarketData((0, viem_1.getViemProvider)(provider, network), network, selectedMarket);
     });
 }
+function getMorphoBluePortfolioMarketData(provider, network, selectedMarket) {
+    return _getMorphoBluePortfolioMarketData((0, viem_1.getViemProvider)(provider, network), network, selectedMarket);
+}
+const getMorphoBluePositionDataWithMarketInfo = (data, marketInfo) => (Object.assign(Object.assign({}, data), (0, morphoBlueHelpers_1.getMorphoBlueAggregatedPositionData)({
+    usedAssets: data.usedAssets,
+    assetsData: marketInfo.assetsData,
+    marketInfo,
+})));
+exports.getMorphoBluePositionDataWithMarketInfo = getMorphoBluePositionDataWithMarketInfo;
+const getMorphoEarnDataWithMarketInfo = (data, marketInfo) => {
+    const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
+    const usedAssets = {
+        [marketInfo.loanToken]: {
+            symbol: loanTokenInfo.symbol,
+            supplied: data.amount,
+            borrowed: '0',
+            isSupplied: new decimal_js_1.default(data.amount).gt(0),
+            isBorrowed: false,
+            collateral: false,
+            suppliedUsd: data.amountUsd,
+            borrowedUsd: '0',
+        },
+    };
+    return Object.assign(Object.assign({}, data), { apy: (0, staking_1.calculateNetApy)({ usedAssets, assetsData: marketInfo.assetsData }).netApy });
+};
+exports.getMorphoEarnDataWithMarketInfo = getMorphoEarnDataWithMarketInfo;
+function getMorphoBlueMarketRewards(network, selectedMarket) {
+    return (0, morphoBlueHelpers_1.getRewardsForMarket)(selectedMarket.marketId, network);
+}
 const _getMorphoBlueAccountBalances = (provider, network, block, addressMapping, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
     let balances = {
         collateral: {},
@@ -229,23 +271,10 @@ function getMorphoEarn(provider, network, account, selectedMarket, marketInfo) {
         const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
         const loanTokenSupplied = (0, tokens_1.assetAmountInEth)(loanInfo.suppliedInAssets.toString(), marketInfo.loanToken);
         const loanTokenSuppliedUsd = new decimal_js_1.default(loanTokenSupplied).mul(loanTokenInfo.price).toString();
-        const usedAssets = {
-            [marketInfo.loanToken]: {
-                symbol: loanTokenInfo.symbol,
-                supplied: loanTokenSupplied,
-                borrowed: '0',
-                isSupplied: new decimal_js_1.default(loanInfo.suppliedInAssets.toString()).gt(0),
-                isBorrowed: false,
-                collateral: false,
-                suppliedUsd: loanTokenSuppliedUsd,
-                borrowedUsd: '0',
-            },
-        };
-        const { netApy } = (0, staking_1.calculateNetApy)({ usedAssets, assetsData: marketInfo.assetsData });
-        return {
-            apy: netApy,
+        return (0, exports.getMorphoEarnDataWithMarketInfo)({
+            apy: '0',
             amount: loanTokenSupplied,
             amountUsd: loanTokenSuppliedUsd,
-        };
+        }, marketInfo);
     });
 }

package/cjs/portfolio/discovery.js

@@ -24,7 +24,6 @@ const compoundV3_1 = require("../compoundV3");
 const curveUsd_1 = require("../curveUsd");
 const llamaLend_1 = require("../llamaLend");
 const morphoBlue_1 = require("../morphoBlue");
-const morphoMidnight_1 = require("../morphoMidnight");
 const contracts_1 = require("../contracts");
 const hasAnyBalance = (balances) => ([balances.collateral, balances.debt].some((group) => Object.values(group || {}).some((amount) => new decimal_js_1.default(amount || '0').gt(0))));
 /**
@@ -88,9 +87,6 @@ function getUserPositionsExistence(provider_1, network_1, address_1) {
         Object.values((0, markets_1.MorphoBlueMarkets)(network)).filter((market) => market.chainIds.includes(network)).forEach((market) => {
             tasks.push(balanceTask(market.value, () => (0, morphoBlue_1._getMorphoBlueAccountBalances)(client, network, block, false, address, market)));
         });
-        Object.values((0, markets_1.MorphoMidnightMarkets)(network)).filter((market) => market.chainIds.includes(network)).forEach((market) => {
-            tasks.push(balanceTask(market.value, () => (0, morphoMidnight_1._getMorphoMidnightAccountBalances)(client, network, block, false, address, market)));
-        });
         yield Promise.all(tasks);
         return existence;
     });

package/cjs/portfolio/index.js

@@ -31,7 +31,6 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
 const common_1 = require("../types/common");
 const markets_1 = require("../markets");
 const morphoBlue_1 = require("../morphoBlue");
-const morphoMidnight_1 = require("../morphoMidnight");
 const types_1 = require("../types");
 const compoundV3_1 = require("../compoundV3");
 const spark_1 = require("../spark");
@@ -55,12 +54,12 @@ const spark_2 = require("../claiming/spark");
 const king_1 = require("../claiming/king");
 const ethena_1 = require("../claiming/ethena");
 const aaveV4_1 = require("../aaveV4");
+const uniswap_1 = require("../claiming/uniswap");
 function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, addresses, isSim = false) {
         const isMainnet = network === common_1.NetworkNumber.Eth;
         const isFluidSupported = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base, common_1.NetworkNumber.Plasma].includes(network);
         const morphoMarkets = Object.values((0, markets_1.MorphoBlueMarkets)(network)).filter((market) => market.chainIds.includes(network));
-        const morphoMidnightMarkets = Object.values((0, markets_1.MorphoMidnightMarkets)(network)).filter((market) => market.chainIds.includes(network));
         const compoundV3Markets = Object.values((0, markets_1.CompoundMarkets)(network)).filter((market) => market.chainIds.includes(network) && market.value !== types_1.CompoundVersions.CompoundV2);
         const sparkMarkets = Object.values((0, markets_1.SparkMarkets)(network)).filter((market) => market.chainIds.includes(network));
         const eulerV2Markets = Object.values((0, markets_1.EulerV2Markets)(network)).filter((market) => market.chainIds.includes(network));
@@ -76,7 +75,6 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
         const client = (0, viem_1.getViemProvider)(provider, ...args);
         const defaultClient = (0, viem_1.getViemProvider)(defaultProvider, ...args);
         const morphoMarketsData = {};
-        const morphoMidnightMarketsData = {};
         const compoundV3MarketsData = {};
         const sparkMarketsData = {};
         const eulerV2MarketsData = {};
@@ -90,7 +88,6 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
         const aaveV4SpokesData = {};
         const markets = {
             morphoMarketsData,
-            morphoMidnightMarketsData,
             compoundV3MarketsData,
             sparkMarketsData,
             eulerV2MarketsData,
@@ -111,7 +108,6 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
                 aaveV3: {},
                 aaveV4: {},
                 morphoBlue: {},
-                morphoMidnight: {},
                 compoundV3: {},
                 spark: {},
                 eulerV2: {},
@@ -132,7 +128,6 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
             stakingPositions[address.toLowerCase()] = {
                 aaveV3: {},
                 morphoBlue: {},
-                morphoMidnight: {},
                 compoundV3: {},
                 spark: {},
                 aaveV2: {},
@@ -157,13 +152,9 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
         yield Promise.allSettled([
             // === MARKET DATA (needs to be fetched first) ===
             ...morphoMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield (0, morphoBlue_1._getMorphoBlueMarketData)(client, network, market);
+                const marketData = yield (0, morphoBlue_1._getMorphoBluePortfolioMarketData)(client, network, market);
                 morphoMarketsData[market.value] = marketData;
             })),
-            ...morphoMidnightMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                const marketData = yield (0, morphoMidnight_1._getMorphoMidnightMarketData)(client, network, market);
-                morphoMidnightMarketsData[market.value] = marketData;
-            })),
             ...compoundV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
                 const marketData = yield (0, compoundV3_1._getCompoundV3MarketsData)(client, network, market, defaultClient);
                 compoundV3MarketsData[market.value] = marketData;
@@ -319,6 +310,34 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
                     }
                 }
             }))(),
+            // Batch UNI rewards
+            (() => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (!isMainnet) {
+                        for (const address of addresses) {
+                            rewardsData[address.toLowerCase()].uniswap = { error: '', data: [] };
+                        }
+                        return;
+                    }
+                    const uniswapRewards = yield (0, uniswap_1.getUniswapRewards)(client, network, addresses);
+                    for (const address of addresses) {
+                        const lowerAddress = address.toLowerCase();
+                        rewardsData[lowerAddress].uniswap = {
+                            error: '',
+                            data: uniswapRewards[lowerAddress] || [],
+                        };
+                    }
+                }
+                catch (error) {
+                    console.error('Error fetching Uniswap rewards data in batch:', error);
+                    for (const address of addresses) {
+                        rewardsData[address.toLowerCase()].uniswap = {
+                            error: 'Error fetching Uniswap rewards data in batch',
+                            data: null,
+                        };
+                    }
+                }
+            }))(),
             ...sparkMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!isMainnet) {
@@ -474,40 +493,6 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
                     positions[address.toLowerCase()].morphoBlue[market.value] = { error: `Error fetching MorphoBlue account data for address ${address} on market ${market.value}`, data: null };
                 }
             }))).flat(),
-            ...morphoMidnightMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const [accDataPromise, earnDataPromise] = yield Promise.allSettled([
-                        (0, morphoMidnight_1._getMorphoMidnightAccountData)(client, network, address, market, morphoMidnightMarketsData[market.value]),
-                        (0, morphoMidnight_1.getMorphoMidnightEarn)(client, network, address, market, morphoMidnightMarketsData[market.value]),
-                    ]);
-                    if (accDataPromise.status === 'rejected') {
-                        console.error(`Error fetching MorphoMidnight account data for address ${address} on market ${market.value}:`, accDataPromise.reason);
-                        positions[address.toLowerCase()].morphoMidnight[market.value] = { error: `Error fetching MorphoMidnight account data for address ${address} on market ${market.value}`, data: null };
-                    }
-                    if (earnDataPromise.status === 'rejected') {
-                        console.error(`Error fetching MorphoMidnight account data for address ${address} on market ${market.value}:`, earnDataPromise.reason);
-                        positions[address.toLowerCase()].morphoMidnight[market.value] = { error: `Error fetching MorphoMidnight account data for address ${address} on market ${market.value}`, data: null };
-                    }
-                    if (accDataPromise.status !== 'rejected') {
-                        const accData = accDataPromise.value;
-                        if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
-                            positions[address.toLowerCase()].morphoMidnight[market.value] = { error: '', data: accData };
-                    }
-                    if (earnDataPromise.status !== 'rejected') {
-                        const earnData = earnDataPromise.value;
-                        if (earnData && new decimal_js_1.default(earnData.amount).gt(0)) {
-                            stakingPositions[address.toLowerCase()].morphoMidnight[market.value] = {
-                                error: '',
-                                data: earnData,
-                            };
-                        }
-                    }
-                }
-                catch (error) {
-                    console.error(`Error fetching MorphoMidnight account data for address ${address} on market ${market.value}:`, error);
-                    positions[address.toLowerCase()].morphoMidnight[market.value] = { error: `Error fetching MorphoMidnight account data for address ${address} on market ${market.value}`, data: null };
-                }
-            }))).flat(),
             ...compoundV3Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const accData = yield (0, compoundV3_1._getCompoundV3AccountData)(client, network, address, constants_1.ZERO_ADDRESS, { selectedMarket: market, assetsData: compoundV3MarketsData[market.value].assetsData });