Liqwid Finance V2 integration (DefiLlama#11433)

Author: Salgueirinho

projects/liqwid/index.js

@@ -11,99 +11,124 @@ module.exports = {
   }
 };
 
-
-const endpoint = 'https://api.liqwid.finance/graphql'
-
-const queryAdaLoans = `query ($page: Int) {
-  Page (page: $page) {
-    pageInfo {
-      currentPage
-      hasNextPage
-    }
-    loan(marketId: "Ada") {
-      collaterals {
-        id
-        amount
+const endpoint = 'https://v2.api.liqwid.finance/graphql'
+
+const queryAdaLoans = `query($input: LoansInput){
+  liqwid {
+    data {
+      loans(input: $input) {
+        page
+        pagesCount
+        results {
+          collaterals {
+            qTokenAmount
+            market {
+              id
+            }
+          }
+        }
       }
     }
   }
 }
 `
 
-const query = `query ($page: Int) {
-  Page (page: $page) {
-    pageInfo {
-      currentPage
-      hasNextPage
-    }
-    market {
-      asset {
-        marketId
-        name
-        qTokenId
-        qTokenPolicyId
-      }
-      state {
-        totalSupply
-        utilization
-      }
-      marketId
-      decimals
-      info {
-        params {
-          underlyingClass {
-            value0 {
-              symbol
-              name
-            }
-          }
-        }
-        scripts {
-          actionToken {
-            script {
-              value0 {
-                value0
-              }
-            }
+const query = `query($input: MarketsInput)  {
+  liqwid {
+    data {
+      markets(input: $input) {
+        page
+        pagesCount
+        results {
+          asset {
+            id
+            symbol
+            qTokenName
+            qTokenCurrencySymbol
+            currencySymbol
+            name
+            decimals
           }
+          supply
+          liquidity
+          borrow
+          utilization
         }
       }
     }
   }
 }
 `
+
 const tokenMapping = {
   ADA: 'lovelace',
   DJED: '8db269c3ec630e06ae29f74bc39edd1f87c819f1056206e879a1cd61446a65644d6963726f555344',
   DAI: 'dai',
 
 }
 
-const getToken = market => tokenMapping[market.marketId.toUpperCase()] ?? market.info.params.underlyingClass.value0.symbol + toHex(market.info.params.underlyingClass.value0.name)
+const getToken = (market) => tokenMapping[market.asset.symbol] ?? market.asset.currencySymbol + toHex(market.asset.name)
 
 const getOptimBondTVL = async () => {
-  const getLoans = async (pageIndex) => {
-    const { Page: { pageInfo, loan: loans } } = await graphQuery(endpoint, queryAdaLoans, { page: pageIndex })
-
-    if (!pageInfo.hasNextPage) {
-      return loans
+  const getLoans = async (pageIndex = 0, collectedLoans = []) => {
+    const {
+      liqwid: {
+        data: { loans },
+      },
+    } = await graphQuery(endpoint, queryAdaLoans, {
+      input: {
+        marketIds: 'Ada',
+        page: pageIndex,
+      },
+    })
+
+    const allLoans = [...collectedLoans, ...loans.results]
+
+    // Check if we've reached the last page
+    if (pageIndex < loans.pagesCount - 1) {
+      return await getLoans(pageIndex + 1, allLoans)
     }
-    return [...loans, ...(await getLoans(pageIndex + 1))]
+
+    return allLoans
   }
-  const loans = await getLoans(0)
-  const relevantLoans =
-    loans.filter(l => (l.collaterals.filter(c => c.id === "OptimBond1")).length != 0)
-  const bonds =
-    relevantLoans.map(l => l.collaterals[0].amount).reduce((acc, amount) =>
-      acc + Number(amount), 0)
 
+  const loans = await getLoans()
+  const relevantLoans = loans.filter((l) =>
+    l.collaterals.some((c) => c.market.id === 'OptimBond1'),
+  )
+  const bonds = relevantLoans
+    .flatMap((l) => l.collaterals)
+    .filter((c) => c.market.id === 'OptimBond1')
+    .reduce((acc, collateral) => acc + collateral.qTokenAmount, 0)
   return bonds
 }
 
 async function tvl(api) {
-  const { Page: { market: markets } } = await graphQuery(endpoint, query, { page: 0 })
+  const getMarkets = async (pageIndex = 0, collectedMarkets = []) => {
+    const {
+      liqwid: {
+        data: { markets },
+      },
+    } = await graphQuery(endpoint, query, {
+      input: {
+        page: pageIndex,
+      },
+    })
+
+    const allMarkets = [...collectedMarkets, ...markets.results]
+
+    // Check if we've reached the last page
+    if (pageIndex < markets.pagesCount - 1) {
+      return await getMarkets(pageIndex + 1, allMarkets)
+    }
 
-  markets.forEach(market => add(api, market, market.state.totalSupply))
+    return allMarkets
+  }
+
+  const markets = await getMarkets()
+  markets.forEach((market) =>
+    add(api, market, market.liquidity * 10 ** market.asset.decimals),
+  )
   add(api, "OptimBond1", await getOptimBondTVL())
 }
 
@@ -117,30 +142,31 @@ function add(api, market, bal) {
 }
 
 async function borrowed(api) {
-  const { Page: { market: markets } } = await graphQuery(endpoint, query)
-
-  markets.forEach(market => {
-    const utilization = market.state.utilization
-    const availability = 1 - utilization
-    const totalBorrowed = market.state.totalSupply * utilization / availability
-    add(api, market, totalBorrowed)
-  })
-}
-
-function base64ToHex(base64) {
-  return base64
-  /* // Step 1: Decode the Base64 string to a byte array
-  const binaryData = atob(base64);
+  const getMarkets = async (pageIndex = 0, collectedMarkets = []) => {
+    const {
+      liqwid: {
+        data: { markets },
+      },
+    } = await graphQuery(endpoint, query, {
+      input: {
+        page: pageIndex,
+      },
+    })
+
+    const allMarkets = [...collectedMarkets, ...markets.results]
+
+    // Check if we've reached the last page
+    if (pageIndex < markets.pagesCount - 1) {
+      return await getMarkets(pageIndex + 1, allMarkets)
+    }
 
-  // Step 2: Convert each byte to its hexadecimal representation
-  const hexArray = [];
-  for (let i = 0; i < binaryData.length; i++) {
-    const byte = binaryData.charCodeAt(i).toString(16).padStart(2, '0');
-    hexArray.push(byte);
+    return allMarkets
   }
 
-  // Step 3: Concatenate the hexadecimal values to form the final hexadecimal string
-  return hexArray.join(''); */
+  const markets = await getMarkets()
+  markets.forEach((market) => {
+    add(api, market, market.borrow * 10 ** market.asset.decimals)
+  })
 }
 
 function toHex(str) {
@@ -149,4 +175,4 @@ function toHex(str) {
     hex += str.charCodeAt(i).toString(16);
   }
   return hex
-}
+}