Merge branch 'main' of github.com:DefiLlama/DefiLlama-Adapters

* 'main' of github.com:DefiLlama/DefiLlama-Adapters: (164 commits)
  add gate wallets (DefiLlama#14961)
  Add adapter for nebula on nibiru (DefiLlama#14924)
  ci fix (DefiLlama#14957)
  DegenPrime - Add new lending pools and tokens (DefiLlama#14951)
  *bugfix: remove doublecount
  bugfix
  Bitkub lending (DefiLlama#14949)
  add aave on soneium (DefiLlama#14947)
  track aave umbrella
  Update Concrete (DefiLlama#14944)
  clean-up
  Trading strategy (DefiLlama#14943)
  update @defillama/sdk
  fix ens
  fix bug
  Add Marinade Select tvl adapter (DefiLlama#14928)
  Support Spark Liquidity Layer on Optimism and Unichain (DefiLlama#14938)
  update adapters on nibiru chains (DefiLlama#14940)
  Added missing Corn coreAssets to fix Uniswap TVL (DefiLlama#14930)
  update nibiru rpc
  Add new pools (DefiLlama#14925)
  feat: add luckystake adapter (DefiLlama#14919)
  keep old contracts for now (DefiLlama#14937)
  feat: batch listing (DefiLlama#14927)
  Add Swirl Liquid Staking Protocol (DefiLlama#14904)
  add X3X on World Chain (DefiLlama#14929)
  Add new Hydration adapters (DefiLlama#14923)
  add benji
  update lock version
  code refactor
  code refactor
  Optimize unicrypt + pinksale (DefiLlama#14922)
  Fix aptos Fungible helper (DefiLlama#14918)
  add indxs.app (DefiLlama#14915)
  Add granite (DefiLlama#14917)
  Amped sseed (DefiLlama#14916)
  Add files via upload (DefiLlama#14899)
  Add stellar tvl (DefiLlama#14646)
  add unichain morpho vaults for curators (DefiLlama#14911)
  temp disable nibiru adapters (DefiLlama#14910)
  projects(uniswap): add Uniswap deployment on Nibiru (DefiLlama#14890)
  projects(silverswap): Nibiru has a SilverSwap deployment on mainnet (DefiLlama#14889)
  kamino lend - borrows (DefiLlama#14909)
  ZEROBASE adaptor for DeFiLama (DefiLlama#14832)
  feat: Add fungible support aptos (DefiLlama#14905)
  up vestingHelper limit for bsc (DefiLlama#14903)
  feat(satlayer): add BOB to `satlayer` tvl (DefiLlama#14900)
  Add milkINIT TVL for MilkyWay (DefiLlama#14902)
  [Bucket]" add xBTC collateral (DefiLlama#14897)
  add v2 liquidity and plume (DefiLlama#14824)
  Update ExtraFi Xlend TVL to include Morpho Vaults (DefiLlama#14886)
  stability: keep old markets and adapter name (DefiLlama#14892)
  disable pool2, add hallmark (DefiLlama#14898)
  [Update] desyn add goat chain  (DefiLlama#14896)
  Add Tokenized Balance Sheet Vaults for Origami (DefiLlama#14895)
  fix cex usdt aptos (DefiLlama#14894)
  Add Dre Finance (DefiLlama#14883)
  Fix Sei TVL + Add Sonic TVL (DefiLlama#14368)
  New OTTV contract (DefiLlama#14875)
  Add new berancia vaults (DefiLlama#14877)
  symbiosis add hyper evm support (DefiLlama#14887)
  remove dup vaults (DefiLlama#14888)
  fix aptos token (DefiLlama#14884)
  add price usdt aptos (DefiLlama#14882)
  Smardex / USDN: Use recipient as owner of the position (DefiLlama#14881)
  Catex/unichain migration (DefiLlama#14859)
  remove dai blacklist (DefiLlama#14880)
  Fix Moar TVL calculation (DefiLlama#14879)
  add hallmarks tracking on starknet (DefiLlama#14878)
  dynamic get vaults lists (DefiLlama#14869)
  Update: D2Finance (DefiLlama#14876)
  Sui Rewards Me - Project Listing resubmission with requested updates (DefiLlama#14874)
  Add aptos address of flipster (DefiLlama#14872)
  disable historical queries (DefiLlama#14871)
  update curator tvl sources (DefiLlama#14870)
  add iteration 2 pools (DefiLlama#14862)
  fix: Add Credbull Plume TVL.  Map Plume Stargate USDC.e. (DefiLlama#14861)
  update sdk to latest version (DefiLlama#14866)
  feat: update milkBABY and add milkINIT commented out because of issues (DefiLlama#14767)
  add wstASTR vault (DefiLlama#14864)
  Fix: Wasabi, dedup + bera (DefiLlama#14865)
  fix ironbank
  feature: add Arkis Wrapped Hype Vault to Arkis adapter (DefiLlama#14796)
  doublecount protocols first batch (DefiLlama#14705)
  Update olab (DefiLlama#14860)
  correct native token mappings where possible (DefiLlama#14850)
  Add new berancia vaults (DefiLlama#14855)
  Ensuro: adds Compound Blue (compUSDC) to the TVL calculation (DefiLlama#14851)
  fix: Swissborg - Use cosmos addresses instead of evm (DefiLlama#14858)
  Commit Hybra V2 (DefiLlama#14854)
  addresses fixed (DefiLlama#14853)
  Curve: track hyperliquid (DefiLlama#14852)
  fix concentrated pool recognition (DefiLlama#14849)
  code cleanup
  chore: add yearn curating vaults (DefiLlama#14845)
  code cleanup
  migrate coin mapping
  Saros Dlmm (DefiLlama#14847)
  add Jiko (DefiLlama#14843)
  code refactor
  ...

Author: brentstone

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

@@ -1,21 +1,32 @@
 const { getCuratorExport } = require("../helper/curators");
 
 const configs = {
-  methodology: 'Count all assets are depoisted in all vaults curated by 9Summits.',
+  methodology: 'Count all assets are deposited in all vaults curated by 9Summits.',
   blockchains: {
     ethereum: {
+      morphoVaultOwners: [
+        '0x23E6aecB76675462Ad8f2B31eC7C492060c2fAEF',
+      ],
       morpho: [
-        '0xb5e4576C2FAA16b0cC59D1A2f3366164844Ef9E0',
-        '0xD5Ac156319f2491d4ad1Ec4aA5ed0ED48C0fa173',
-        '0x1E2aAaDcF528b9cC08F43d4fd7db488cE89F5741',
-        '0x00B6f2C15E4439749f192D10c70f65354848Cf4b',
-        '0x0bB2751a90fFF62e844b1521637DeD28F3f5046A',
+        '0xb5e4576C2FAA16b0cC59D1A2f3366164844Ef9E0', // co-curator with tulip-capital
+        '0x1E2aAaDcF528b9cC08F43d4fd7db488cE89F5741', // co-curator with tulip-capital
+        '0x0bB2751a90fFF62e844b1521637DeD28F3f5046A', // co-curator with tulip-capital
+      ],
+      turtleclub: [
+        '0xa853d8f5f253468495c5a92d54a3fe6cca2aa26b',
+        '0x7388d4b5c4cfc96c9105de913717ba7519178129',
+        '0xDe7CFf032D453Ce6B0a796043E75d380Df258812',
+        '0xAF87B90E8a3035905697E07Bb813d2d59D2b0951',
       ],
     },
     base: {
-      morpho: [
-        '0x5496b42ad0deCebFab0db944D83260e60D54f667',
-        '0xF540D790413FCFAedAC93518Ae99EdDacE82cb78'
+      morphoVaultOwners: [
+        '0x23E6aecB76675462Ad8f2B31eC7C492060c2fAEF',
+      ],
+    },
+    unichain: {
+      morphoVaultOwners: [
+        '0x59e608E4842162480591032f3c8b0aE55C98d104',
       ],
     },
   }

projects/9summits/index.js

@@ -11,4 +11,7 @@ module.exports= mergeExports([
   [unitroller_lpt_oasis, '0x63f1fe2e1da490611fc16e4a5d92b7ec7d0911a9'],
 ].map( ([comptroller, cether]) => ({
   oasis: compoundExports2({ comptroller, cether, }),
-})))
+})))
+
+module.exports.deadFrom = '2023-06-22'
+module.exports.oasis.borrowed=  () => ({})

projects/Fountain-Protocol/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

@@ -0,0 +1,49 @@
+const headers = {
+  origin: "https://subgraph.smardex.io",
+  referer: "https://subgraph.smardex.io",
+  "x-api-key": process.env.SMARDEX_SUBGRAPH_API_KEY,
+};
+
+const subgraphUrl = "https://subgraph.smardex.io/ethereum/spro";
+
+const getTokenMetrics = async () => {
+  const tokenMetricsQuery = `{
+    tokenMetrics_collection {
+      id
+      totalCollateralAmount
+      totalBorrowedAmount
+    }
+  }`;
+
+  const result = await fetch(subgraphUrl, {
+    method: "POST",
+    headers,
+    body: JSON.stringify({
+      query: tokenMetricsQuery,
+    }),
+  }).then((res) => res.json());
+  return result?.data?.tokenMetrics_collection || [];
+};
+
+async function getP2pData(isBorrowed = false) {
+  const tokenMetrics = await getTokenMetrics();
+
+  return tokenMetrics.reduce((acc, token) => {
+    const totalBorrowedAmount = parseFloat(token.totalBorrowedAmount);
+
+    return {
+      ...acc,
+      [token.id]:
+        // We only need to add the total collateral amount if it's not borrowed
+        totalBorrowedAmount + parseFloat(isBorrowed ? 0 : token.totalCollateralAmount),
+    };
+  }, {});
+}
+
+module.exports = {
+  ethereum: {
+    tvl: () => getP2pData(),
+    borrowed: () => getP2pData(true),
+  },
+};
+// node test.js projects/p2p-lending/index.js

projects/SMARDEX-P2P-Lending/index.js

@@ -0,0 +1,33 @@
+const ADDRESSES = require('../helper/coreAssets.json')
+
+const USDN_PROTOCOL_ADDRESS = "0x656cB8C6d154Aad29d8771384089be5B5141f01a";
+const WSTETH_TOKEN_ADDRESS = ADDRESSES.ethereum.WSTETH;
+const REBALANCER_ADDRESS = "0xaebcc85a5594e687f6b302405e6e92d616826e03";
+
+async function fetchUSDNData(api) {
+
+  const balanceVault = await api.call({ target: USDN_PROTOCOL_ADDRESS, abi: "uint256:getBalanceVault", });
+  const balanceLong = await api.call({ target: USDN_PROTOCOL_ADDRESS, abi: "uint256:getBalanceLong", });
+  const rebalancerCurrentStateData = await api.call({
+    target: REBALANCER_ADDRESS,
+    abi: "function getCurrentStateData() view returns (uint128 pendingAssets_, uint256 maxLeverage_, (int24 tick, uint256 tickVersion, uint256 index) currentPosId_)",
+  });
+
+  return {
+    getBalanceVault: balanceVault,
+    getBalanceLong: balanceLong,
+    rebalancerPendingAssets: rebalancerCurrentStateData.pendingAssets_,
+  };
+}
+
+const getEthereumTVL = async (api, block, chainBlocks) => {
+  const usdnData = await fetchUSDNData(api);
+
+  api.add(WSTETH_TOKEN_ADDRESS, Object.values(usdnData))
+  return api.getBalances();
+};
+
+module.exports["ethereum"] = {
+  timetravel: true,
+  tvl: getEthereumTVL
+};

projects/SMARDEX-USDN/index.js

@@ -10,32 +10,11 @@ const config = {
 };
 
 const ethereumFactory = "0xB878DC600550367e14220d4916Ff678fB284214F";
-const USDN_PROTOCOL_ADDRESS = "0x656cB8C6d154Aad29d8771384089be5B5141f01a";
-const WSTETH_TOKEN_ADDRESS = ADDRESSES.ethereum.WSTETH;
-const REBALANCER_ADDRESS = "0xaebcc85a5594e687f6b302405e6e92d616826e03";
-
-async function fetchUSDNData(api) {
-
-  const balanceVault = await api.call({ target: USDN_PROTOCOL_ADDRESS, abi: "uint256:getBalanceVault", });
-  const balanceLong = await api.call({ target: USDN_PROTOCOL_ADDRESS, abi: "uint256:getBalanceLong", });
-  const rebalancerCurrentStateData = await api.call({
-    target: REBALANCER_ADDRESS,
-    abi: "function getCurrentStateData() view returns (uint128 pendingAssets_, uint256 maxLeverage_, (int24 tick, uint256 tickVersion, uint256 index) currentPosId_)",
-  });
-
-  return {
-    getBalanceVault: balanceVault,
-    getBalanceLong: balanceLong,
-    rebalancerPendingAssets: rebalancerCurrentStateData.pendingAssets_,
-  };
-}
 
 const getEthereumTVL = async (api, block, chainBlocks) => {
-  const usdnData = await fetchUSDNData(api);
   const uniTVL = await getUniTVL({ factory: ethereumFactory, fetchBalances: true, useDefaultCoreAssets: false })(api, block, chainBlocks);
 
   api.addBalances(uniTVL)
-  api.add(WSTETH_TOKEN_ADDRESS, Object.values(usdnData))
   return api.getBalances();
 };
 

projects/SmarDex/index.js

@@ -0,0 +1,18 @@
+const { sumTokens2 } = require("../helper/unwrapLPs");
+const { staking } = require('../helper/staking')
+
+const main_contract = '0xa77BaD7300d954BF9fad8d583ECd3E85a62b8CC0'
+
+const token = '0x5dd2750f18Da3e5933a20340B0fa10cef56A8B07'
+const sToken = '0x5Fa631D20B685Aff98aCF4EaAACe28cDbd86f3D3'
+
+module.exports = {
+  base: {
+    tvl: async (api) => {
+      const pools = await api.call({ target: main_contract, abi: "function getAllPools() public view returns(address[] memory list)" })
+      const tokens = await api.multiCall({ abi: "function getPoolTokens(address _pool) public view returns(address[] memory list)", target: main_contract, calls: pools })
+      return sumTokens2({ api, ownerTokens: tokens.map((v, i) => [v, pools[i]]), })
+    },
+    staking: staking(sToken, token)
+  }
+}

projects/SypherFinance/index.js

@@ -49,7 +49,7 @@ async function getAllPairs(factory, chain, {blacklistedPairs = []} = {}) {
   return dtos
 }
 
-const isNotXYK = (pair) => pair.pair_type && pair.pair_type.custom === 'concentrated'
+const isNotXYK = (pair) => pair.pair_type && pair.pair_type.concentrated
 
 function getFactoryTvl(factory, {blacklistedPairs = []} = {}) {
   return async (api) => {

projects/TowerDEX/factoryTvl.js

@@ -0,0 +1,48 @@
+const CONFIG = {
+  ethereum: {
+    vault: '0x9eF52D8953d184840F2c69096B7b3A7dA7093685',
+    tokens: ['0xdAC17F958D2ee523a2206206994597C13D831ec7', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48']
+  },
+  bsc: {
+    vault: '0xCc5Df5C68d8c991035B6A437D4e00A99875228E4',
+    tokens: ['0x55d398326f99059fF775485246999027B3197955', '0x8AC76a51cc950d9822D68b83fE1Ad97B32Cd580d']
+  },
+  polygon: {
+    vault: '0xCc5Df5C68d8c991035B6A437D4e00A99875228E4',
+    tokens: ['0xc2132D05D31c914a87C6611C10748AEb04B58e8F', '0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359']
+  },
+  arbitrum: {
+    vault: '0xCc5Df5C68d8c991035B6A437D4e00A99875228E4',
+    tokens: ['0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9', '0xaf88d065e77c8cC2239327C5EDb3A432268e5831']
+  },
+  optimism: {
+    vault: '0xCc5Df5C68d8c991035B6A437D4e00A99875228E4',
+    tokens: ['0x94b008aA00579c1307B0EF2c499aD98a8ce58e58', '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85']
+  },
+  avax: {
+    vault: '0xC3e9006559cB209a987e99257986aA5Ce324F829',
+    tokens: ['0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7', '0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E']
+  },
+  base: {
+    vault: '0xCc5Df5C68d8c991035B6A437D4e00A99875228E4',
+    tokens: ['0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913']
+  }
+}
+
+const abis = {
+  getTVL: "function getTVL(address _token) view returns (uint256)"
+}
+
+module.exports = {
+  methodology: 'For each chain: call getTVL(token) on its vault and sum per-token amounts',
+}
+
+const tvl = async (api) => {
+  const { vault, tokens } = CONFIG[api.chain]
+  const balances = await api.multiCall({ abi: abis.getTVL, calls: tokens.map((t) => ({ target: vault, params: [t]})) })
+  tokens.forEach((t, i) => { api.add(t, balances[i]) })
+}
+
+Object.keys(CONFIG).forEach((chain) => {
+  module.exports[chain] = { tvl }
+})

projects/ZEROBASE/index.js

@@ -0,0 +1,16 @@
+const config = {
+  ethereum: { factories: ['0xd400fc38ed4732893174325693a63c30ee3881a8'], }
+}
+
+Object.keys(config).forEach(chain => {
+  const { factories, } = config[chain]
+  module.exports[chain] = {
+    tvl: async (api) => {
+      const stkTokens = (await api.multiCall({ calls: factories, abi: 'address[]:getStkTokens' })).flat()
+      const tokens = await api.multiCall({ abi: 'address:asset', calls: stkTokens })
+      return api.sumTokens({ tokensAndOwners2: [tokens, stkTokens], })
+    }
+  }
+})
+
+module.exports.doublecounted = true

projects/aave-umbrella/index.js

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

projects/aave-v3/index.js

@@ -27,6 +27,12 @@ const config = {
             }
         }
     ],
+    "bitkub": [{
+        "bitkub": {
+            address: "0xc293a0a2521188f9c81e6e11f577649e671f9965",
+            collateralToken: '0x7ac168c81f4f3820fa3f22603ce5864d6ab3c547'
+        }
+    }],
 };
 
 function transformConfig(config) {

projects/accumulated-finance-lending/index.js

@@ -20,7 +20,8 @@ function fetchallchain(chainId) {
 
 module.exports = {
   timetravel: false,
-    methodology: "Acryptos TVL is the USD value of token within the vault and farm contracts",
+  methodology: "Acryptos TVL is the USD value of token within the vault and farm contracts",
+  misrepresentedTokens: true,
   ethereum: {
     tvl: fetchallchain(1),
   },

projects/acryptos/index.js

@@ -1,14 +1,11 @@
 const { getCuratorExport } = require("../helper/curators");
 
 const configs = {
-  methodology: 'Count all assets are depoisted in all vaults curated by Alphaping.',
+  methodology: 'Count all assets are deposited in all vaults curated by Alphaping.',
   blockchains: {
     ethereum: {
-      morpho: [
-        '0xb0f05E4De970A1aaf77f8C2F823953a367504BA9',
-        '0x6619F92861C760AD11BA0D56E8ED63A33EccE22B',
-        '0xFa7ED49Eb24A6117D8a3168EEE69D26b45C40C63',
-        '0x47fe8Ab9eE47DD65c24df52324181790b9F47EfC'
+      morphoVaultOwners: [
+        '0xEB4Af6fA3AFA08B10d593EC8fF87efB03BC04645',
       ],
     },
   }