@defisaver/positions-sdk 2.1.43-dev-stats-test-2-dev → 2.1.44-aave-v1-dev

package/cjs/aaveV3/index.js

@@ -59,7 +59,6 @@ exports.aaveV3EmodeCategoriesMapping = aaveV3EmodeCategoriesMapping;
 function _getAaveV3MarketData(provider_1, network_1, market_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
         const _addresses = market.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.getWrappedNativeAssetFromUnwrapped)(a), network).address);
-        console.log('Fetched addresses');
         const isL2 = (0, utils_1.isLayer2Network)(network);
         const loanInfoContract = (0, contracts_1.AaveV3ViewContractViem)(provider, network);
         const aaveIncentivesContract = (0, contracts_1.AaveIncentiveDataProviderV3ContractViem)(provider, network);
@@ -74,7 +73,6 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
             (0, merkl_1.getMerkleCampaigns)(network),
             (0, merit_1.getMeritCampaigns)(network, market.value),
         ]);
-        console.log('Fetched tokens, emodes, campaigns, incentives');
         isBorrowAllowed = (0, utils_1.isLayer2Network)(network) ? isBorrowAllowed : true;
         const eModeCategoriesData = {};
         for (let i = 0; i < eModesInfo.length; i++) {
@@ -92,7 +90,6 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                 collateralAssets: [],
             };
         }
-        console.log('Parsed e modes info');
         if (networksWithIncentives.includes(network) && rewardInfo) {
             rewardInfo = rewardInfo.reduce((all, _market) => {
                 // eslint-disable-next-line no-param-reassign
@@ -100,7 +97,6 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                 return all;
             }, {});
         }
-        console.log('Parsed reward info');
         const assetsData = yield Promise.all(loanInfo
             .map((tokenMarket, i) => __awaiter(this, void 0, void 0, function* () {
             const symbol = market.assets[i];
@@ -162,7 +158,6 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                 borrowIncentives: [],
             });
         })));
-        console.log('Parsed assets data');
         // Get incentives data
         yield Promise.all(assetsData.map((_market, index) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
@@ -170,10 +165,8 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
             // @ts-ignore
             const rewardForMarket = rewardInfo === null || rewardInfo === void 0 ? void 0 : rewardInfo[_market.underlyingTokenAddress];
             const isStakingAsset = staking_1.STAKING_ASSETS.includes(_market.symbol);
-            console.log('Processing market', _market.symbol);
             if (isStakingAsset) {
                 const yieldApy = yield (0, staking_1.getStakingApy)(_market.symbol, network);
-                console.log('Got yield apy', yieldApy);
                 _market.supplyIncentives.push({
                     apy: yieldApy,
                     token: _market.symbol,
@@ -201,7 +194,6 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     eligibilityId: identifier,
                 });
             }
-            console.log('Processed merkle a incentives');
             const vTokenAddress = _market.vTokenAddress.toLowerCase(); // DEV: Should vTokenAddress be in AaveV3AssetData type?
             if ((_b = merkleRewardsMap[vTokenAddress]) === null || _b === void 0 ? void 0 : _b.borrow) {
                 const { apy, rewardTokenSymbol, description, identifier, } = merkleRewardsMap[vTokenAddress].borrow;
@@ -213,7 +205,6 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     eligibilityId: identifier,
                 });
             }
-            console.log('Processed merkle v incentives');
             if (meritRewardsMap.supply[_market.symbol]) {
                 const { apy, rewardTokenSymbol, description } = meritRewardsMap.supply[_market.symbol];
                 _market.supplyIncentives.push({
@@ -223,7 +214,6 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     description,
                 });
             }
-            console.log('Processed merit supply incentives');
             if (meritRewardsMap.borrow[_market.symbol]) {
                 const { apy, rewardTokenSymbol, description } = meritRewardsMap.borrow[_market.symbol];
                 _market.borrowIncentives.push({
@@ -233,10 +223,8 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     description,
                 });
             }
-            console.log('Processed merit borrow incentives');
             if (!rewardForMarket)
                 return;
-            console.log('Reward for market', rewardForMarket);
             // @ts-ignore
             rewardForMarket.aIncentiveData.rewardsTokenInformation.forEach(supplyRewardData => {
                 if (supplyRewardData) {
@@ -303,7 +291,6 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
             collateralAssets: assetsData.map((a) => a.symbol),
             borrowAssets: assetsData.map((a) => a.symbol),
         };
-        console.log('Parsed payload');
         return { assetsData: payload, eModeCategoriesData };
     });
 }

package/cjs/aaveV3/merit.js

@@ -53,15 +53,12 @@ const MERIT_DATA_MAP = {
  * Fetches merit rewards data from Aave API
  */
 const fetchMeritRewardsData = () => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
     try {
         const response = yield fetch('https://apps.aavechan.com/api/merit/aprs', {
             signal: AbortSignal.timeout(5000),
         });
-        if (!response.ok)
-            throw new Error('Failed to fetch Merit rewards data');
         const data = yield response.json();
-        return ((_a = data === null || data === void 0 ? void 0 : data.currentAPR) === null || _a === void 0 ? void 0 : _a.actionsAPR) || {};
+        return data.currentAPR.actionsAPR;
     }
     catch (error) {
         console.error('External API Failure: Failed to fetch merit rewards data:', error);
@@ -71,7 +68,6 @@ const fetchMeritRewardsData = () => __awaiter(void 0, void 0, void 0, function*
 exports.fetchMeritRewardsData = fetchMeritRewardsData;
 const getMeritCampaigns = (chainId, market) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    console.log('Fetching Merit campaigns');
     const meritData = yield (0, exports.fetchMeritRewardsData)();
     const relevantCampaigns = {
         supply: {},

package/cjs/aaveV3/merkl.js

@@ -39,7 +39,6 @@ const formatAaveAsset = (_symbol) => {
 };
 exports.formatAaveAsset = formatAaveAsset;
 const getMerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
-    console.log('Fetching Merkle campaigns');
     try {
         const res = yield fetch('https://api.merkl.xyz/v4/opportunities?mainProtocolId=aave', {
             signal: AbortSignal.timeout(utils_1.DEFAULT_TIMEOUT),

package/cjs/savings/morphoVaults/options.js

@@ -118,7 +118,7 @@ exports.MORPHO_VAULT_STEAKHOUSE_ETH = {
 exports.MORPHO_VAULT_STEAKHOUSE_PYUSD = {
     type: types_1.MorphoVaultType.MorphoVaultSteakhousePYUSD,
     name: 'Steakhouse PYUSD',
-    address: '0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB',
+    address: '0xbEEF02e5E13584ab96848af90261f0C8Ee04722a',
     asset: 'PYUSD',
     deploymentBlock: 19043398,
     isLegacy: false,

package/cjs/staking/staking.js

@@ -168,17 +168,19 @@ const calculateNetApy = ({ usedAssets, assetsData, optionalData, }) => {
             const rate = assetData.supplyRate;
             const supplyInterest = (0, exports.calculateInterestEarned)(amount, rate, 'year', true);
             acc.supplyInterest = new decimal_js_1.default(acc.supplyInterest).add(supplyInterest.toString()).toString();
-            for (const supplyIncentive of assetData.supplyIncentives) {
-                const { apy, eligibilityId } = supplyIncentive;
-                const eligibilityCheck = eligibilityId ? eligibility_1.EligibilityMapping[eligibilityId] : null;
-                if (eligibilityCheck) {
-                    const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
-                    const incentiveInterest = isEligible ? (0, exports.calculateInterestEarned)(eligibleUSDAmount, apy, 'year', true) : '0';
-                    acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
-                }
-                else {
-                    const incentiveInterest = (0, exports.calculateInterestEarned)(amount, apy, 'year', true);
-                    acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
+            if (assetData.supplyIncentives) {
+                for (const supplyIncentive of assetData.supplyIncentives) {
+                    const { apy, eligibilityId } = supplyIncentive;
+                    const eligibilityCheck = eligibilityId ? eligibility_1.EligibilityMapping[eligibilityId] : null;
+                    if (eligibilityCheck) {
+                        const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
+                        const incentiveInterest = isEligible ? (0, exports.calculateInterestEarned)(eligibleUSDAmount, apy, 'year', true) : '0';
+                        acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
+                    }
+                    else {
+                        const incentiveInterest = (0, exports.calculateInterestEarned)(amount, apy, 'year', true);
+                        acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
+                    }
                 }
             }
         }
@@ -188,17 +190,19 @@ const calculateNetApy = ({ usedAssets, assetsData, optionalData, }) => {
             const rate = assetData.borrowRate;
             const borrowInterest = (0, exports.calculateInterestEarned)(amount, rate, 'year', true);
             acc.borrowInterest = new decimal_js_1.default(acc.borrowInterest).sub(borrowInterest.toString()).toString();
-            for (const borrowIncentive of assetData.borrowIncentives) {
-                const { apy, eligibilityId } = borrowIncentive;
-                const eligibilityCheck = eligibilityId ? eligibility_1.EligibilityMapping[eligibilityId] : null;
-                if (eligibilityCheck) {
-                    const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
-                    const incentiveInterest = isEligible ? (0, exports.calculateInterestEarned)(eligibleUSDAmount, apy, 'year', true) : '0';
-                    acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
-                }
-                else {
-                    const incentiveInterest = (0, exports.calculateInterestEarned)(amount, apy, 'year', true);
-                    acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
+            if (assetData.borrowIncentives) {
+                for (const borrowIncentive of assetData.borrowIncentives) {
+                    const { apy, eligibilityId } = borrowIncentive;
+                    const eligibilityCheck = eligibilityId ? eligibility_1.EligibilityMapping[eligibilityId] : null;
+                    if (eligibilityCheck) {
+                        const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
+                        const incentiveInterest = isEligible ? (0, exports.calculateInterestEarned)(eligibleUSDAmount, apy, 'year', true) : '0';
+                        acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
+                    }
+                    else {
+                        const incentiveInterest = (0, exports.calculateInterestEarned)(amount, apy, 'year', true);
+                        acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
+                    }
                 }
             }
         }

package/esm/aaveV3/index.js

@@ -48,7 +48,6 @@ export const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
 export function _getAaveV3MarketData(provider_1, network_1, market_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
         const _addresses = market.assets.map(a => getAssetInfo(getWrappedNativeAssetFromUnwrapped(a), network).address);
-        console.log('Fetched addresses');
         const isL2 = isLayer2Network(network);
         const loanInfoContract = AaveV3ViewContractViem(provider, network);
         const aaveIncentivesContract = AaveIncentiveDataProviderV3ContractViem(provider, network);
@@ -63,7 +62,6 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
             getMerkleCampaigns(network),
             getMeritCampaigns(network, market.value),
         ]);
-        console.log('Fetched tokens, emodes, campaigns, incentives');
         isBorrowAllowed = isLayer2Network(network) ? isBorrowAllowed : true;
         const eModeCategoriesData = {};
         for (let i = 0; i < eModesInfo.length; i++) {
@@ -81,7 +79,6 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                 collateralAssets: [],
             };
         }
-        console.log('Parsed e modes info');
         if (networksWithIncentives.includes(network) && rewardInfo) {
             rewardInfo = rewardInfo.reduce((all, _market) => {
                 // eslint-disable-next-line no-param-reassign
@@ -89,7 +86,6 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                 return all;
             }, {});
         }
-        console.log('Parsed reward info');
         const assetsData = yield Promise.all(loanInfo
             .map((tokenMarket, i) => __awaiter(this, void 0, void 0, function* () {
             const symbol = market.assets[i];
@@ -151,7 +147,6 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                 borrowIncentives: [],
             });
         })));
-        console.log('Parsed assets data');
         // Get incentives data
         yield Promise.all(assetsData.map((_market, index) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
@@ -159,10 +154,8 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
             // @ts-ignore
             const rewardForMarket = rewardInfo === null || rewardInfo === void 0 ? void 0 : rewardInfo[_market.underlyingTokenAddress];
             const isStakingAsset = STAKING_ASSETS.includes(_market.symbol);
-            console.log('Processing market', _market.symbol);
             if (isStakingAsset) {
                 const yieldApy = yield getStakingApy(_market.symbol, network);
-                console.log('Got yield apy', yieldApy);
                 _market.supplyIncentives.push({
                     apy: yieldApy,
                     token: _market.symbol,
@@ -190,7 +183,6 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     eligibilityId: identifier,
                 });
             }
-            console.log('Processed merkle a incentives');
             const vTokenAddress = _market.vTokenAddress.toLowerCase(); // DEV: Should vTokenAddress be in AaveV3AssetData type?
             if ((_b = merkleRewardsMap[vTokenAddress]) === null || _b === void 0 ? void 0 : _b.borrow) {
                 const { apy, rewardTokenSymbol, description, identifier, } = merkleRewardsMap[vTokenAddress].borrow;
@@ -202,7 +194,6 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     eligibilityId: identifier,
                 });
             }
-            console.log('Processed merkle v incentives');
             if (meritRewardsMap.supply[_market.symbol]) {
                 const { apy, rewardTokenSymbol, description } = meritRewardsMap.supply[_market.symbol];
                 _market.supplyIncentives.push({
@@ -212,7 +203,6 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     description,
                 });
             }
-            console.log('Processed merit supply incentives');
             if (meritRewardsMap.borrow[_market.symbol]) {
                 const { apy, rewardTokenSymbol, description } = meritRewardsMap.borrow[_market.symbol];
                 _market.borrowIncentives.push({
@@ -222,10 +212,8 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     description,
                 });
             }
-            console.log('Processed merit borrow incentives');
             if (!rewardForMarket)
                 return;
-            console.log('Reward for market', rewardForMarket);
             // @ts-ignore
             rewardForMarket.aIncentiveData.rewardsTokenInformation.forEach(supplyRewardData => {
                 if (supplyRewardData) {
@@ -292,7 +280,6 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
             collateralAssets: assetsData.map((a) => a.symbol),
             borrowAssets: assetsData.map((a) => a.symbol),
         };
-        console.log('Parsed payload');
         return { assetsData: payload, eModeCategoriesData };
     });
 }

package/esm/aaveV3/merit.js

@@ -50,15 +50,12 @@ const MERIT_DATA_MAP = {
  * Fetches merit rewards data from Aave API
  */
 export const fetchMeritRewardsData = () => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
     try {
         const response = yield fetch('https://apps.aavechan.com/api/merit/aprs', {
             signal: AbortSignal.timeout(5000),
         });
-        if (!response.ok)
-            throw new Error('Failed to fetch Merit rewards data');
         const data = yield response.json();
-        return ((_a = data === null || data === void 0 ? void 0 : data.currentAPR) === null || _a === void 0 ? void 0 : _a.actionsAPR) || {};
+        return data.currentAPR.actionsAPR;
     }
     catch (error) {
         console.error('External API Failure: Failed to fetch merit rewards data:', error);
@@ -67,7 +64,6 @@ export const fetchMeritRewardsData = () => __awaiter(void 0, void 0, void 0, fun
 });
 export const getMeritCampaigns = (chainId, market) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    console.log('Fetching Merit campaigns');
     const meritData = yield fetchMeritRewardsData();
     const relevantCampaigns = {
         supply: {},

package/esm/aaveV3/merkl.js

@@ -34,7 +34,6 @@ export const formatAaveAsset = (_symbol) => {
     return _symbol;
 };
 export const getMerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
-    console.log('Fetching Merkle campaigns');
     try {
         const res = yield fetch('https://api.merkl.xyz/v4/opportunities?mainProtocolId=aave', {
             signal: AbortSignal.timeout(DEFAULT_TIMEOUT),

package/esm/savings/morphoVaults/options.js

@@ -115,7 +115,7 @@ export const MORPHO_VAULT_STEAKHOUSE_ETH = {
 export const MORPHO_VAULT_STEAKHOUSE_PYUSD = {
     type: MorphoVaultType.MorphoVaultSteakhousePYUSD,
     name: 'Steakhouse PYUSD',
-    address: '0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB',
+    address: '0xbEEF02e5E13584ab96848af90261f0C8Ee04722a',
     asset: 'PYUSD',
     deploymentBlock: 19043398,
     isLegacy: false,

package/esm/staking/staking.js

@@ -161,17 +161,19 @@ export const calculateNetApy = ({ usedAssets, assetsData, optionalData, }) => {
             const rate = assetData.supplyRate;
             const supplyInterest = calculateInterestEarned(amount, rate, 'year', true);
             acc.supplyInterest = new Dec(acc.supplyInterest).add(supplyInterest.toString()).toString();
-            for (const supplyIncentive of assetData.supplyIncentives) {
-                const { apy, eligibilityId } = supplyIncentive;
-                const eligibilityCheck = eligibilityId ? EligibilityMapping[eligibilityId] : null;
-                if (eligibilityCheck) {
-                    const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
-                    const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
-                    acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
-                }
-                else {
-                    const incentiveInterest = calculateInterestEarned(amount, apy, 'year', true);
-                    acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
+            if (assetData.supplyIncentives) {
+                for (const supplyIncentive of assetData.supplyIncentives) {
+                    const { apy, eligibilityId } = supplyIncentive;
+                    const eligibilityCheck = eligibilityId ? EligibilityMapping[eligibilityId] : null;
+                    if (eligibilityCheck) {
+                        const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
+                        const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
+                        acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
+                    }
+                    else {
+                        const incentiveInterest = calculateInterestEarned(amount, apy, 'year', true);
+                        acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
+                    }
                 }
             }
         }
@@ -181,17 +183,19 @@ export const calculateNetApy = ({ usedAssets, assetsData, optionalData, }) => {
             const rate = assetData.borrowRate;
             const borrowInterest = calculateInterestEarned(amount, rate, 'year', true);
             acc.borrowInterest = new Dec(acc.borrowInterest).sub(borrowInterest.toString()).toString();
-            for (const borrowIncentive of assetData.borrowIncentives) {
-                const { apy, eligibilityId } = borrowIncentive;
-                const eligibilityCheck = eligibilityId ? EligibilityMapping[eligibilityId] : null;
-                if (eligibilityCheck) {
-                    const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
-                    const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
-                    acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
-                }
-                else {
-                    const incentiveInterest = calculateInterestEarned(amount, apy, 'year', true);
-                    acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
+            if (assetData.borrowIncentives) {
+                for (const borrowIncentive of assetData.borrowIncentives) {
+                    const { apy, eligibilityId } = borrowIncentive;
+                    const eligibilityCheck = eligibilityId ? EligibilityMapping[eligibilityId] : null;
+                    if (eligibilityCheck) {
+                        const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
+                        const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
+                        acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
+                    }
+                    else {
+                        const incentiveInterest = calculateInterestEarned(amount, apy, 'year', true);
+                        acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
+                    }
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.43-dev-stats-test-2-dev",
+  "version": "2.1.44-aave-v1-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV3/index.ts

@@ -79,7 +79,6 @@ export const aaveV3EmodeCategoriesMapping = (extractedState: any, usedAssets: Aa
 export async function _getAaveV3MarketData(provider: Client, network: NetworkNumber, market: AaveMarketInfo, blockNumber: 'latest' | number = 'latest'): Promise<AaveV3MarketData> {
   const _addresses = market.assets.map(a => getAssetInfo(getWrappedNativeAssetFromUnwrapped(a), network).address);
 
-  console.log('Fetched addresses');
   const isL2 = isLayer2Network(network);
   const loanInfoContract = AaveV3ViewContractViem(provider, network);
   const aaveIncentivesContract = AaveIncentiveDataProviderV3ContractViem(provider, network);
@@ -95,8 +94,6 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
     getMerkleCampaigns(network),
     getMeritCampaigns(network, market.value),
   ]);
-  console.log('Fetched tokens, emodes, campaigns, incentives');
-
   isBorrowAllowed = isLayer2Network(network) ? isBorrowAllowed : true;
 
   const eModeCategoriesData: EModeCategoriesData = {};
@@ -115,7 +112,6 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
     };
   }
 
-  console.log('Parsed e modes info');
   if (networksWithIncentives.includes(network) && rewardInfo) {
     rewardInfo = rewardInfo.reduce((all: any, _market: any) => {
       // eslint-disable-next-line no-param-reassign
@@ -124,7 +120,6 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
     }, {});
   }
 
-  console.log('Parsed reward info');
   const assetsData: AaveV3AssetData[] = await Promise.all(loanInfo
     .map(async (tokenMarket, i) => {
       const symbol = market.assets[i];
@@ -189,17 +184,16 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
       });
     }),
   );
-  console.log('Parsed assets data');
+
   // Get incentives data
   await Promise.all(assetsData.map(async (_market: AaveV3AssetData, index) => {
     /* eslint-disable no-param-reassign */
     // @ts-ignore
     const rewardForMarket = rewardInfo?.[_market.underlyingTokenAddress];
     const isStakingAsset = STAKING_ASSETS.includes(_market.symbol);
-    console.log('Processing market', _market.symbol);
+
     if (isStakingAsset) {
       const yieldApy = await getStakingApy(_market.symbol, network as NetworkNumber);
-      console.log('Got yield apy', yieldApy);
       _market.supplyIncentives.push({
         apy: yieldApy,
         token: _market.symbol,
@@ -230,7 +224,6 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
         eligibilityId: identifier as IncentiveEligibilityId,
       });
     }
-    console.log('Processed merkle a incentives');
 
     const vTokenAddress = (_market as any).vTokenAddress.toLowerCase(); // DEV: Should vTokenAddress be in AaveV3AssetData type?
     if (merkleRewardsMap[vTokenAddress]?.borrow) {
@@ -245,7 +238,6 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
         eligibilityId: identifier as IncentiveEligibilityId,
       });
     }
-    console.log('Processed merkle v incentives');
 
     if (meritRewardsMap.supply[_market.symbol]) {
       const { apy, rewardTokenSymbol, description } = meritRewardsMap.supply[_market.symbol];
@@ -256,7 +248,7 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
         description,
       });
     }
-    console.log('Processed merit supply incentives');
+
     if (meritRewardsMap.borrow[_market.symbol]) {
       const { apy, rewardTokenSymbol, description } = meritRewardsMap.borrow[_market.symbol];
       _market.borrowIncentives.push({
@@ -266,9 +258,8 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
         description,
       });
     }
-    console.log('Processed merit borrow incentives');
+
     if (!rewardForMarket) return;
-    console.log('Reward for market', rewardForMarket);
     // @ts-ignore
     rewardForMarket.aIncentiveData.rewardsTokenInformation.forEach(supplyRewardData => {
       if (supplyRewardData) {
@@ -337,7 +328,6 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
     borrowAssets: assetsData.map((a) => a.symbol),
   };
 
-  console.log('Parsed payload');
   return { assetsData: payload, eModeCategoriesData };
 }
 

package/src/aaveV3/merit.ts

@@ -62,9 +62,8 @@ export const fetchMeritRewardsData = async (): Promise<Record<string, number | n
     const response = await fetch('https://apps.aavechan.com/api/merit/aprs', {
       signal: AbortSignal.timeout(5000),
     });
-    if (!response.ok) throw new Error('Failed to fetch Merit rewards data');
     const data = await response.json();
-    return (data?.currentAPR?.actionsAPR as Record<string, number | null>) || {};
+    return data.currentAPR.actionsAPR as Record<string, number | null>;
   } catch (error) {
     console.error('External API Failure: Failed to fetch merit rewards data:', error);
     return {};
@@ -72,7 +71,6 @@ export const fetchMeritRewardsData = async (): Promise<Record<string, number | n
 };
 
 export const getMeritCampaigns = async (chainId: NetworkNumber, market: AaveVersions): Promise<MeritTokenRewardMap> => {
-  console.log('Fetching Merit campaigns');
   const meritData = await fetchMeritRewardsData();
   const relevantCampaigns = {
     supply: {},

package/src/aaveV3/merkl.ts

@@ -30,7 +30,6 @@ export const formatAaveAsset = (_symbol: string) => {
 };
 
 export const getMerkleCampaigns = async (chainId: NetworkNumber): Promise<MerkleRewardMap> => {
-  console.log('Fetching Merkle campaigns');
   try {
     const res = await fetch('https://api.merkl.xyz/v4/opportunities?mainProtocolId=aave', {
       signal: AbortSignal.timeout(DEFAULT_TIMEOUT),

package/src/savings/morphoVaults/options.ts

@@ -131,7 +131,7 @@ export const MORPHO_VAULT_STEAKHOUSE_ETH: MorphoVault = {
 export const MORPHO_VAULT_STEAKHOUSE_PYUSD: MorphoVault = {
   type: MorphoVaultType.MorphoVaultSteakhousePYUSD,
   name: 'Steakhouse PYUSD',
-  address: '0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB',
+  address: '0xbEEF02e5E13584ab96848af90261f0C8Ee04722a',
   asset: 'PYUSD',
   deploymentBlock: 19043398,
   isLegacy: false,

package/src/staking/staking.ts

@@ -135,16 +135,18 @@ export const calculateNetApy = ({
       const supplyInterest = calculateInterestEarned(amount, rate as string, 'year', true);
       acc.supplyInterest = new Dec(acc.supplyInterest).add(supplyInterest.toString()).toString();
 
-      for (const supplyIncentive of assetData.supplyIncentives) {
-        const { apy, eligibilityId } = supplyIncentive;
-        const eligibilityCheck = eligibilityId ? EligibilityMapping[eligibilityId] : null;
-        if (eligibilityCheck) {
-          const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
-          const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
-          acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
-        } else {
-          const incentiveInterest = calculateInterestEarned(amount, apy, 'year', true);
-          acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
+      if (assetData.supplyIncentives) {
+        for (const supplyIncentive of assetData.supplyIncentives) {
+          const { apy, eligibilityId } = supplyIncentive;
+          const eligibilityCheck = eligibilityId ? EligibilityMapping[eligibilityId] : null;
+          if (eligibilityCheck) {
+            const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
+            const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
+            acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
+          } else {
+            const incentiveInterest = calculateInterestEarned(amount, apy, 'year', true);
+            acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
+          }
         }
       }
     }
@@ -156,16 +158,18 @@ export const calculateNetApy = ({
       const borrowInterest = calculateInterestEarned(amount, rate as string, 'year', true);
       acc.borrowInterest = new Dec(acc.borrowInterest).sub(borrowInterest.toString()).toString();
 
-      for (const borrowIncentive of assetData.borrowIncentives) {
-        const { apy, eligibilityId } = borrowIncentive;
-        const eligibilityCheck = eligibilityId ? EligibilityMapping[eligibilityId] : null;
-        if (eligibilityCheck) {
-          const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
-          const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
-          acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
-        } else {
-          const incentiveInterest = calculateInterestEarned(amount, apy, 'year', true);
-          acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
+      if (assetData.borrowIncentives) {
+        for (const borrowIncentive of assetData.borrowIncentives) {
+          const { apy, eligibilityId } = borrowIncentive;
+          const eligibilityCheck = eligibilityId ? EligibilityMapping[eligibilityId] : null;
+          if (eligibilityCheck) {
+            const { isEligible, eligibleUSDAmount } = eligibilityCheck(usedAssets, optionalData);
+            const incentiveInterest = isEligible ? calculateInterestEarned(eligibleUSDAmount, apy, 'year', true) : '0';
+            acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
+          } else {
+            const incentiveInterest = calculateInterestEarned(amount, apy, 'year', true);
+            acc.incentiveUsd = new Dec(acc.incentiveUsd).add(incentiveInterest).toString();
+          }
         }
       }
     }