fix broken adapters

Author: g1nt0ki

package-lock.json

@@ -12,7 +12,7 @@ const vault = {
 const subgraphs = {
   scroll: 'https://ambindexer.net/scroll-gcgo/pool_list?chainId=0x82750',
   blast: 'https://ambindexer.net/blast-gcgo/pool_list?chainId=0x13e31',
-  canto: "https://canto-subgraph.plexnode.wtf/subgraphs/name/ambient-graph",
+  canto: "https://ambient-graphcache.fly.dev/gcgo/pool_list?chainId=0x1e14",
   ethereum: `https://api.thegraph.com/subgraphs/name/crocswap/croc-mainnet`
 }
 

projects/ambient-finance/index.js

@@ -10,7 +10,7 @@ const query = `{
 }`
 
 async function tvl(_, _b, _cb, { api, }) {
-  const { pools } = await cachedGraphQuery('elektrik', 'https://subgraph.elektrik.network/subgraphs/name/ELEKTRIK-GRAPH', query)
+  const { pools } = await cachedGraphQuery('elektrik-1', 'https://subgraph.elektrik.network/subgraphs/name/ELEKTRIK-GRAPH', query)
   const ownerTokens = pools.map(i => [[i.token0.id, i.token1.id], i.id])
   return sumTokens2({ api, ownerTokens, })
 }

projects/elektrik/index.js

@@ -25,7 +25,7 @@ const endPoints = {
   stargaze: "https://rest.stargaze-apis.com",
   quicksilver: "https://rest.cosmos.directory/quicksilver",
   persistence: "https://rest.cosmos.directory/persistence",
-  secret: "https://lcd.secret.express",
+  secret: "https://rpc.ankr.com/http/scrt_cosmos",
   // chihuahua: "https://api.chihuahua.wtf",
   injective: "https://sentry.lcd.injective.network:443",
   migaloo: "https://migaloo-api.polkachu.com",

projects/helper/chain/cosmos.js

@@ -23,6 +23,8 @@ const DEFAULTS = {
   MERLIN_RPC: "https://rpc.merlinchain.io",
   MERLIN_RPC_MULTICALL: '0x830E7E548F4D80947a40A7Cf3a2a53166a0C3980',
   BITROCK_RPC_MULTICALL: '0x40DD0342A46Ab0893251211F6626E82c09A75345',
+  RONIN_RPC: 'https://api.roninchain.com/rpc',
+  ETHF_RPC: 'https://rpc.dischain.xyz/',
 }
 
 const ENV_KEYS = [

projects/helper/env.js

@@ -1,5 +1,4 @@
 const ADDRESSES = require('../helper/coreAssets.json')
-const sdk = require('@defillama/sdk')
 const { getConfig } = require('../helper/cache')
 const { sumTokensExport } = require('../helper/sumTokens')
 const { sumTokens2 } = require('../helper/unwrapLPs')
@@ -40,72 +39,52 @@ const farms = {
 
 let tokenData
 
-function chainTvls(chain) {
-  return async (timestamp, ethBlock, {[chain]: block}) => {
-    const vault = vaults[chain]
-    let targetChain = chain
-    if (chain === 'ethereum') targetChain = 'eth'
-    if (chain === 'polygon') targetChain = 'matic'
+async function tvl(timestamp, ethBlock, _1, { api }) {
+  const chain = api.chain
 
-    const tokenListURL = 'https://bridge.orbitchain.io/open/v1/api/monitor/rawTokenList'
-    tokenData = tokenData || getConfig('orbit-bridge', tokenListURL)
-    const data = await tokenData
+  if (chain === 'meta') return {} // rpc issues with meta
 
-    let tokenList = data.origins.filter(x => x.chain === targetChain && !x.is_nft).map(x => x.address)
-    tokenList.push(nullAddress)
-    const balances = await sumTokens2({ owner: vault, tokens: tokenList, chain, block, blacklistedTokens: [
+  const vault = vaults[chain]
+  let targetChain = chain
+  if (chain === 'ethereum') targetChain = 'eth'
+  if (chain === 'polygon') targetChain = 'matic'
+
+  const tokenListURL = 'https://bridge.orbitchain.io/open/v1/api/monitor/rawTokenList'
+  tokenData = tokenData || getConfig('orbit-bridge', tokenListURL)
+  const data = await tokenData
+
+  let tokenList = data.origins.filter(x => x.chain === targetChain && !x.is_nft).map(x => x.address)
+  tokenList.push(nullAddress)
+  await sumTokens2({
+    api,
+    owner: vault, tokens: tokenList, blacklistedTokens: [
       '0x662b67d00a13faf93254714dd601f5ed49ef2f51' // ORC, blacklist project's own token
       // reason for skipping, most of the tvl comes from this transaction which is about 25% of ORU supply on ETH
       // https://etherscan.io/tx/0x0a556fcef2a867421ec3941251ad3c10ae1402a23ddd9ad4b1097b686ced89f7
-    ] })
+    ]
+  })
 
-    if (farms[chain]) {
-      const calls = farms[chain].map(i => ({ params: i }))
-      const { output: farmData } = await sdk.api.abi.multiCall({
-        target: vault,
-        abi: ABI.farms,
-        calls, chain, block,
-      })
-      const { output: farmBalance } = await sdk.api.abi.multiCall({
-        abi: ABI.wantLockedTotal,
-        calls: farmData.map(i => ({ target: i.output})), 
-        chain, block,
-      })
-      farmBalance.forEach((data, i) => sdk.util.sumSingleBalance(balances, chain + ':' + farms[chain][i], data.output))
-    }
-    return balances
+  if (farms[chain]) {
+    const calls = farms[chain]
+    const farmData = await api.multiCall({ target: vault, abi: ABI.farms, calls, })
+    const farmBalance = await api.multiCall({ abi: ABI.wantLockedTotal, calls: farmData, })
+    api.add(farms[chain], farmBalance)
   }
 }
 
 module.exports = {
   methodology: 'Tokens locked in Orbit Bridge contract are counted as TVL',
   timetravel: false,
-  bsc: {
-    tvl: chainTvls('bsc')
-  },
-  celo: {
-    tvl: chainTvls('celo')
-  },
-  heco: {
-    tvl: chainTvls('heco')
-  },
-  ethereum: {
-    tvl: chainTvls('ethereum')
-  },
-  klaytn: {
-    tvl: chainTvls('klaytn')
-  },
-  polygon: {
-    tvl: chainTvls('polygon')
-  },
-  meta: {
-    tvl: chainTvls('meta')
-  },
-  wemix: {
-    tvl: chainTvls('wemix')
-  },
+  bsc: { tvl },
+  celo: { tvl },
+  heco: { tvl },
+  ethereum: { tvl },
+  klaytn: { tvl },
+  polygon: { tvl },
+  meta: { tvl },
+  wemix: { tvl },
   ripple: {
-    tvl: sumTokensExport({ chain: 'ripple', owner: 'rLcxBUrZESqHnruY4fX7GQthRjDCDSAWia'})
+    tvl: sumTokensExport({ chain: 'ripple', owner: 'rLcxBUrZESqHnruY4fX7GQthRjDCDSAWia' })
   },
   ton: {
     tvl: tonExport({ owner: "EQAtkbV8ysI75e7faO8Ihu0mFtmsg-osj7gmrTg_mljVRccy", tokens: [ADDRESSES.null], onlyWhitelistedTokens: true }),