Merge branch 'main' into main

Author: valiant-coder

README.md

@@ -9,7 +9,7 @@ Also, don't hesitate to send a message on [our discord](https://discord.defillam
 
 1. PLEASE PLEASE **enable "Allow edits by maintainers" while putting up the PR.**
 2. Once your adapter has been merged, it takes time to show on the UI. No need to notify us on Discord.
-3. TVL must be computed from blockchain data (reason: https://github.com/DefiLlama/DefiLlama-Adapters/discussions/432), if you have trouble with creating a the adapter, please hop onto our discord, we are happy to assist you.
+3. TVL must be computed from blockchain data (reason: https://github.com/DefiLlama/DefiLlama-Adapters/discussions/432), if you have trouble with creating the adapter, please hop onto our discord, we are happy to assist you.
 4. **For updating listing info** It is a different repo, you can find your listing in this file: https://github.com/DefiLlama/defillama-server/blob/master/defi/src/protocols/data2.ts, you can  edit it there and put up a PR
 5. Do not edit/push `package-lock.json` file as part of your changes, we use lockfileVersion 2, and most use v1 and using that messes up our CI
 6. No need to go to our discord and announce that you've created a PR, we monitor all PRs and will review it asap
@@ -20,7 +20,7 @@ Please send answers to questions there https://github.com/DefiLlama/DefiLlama-Ad
 
 ## Work in progress
 
-This is a work in progress. DefiLlama aims to be transparent, accurate and open source.
+This is a work in progress. DefiLlama aims to be transparent, accurate, and open source.
 
 If you have any suggestions, want to contribute or want to chat, please join [our discord](https://discord.defillama.com/) and drop a message.
 
@@ -44,4 +44,4 @@ POLYGON_RPC="..."
 The name of each rpc is `{CHAIN-NAME}_RPC`, and the name we use for each chain can be found [here](https://unpkg.com/@defillama/sdk@latest/build/providers.json). If you run into issues with a chain make sure to update the sdk with `npm update @defillama/sdk`.
 
 ## Adapter rules
-- Never add extra npm packages, if you need a chain-level package for your chain, ask us and we'll consider it, but we can't accept any npm package that is project-specific
+- Never add extra npm packages, if you need a chain-level package for your chain, ask us, and we'll consider it, but we can't accept any npm package that is project-specific

funding.json

@@ -0,0 +1,5 @@
+{
+  "opRetro": {
+    "projectId": "0xae07bfec2c3c90937679f8c8c5c32e80407c09903aa03d1b5e5a075e67592b86"
+  }
+}

package-lock.json

@@ -1,63 +1,99 @@
 const { post } = require("../helper/http.js")
+const methodologies = require('../helper/methodologies');
 
 
 const endpoint = 'https://cu.ao-testnet.xyz'
 const controllerId = 'SmmMv0rJwfIDVM3RvY2-P729JFYwhdGSeGo2deynbfY'
 const tickerTransformations = {
     'qAR': 'arweave',
     'wUSDC': 'usd-coin',
-  };
-  
+};
 
-async function tvl() {
 
-    const supportedTokensRes = await DryRun(controllerId, "Get-Tokens")
-    const supportedTokens = JSON.parse(supportedTokensRes.Messages[0].Data)
-    const balancesPromises = supportedTokens.map(async balanceObject => {
-        const infoRes = await DryRun(balanceObject.oToken, "Info");
-        const tagsObject = Object.fromEntries(
-          infoRes.Messages[0].Tags.map((tag) => [tag.name, tag.value])
-        );
-        const ticker = tickerTransformations[balanceObject.ticker] || balanceObject.ticker;
-        return { [`coingecko:${ticker}`]: scaleBalance(tagsObject['Cash'], tagsObject['Denomination']) };
-      });
-      
-      const balancesArray = await Promise.all(balancesPromises);
-      
-      const combinedBalances = Object.assign({}, ...balancesArray);
+// Access AO on chain data via the node endpoint
+async function DryRun(target, action) {
+  const response = await post(`${endpoint}/dry-run?process-id=${target}`, { 
+      Id: "1234", Target: target, Owner: "1234", Anchor: "0", Data: "1234",
+      Tags: [
+          ["Target", target],
+          ["Action", action],
+          ["Data-Protocol", "ao"],
+          ["Type", "Message"],
+          ["Variant", "ao.TN.1"]
+      ].map(([name, value]) => ({ name, value }))
+  });
+  return response
+}
 
-      return combinedBalances
 
-}
+function scaleBalance(amount, denomination) {
+  if (amount === "0") return 0;
+  const denominationVal = parseInt(denomination);
+  const len = amount.length;
 
+  if (denominationVal >= len) {
+      return parseFloat("0." + "0".repeat(denominationVal - len) + amount.replace(/0+$/, ""));
+  }
 
+  const integerPart = amount.substr(0, len - denominationVal);
+  const fractionalPart = amount.substr(len - denominationVal).replace(/0+$/, "");
 
-// Access AO on chain data via the node endpoint
-async function DryRun(target, action) {
-    const response = await post(`${endpoint}/dry-run?process-id=${target}`, { 
-        Id: "1234", Target: target, Owner: "1234", Anchor: "0", Data: "1234",
-        Tags: [
-            ["Target", target],
-            ["Action", action],
-            ["Data-Protocol", "ao"],
-            ["Type", "Message"],
-            ["Variant", "ao.TN.1"]
-        ].map(([name, value]) => ({ name, value }))
-    });
-    return response
+  if (fractionalPart === "") return parseInt(integerPart);
+
+  return parseFloat(integerPart + "." + fractionalPart);
 }
 
-function scaleBalance(amount, denomination) {
-    const scaledDivider = BigInt(10) ** BigInt(denomination)
-    const balance = BigInt(amount)  / scaledDivider
-    return Number(balance)
+
+async function getTokenInfos() {
+  const supportedTokensRes = await DryRun(controllerId, "Get-Tokens")
+  const supportedTokens = JSON.parse(supportedTokensRes.Messages[0].Data)
+  const tokenInfo = await Promise.all(
+    supportedTokens.map(async (balanceObject) => {
+      const infoRes = await DryRun(balanceObject.oToken, "Info");
+      const tagsObject = Object.fromEntries(
+        infoRes.Messages[0].Tags.map((tag) => [tag.name, tag.value])
+      );
+      const ticker = tickerTransformations[balanceObject.ticker] || balanceObject.ticker;
+      
+      return {
+        ticker: `coingecko:${ticker}`,
+        cash: scaleBalance(tagsObject['Cash'], tagsObject['Denomination']),
+        totalBorrows: scaleBalance(tagsObject['Total-Borrows'], tagsObject['Denomination'])
+      };
+    })
+  );
+  
+  return tokenInfo;
+}
+
+
+async function tvl() {
+  const tokensInfo = await getTokenInfos();
+  const combinedBalances = {};
+  
+  tokensInfo.forEach(token => {
+    combinedBalances[token.ticker] = token.cash;
+  });
+  
+  return combinedBalances;
 }
 
 
+async function borrowed() {
+  const tokensInfo = await getTokenInfos();
+  const combinedBalances = {};
+  
+  tokensInfo.forEach(token => {
+    combinedBalances[token.ticker] = token.totalBorrows;
+  });
+  
+  return combinedBalances;
+}
+
 
 module.exports = {
-  methodology: "TVL is calculated by getting all supported token pools on LiquidOps, then the lent token balances from the pools and adding up all token USD values provided by CoinGecko.",
-  ao: { tvl },
+  methodology: methodologies.lendingMarket,
+  ao: { tvl, borrowed },
 };
-
+// node test.js projects/LiquidOps/index.js
 

projects/LiquidOps/index.js

@@ -1,3 +1,4 @@
+const ADDRESSES = require('../helper/coreAssets.json')
 const { sumTokens2 } = require('../helper/unwrapLPs')
 
 const MANTRA_CONTRACT_PER_CHAIN = {

projects/MantraProtocol/index.js

@@ -1,7 +1,4 @@
 
-const sdk = require('@defillama/sdk')
-const { createIncrementArray } = require('../helper/utils')
-const { sumTokens2 } = require('../helper/unwrapLPs')
 const token0ABI = 'address:token0'
 const token1ABI = 'address:token1'
 
@@ -25,41 +22,16 @@ const config = {
   },
 }
 
-module.exports = {}
-
 Object.keys(config).forEach(chain => {
   const { positionManager } = config[chain]
   module.exports[chain] = {
-    tvl: async function tvl(_, _b, { [chain]: block }) {
-
-      const { output: poolCount } = await sdk.api.abi.call({
-        target: positionManager,
-        abi: abis.poolsCount,
-        chain, block,
-      })
-      const calls = createIncrementArray(poolCount).map(i => ({ params: i }))
-      let { output: poolAddreses } = await sdk.api.abi.multiCall({
-        target: positionManager,
-        abi: abis.poolsAddresses,
-        calls,
-        chain, block,
-      })
-
-      poolAddreses = poolAddreses.map(i => ({ target: i.output }))
-      const { output: token0s } = await sdk.api.abi.multiCall({
-        abi: token0ABI,
-        calls: poolAddreses,
-        chain, block,
-      })
-      const { output: token1s } = await sdk.api.abi.multiCall({
-        abi: token1ABI,
-        calls: poolAddreses,
-        chain, block,
-      })
-      const toa = []
-      token0s.forEach(({ input: { target }, output }) => toa.push([output, target]))
-      token1s.forEach(({ input: { target }, output }) => toa.push([output, target]))
-      return sumTokens2({ chain, block, tokensAndOwners: toa })
+    tvl: async function tvl(api) {
+      const pools = await api.fetchList({  lengthAbi: abis.poolsCount, itemAbi: abis.poolsAddresses, target: positionManager})
+      const token0s = await api.multiCall({  abi: token0ABI, calls: pools})
+      const token1s = await api.multiCall({  abi: token1ABI, calls: pools})
+      const ownerTokens = []
+      pools.forEach((pool, i) => ownerTokens.push([[token0s[i], token1s[i]], pool]))
+      return api.sumTokens({ ownerTokens })
     }
   }
 })

projects/MultiSwap/index.js

@@ -1,45 +1,56 @@
 const ADDRESSES = require('../helper/coreAssets.json')
-const SH_VAULT_1_CURRENCY = ADDRESSES.ethereum.USDe; // USDe Ethereum
-const SH_VAULT_1_PT = '0x8A47b431A7D947c6a3ED6E42d501803615a97EAa'; // Pendle pt token
-const SH_VAULT_1 = '0xDF59153DA47dc7c39505261D423BAf14c48D23A6'; // SHProduct Vault
 
-const SH_VAULT_2_CURRENCY = '0x7c1156e515aa1a2e851674120074968c905aaf37'; // lvlUSD Ethereum
-const SH_VAULT_2_PT = '0x9bca74f805ab0a22ddd0886db0942199a0feba71'; // Pendle pt token
-const SH_VAULT_2 = '0xca287B0E1F4d498D3e9C637E611eb37AAA553B2a'; // SHProduct Vault 2
+// Vault configs
+const vaults = [
+  // BTC Bullish Call-Spread eUSDe
+  {
+    currency: '0x90d2af7d622ca3141efa4d8f1f24d86e5974cc8f',
+    pt: '0x50d2c7992b802eef16c04feadab310f31866a545',
+    vault: '0x2324bb9F7d651E0169B9df9194937759E08Acfa9'
+  },
+  // BTC Bullish Call-Spread lvlUSD
+  {
+    currency: '0x7c1156e515aa1a2e851674120074968c905aaf37',
+    pt: '0x9bca74f805ab0a22ddd0886db0942199a0feba71',
+    vault: '0x93c318E595F58E4Ffc8779E35E574832D8d9a5Dc'
+  },
+  // BTC Bearish Put eUSDe
+  {
+    currency: '0x90d2af7d622ca3141efa4d8f1f24d86e5974cc8f',
+    pt: '0x50d2c7992b802eef16c04feadab310f31866a545',
+    vault: '0x9021d933D1Ef4c31550201C8A9522Ab15b3e6d65'
+  },
+  // BTC Bearish Put lvlUSD
+  {
+    currency: '0x7c1156e515aa1a2e851674120074968c905aaf37',
+    pt: '0x9bca74f805ab0a22ddd0886db0942199a0feba71',
+    vault: '0x1fEcD2E54648476bD6AeA2f5B8BBD5155166816e'
+  }
+]
 
 async function tvl(api) {
-  
-  const currencyBalance1 = await api.call({
-    abi: 'erc20:balanceOf',
-    target: SH_VAULT_1_CURRENCY,
-    params: [SH_VAULT_1],
-  });
-  api.add(SH_VAULT_1_CURRENCY, currencyBalance1)
-
-  const ptBalance1 = await api.call({
-    abi: 'erc20:balanceOf',
-    target: SH_VAULT_1_PT,
-    params: [SH_VAULT_1],
-  });
-  api.add(SH_VAULT_1_PT, ptBalance1)
-
-  const currencyBalance2 = await api.call({
-    abi: 'erc20:balanceOf',
-    target: SH_VAULT_2_CURRENCY,
-    params: [SH_VAULT_2],
-  });
-  api.add(SH_VAULT_2_CURRENCY, currencyBalance2)
-  
-  const ptBalance2 = await api.call({
-    abi: 'erc20:balanceOf',
-    target: SH_VAULT_2_PT,
-    params: [SH_VAULT_2],
-  });
-  api.add(SH_VAULT_2_PT, ptBalance2)
+  // Process all vaults in a loop
+  for (const { currency, pt, vault } of vaults) {
+    // Get currency balance
+    const currencyBalance = await api.call({
+      abi: 'erc20:balanceOf',
+      target: currency,
+      params: [vault],
+    });
+    api.add(currency, currencyBalance);
+    
+    // Get PT token balance
+    const ptBalance = await api.call({
+      abi: 'erc20:balanceOf',
+      target: pt,
+      params: [vault],
+    });
+    api.add(pt, ptBalance);
+  }
 }
 
 module.exports = {
-  methodology: 'counts the number of stablecoins and pt tokens in the SuperHedge Vault contracts.',
+  methodology: 'Counts the number of stablecoins and PT tokens in the SuperHedge Vault contracts.',
   ethereum: {
     tvl,
   }

projects/SuperHedge/index.js

@@ -0,0 +1,37 @@
+const { cexExports } = require('../helper/cex')
+
+const config = {
+  avax: {
+    owners: [
+      '0x4648451b5f87ff8f0f7d622bd40574bb97e25980'
+    ]
+  },
+  bsc: {
+    owners: [
+      '0x4648451b5f87ff8f0f7d622bd40574bb97e25980'
+    ]
+  },
+  ethereum: {
+    owners: [
+      '0x4648451b5f87ff8f0f7d622bd40574bb97e25980'
+    ],
+  },
+  polygon: {
+    owners: [
+      '0x4648451b5f87ff8f0f7d622bd40574bb97e25980'
+    ]
+  },
+  ripple: {
+    owners: [
+      'rhsZa1NR9GqA7NtQjDe5HtYWZxPAZ4oGrE'
+    ]
+  },
+  tron: {
+    owners: [
+      'TBQc1xRWp2G6iUQTD51Lczrk7zbjTRoGRE'
+    ]
+  },  
+}
+
+module.exports = cexExports(config)
+module.exports.methodology = 'All reserves information can be found on block explorers.'

projects/TradeOgre/index.js

@@ -5,3 +5,4 @@ module.exports = uniV3Export({
   astrzk: { factory: factory, fromBlock: 156301, },
 });
 
+module.exports.deadFrom = '2025-03-31'  // Astar ZK is shutting down on March 31, 2025: https://docs.astar.network/docs/learn/zkEVM

projects/VeryLongSwap/index.js

@@ -19,7 +19,8 @@ const CONFIG = {
   bsc: ['0x23dF2a19384231aFD114b036C14b6b03324D79BC'],
   era: ['0x5F2A704cE47B373c908fE8A29514249469b52b99'],
   linea: ['0x2D97F8FA96886Fd923c065F5457F9DDd494e3877'],
-  sonic: ['0x306c124fFba5f2Bc0BcAf40D249cf19D492440b9']
+  sonic: ['0x306c124fFba5f2Bc0BcAf40D249cf19D492440b9'],
+  celo: ['0x33b7d355613110b4E842f5f7057Ccd36fb4cee28']
 };
 
 const fetchReserveData = async (api, poolDatas, isBorrowed) => {