Merge branch 'DefiLlama:main' into main

Author: DackieSwap

package-lock.json

@@ -0,0 +1,8 @@
+const ADDRESSES = require('../helper/coreAssets.json')
+const { sumTokensExport } = require('../helper/sumTokens')
+
+module.exports = {
+	zeta: {
+		tvl: sumTokensExport({ owner: '0x3aC3d90dc8cB1Cacf1Fd8bc07e4B76c5EA443279', tokens: [ADDRESSES.zeta.WZETA] }),
+	}
+}

projects/0xzebra/index.js

@@ -9,21 +9,9 @@ const FACTORY = "0x3dC4e6aC26df957a908cfE1C0E6019545D08319b";
 const MASTERBREEDER = "0xeC0A7496e66a206181034F86B261DDDC1A2c406E";
 const rBCH_WBCH_LP = "0xb9659B524447F53FF1019952A6eeDBb99776Ab4A";
 const COREASSETNAME = "bitcoin-cash";
-const CHAIN = "smartbch";
 
-async function bchMasterChef(timestamp, ethBlock, {[CHAIN]: block}) {
-
-    const stakedBCH = (await sdk.api.erc20.balanceOf({
-        target: WBCH,
-        owner: MASTERBREEDER,
-        chain: CHAIN,
-        block: block,
-        decimals: 18
-    })).output;
-
-    return {
-        [COREASSETNAME]: Number(stakedBCH)
-    }
+async function bchMasterChef(api) {
+    return api.sumTokens({ owner: MASTERBREEDER, tokens: [WBCH]})
 }
 
 const bchDexTvl = getUniTVL({ factory: FACTORY, useDefaultCoreAssets: true, })

projects/1bch/index.js

@@ -1,4 +1,3 @@
-const sdk = require('@defillama/sdk')
 const { getUniqueAddresses } = require('../helper/utils')
 const { getConfig } = require('../helper/cache')
 const archimedesAbi = require('./archimedes.json')
@@ -17,21 +16,14 @@ const fetchChainAddresses = async chain => {
 }
 
 const fetchTvl = chain => {
-  return async (_timestamp, _block, chainBlocks) => {
-    const block = chainBlocks[chain]
+  return async (api) => {
     const addresses = await fetchChainAddresses(chains[chain])
-    let pools = await Promise.all(addresses.map(i => sdk.api2.abi.fetchList({ withMetadata: true, chain, block, target: i, lengthAbi: archimedesAbi['poolLength'], itemAbi: archimedesAbi['poolInfo'] })))
+    let pools = await Promise.all(addresses.map(i => api.fetchList({ withMetadata: true, target: i, lengthAbi: archimedesAbi['poolLength'], itemAbi: archimedesAbi['poolInfo'] })))
     pools = pools.flat()
     const wantTokens = pools.map(i => i.output.want)
     const calls = pools.map(i => i.input)
-    const { output: bal } = await sdk.api.abi.multiCall({
-      abi: archimedesAbi.balance,
-      calls,
-      chain, block,
-    })
-    const balances = {}
-    bal.forEach(({ output}, i) => sdk.util.sumSingleBalance(balances,wantTokens[i],output, chain))
-    return balances
+    const  bal = await api.multiCall({      abi: archimedesAbi.balance,      calls,    })
+    api.add(wantTokens, bal)
   }
 }
 

projects/2pi/index.js

@@ -14,7 +14,7 @@ module.exports = {
     deadFrom: 1648765747,
     bsc: {
         tvl: async () => ({}),
-        staking: staking(boardroom, shares, "bsc"),
+        staking: staking(boardroom, shares),
         pool2: pool2Exports(shareRewardPool, pancakeLPs, "bsc", addr=>`bsc:${addr}`)
     }
 }

projects/Caketomb/index.js

@@ -5,6 +5,6 @@ module.exports = {
   misrepresentedTokens: true,
   fantom:{
     tvl: uniTvlExport("0xc6366EFD0AF1d09171fe0EBF32c7943BB310832a", "fantom", undefined, undefined, { hasStablePools: true, useDefaultCoreAssets: true, }),
-    staking: staking("0x8313f3551C4D3984FfbaDFb42f780D0c8763Ce94", "0x3Fd3A0c85B70754eFc07aC9Ac0cbBDCe664865A6","fantom"),
+    staking: staking("0x8313f3551C4D3984FfbaDFb42f780D0c8763Ce94", "0x3Fd3A0c85B70754eFc07aC9Ac0cbBDCe664865A6"),
   },
 }

projects/Equalizer/index.js

@@ -2,7 +2,7 @@ const { getUniTVL } = require('../helper/unknownTokens')
 
 const FACTORY = "0xe63Cf585Dae8273A5e37AfF6da2f823FBf3Eb5BE" // This factory is on AirDAO Mainnet (Chain Id: 16718)
 
-const dexTVL = getUniTVL({ factory: FACTORY, useDefaultCoreAssets: true, fetchBalances: true, chain: "airdao" })
+const dexTVL = getUniTVL({ factory: FACTORY, useDefaultCoreAssets: true, fetchBalances: true, })
 
 module.exports = {
   misrepresentedTokens: true,

projects/FirepotSwap/index.js

@@ -4,6 +4,6 @@ module.exports={
         misrepresentedTokens: true,
     methodology: "Factory address (0xe93c2cD333902d8dd65bF9420B68fC7B1be94bB3) is used to find the LP pairs. TVL is equal to the liquidity on the AMM.",
     gochain: {
-        tvl: getUniTVL({ factory: '0xe93c2cD333902d8dd65bF9420B68fC7B1be94bB3', chain: 'gochain', useDefaultCoreAssets: true }),
+        tvl: getUniTVL({ factory: '0xe93c2cD333902d8dd65bF9420B68fC7B1be94bB3', useDefaultCoreAssets: true }),
     }
 }

projects/GoSwap/index.js

@@ -0,0 +1,27 @@
+const { compoundExports2, } = require('../helper/compound')
+const { stakings } = require("../helper/staking")
+const { mergeExports } = require("../helper/utils")
+const { yieldHelper, } = require("../helper/yieldHelper")
+
+const lend = compoundExports2({ comptroller: '0xB37e4151603bD0A83329CDB3F7AB0Ba608D2b9e4' })
+
+const stake = '0x94C84CdA39fc7099d745Fea787b2e42BAe51B5a5'
+const contract = '0x8B0eB5bD61c790E2CC6FB61a08210736ae66B462'
+const token = '0x49cD19636855C00Dd0408C0C40e0951a41c4512A'
+const abis = {
+  poolInfo: 'function poolInfo(uint256) view returns (address want, uint256 allocPoint, uint256 lastRewardTime, uint256 accSushiPerShare, uint256 amount, address strat)',
+}
+
+const arbi_helper = yieldHelper({
+  project: 'leaper-finance',
+  chain: 'blast',
+  masterchef: contract,
+  nativeToken: token,
+  abis,
+})
+
+module.exports = mergeExports([
+  arbi_helper,
+  { blast: lend, },
+  { blast: { staking: stakings([stake], token) }, }
+])

projects/LeaperFinance/index.js

@@ -1,6 +1,6 @@
 const { getUniTVL } = require('../helper/unknownTokens')
 module.exports = {
     oasis: {
-        tvl: getUniTVL({ factory: '0xefA6861931991CCE372c477a015619A21dfEBE8c', chain: 'oasis', useDefaultCoreAssets: true }),
+        tvl: getUniTVL({ factory: '0xefA6861931991CCE372c477a015619A21dfEBE8c', useDefaultCoreAssets: true }),
     }
 };