update

.github/workflows/master.yml

@@ -44,3 +44,4 @@ jobs:
           VENDOR_FINANCE: ${{ secrets.VENDOR_FINANCE }}
           TRADERJOE: ${{ secrets.TRADERJOE }}
           GRAPH_API_KEY: ${{ secrets.GRAPH_API_KEY }}
+          OSMOSIS_API_KEY: ${{ secrets.OSMOSIS_API_KEY}}

README.md

@@ -74,21 +74,21 @@ A note on how to set apy related fields:
 - if you are unsure/your data source doesn't contain a detailed breakdown, then provide an `apy` field indicating the total apy and omit the `apyBase` and `apyReward` fields (or set to null)
 ```
 
-#### FAQ
+### FAQ
 
-> Why are some pools missing on DefiLlama which appear on my adapter?
+#### Why are some pools missing on DefiLlama which appear on my adapter?
 
 DefiLlama only displays pools with >10k TVL, so pools with less TVL than that will appear on the adapter but not on defillama
 
-> I'm getting errors when running `npm install`
+#### I'm getting errors when running `npm install`
 
 Make sure you're running the command inside the `src/adaptors` folder, not in the project root folder.
 
-> Why is X pool missing from https://defillama.com/yields/stablecoins ?
+#### Why is X pool missing from https://defillama.com/yields/stablecoins ?
 
 That page has stricter filters than other pages, only pools with >1M TVL and on audited protocols are included there.
 
-#### Adapter module structure
+### Adapter module structure
 
 ```js
 module.exports = {

env.js

@@ -26,4 +26,5 @@ module.exports = {
   GRAPH_API_KEY: process.env.GRAPH_API_KEY,
   // DB
   DATABASE_URL: process.env.DATABASE_URL,
+  OSMOSIS_API_KEY: process.env.OSMOSIS_API_KEY,
 };

serverless.yml

@@ -79,6 +79,7 @@ functions:
       SMARDEX_SUBGRAPH_API_KEY: ${file(./env.js):SMARDEX_SUBGRAPH_API_KEY}
       VENDOR_FINANCE: ${file(./env.js):VENDOR_FINANCE}
       TRADERJOE: ${file(./env.js):TRADERJOE}
+      OSMOSIS_API_KEY: ${file(./env.js):OSMOSIS_API_KEY}
 
   # --- data enrichment
   triggerEnrichment:

src/adaptors/aqua-patina/abi.json

@@ -0,0 +1,28 @@
+{
+    "totalSupply": {
+    "inputs": [],
+    "name": "totalSupply",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "totalSupply",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  "ethPerAPEth": {
+    "inputs": [],
+    "name": "ethPerAPEth",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "ethPerAPEth",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  }
+}

src/adaptors/aqua-patina/index.js

@@ -0,0 +1,54 @@
+const utils = require('../utils');
+const sdk = require('@defillama/sdk');
+const abi = require('./abi.json');
+const axios = require('axios');
+
+const APETH = '0xAaAaAAaBC6CBc3A1FD3a0fe0FDec43251C6562F5';
+const ETH = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE'
+
+
+const getApy = async () => {
+    const apy = await utils.getData('https://wallet.aquapatina.com/api/apy_current');
+
+    tvl = await tvlUsd();
+
+    return [
+        {
+            pool: APETH,
+            chain: utils.formatChain('ethereum'),
+            project: 'aqua-patina',
+            symbol: utils.formatSymbol('APETH'),
+            tvlUsd: tvl,
+            apy: apy.data.apy,
+        },
+    ];
+};
+
+async function tvlUsd() {
+
+    const supply = await sdk.api.abi.call({
+        target: APETH,
+        abi: abi['totalSupply'],
+        chain: 'ethereum'
+    });
+
+    const multiplier = await sdk.api.abi.call({
+        target: APETH,
+        abi: abi['ethPerAPEth'],
+        chain: 'ethereum'
+    });
+
+    const ethPrice = (
+        await axios.get('https://coins.llama.fi/prices/current/coingecko:ethereum')
+    ).data.coins['coingecko:ethereum'].price;
+
+    let tvl = BigInt(supply.output) * BigInt(multiplier.output) / BigInt(1e18) / BigInt(1e18);
+
+    return Number(tvl) * ethPrice;
+}
+
+module.exports = {
+    timetravel: false,
+    apy: getApy,
+    url: 'https://aquapatina.eth/',
+};

src/adaptors/avantis/helpers.js

@@ -0,0 +1,14 @@
+module.exports = {
+  chunkArray: (array, size) => {
+    const result = [];
+    for (let i = 0; i < array.length; i += size) {
+      result.push(array.slice(i, i + size));
+    }
+    return result;
+  },
+  calculateTrancheTotal: (transfers, trancheAddress) => {
+    return transfers
+      .filter((t) => t.to.toLowerCase() === trancheAddress.toLowerCase())
+      .reduce((acc, t) => acc + parseFloat((t.value / 1e6).toFixed(6)), 0);
+  },
+};

src/adaptors/avantis/index.js

@@ -1,74 +1,152 @@
 const utils = require('../utils');
 const sdk = require('@defillama/sdk');
-const abiVaultManager = require('./abiVaultManager');
+const { request, gql } = require('graphql-request');
+const { chunkArray, calculateTrancheTotal } = require('./helpers');
+const { getBlocksByTime, getData } = require('../utils');
 
 const ADDRESSES = {
   base: {
     AvantisJuniorTranche: '0x944766f715b51967E56aFdE5f0Aa76cEaCc9E7f9',
     AvantisSeniorTranche: '0x83084cB182162473d6FEFfCd3Aa48BA55a7B66F7',
-    AvantisVaultManager: '0xe9fB8C70aF1b99F2Baaa07Aa926FCf3d237348DD',
     USDC: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
   },
 };
 
-const API_BASE = 'https://api.avantisfi.com/v1/history/vaults/apr/';
+const SUBGRAPH_URL =
+  'https://subgraph.satsuma-prod.com/052b6e8d4af9/avantis/avantis-mainnet/version/v0.1.9/api';
 
-const main = async () => {
-  const [jrData, srData] = await Promise.all([
-    utils.getData(`${API_BASE}${ADDRESSES.base.AvantisJuniorTranche}/7`),
-    utils.getData(`${API_BASE}${ADDRESSES.base.AvantisSeniorTranche}/7`),
-  ]);
+const feeFetchCount = 10000;
 
-  if (jrData.success === false || srData.success === false) {
-    throw new Error('API response is not successful');
+const feeDistributedQuery = gql`
+  query FeesDistributeds($first: Int!, $skip: Int!, $start: Int!, $end: Int!) {
+    feesDistributeds(
+      first: $first
+      skip: $skip
+      where: { timestamp_gte: $start, timestamp_lte: $end }
+      orderBy: timestamp
+      orderDirection: asc
+    ) {
+      id
+    }
   }
+`;
 
-  const { averageApr: jrAverageApr, averageFee: jrAverageFee } = jrData;
-  const { averageApr: srAverageApr, averageFee: srAverageFee } = srData;
+const vmToTrancheQuery = gql`
+  query VmToTrancheTransfers($transactionHashes: [String!]!, $to: [String!]!) {
+    vmtoTrancheTransfers(
+      where: { transactionHash_in: $transactionHashes, to_in: $to }
+    ) {
+      value
+      to
+    }
+  }
+`;
 
-  let [reserveRatio, profitMultiplier, jrTvl, srTvl] = await Promise.all([
-    sdk.api.abi.call({
-      target: ADDRESSES.base.AvantisVaultManager,
-      abi: abiVaultManager.find((m) => m.name === 'getReserveRatio'),
-      params: [0],
-      chain: 'base',
-    }),
-    sdk.api.abi.call({
-      target: ADDRESSES.base.AvantisVaultManager,
-      abi: abiVaultManager.find((m) => m.name === 'getProfitMultiplier'),
-      chain: 'base',
-    }),
+const fetchFeeDistributedIds = async (timestamp, skip = 0) => {
+  const { feesDistributeds } = await request(
+    SUBGRAPH_URL,
+    feeDistributedQuery,
+    {
+      first: feeFetchCount,
+      skip: skip,
+      start: timestamp - 7 * 86400,
+      end: timestamp,
+    }
+  );
+
+  let ids = feesDistributeds.map((f) => f.id);
+
+  if (ids.length === feeFetchCount) {
+    ids = ids.concat(
+      await fetchFeeDistributedIds(timestamp, skip + feeFetchCount)
+    );
+  }
+
+  return ids;
+};
+
+const fetchTransfersForFeeDistributedIds = async (ids) => {
+  const chunkedIds = chunkArray(ids, 1000);
+
+  let totalJunior = 0;
+  let totalSenior = 0;
+
+  for (const chunk of chunkedIds) {
+    const { vmtoTrancheTransfers } = await request(
+      SUBGRAPH_URL,
+      vmToTrancheQuery,
+      {
+        transactionHashes: chunk,
+        to: [
+          ADDRESSES.base.AvantisJuniorTranche,
+          ADDRESSES.base.AvantisSeniorTranche,
+        ],
+      }
+    );
+
+    totalJunior += calculateTrancheTotal(
+      vmtoTrancheTransfers,
+      ADDRESSES.base.AvantisJuniorTranche
+    );
+    totalSenior += calculateTrancheTotal(
+      vmtoTrancheTransfers,
+      ADDRESSES.base.AvantisSeniorTranche
+    );
+  }
+
+  return { totalJunior: totalJunior / 7, totalSenior: totalSenior / 7 };
+};
+
+// NOTE: OUR SUBGRAPH IS NOT CAUGHT UP TO DATE, SO WE ARE USING THE API FOR NOW
+// -----------------------------------------------------------------------------
+// We will reenable time travel once our subgraph is caught up
+const main = async (timestamp = null) => {
+  // timestamp = timestamp ? parseInt(timestamp) : Math.floor(Date.now() / 1000);
+
+  // NOTE: OUR SUBGRAPH IS NOT CAUGHT UP TO DATE, SO WE ARE USING THE API FOR NOW
+  // -----------------------------------------------------------------------------
+  // Get total fees distributed for junior and senior tranches
+  // const feesDistributedIds = await fetchFeeDistributedIds(timestamp);
+  // const { totalJunior, totalSenior } = await fetchTransfersForFeeDistributedIds(
+  //   feesDistributedIds
+  // );
+
+  // const [block] = await getBlocksByTime([timestamp], 'base');
+
+  const { meta } = await getData(
+    'https://api.avantisfi.com/v1/vault/returns-7-days'
+  );
+
+  // Get TVL for junior and senior tranches
+  let [juniorTvl, seniorTvl] = await Promise.all([
     sdk.api.abi.call({
       abi: 'erc20:balanceOf',
       target: ADDRESSES.base.USDC,
       params: [ADDRESSES.base.AvantisJuniorTranche],
       chain: 'base',
+      // block: block,
     }),
     sdk.api.abi.call({
       abi: 'erc20:balanceOf',
       target: ADDRESSES.base.USDC,
       params: [ADDRESSES.base.AvantisSeniorTranche],
       chain: 'base',
+      // block: block,
     }),
   ]);
 
-  jrTvl = jrTvl.output / 1e6;
-  srTvl = srTvl.output / 1e6;
-
-  const jrFeeSplit =
-    (parseFloat(profitMultiplier.output) * parseFloat(reserveRatio.output)) /
-    100;
+  juniorTvl = juniorTvl.output / 1e6;
+  seniorTvl = seniorTvl.output / 1e6;
 
-  let adjApyJr = 0,
-    adjApySr = 0;
+  // Calculate daily returns for junior and senior tranches
+  // const juniorDailyReturns = totalJunior / juniorTvl;
+  // const seniorDailyReturns = totalSenior / seniorTvl;
+  const juniorDailyReturns = meta.averageJrFees / juniorTvl;
+  const seniorDailyReturns = meta.averageSrFees / seniorTvl;
 
-  if (jrAverageApr > 0 && jrTvl > 0) {
-    adjApyJr = ((1 + jrAverageFee / jrTvl) ** 365 - 1) * jrFeeSplit;
-  }
-
-  if (srAverageApr > 0 && srTvl > 0) {
-    adjApySr = ((1 + srAverageFee / srTvl) ** 365 - 1) * (100 - jrFeeSplit);
-  }
+  // Calculate APY for junior and senior tranches
+  const juniorApy = (1 + juniorDailyReturns) ** 365 - 1;
+  const seniorApy = (1 + seniorDailyReturns) ** 365 - 1;
 
   return [
     {
@@ -77,8 +155,8 @@ const main = async () => {
       project: 'avantis',
       symbol: 'USDC',
       poolMeta: 'junior',
-      tvlUsd: jrTvl,
-      apyBase: adjApyJr,
+      tvlUsd: juniorTvl,
+      apyBase: juniorApy * 100,
       url: 'https://www.avantisfi.com/earn/junior',
     },
     {
@@ -87,8 +165,8 @@ const main = async () => {
       project: 'avantis',
       symbol: 'USDC',
       poolMeta: 'senior',
-      tvlUsd: srTvl,
-      apyBase: adjApySr,
+      tvlUsd: seniorTvl,
+      apyBase: seniorApy * 100,
       url: 'https://www.avantisfi.com/earn/senior',
     },
   ];