@defisaver/positions-sdk 2.1.49-aave-v4-dev-1-dev → 2.1.49-aave-v4-dev-2

package/src/aaveV4/index.ts

@@ -1,169 +1,169 @@
-import { Client } from 'viem';
-import Dec from 'decimal.js';
-import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
-import { getViemProvider } from '../services/viem';
-import {
-  AaveV4AccountData,
-  AaveV4HubAssetOnChainData,
-  AaveV4HubOnChainData,
-  AaveV4ReserveAssetData, AaveV4ReserveAssetOnChain, AaveV4SpokeData, AaveV4SpokeInfo,
-  AaveV4UsedReserveAssets,
-} from '../types';
-import {
-  EthAddress, EthereumProvider, IncentiveData, IncentiveKind, NetworkNumber,
-} from '../types/common';
-import { AaveV4ViewContractViem } from '../contracts';
-import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { wethToEth } from '../services/utils';
-import { aaveV4GetAggregatedPositionData } from '../helpers/aaveV4Helpers';
-
-const fetchHubData = async (viewContract: ReturnType<typeof AaveV4ViewContractViem>, hubAddress: EthAddress): Promise<AaveV4HubOnChainData> => {
-  const hubData = await viewContract.read.getHubAllAssetsData([hubAddress]);
-  return {
-    assets: hubData.reduce((acc: Record<number, AaveV4HubAssetOnChainData>, assetOnChainData) => {
-      acc[assetOnChainData.assetId] = {
-        assetId: assetOnChainData.assetId,
-        drawnRate: assetOnChainData.drawnRate,
-      };
-      return acc;
-    }, {}),
-  };
-};
-
-const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAsset: AaveV4HubAssetOnChainData, reserveId: number, oracleDecimals: number, network: NetworkNumber): Promise<AaveV4ReserveAssetData> => {
-  const assetInfo = getAssetInfoByAddress(reserveAsset.underlying, network);
-  const symbol = wethToEth(assetInfo.symbol);
-
-  const isStakingAsset = STAKING_ASSETS.includes(symbol);
-  const supplyIncentives: IncentiveData[] = [];
-  const borrowIncentives: IncentiveData[] = [];
-
-  if (isStakingAsset) {
-    const yieldApy = await getStakingApy(symbol, network as NetworkNumber);
-    supplyIncentives.push({
-      apy: yieldApy,
-      token: symbol,
-      incentiveKind: IncentiveKind.Staking,
-      description: `Native ${symbol} yield.`,
-    });
-    if (reserveAsset.borrowable) {
-      // when borrowing assets whose value increases over time
-      borrowIncentives.push({
-        apy: new Dec(yieldApy).mul(-1).toString(),
-        token: symbol,
-        incentiveKind: IncentiveKind.Reward,
-        description: `Due to the native yield of ${symbol}, the value of the debt would increase over time.`,
-      });
-    }
-  }
-
-  return ({
-    symbol,
-    underlying: reserveAsset.underlying,
-    hub: reserveAsset.hub,
-    assetId: reserveAsset.assetId,
-    reserveId,
-    paused: reserveAsset.paused,
-    frozen: reserveAsset.frozen,
-    borrowable: reserveAsset.borrowable,
-    collateralRisk: new Dec(reserveAsset.collateralRisk).div(10000).toNumber(),
-    collateralFactor: new Dec(reserveAsset.collateralFactor).div(10000).toNumber(),
-    liquidationFee: new Dec(reserveAsset.liquidationFee).div(10000).toNumber(),
-    price: new Dec(reserveAsset.price).div(new Dec(10).pow(oracleDecimals)).toString(),
-    totalSupplied: assetAmountInEth(reserveAsset.totalSupplied.toString(), symbol),
-    totalDrawn: assetAmountInEth(reserveAsset.totalDrawn.toString(), symbol),
-    totalPremium: assetAmountInEth(reserveAsset.totalPremium.toString(), symbol),
-    totalDebt: assetAmountInEth(reserveAsset.totalDebt.toString(), symbol),
-    supplyCap: assetAmountInEth(reserveAsset.supplyCap.toString(), symbol),
-    borrowCap: assetAmountInEth(reserveAsset.borrowCap.toString(), symbol),
-    spokeActive: reserveAsset.spokeActive,
-    spokePaused: reserveAsset.spokePaused,
-    drawnRate: new Dec(hubAsset.drawnRate).div(new Dec(10).pow(27)).toString(),
-    supplyRate: '0', // To be implemented
-    supplyIncentives,
-    borrowIncentives,
-    canBeBorrowed: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused && !reserveAsset.frozen,
-    canBeSupplied: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused && !reserveAsset.frozen,
-    canBeWithdrawn: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused,
-    canBePayBacked: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused,
-    utilization: new Dec(reserveAsset.totalDrawn.toString()).times(100).div(new Dec(reserveAsset.totalSupplied.toString())).toString(),
-  });
-};
-
-export async function _getAaveV4SpokeData(provider: Client, network: NetworkNumber, market: AaveV4SpokeInfo, blockNumber: 'latest' | number = 'latest'): Promise<AaveV4SpokeData> {
-  const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
-
-  const hubsData: Record<EthAddress, AaveV4HubOnChainData> = {};
-  const [spokeData] = await Promise.all([
-    viewContract.read.getSpokeDataFull([market.address]),
-    ...market.hubs.map(async (hubAddress) => {
-      hubsData[hubAddress] = await fetchHubData(viewContract, hubAddress);
-    }),
-  ]);
-
-  const reserveAssetsArray = await Promise.all(spokeData[1].map(async (reserveAssetOnChain: AaveV4ReserveAssetOnChain, index: number) => formatReserveAsset(reserveAssetOnChain, hubsData[reserveAssetOnChain.hub].assets[reserveAssetOnChain.assetId], index, +spokeData[0].oracleDecimals.toString(), network)));
-
-  return {
-    assetsData: reserveAssetsArray.reduce((acc: Record<string, AaveV4ReserveAssetData>, reserveAsset: AaveV4ReserveAssetData) => {
-      acc[`${reserveAsset.symbol}-${reserveAsset.reserveId}`] = reserveAsset;
-      return acc;
-    }, {}),
-    oracle: spokeData[0].oracle,
-    oracleDecimals: +spokeData[0].oracleDecimals.toString(),
-    address: market.address,
-  };
-}
-
-export async function getAaveV4SpokeData(provider: EthereumProvider, network: NetworkNumber, spoke: AaveV4SpokeInfo, blockNumber: 'latest' | number = 'latest'): Promise<AaveV4SpokeData> {
-  return _getAaveV4SpokeData(getViemProvider(provider, network), network, spoke, blockNumber);
-}
-
-export async function _getAaveV4AccountData(provider: Client, network: NetworkNumber, spokeData: AaveV4SpokeData, address: EthAddress, blockNumber: 'latest' | number = 'latest'): Promise<AaveV4AccountData> {
-  const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
-
-  const loanData = await viewContract.read.getLoanData([spokeData.address, address]);
-
-  const healthFactor = new Dec(loanData.healthFactor).div(1e18).toString();
-  const usedAssets = loanData.reserves.reduce((acc: AaveV4UsedReserveAssets, usedReserveAsset) => {
-    const identifier = `${wethToEth(getAssetInfoByAddress(usedReserveAsset.underlying, network).symbol)}-${+usedReserveAsset.reserveId.toString()}`;
-    const reserveData = spokeData.assetsData[identifier];
-    const price = reserveData.price;
-    const supplied = assetAmountInEth(usedReserveAsset.supplied.toString(), reserveData.symbol);
-    const drawn = assetAmountInEth(usedReserveAsset.drawn.toString(), reserveData.symbol);
-    const premium = assetAmountInEth(usedReserveAsset.premium.toString(), reserveData.symbol);
-    const borrowed = assetAmountInEth(usedReserveAsset.totalDebt.toString(), reserveData.symbol);
-    acc[identifier] = {
-      symbol: reserveData.symbol,
-      assetId: reserveData.assetId,
-      reserveId: +usedReserveAsset.reserveId.toString(),
-      supplied,
-      suppliedUsd: new Dec(supplied).mul(price).toString(),
-      drawn,
-      drawnUsd: new Dec(drawn).mul(price).toString(),
-      premium,
-      premiumUsd: new Dec(premium).mul(price).toString(),
-      borrowed,
-      borrowedUsd: new Dec(borrowed).mul(price).toString(),
-      isSupplied: !new Dec(supplied).eq(0),
-      isBorrowed: usedReserveAsset.isBorrowing,
-      collateral: usedReserveAsset.isUsingAsCollateral,
-      collateralFactor: new Dec(usedReserveAsset.collateralFactor).div(10000).toNumber(),
-    };
-    return acc;
-  }, {});
-
-  return {
-    usedAssets,
-    healthFactor,
-    ...aaveV4GetAggregatedPositionData({
-      usedAssets,
-      assetsData: spokeData.assetsData,
-      network,
-      useUserCollateralFactor: true,
-    }),
-  };
-}
-
-export async function getAaveV4AccountData(provider: EthereumProvider, network: NetworkNumber, marketData: AaveV4SpokeData, address: EthAddress, blockNumber: 'latest' | number = 'latest'): Promise<any> {
-  return _getAaveV4AccountData(getViemProvider(provider, network), network, marketData, address, blockNumber);
+import { Client } from 'viem';
+import Dec from 'decimal.js';
+import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
+import { getViemProvider } from '../services/viem';
+import {
+  AaveV4AccountData,
+  AaveV4HubAssetOnChainData,
+  AaveV4HubOnChainData,
+  AaveV4ReserveAssetData, AaveV4ReserveAssetOnChain, AaveV4SpokeData, AaveV4SpokeInfo,
+  AaveV4UsedReserveAssets,
+} from '../types';
+import {
+  EthAddress, EthereumProvider, IncentiveData, IncentiveKind, NetworkNumber,
+} from '../types/common';
+import { AaveV4ViewContractViem } from '../contracts';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
+import { wethToEth } from '../services/utils';
+import { aaveV4GetAggregatedPositionData } from '../helpers/aaveV4Helpers';
+
+const fetchHubData = async (viewContract: ReturnType<typeof AaveV4ViewContractViem>, hubAddress: EthAddress): Promise<AaveV4HubOnChainData> => {
+  const hubData = await viewContract.read.getHubAllAssetsData([hubAddress]);
+  return {
+    assets: hubData.reduce((acc: Record<number, AaveV4HubAssetOnChainData>, assetOnChainData) => {
+      acc[assetOnChainData.assetId] = {
+        assetId: assetOnChainData.assetId,
+        drawnRate: assetOnChainData.drawnRate,
+      };
+      return acc;
+    }, {}),
+  };
+};
+
+const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAsset: AaveV4HubAssetOnChainData, reserveId: number, oracleDecimals: number, network: NetworkNumber): Promise<AaveV4ReserveAssetData> => {
+  const assetInfo = getAssetInfoByAddress(reserveAsset.underlying, network);
+  const symbol = wethToEth(assetInfo.symbol);
+
+  const isStakingAsset = STAKING_ASSETS.includes(symbol);
+  const supplyIncentives: IncentiveData[] = [];
+  const borrowIncentives: IncentiveData[] = [];
+
+  if (isStakingAsset) {
+    const yieldApy = await getStakingApy(symbol, network as NetworkNumber);
+    supplyIncentives.push({
+      apy: yieldApy,
+      token: symbol,
+      incentiveKind: IncentiveKind.Staking,
+      description: `Native ${symbol} yield.`,
+    });
+    if (reserveAsset.borrowable) {
+      // when borrowing assets whose value increases over time
+      borrowIncentives.push({
+        apy: new Dec(yieldApy).mul(-1).toString(),
+        token: symbol,
+        incentiveKind: IncentiveKind.Reward,
+        description: `Due to the native yield of ${symbol}, the value of the debt would increase over time.`,
+      });
+    }
+  }
+
+  return ({
+    symbol,
+    underlying: reserveAsset.underlying,
+    hub: reserveAsset.hub,
+    assetId: reserveAsset.assetId,
+    reserveId,
+    paused: reserveAsset.paused,
+    frozen: reserveAsset.frozen,
+    borrowable: reserveAsset.borrowable,
+    collateralRisk: new Dec(reserveAsset.collateralRisk).div(10000).toNumber(),
+    collateralFactor: new Dec(reserveAsset.collateralFactor).div(10000).toNumber(),
+    liquidationFee: new Dec(reserveAsset.liquidationFee).div(10000).toNumber(),
+    price: new Dec(reserveAsset.price).div(new Dec(10).pow(oracleDecimals)).toString(),
+    totalSupplied: assetAmountInEth(reserveAsset.totalSupplied.toString(), symbol),
+    totalDrawn: assetAmountInEth(reserveAsset.totalDrawn.toString(), symbol),
+    totalPremium: assetAmountInEth(reserveAsset.totalPremium.toString(), symbol),
+    totalDebt: assetAmountInEth(reserveAsset.totalDebt.toString(), symbol),
+    supplyCap: assetAmountInEth(reserveAsset.supplyCap.toString(), symbol),
+    borrowCap: assetAmountInEth(reserveAsset.borrowCap.toString(), symbol),
+    spokeActive: reserveAsset.spokeActive,
+    spokePaused: reserveAsset.spokePaused,
+    drawnRate: new Dec(hubAsset.drawnRate).div(new Dec(10).pow(27)).toString(),
+    supplyRate: '0', // To be implemented
+    supplyIncentives,
+    borrowIncentives,
+    canBeBorrowed: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused && !reserveAsset.frozen,
+    canBeSupplied: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused && !reserveAsset.frozen,
+    canBeWithdrawn: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused,
+    canBePayBacked: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused,
+    utilization: new Dec(reserveAsset.totalDrawn.toString()).times(100).div(new Dec(reserveAsset.totalSupplied.toString())).toString(),
+  });
+};
+
+export async function _getAaveV4SpokeData(provider: Client, network: NetworkNumber, market: AaveV4SpokeInfo, blockNumber: 'latest' | number = 'latest'): Promise<AaveV4SpokeData> {
+  const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
+
+  const hubsData: Record<EthAddress, AaveV4HubOnChainData> = {};
+  const [spokeData] = await Promise.all([
+    viewContract.read.getSpokeDataFull([market.address]),
+    ...market.hubs.map(async (hubAddress) => {
+      hubsData[hubAddress] = await fetchHubData(viewContract, hubAddress);
+    }),
+  ]);
+
+  const reserveAssetsArray = await Promise.all(spokeData[1].map(async (reserveAssetOnChain: AaveV4ReserveAssetOnChain, index: number) => formatReserveAsset(reserveAssetOnChain, hubsData[reserveAssetOnChain.hub].assets[reserveAssetOnChain.assetId], index, +spokeData[0].oracleDecimals.toString(), network)));
+
+  return {
+    assetsData: reserveAssetsArray.reduce((acc: Record<string, AaveV4ReserveAssetData>, reserveAsset: AaveV4ReserveAssetData) => {
+      acc[`${reserveAsset.symbol}-${reserveAsset.reserveId}`] = reserveAsset;
+      return acc;
+    }, {}),
+    oracle: spokeData[0].oracle,
+    oracleDecimals: +spokeData[0].oracleDecimals.toString(),
+    address: market.address,
+  };
+}
+
+export async function getAaveV4SpokeData(provider: EthereumProvider, network: NetworkNumber, spoke: AaveV4SpokeInfo, blockNumber: 'latest' | number = 'latest'): Promise<AaveV4SpokeData> {
+  return _getAaveV4SpokeData(getViemProvider(provider, network), network, spoke, blockNumber);
+}
+
+export async function _getAaveV4AccountData(provider: Client, network: NetworkNumber, spokeData: AaveV4SpokeData, address: EthAddress, blockNumber: 'latest' | number = 'latest'): Promise<AaveV4AccountData> {
+  const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
+
+  const loanData = await viewContract.read.getLoanData([spokeData.address, address]);
+
+  const healthFactor = new Dec(loanData.healthFactor).div(1e18).toString();
+  const usedAssets = loanData.reserves.reduce((acc: AaveV4UsedReserveAssets, usedReserveAsset) => {
+    const identifier = `${wethToEth(getAssetInfoByAddress(usedReserveAsset.underlying, network).symbol)}-${+usedReserveAsset.reserveId.toString()}`;
+    const reserveData = spokeData.assetsData[identifier];
+    const price = reserveData.price;
+    const supplied = assetAmountInEth(usedReserveAsset.supplied.toString(), reserveData.symbol);
+    const drawn = assetAmountInEth(usedReserveAsset.drawn.toString(), reserveData.symbol);
+    const premium = assetAmountInEth(usedReserveAsset.premium.toString(), reserveData.symbol);
+    const borrowed = assetAmountInEth(usedReserveAsset.totalDebt.toString(), reserveData.symbol);
+    acc[identifier] = {
+      symbol: reserveData.symbol,
+      assetId: reserveData.assetId,
+      reserveId: +usedReserveAsset.reserveId.toString(),
+      supplied,
+      suppliedUsd: new Dec(supplied).mul(price).toString(),
+      drawn,
+      drawnUsd: new Dec(drawn).mul(price).toString(),
+      premium,
+      premiumUsd: new Dec(premium).mul(price).toString(),
+      borrowed,
+      borrowedUsd: new Dec(borrowed).mul(price).toString(),
+      isSupplied: !new Dec(supplied).eq(0),
+      isBorrowed: usedReserveAsset.isBorrowing,
+      collateral: usedReserveAsset.isUsingAsCollateral,
+      collateralFactor: new Dec(usedReserveAsset.collateralFactor).div(10000).toNumber(),
+    };
+    return acc;
+  }, {});
+
+  return {
+    usedAssets,
+    healthFactor,
+    ...aaveV4GetAggregatedPositionData({
+      usedAssets,
+      assetsData: spokeData.assetsData,
+      network,
+      useUserCollateralFactor: true,
+    }),
+  };
+}
+
+export async function getAaveV4AccountData(provider: EthereumProvider, network: NetworkNumber, marketData: AaveV4SpokeData, address: EthAddress, blockNumber: 'latest' | number = 'latest'): Promise<any> {
+  return _getAaveV4AccountData(getViemProvider(provider, network), network, marketData, address, blockNumber);
 }

package/src/claiming/aaveV3.ts

@@ -1,155 +1,155 @@
-import { Client } from 'viem';
-import Dec from 'decimal.js';
-import { EthAddress, NetworkNumber } from '../types/common';
-import { ClaimableToken, ClaimType } from '../types/claiming';
-import {
-  AaveIncentiveDataProviderV3ContractViem,
-  AaveRewardsControllerViem,
-} from '../contracts';
-import { compareAddresses, getEthAmountForDecimals } from '../services/utils';
-import { getAaveUnderlyingSymbol } from '../helpers/aaveHelpers';
-
-type AaveReward = {
-  amount: string;
-  symbol: string;
-  underlyingAsset: string;
-  rewardTokenAddress: string;
-  aTokenAddresses: string[];
-};
-
-const mapAaveRewardsToClaimableTokens = (aaveRewards: AaveReward[], marketAddress: EthAddress, walletAddress: EthAddress) => aaveRewards.map(reward => ({
-  symbol: reward.symbol,
-  amount: reward.amount,
-  claimType: ClaimType.AAVE_REWARDS as const,
-  tokenAddress: reward.rewardTokenAddress as EthAddress,
-  underlyingSymbol: reward.underlyingAsset,
-  walletAddress,
-  label: 'AAVE Rewards',
-  additionalClaimFields: {
-    marketAddress,
-    aTokenAddresses: reward.aTokenAddresses,
-    isAaveToken: reward.symbol.startsWith('a'),
-  },
-}));
-
-export async function getUnclaimedRewardsForAllMarkets(
-  provider: Client,
-  network: NetworkNumber,
-  walletAddress: EthAddress,
-  marketAddress: EthAddress,
-): Promise<ClaimableToken[]> {
-  const contract = AaveIncentiveDataProviderV3ContractViem(provider, network);
-  const tokensData = await contract.read.getUserReservesIncentivesData([marketAddress, walletAddress]);
-  const allTokensDataArrays = tokensData.reduce((acc: any[], val) => {
-    acc.push(val.aTokenIncentivesUserData.userRewardsInformation);
-    acc.push(val.vTokenIncentivesUserData.userRewardsInformation);
-    return acc;
-  }, []);
-  const allATokens = tokensData.reduce((acc, val) => {
-    acc.push(val.aTokenIncentivesUserData.tokenAddress);
-    acc.push(val.vTokenIncentivesUserData.tokenAddress);
-    return acc;
-  }, [] as string[]);
-  // array of rewards for each market (aToken/vToken)
-  // reward can be any token like wstETH, but also aToken like aWETH
-  const aaveRewardsController = AaveRewardsControllerViem(provider, network);
-  const rewardsPerAAsset = await Promise.all(allATokens.map(
-    (token: string) => aaveRewardsController.read.getAllUserRewards([[token as EthAddress], walletAddress])));
-
-  // match amounts to token symbol, parse decimal amounts
-  const rewardsPerAAssetWithInfo = rewardsPerAAsset.map((rewardForAAsset, aaIndex) => {
-    const rewardsList = rewardForAAsset[0];
-    const amounts = rewardForAAsset[1];
-
-    const rewardsDataArraysForAAsset = allTokensDataArrays[aaIndex];
-    const aTokenAddress = allATokens[aaIndex];
-    return rewardsList.map((rewardTokenAddress, rewardIndex) => {
-      const dataArrIndex = rewardsDataArraysForAAsset.findIndex((arr: { rewardTokenAddress: string | undefined; }) => compareAddresses(arr.rewardTokenAddress, rewardTokenAddress));
-      const amountWei = amounts[rewardIndex];
-      const amount = getEthAmountForDecimals(amountWei.toString(), rewardsDataArraysForAAsset[dataArrIndex]?.rewardTokenDecimals);
-      const symbol = rewardsDataArraysForAAsset[dataArrIndex]?.rewardTokenSymbol || '';
-      const underlyingAsset = getAaveUnderlyingSymbol(symbol);
-      return ({
-        amount,
-        symbol,
-        underlyingAsset,
-        rewardTokenAddress,
-        aTokenAddress,
-      });
-    });
-  });
-
-  // sum all unclaimed rewards of all markets per each token
-  // (e.g. how much awstETH is claimable in total from both aUSDC and awstETH markets)
-  const totalUnclaimedPerRewardToken: Record<string, any> = {};
-  rewardsPerAAssetWithInfo
-    .flat()
-    .forEach(({
-      amount, symbol, underlyingAsset, rewardTokenAddress, aTokenAddress,
-    }) => {
-      if (+amount > 0) {
-        if (!totalUnclaimedPerRewardToken[symbol]) {
-          totalUnclaimedPerRewardToken[symbol] = {
-            amount, symbol, underlyingAsset, rewardTokenAddress, aTokenAddresses: [aTokenAddress],
-          };
-        } else {
-          totalUnclaimedPerRewardToken[symbol].amount =
-                new Dec(totalUnclaimedPerRewardToken[symbol].amount).add(amount).toString();
-          totalUnclaimedPerRewardToken[symbol].aTokenAddresses.push(aTokenAddress);
-        }
-      }
-    }, []);
-
-  return mapAaveRewardsToClaimableTokens(Object.values(totalUnclaimedPerRewardToken), marketAddress, walletAddress);
-}
-
-export async function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber, acceptMorpho: boolean = true): Promise<ClaimableToken[]> {
-  let data;
-  try {
-    const res = await fetch(`https://api.merkl.xyz/v4/users/${account}/rewards?chainId=${network}`,
-      { signal: AbortSignal.timeout(3000) });
-    data = await res.json();
-  } catch (error) {
-    console.error('External API Failure: Aave Merit', error);
-    data = [];
-  }
-
-  const claimableTokens: ClaimableToken[] = [];
-
-  data.forEach((item: { rewards: any[]; }) => {
-    item.rewards.forEach(reward => {
-      const {
-        token,
-        amount,
-        claimed,
-        proofs,
-      } = reward;
-
-      const isTokenMorpho = token.symbol === 'MORPHO';
-      if (!token || !token.symbol || amount === '0' || (isTokenMorpho && !acceptMorpho)) return;
-
-      const unclaimedAmount = new Dec(amount).minus(claimed || 0).toString();
-      if (unclaimedAmount === '0') return;
-
-      const unclaimed = getEthAmountForDecimals(unclaimedAmount, token.decimals);
-
-      claimableTokens.push({
-        claimType: ClaimType.AAVE_MERIT_REWARDS,
-        amount: unclaimed,
-        symbol: token.symbol,
-        tokenAddress: token.address,
-        walletAddress: account,
-        label: 'AAVE Merit Rewards',
-        underlyingSymbol: getAaveUnderlyingSymbol(token.symbol),
-        additionalClaimFields: {
-          accumulated: amount,
-          proof: proofs,
-          decimals: token.decimals,
-          unclaimed: unclaimedAmount,
-        },
-      });
-    });
-  });
-
-  return claimableTokens;
+import { Client } from 'viem';
+import Dec from 'decimal.js';
+import { EthAddress, NetworkNumber } from '../types/common';
+import { ClaimableToken, ClaimType } from '../types/claiming';
+import {
+  AaveIncentiveDataProviderV3ContractViem,
+  AaveRewardsControllerViem,
+} from '../contracts';
+import { compareAddresses, getEthAmountForDecimals } from '../services/utils';
+import { getAaveUnderlyingSymbol } from '../helpers/aaveHelpers';
+
+type AaveReward = {
+  amount: string;
+  symbol: string;
+  underlyingAsset: string;
+  rewardTokenAddress: string;
+  aTokenAddresses: string[];
+};
+
+const mapAaveRewardsToClaimableTokens = (aaveRewards: AaveReward[], marketAddress: EthAddress, walletAddress: EthAddress) => aaveRewards.map(reward => ({
+  symbol: reward.symbol,
+  amount: reward.amount,
+  claimType: ClaimType.AAVE_REWARDS as const,
+  tokenAddress: reward.rewardTokenAddress as EthAddress,
+  underlyingSymbol: reward.underlyingAsset,
+  walletAddress,
+  label: 'AAVE Rewards',
+  additionalClaimFields: {
+    marketAddress,
+    aTokenAddresses: reward.aTokenAddresses,
+    isAaveToken: reward.symbol.startsWith('a'),
+  },
+}));
+
+export async function getUnclaimedRewardsForAllMarkets(
+  provider: Client,
+  network: NetworkNumber,
+  walletAddress: EthAddress,
+  marketAddress: EthAddress,
+): Promise<ClaimableToken[]> {
+  const contract = AaveIncentiveDataProviderV3ContractViem(provider, network);
+  const tokensData = await contract.read.getUserReservesIncentivesData([marketAddress, walletAddress]);
+  const allTokensDataArrays = tokensData.reduce((acc: any[], val) => {
+    acc.push(val.aTokenIncentivesUserData.userRewardsInformation);
+    acc.push(val.vTokenIncentivesUserData.userRewardsInformation);
+    return acc;
+  }, []);
+  const allATokens = tokensData.reduce((acc, val) => {
+    acc.push(val.aTokenIncentivesUserData.tokenAddress);
+    acc.push(val.vTokenIncentivesUserData.tokenAddress);
+    return acc;
+  }, [] as string[]);
+  // array of rewards for each market (aToken/vToken)
+  // reward can be any token like wstETH, but also aToken like aWETH
+  const aaveRewardsController = AaveRewardsControllerViem(provider, network);
+  const rewardsPerAAsset = await Promise.all(allATokens.map(
+    (token: string) => aaveRewardsController.read.getAllUserRewards([[token as EthAddress], walletAddress])));
+
+  // match amounts to token symbol, parse decimal amounts
+  const rewardsPerAAssetWithInfo = rewardsPerAAsset.map((rewardForAAsset, aaIndex) => {
+    const rewardsList = rewardForAAsset[0];
+    const amounts = rewardForAAsset[1];
+
+    const rewardsDataArraysForAAsset = allTokensDataArrays[aaIndex];
+    const aTokenAddress = allATokens[aaIndex];
+    return rewardsList.map((rewardTokenAddress, rewardIndex) => {
+      const dataArrIndex = rewardsDataArraysForAAsset.findIndex((arr: { rewardTokenAddress: string | undefined; }) => compareAddresses(arr.rewardTokenAddress, rewardTokenAddress));
+      const amountWei = amounts[rewardIndex];
+      const amount = getEthAmountForDecimals(amountWei.toString(), rewardsDataArraysForAAsset[dataArrIndex]?.rewardTokenDecimals);
+      const symbol = rewardsDataArraysForAAsset[dataArrIndex]?.rewardTokenSymbol || '';
+      const underlyingAsset = getAaveUnderlyingSymbol(symbol);
+      return ({
+        amount,
+        symbol,
+        underlyingAsset,
+        rewardTokenAddress,
+        aTokenAddress,
+      });
+    });
+  });
+
+  // sum all unclaimed rewards of all markets per each token
+  // (e.g. how much awstETH is claimable in total from both aUSDC and awstETH markets)
+  const totalUnclaimedPerRewardToken: Record<string, any> = {};
+  rewardsPerAAssetWithInfo
+    .flat()
+    .forEach(({
+      amount, symbol, underlyingAsset, rewardTokenAddress, aTokenAddress,
+    }) => {
+      if (+amount > 0) {
+        if (!totalUnclaimedPerRewardToken[symbol]) {
+          totalUnclaimedPerRewardToken[symbol] = {
+            amount, symbol, underlyingAsset, rewardTokenAddress, aTokenAddresses: [aTokenAddress],
+          };
+        } else {
+          totalUnclaimedPerRewardToken[symbol].amount =
+                new Dec(totalUnclaimedPerRewardToken[symbol].amount).add(amount).toString();
+          totalUnclaimedPerRewardToken[symbol].aTokenAddresses.push(aTokenAddress);
+        }
+      }
+    }, []);
+
+  return mapAaveRewardsToClaimableTokens(Object.values(totalUnclaimedPerRewardToken), marketAddress, walletAddress);
+}
+
+export async function getMeritUnclaimedRewards(account: EthAddress, network: NetworkNumber, acceptMorpho: boolean = true): Promise<ClaimableToken[]> {
+  let data;
+  try {
+    const res = await fetch(`https://api.merkl.xyz/v4/users/${account}/rewards?chainId=${network}`,
+      { signal: AbortSignal.timeout(3000) });
+    data = await res.json();
+  } catch (error) {
+    console.error('External API Failure: Aave Merit', error);
+    data = [];
+  }
+
+  const claimableTokens: ClaimableToken[] = [];
+
+  data.forEach((item: { rewards: any[]; }) => {
+    item.rewards.forEach(reward => {
+      const {
+        token,
+        amount,
+        claimed,
+        proofs,
+      } = reward;
+
+      const isTokenMorpho = token.symbol === 'MORPHO';
+      if (!token || !token.symbol || amount === '0' || (isTokenMorpho && !acceptMorpho)) return;
+
+      const unclaimedAmount = new Dec(amount).minus(claimed || 0).toString();
+      if (unclaimedAmount === '0') return;
+
+      const unclaimed = getEthAmountForDecimals(unclaimedAmount, token.decimals);
+
+      claimableTokens.push({
+        claimType: ClaimType.AAVE_MERIT_REWARDS,
+        amount: unclaimed,
+        symbol: token.symbol,
+        tokenAddress: token.address,
+        walletAddress: account,
+        label: 'AAVE Merit Rewards',
+        underlyingSymbol: getAaveUnderlyingSymbol(token.symbol),
+        additionalClaimFields: {
+          accumulated: amount,
+          proof: proofs,
+          decimals: token.decimals,
+          unclaimed: unclaimedAmount,
+        },
+      });
+    });
+  });
+
+  return claimableTokens;
 }