Merge branch 'main' into nibiru/silverswap

Author: Unique-Divine

liquidations/smardex/index.ts

@@ -68,7 +68,7 @@ const calculateLiquidationPrice = (position: Position): number => {
 
 const formatPosition = (position: Position): Liq => {
   const owner =
-    position.mainPosition?.lastOwner?.address || '0x0000000000000000000000000000000000000000';
+    position.recipient || '0x0000000000000000000000000000000000000000';
 
   const searchParam = position.history && position.history.length > 0 ? 
     position.history[position.history.length - 1].transactionHash : position.index;

package-lock.json

@@ -12,6 +12,12 @@ const configs = {
         '0x1E2aAaDcF528b9cC08F43d4fd7db488cE89F5741', // co-curator with tulip-capital
         '0x0bB2751a90fFF62e844b1521637DeD28F3f5046A', // co-curator with tulip-capital
       ],
+      turtleclub: [
+        '0xa853d8f5f253468495c5a92d54a3fe6cca2aa26b',
+        '0x7388d4b5c4cfc96c9105de913717ba7519178129',
+        '0xDe7CFf032D453Ce6B0a796043E75d380Df258812',
+        '0xAF87B90E8a3035905697E07Bb813d2d59D2b0951',
+      ],
     },
     base: {
       morphoVaultOwners: [

projects/9summits/index.js

@@ -29,35 +29,16 @@ Object.keys(config).forEach(chain => {
   module.exports[chain] = {
     tvl: async (api) => {
       const balances = {}
-      const logs = await getLogs({
-        api,
-        target: registry,
-        topic: 'VaultRegistered(address,address,uint256,address,address)',
-        fromBlock,
-        eventAbi: 'event VaultRegistered (address indexed origin, address indexed sender, uint256 indexed nft, address vault, address owner)',
-        onlyArgs: true,
-        extraKey: 'VaultRegistered'
-      })
-      const vaultKeys = {}
-      logs.forEach(i => vaultKeys[i.nft] = i.vault)
-      const tokenLockedLogs = await getLogs({
-        api,
-        target: registry,
-        topic: 'TokenLocked(address,address,uint256)',
-        fromBlock,
-        eventAbi: 'event TokenLocked (address indexed origin, address indexed sender, uint256 indexed nft)',
-        onlyArgs: true,
-        extraKey: 'TokenLocked'
-      })
-      tokenLockedLogs.forEach(i => delete vaultKeys[i.nft])
-      let vaults = Object.values(vaultKeys)
+
+      const vaults = await api.call({ abi: 'function vaults() view returns (address[])', target: registry })
       const tokens = await api.multiCall({ abi: 'function vaultTokens() view returns (address[])', calls: vaults })
       const bals = await api.multiCall({ abi: 'function tvl() view returns (uint256[] minTokenAmounts, uint256[] maxTokenAmounts)', calls: vaults, permitFailure: true })
       tokens.forEach((tokens, i) => {
         if (!bals[i]) return;
         let balsInner = bals[i].minTokenAmounts
         tokens.forEach((v, i) => sdk.util.sumSingleBalance(balances, v, balsInner[i], api.chain))
       })
+
       return balances
     }
   }

projects/MellowProtocol/index.js

@@ -8,7 +8,23 @@ const configs = {
         '0x0d8249DD621fB1c386A7A7A949504035Dd3436A3',
       ],
     },
+    starknet: {
+      vesu: [
+        '0x7bafdbd2939cc3f3526c587cb0092c0d9a93b07b9ced517873f7f6bf6c65563',
+        '0x27f2bb7fb0e232befc5aa865ee27ef82839d5fad3e6ec1de598d0fab438cb56',
+        '0x5c678347b60b99b72f245399ba27900b5fc126af11f6637c04a193d508dda26',
+        '0x2906e07881acceff9e4ae4d9dacbcd4239217e5114001844529176e1f0982ec',
+      ],
+    },
   }
 }
 
-module.exports = getCuratorExport(configs)
+module.exports = {
+  ...getCuratorExport(configs),
+
+  // starknet doesn't support historical queries
+  timetravel: false,
+  hallmarks: [
+    ['2025-06-01', "Start tracking vaults on starknet"],
+  ]
+}

projects/alterscope/index.js

@@ -1,44 +1,40 @@
-const { sumTokens2 } = require('../helper/unwrapLPs')
 const { get } = require('../helper/http')
 
 const STRATEGIES_URL = 'https://raw.githubusercontent.com/Lynexfi/lynex-lists/main/strategies/main.json'
 
-async function getCatexPools() {
+async function getCatexPools(chainId) {
   const data = await get(STRATEGIES_URL)
-  // Get only Polygon (137) strategies
-  const polygonStrategies = data['137'] || []
-  // Filter for uniV4 strategies only since Catex only manages V4 pools
-  return polygonStrategies
+  const strategies = data[chainId] || []
+  return strategies
     .filter(strategy => strategy.variant === 'uniV4')
     .map(strategy => strategy.address)
 }
 
+async function tvlForChain(api, chainId) {
+  const CATEX_POOLS = await getCatexPools(chainId)
+  if (!CATEX_POOLS.length) return {}
+
+  const token0s = await api.multiCall({ abi: 'address:token0', calls: CATEX_POOLS })
+  const token1s = await api.multiCall({ abi: 'address:token1', calls: CATEX_POOLS })
+  const totalAmounts = await api.multiCall({
+    abi: 'function getTotalAmounts() view returns (uint256 total0, uint256 total1, uint256 totalFee0, uint256 totalFee1)',
+    calls: CATEX_POOLS,
+  })
+
+  totalAmounts.forEach((amounts, i) => {
+    api.add(token0s[i], amounts.total0)
+    api.add(token1s[i], amounts.total1)
+  })
+
+  return api.getBalances()
+}
+
 module.exports = {
-  methodology: 'TVL counts the tokens locked in Gamma ALM vaults that Catex manages on top of Uniswap V4',
+  methodology: 'TVL counts the tokens locked in ALM vaults that Catex manages on top of Uniswap V4',
   start: 69453847,
-  polygon: {
-    tvl: async (api) => {
-      const CATEX_POOLS = await getCatexPools()
-      
-      // Get token addresses for each vault
-      const token0s = await api.multiCall({ abi: 'address:token0', calls: CATEX_POOLS })
-      const token1s = await api.multiCall({ abi: 'address:token1', calls: CATEX_POOLS })
-      
-      // Get total amounts including fees for each vault
-      const totalAmounts = await api.multiCall({ 
-        abi: 'function getTotalAmounts() view returns (uint256 total0, uint256 total1, uint256 totalFee0, uint256 totalFee1)',
-        calls: CATEX_POOLS 
-      })
-      
-      // Add balances for each vault
-      totalAmounts.forEach((amounts, i) => {
-        // Add token0 total (including fees)
-        api.add(token0s[i], amounts.total0)
-        // Add token1 total (including fees)
-        api.add(token1s[i], amounts.total1)
-      })
-      
-      return api.getBalances()
-    }
-  }
+  polygon: { tvl: (api) => tvlForChain(api, '137') },
+  unichain: { tvl: (api) => tvlForChain(api, '130') },
+  hallmarks: [
+    [1748451600, "Catex migrated from Polygon to Unichain"],
+  ],
 } 

projects/catex/index.js

@@ -0,0 +1,21 @@
+const { getCuratorExport } = require("../helper/curators");
+
+const configs = {
+  methodology: 'Count all assets are deposited in all vaults curated by CIAN Protocol.',
+  blockchains: {
+    ethereum: {
+      turtleclub_erc4626: [
+        '0x0d1862e73a1430A5FD3245B47859c1BEcD6f3A1D',
+        '0x2B11527e1fab84a5382D20efD198BF3d332f7E73',
+        '0x65939777a9dC5A370707bb6b44b1ad0BC9e2D8a4',
+        '0x34d16e4fB8757A88D986f9EfE2484F0badBF22C1',
+        '0x0982eB22086183bF10acd2991A2dBeD1e3B9Ac2A',
+        '0x76f31800eFdE39A5f98189447c7a514d974f4364',
+        '0xd72c3a44b51C8D6631C004ecf3A318b9D2c58F80',
+        '0x6945f516413cB2d7311297e8A39E7D004dEB5566',
+      ],
+    },
+  }
+}
+
+module.exports = getCuratorExport(configs)

projects/cian-curating/index.js

@@ -1,15 +1,13 @@
 const ADDRESSES = require('../helper/coreAssets.json')
 const { getConfig } = require('../helper/cache');
-const {api} = require("@defillama/sdk");
+
+const { getFixBalances } = require('../helper/portedTokens');
 
 const addresses = {
   arbitrum: {
     cbl: "0xD6b3d81868770083307840F513A3491960b95cb6",
     cblStakingV2: "0xc0C1DaA773570C041c47cE12c397AdDFD6B7403F",
   },
-  plume: { // legacy plume (ETH Gas)
-    v2Vaults: ["0x2b9d2023DbF3c7473f1cec42F78713d09DdC9FBF"]  // liquidStone X Plume
-  },
   plume_mainnet: { // plume ($PLUME gas)
     v2Vaults: ["0x577349C99830D3c078034087A532581EF5381A08"]  // liquidStone X Plume
   },
@@ -30,15 +28,6 @@ const vaultStablecoins = [
   ADDRESSES.polygon.USDT,
 ];
 
-function normalizeToken(chain, token) {
-  const map = {
-    'plume_mainnet': {
-      '0x78add880a697070c1e765ac44d65323a0dcce913': ADDRESSES.plume_mainnet.USDC_e,
-    },
-  };
-  return map[chain]?.[token.toLowerCase()] || token;
-}
-
 async function includeStablecoins(api, vaultAddresses) {
   await Promise.all(
       vaultStablecoins.map(token => handleStablecoinBalance(api, vaultAddresses, token))
@@ -63,11 +52,15 @@ async function handleStablecoinBalance(api, vaultAddresses, erc20address, isIncl
 
 // Credbull DeFi Vaults v1 TVL (6 or 12 month fixed APY)
 async function tvl(api) {
-  let vaults = await getConfig('credbull', "https://incredbull.io/api/vaults")
-  vaults = vaults[api.chain]
-  const tokens = await api.multiCall({ abi: 'address:asset', calls: vaults })
+  const vaults = await getVaultsForChain(api.chain);
+  if (vaults.length === 0) return; // no vaults for this chain, return early
+
+  const tokens = await api.multiCall({ abi: 'address:asset', calls: vaults });
 
-  return api.sumTokens({ tokensAndOwners2: [tokens, vaults] })
+  await api.sumTokens({ tokensAndOwners2: [tokens, vaults] });
+
+  const fixBalances = await getFixBalances(api.chain);
+  await fixBalances(api.getBalances());
 }
 
 // Credbull Fund (e.g. LiquidStone Fund)
@@ -100,13 +93,16 @@ async function borrowedVaults(api) {
   const vaults = await getVaultsForChain(api.chain);
   if (vaults.length === 0) return; // no vaults for this chain, return early
 
-  let tokens = await api.multiCall({ abi: 'address:asset', calls: vaults });
-  tokens = tokens.map(t => normalizeToken(api.chain, t));
+  const tokens = await api.multiCall({ abi: 'address:asset', calls: vaults });
 
   const bals = await api.multiCall({ abi: 'address:totalAssets', calls: vaults })
   api.add(tokens, bals)
   const tBals = (await api.multiCall({ abi: 'erc20:balanceOf', calls: tokens.map((t, i) => ({ target: t, params: vaults[i] })) })).map(i => i * -1)
   api.add(tokens, tBals)
+
+  // apply fixBalances to correct token labels
+  const fixBalances = await getFixBalances(api.chain);
+  await fixBalances(api.getBalances());
 }
 
 // get Credbull DeFi vaults
@@ -128,6 +124,6 @@ module.exports = {
   methodology: 'TVL consist of the sum of every deposit of all vaults for a given asset.',
   arbitrum: { tvl, borrowed: borrowedVaults, staking: stakedCbl },
   btr: { tvl, borrowed: borrowedVaults, },
-  plume_mainnet: { borrowed: borrowedVaults},
+  plume_mainnet: { tvl, borrowed: borrowedVaults},
   polygon: { borrowed: borrowedFund, tvl: polygonTvl },
 };

projects/credbull/index.js

@@ -39,7 +39,9 @@ const config = {
     '0xC4fEE8c68293a63241b64e5A2EF07fcf89005dD3',
   ], 
   hyperliquid: [
-    '0xf44f49E6577B3934f981C6f0629d15154d2606E6'
+    '0xf44f49E6577B3934f981C6f0629d15154d2606E6',
+    '0x7410E69958a8ECE2A51C231C8528513d4d668C7a',
+    '0xade27c7dec9211973278876f3819aedc28cd50ca'
   ]
 }
 

projects/d2finance/index.js

@@ -2,50 +2,77 @@ const { sumTokens} = require("../helper/chain/ton");
 const ADDRESSES = require("../helper/coreAssets.json");
 const plimit = require("p-limit");
 const { call } = require('../helper/chain/ton');
+const { sleep } = require('../helper/utils');
 
 const tsTON6mSyMinter = "EQAxGi9Al7hamLAORroxGkvfap6knGyzI50ThkP3CLPLTtOZ"
 const USDTSlpSyMinter = "EQA0Pobx0rXc7MlfXvUAZlC_U4MRGJ4FKGq79dHbBJ7RsuyB"
 const NOTSlpSyMinter = "EQD5A2ygwSgAXXTqI-OkAOY72bXn8-mRgE9wOEFLKgu6ifbD"
 const TONSlpSyMinter = "EQB9nQdgwdaTXG6F7mDEErPuuJza6lmCfQjun-PXK3iJXm2h"
 
-
 const syEvaaMinter = "EQDi9blCcyT-k8iMpFMYY0t7mHVyiCB50ZsRgyUECJDuGvIl" // Evaa USDT (maturity 2025-06-01)
 
+// i2 pools
+const USDTSlpSyMinter01Sep2025 = "EQDLqPppdVfv4bVqV6bpCYwmDUVCsem2LV5zda3fMIKgCxkH"
+const TONSlpSyMinter01Sep2025 = "EQBeLuWFjniPGnAyy7gVKJkA1mXptxP-dgBswKIY5su6NHFd"
+const USDe01Sep2025 = "EQDafE9flDXaRCnhrprgPj_sJNJb502Dov1GDruIRjarHscs"
+const tsUSDe01Sep2025 = "EQC57U5O4_OGLSEgX498PpmNqSYzcXx63wvOdtkCoe5LHcfo"
+
+const syEvaaMinter01Sep2025 = "EQBY5JE96x_U5fSSsAzBj8d-_ZbK-5AihJ2rzjTZAtNqsntL"
+
 const indexPrecision = 10 ** 6
 
 const _rateLimited = plimit(1)
 const rateLimited = fn => (...args) => _rateLimited(() => fn(...args))
-const getEVAASuppliedUSDT = rateLimited(getSuppliedToEVAAJettons);
+const rateLimitedCall = rateLimited(call);
 
-async function getSuppliedToEVAAJettons(api, evaaSyMinter) {
-  const suppliedUSDTToEvaa = await call({
-    target: evaaSyMinter,
-    abi: 'get_total_evaa_supplied',
-    params: []
-  });
+async function getSuppliedToEVAAJettons(api, evaaSyMinters) {
+  // Handle both single address and array of addresses
+  const minters = Array.isArray(evaaSyMinters) ? evaaSyMinters : [evaaSyMinters];
+  
+  let totalAdjustedUSDT = 0;
+  
+  for (const evaaSyMinter of minters) {
+    const suppliedUSDTToEvaa = await rateLimitedCall({
+      target: evaaSyMinter,
+      abi: 'get_total_evaa_supplied',
+      params: []
+    });
 
-  const indexData = await call({
-    target: evaaSyMinter,
-    abi: 'get_index',
-    params: []
-  });
+    await sleep(1000 * (2 * Math.random() + 3)); // 3-5 second delay
 
-  const adjustedUSDT = suppliedUSDTToEvaa * indexData[0] / 10 ** 3 / indexPrecision;
+    const indexData = await rateLimitedCall({
+      target: evaaSyMinter,
+      abi: 'get_index',
+      params: []
+    });
 
-  api.add(ADDRESSES.ton.USDT, adjustedUSDT);
+    const adjustedUSDT = suppliedUSDTToEvaa * indexData[0] / 10 ** 3 / indexPrecision;
+    totalAdjustedUSDT += adjustedUSDT;
+    
+    // Add additional delay between different addresses
+    if (minters.length > 1) {
+      await sleep(1000 * (Math.random() + 2)); // Additional 2-3 seconds
+    }
+  }
+  api.add(ADDRESSES.ton.USDT, totalAdjustedUSDT);
 }
 
 async function tvl(api) {
   // balances in the SY minter smart contracts
   await sumTokens({
     api,
-    owners: [tsTON6mSyMinter, USDTSlpSyMinter, NOTSlpSyMinter, TONSlpSyMinter],
+    owners: [
+      tsTON6mSyMinter, USDTSlpSyMinter, NOTSlpSyMinter, TONSlpSyMinter,
+      USDTSlpSyMinter01Sep2025,
+      TONSlpSyMinter01Sep2025,
+      USDe01Sep2025,
+      tsUSDe01Sep2025,
+    ],
     tokens: [ADDRESSES.null],
   })
 
   // Evaa tvl - balance in the EVVA protocol supplied by SY minter smartcontract
-  await getEVAASuppliedUSDT(api, syEvaaMinter);
-
+  await getSuppliedToEVAAJettons(api, [syEvaaMinter, syEvaaMinter01Sep2025]);
 }
 
 module.exports = {