Update Teller Adapter to include Lender Principal Supplied to Pools

projects/teller/index.js

@@ -1,101 +1,276 @@
-const { getLogs } = require('../helper/cache/getLogs')
+const { gql, request } = require("graphql-request");
+
+
+const { cachedGraphQuery } = require('../helper/cache')
+
+const sdk = require('@defillama/sdk')
+
+/*
 const { sumTokens2 } = require('../helper/unwrapLPs')
+ const { getLogs } = require('../helper/cache/getLogs')
 
-// https://docs.teller.org/teller-v2-protocol/l96ARgEDQcTgx4muwINt/resources/deployed-contracts
-const config = {
+
+
+const ogconfig = {
   ethereum: { factory: '0x2551a099129ad9b0b1fec16f34d9cb73c237be8b', fromBlock: 16472616, tellerV2: '0x00182FdB0B880eE24D428e3Cc39383717677C37e', },
   polygon: { factory: '0x76888a882a4ff57455b5e74b791dd19df3ba51bb', fromBlock: 38446227, tellerV2: '0xD3D79A066F2cD471841C047D372F218252Dbf8Ed', },
   arbitrum: { factory: '0x71B04a8569914bCb99D5F95644CF6b089c826024', fromBlock: 108629315, tellerV2: '0x5cfD3aeD08a444Be32839bD911Ebecd688861164', },
   base: { factory: '0x71B04a8569914bCb99D5F95644CF6b089c826024', fromBlock: 2935376, tellerV2: '0x5cfD3aeD08a444Be32839bD911Ebecd688861164', },
-  mantle: { factory: '0x6eB9b34913Bd96CA2695519eD0F8B8752d43FD2b', fromBlock: 3480394, tellerV2: '0xe6774DAAEdf6e95b222CD3dE09456ec0a46672C4', },
+  katana: { factory: '0x6455F2E1CCb14bd0b675A309276FB5333Dec524f', fromBlock: 6541271, tellerV2: '0xf7B14778035fEAF44540A0bC1D4ED859bCB28229', },
 }
 
 const blacklistedTokens = ['0x8f9bbbb0282699921372a134b63799a48c7d17fc', '0xd4416b13d2b3a9abae7acd5d6c2bbdbe25686401']
+*/
 
-const data = {}
-
-async function getData(api) {
-  const key = `${api.chain}-${api.block}`
-  if (!data[key]) data[key] = _getData()
-  return data[key]
-
-  async function _getData() {
-    const chain = api.chain
-    const { factory, fromBlock, tellerV2 } = config[chain]
-    const collateralDepositedLogs = await getLogs({
-      api,
-      target: factory,
-      topics: ['0x1a7f128dbc559fb97831b7681dee32957c2917e95d1c5070da20fb89e91f9d7a'],
-      eventAbi: 'event CollateralDeposited (uint256 _bidId, uint8 _type, address _collateralAddress, uint256 _amount, uint256 _tokenId)',
-      onlyArgs: true,
-      extraKey: 'CollateralDeposited',
-      fromBlock,
-    })
-    const escrowLogs = await getLogs({
-      api,
-      target: factory,
-      topics: ['0xc201bfb915e3eed80ff17e013f3d88db1c51ac7fc12728fce91a2afc659128ef'],
-      eventAbi: 'event CollateralEscrowDeployed (uint256 _bidId, address _collateralEscrow)',
-      onlyArgs: true,
-      extraKey: 'CollateralEscrowDeployed',
-      fromBlock,
-    })
-    const repaidLogs = await getLogs({
-      api,
-      target: tellerV2,
-      topic: 'LoanRepaid(uint256)',
-      eventAbi: 'event LoanRepaid(uint256 indexed bidId)',
-      extraKey: 'LoanRepaid',
-      onlyArgs: true,
-      fromBlock,
-    })
-    const liquidatedLogs = await getLogs({
-      api,
-      target: tellerV2,
-      topic: 'LoanLiquidated(uint256,address)',
-      eventAbi: 'event LoanLiquidated(uint256 indexed bidId, address indexed liquidator)',
-      onlyArgs: true,
-      extraKey: 'LoanLiquidated',
-      fromBlock,
-    })
-    let closedBidSet = new Set()
-    repaidLogs.forEach(i => closedBidSet.add(Number(i.bidId)))
-    liquidatedLogs.forEach(i => closedBidSet.add(Number(i.bidId)))
-    const escrowMap = {}
-    escrowLogs.forEach(i => {
-      const bidId = Number(i._bidId)
-      if (closedBidSet.has(bidId)) return;
-      if (escrowMap[bidId]) throw new Error('Escrow address already found for ' + bidId)
-      escrowMap[bidId] = {
-        owner: i._collateralEscrow,
-        tokens: [],
+/*
+ TO TEST
+node test.js projects/teller/index.js
+*/
+
+const teller_graph_config = {
+
+  ethereum:  sdk.graph.modifyEndpoint('https://gateway.thegraph.com/api/[api-key]/subgraphs/id/4JruhWH1ZdwvUuMg2xCmtnZQYYHvmEq6cmTcZkpM6pW'),
+  base:  sdk.graph.modifyEndpoint('https://gateway.thegraph.com/api/[api-key]/subgraphs/id/8jSq7mzq9HEiJEcAZfvrTT4wYk59oMxm82xUpcVBzryF'),
+  arbitrum:  sdk.graph.modifyEndpoint('https://gateway.thegraph.com/api/[api-key]/subgraphs/id/F2Cgx4q4ATiopuZ13nr1EMKmZXwfAdevF3EujqfayK7a'),
+  katana:  sdk.graph.modifyEndpoint('https://gateway.thegraph.com/api/[api-key]/subgraphs/id/CfcwmqFDd425rEFQVFk52tJmquETeBiUCmK7kv2DHkPs'),
+
+
+}
+
+
+const tellerGraphQuery = gql`
+ {
+    tokenVolumes (orderBy: totalActive, orderDirection: desc ){
+      id
+      token {
+        id
+        address
+        symbol
+        decimals
       }
+      collateralToken {
+        id
+        address
+        symbol
+        decimals
+      }
+      totalAvailable,
+      outstandingCapital,
+      totalLoaned
+      totalActive
+      totalAccepted
+    }
+}
+`
+
+const activeBidsQuery = gql`
+  query ($skip: Int!) {
+    bids(first: 1000, skip: $skip, where: { status: "Accepted" }) {
+      id
+      bidId
+      lendingTokenAddress
+      principal
+      totalRepaidPrincipal
+    }
+  }
+`
+
+const bidCollateralQuery = gql`
+  query ($skip: Int!) {
+    bidCollaterals(first: 1000, skip: $skip, where: { status: "Deposited" }) {
+      id
+      amount
+      collateralAddress
+      token {
+        address
+        symbol
+        decimals
+      }
+      bid {
+        status
+      }
+    }
+  }
+`
+
+
+
+
+
+const pools_graph_config = {
+  ethereum: 'https://subgraph.satsuma-prod.com/daba7a4f162f/teller--16564/tellerv2-pools-mainnet/version/0.4.21.6/api',
+  base: 'https://subgraph.satsuma-prod.com/daba7a4f162f/teller--16564/tellerv2-pools-base/version/0.4.21.4/api', 
+  arbitrum: 'https://subgraph.satsuma-prod.com/daba7a4f162f/teller--16564/tellerv2-pools-arbitrum/version/0.4.21.4/api' , 
+}
+
+
+const pools_v2_graph_config = {
+  ethereum: 'https://subgraph.satsuma-prod.com/daba7a4f162f/teller--16564/tellerv2-poolsv2-mainnet/version/0.4.21.5/api',
+  base: 'https://subgraph.satsuma-prod.com/daba7a4f162f/teller--16564/tellerv2-poolsv2-base/version/0.4.21.5/api', 
+  arbitrum: 'https://subgraph.satsuma-prod.com/daba7a4f162f/teller--16564/tellerv2-poolsv2-arbitrum/version/0.4.21.5/api' , 
+  katana: 'https://api.goldsky.com/api/public/project_cme01oezy1dwd01um5nile55y/subgraphs/teller-pools-v2-katana/0.4.21.12/gn',
+//   hyperevm: 'https://api.goldsky.com/api/public/project_cme01oezy1dwd01um5nile55y/subgraphs/teller-pools-v2-hyperevm/0.4.21.11/gn'
+}
+
+
+const poolsGraphQuery = gql`
+  {
+    groupPoolMetrics(first: 1000) {
+      id
+      group_pool_address
+      principal_token_address
+      collateral_token_address
+      total_principal_tokens_committed
+      total_principal_tokens_withdrawn
+      total_principal_tokens_borrowed
+      total_principal_tokens_repaid
+      total_interest_collected
+      token_difference_from_liquidations
+      total_collateral_tokens_deposited
+      total_collateral_tokens_withdrawn
+    }
+  }
+`
+
+
+async function bidCollateralTvl(api) {
+
+    const tellerGraphUrl = teller_graph_config[api.chain]
+
+    // Fetch all BidCollateral entries with status "Deposited" and active bids
+    let allCollaterals = []
+    let skip = 0
+    const pageSize = 1000
+
+    let hasMore = true
+    while (hasMore) {
+      const data = await request(tellerGraphUrl, bidCollateralQuery, { skip })
+      if (!data.bidCollaterals || data.bidCollaterals.length === 0) {
+        hasMore = false
+        break
+      }
+
+      allCollaterals = allCollaterals.concat(data.bidCollaterals)
+
+      if (data.bidCollaterals.length < pageSize) {
+        hasMore = false
+        break
+      }
+      skip += pageSize
+    }
+
+    // Filter for active loans only (status: Accepted)
+  //  const activeCollaterals = allCollaterals.filter(c => c.bid.status === 'Accepted')
+
+    // Sum collateral by token
+    allCollaterals.forEach(collateral => {
+      api.add(collateral.token.address, collateral.amount)
     })
-    collateralDepositedLogs.forEach(i => {
-      const bidId = Number(i._bidId)
-      if (closedBidSet.has(bidId)) return;
-      if (!escrowMap[bidId]) throw new Error('Escrow address missing for ' + bidId)
-      escrowMap[bidId].tokens.push(i._collateralAddress)
-    })
-    return escrowMap
+
+
+}
+
+async function poolsLenderTvl( api ) {
+
+  let allPools = []
+
+  // Fetch from v1 pools if available
+  if (pools_graph_config[api.chain]) {
+    const { groupPoolMetrics } = await request(pools_graph_config[api.chain], poolsGraphQuery);
+    allPools = allPools.concat(groupPoolMetrics)
   }
+
+  // Fetch from v2 pools if available
+  if (pools_v2_graph_config[api.chain]) {
+    const { groupPoolMetrics } = await request(pools_v2_graph_config[api.chain], poolsGraphQuery);
+    allPools = allPools.concat(groupPoolMetrics)
+  }
+
+  allPools.forEach(pool => {
+    const totalInterestCollected = BigInt(pool.total_interest_collected || '0')
+    const tokenDifferenceFromLiquidations = BigInt(pool.token_difference_from_liquidations || '0')
+    const totalCollateralEscrowedNet = BigInt(pool.total_collateral_tokens_deposited || '0') - BigInt(pool.total_collateral_tokens_withdrawn || '0')
+
+    const totalTokensActivelyBorrowed = BigInt(pool.total_principal_tokens_borrowed || '0') - BigInt(pool.total_principal_tokens_repaid || '0')
+    const totalTokensActivelyCommitted =
+      BigInt(pool.total_principal_tokens_committed || '0') +
+      totalInterestCollected +
+      tokenDifferenceFromLiquidations -
+      BigInt(pool.total_principal_tokens_withdrawn || '0')
+
+    // Add collateral TVL 
+  //  if (totalCollateralEscrowedNet > 0n) {
+   //   api.add(pool.collateral_token_address, totalCollateralEscrowedNet.toString())
+   // }
+
+    // Add net principal TVL (committed - borrowed)
+    const netPrincipalTvl = totalTokensActivelyCommitted - totalTokensActivelyBorrowed
+    if (netPrincipalTvl > 0n) {
+      api.add(pool.principal_token_address, netPrincipalTvl.toString())
+    }
+  })
+
+
 }
 
+
+
 async function tvl(api) {
-  const data = await getData(api)
-  return sumTokens2({ api, ownerTokens: Object.values(data).map(i => [i.tokens, i.owner]), blacklistedTokens, permitFailure: true, })
+
+
+
+     await bidCollateralTvl ( api )
+
+      await poolsLenderTvl( api)
+
+
 }
 
-async function borrowed(api) {
-  const data = await getData(api)
-  const activeLoans = Object.keys(data)
-  const { tellerV2 } = config[api.chain]
-  const loanData = await api.multiCall({ abi: "function bids(uint256) view returns (address borrower, address receiver, address lender, uint256 marketplaceId, bytes32 _metadataURI, tuple(address lendingToken, uint256 principal, tuple(uint256 principal, uint256 interest) totalRepaid, uint32 timestamp, uint32 acceptedTimestamp, uint32 lastRepaidTimestamp, uint32 loanDuration) loanDetails, tuple(uint256 paymentCycleAmount, uint32 paymentCycle, uint16 APR) terms, uint8 state, uint8 paymentType)", calls: activeLoans, target: tellerV2 })
-  loanData.forEach(i => {
-    api.add(i.loanDetails.lendingToken, i.loanDetails.principal - i.loanDetails.totalRepaid.principal)
+
+
+
+async function bidBorrowed(api){
+  const tellerGraphUrl = teller_graph_config[api.chain]
+
+  // Fetch all active bids with pagination
+  let allBids = []
+  let skip = 0
+  const pageSize = 1000
+
+  let hasMore = true
+  while (hasMore) {
+    const data = await request(tellerGraphUrl, activeBidsQuery, { skip })
+    if (!data.bids || data.bids.length === 0) {
+      hasMore = false
+      break
+    }
+
+    allBids = allBids.concat(data.bids)
+
+    if (data.bids.length < pageSize) {
+      hasMore = false
+      break
+    }
+    skip += pageSize
+  }
+
+  // Calculate borrowed amount for each bid (principal - totalRepaidPrincipal)
+  allBids.forEach(bid => {
+    const borrowed = BigInt(bid.principal) - BigInt(bid.totalRepaidPrincipal)
+    if (borrowed > 0n) {
+      api.add(bid.lendingTokenAddress, borrowed.toString())
+    }
   })
 }
 
-Object.keys(config).forEach(chain => {
-  module.exports[chain] = { tvl, borrowed, }
+async function borrowed(api) {
+     await bidBorrowed ( api )
+
+}
+
+// All chains that have either v1 or v2 pools
+const allChains = ["ethereum", "base", "arbitrum", "katana" ]
+
+allChains.forEach(chain => {
+  module.exports[chain] = { tvl, borrowed }
 })