Merge pull request DefiLlama#233 from DefiLlama/fix_aave3

Fix aave-v3
Super-Nim · Aug 18, 2022 · dea33cc · dea33cc
2 parents 1ce2111 + a0bc54c
commit dea33cc
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 5 deletions.
diff --git a/src/adaptors/aave-v3/abi.js b/src/adaptors/aave-v3/abi.js
diff --git a/src/adaptors/aave-v3/index.js b/src/adaptors/aave-v3/index.js
@@ -1,7 +1,9 @@
 const superagent = require('superagent');
 const { request, gql } = require('graphql-request');
+const sdk = require('@defillama/sdk');
 
 const utils = require('../utils');
+const { aTokenAbi } = require('./abi');
 
 const SECONDS_PER_YEAR = 31536000;
 
@@ -46,6 +48,7 @@ const query = gql`
       id
       name
       aToken {
+        id
         rewards {
           id
           emissionsPerSecond
@@ -73,6 +76,34 @@ const apy = async () => {
       (await request(url, query)).reserves,
     ])
   );
+  const totalSupply = await Promise.all(
+    data.map(async ([chain, reserves]) =>
+      (
+        await sdk.api.abi.multiCall({
+          chain: chain === 'avalanche' ? 'avax' : chain,
+          abi: aTokenAbi.find(({ name }) => name === 'totalSupply'),
+          calls: reserves.map((reserve) => ({
+            target: reserve.aToken.id,
+          })),
+        })
+      ).output.map(({ output }) => output)
+    )
+  );
+
+  const underlyingBalances = await Promise.all(
+    data.map(async ([chain, reserves]) =>
+      (
+        await sdk.api.abi.multiCall({
+          chain: chain === 'avalanche' ? 'avax' : chain,
+          abi: aTokenAbi.find(({ name }) => name === 'balanceOf'),
+          calls: reserves.map((reserve, i) => ({
+            target: reserve.aToken.underlyingAssetAddress,
+            params: [reserve.aToken.id],
+          })),
+        })
+      ).output.map(({ output }) => output)
+    )
+  );
 
   const underlyingTokens = data.map(([chain, reserves]) =>
     reserves.map(
@@ -95,15 +126,16 @@ const apy = async () => {
     underlyingTokens.flat().concat(rewardTokens.flat(Infinity))
   );
 
-  const pools = data.map(([chain, markets]) => {
-    const chainPools = markets.map((pool) => {
+  const pools = data.map(([chain, markets], i) => {
+    const chainPools = markets.map((pool, idx) => {
+      const supply = totalSupply[i][idx];
+      const currentSupply = underlyingBalances[i][idx];
       const totalSupplyUsd =
-        (pool.totalLiquidity / 10 ** pool.aToken.underlyingAssetDecimals) *
+        (supply / 10 ** pool.aToken.underlyingAssetDecimals) *
         (pricesByAddress[pool.aToken.underlyingAssetAddress] ||
           pricesBySymbol[pool.symbol]);
       const tvlUsd =
-        ((pool.totalLiquidity - pool.totalCurrentVariableDebt) /
-          10 ** pool.aToken.underlyingAssetDecimals) *
+        (currentSupply / 10 ** pool.aToken.underlyingAssetDecimals) *
         (pricesByAddress[pool.aToken.underlyingAssetAddress] ||
           pricesBySymbol[pool.symbol]);
       const { rewards } = pool.aToken;