minor refactor

Author: g1nt0ki

projects/cronos-zk/index.js

@@ -1,31 +1,7 @@
-const { sumTokens2 } = require("../helper/unwrapLPs");
-
-const target = "0xD7f9f54194C633F36CCD5F3da84ad4a1c38cB2cB"
-const gasQuery = '0x0000000000000000000000000000000000000001'
-const gasAddress = '0x0000000000000000000000000000000000000000'
-const chainId = 388
+const getTvl = require("../txBridge/util")
 
 module.exports = {
   ethereum: {
-    tvl: async (api) => {
-      const totalBalances = await sumTokens2({
-        api,
-        owner: target,
-        fetchCoValentTokens: true,
-      })
-      const balances = await api.multiCall({
-        calls: [gasQuery, ...Object.keys(totalBalances)].map(token => ({
-          target, params: [chainId, token.substring(token.indexOf(':') + 1)]
-        })),
-        abi: { "inputs": [{ "internalType": "uint256", "name": "chainId", "type": "uint256" }, { "internalType": "address", "name": "l1Token", "type": "address" }], "name": "chainBalance", "outputs": [{ "internalType": "uint256", "name": "balance", "type": "uint256" }], "stateMutability": "view", "type": "function" },
-        permitFailure: true,
-        withMetadata: true
-      })
-      api._balances._balances = {}
-      balances.map(call => {
-        const token = call.input.params[1]
-        api.add(token == gasQuery ? gasAddress : token, call.output)
-      })
-    }
+    tvl: async (api) => getTvl(api, { chainId: 388, }),
   },
-};
+}

projects/txBridge/index.js

@@ -1,31 +1,7 @@
-const { sumTokens2 } = require("../helper/unwrapLPs");
-
-const target = "0xD7f9f54194C633F36CCD5F3da84ad4a1c38cB2cB"
-const gasQuery = '0x0000000000000000000000000000000000000001'
-const gasAddress = '0x0000000000000000000000000000000000000000'
-const chainId = 324
+const getTvl = require("./util")
 
 module.exports = {
   ethereum: {
-    tvl: async (api) => {
-      const totalBalances = await sumTokens2({
-        api,
-        owner: target,
-        fetchCoValentTokens: true,
-      })
-      const balances = await api.multiCall({
-        calls: [gasQuery, ...Object.keys(totalBalances)].map(token => ({
-          target, params: [chainId, token.substring(token.indexOf(':') + 1)]
-        })),
-        abi: { "inputs": [{ "internalType": "uint256", "name": "chainId", "type": "uint256" }, { "internalType": "address", "name": "l1Token", "type": "address" }], "name": "chainBalance", "outputs": [{ "internalType": "uint256", "name": "balance", "type": "uint256" }], "stateMutability": "view", "type": "function" },
-        permitFailure: true,
-        withMetadata: true
-      })
-      api._balances._balances = {}
-      balances.map(call => {
-        const token = call.input.params[1]
-        api.add(token == gasQuery ? gasAddress : token, call.output)
-      })
-    }
+    tvl: async (api) => getTvl(api, { chainId: 324, }),
   },
-};
+}

projects/txBridge/util.js

@@ -0,0 +1,20 @@
+const { sumTokens2 } = require("../helper/unwrapLPs");
+
+const _target = "0xD7f9f54194C633F36CCD5F3da84ad4a1c38cB2cB"
+const gasQuery = '0x0000000000000000000000000000000000000001'
+const gasAddress = '0x0000000000000000000000000000000000000000'
+
+module.exports = async (api, { chainId, target = _target } = {}) => {
+  const totalBalances = await sumTokens2({ api, owner: target, fetchCoValentTokens: true, balances: {} })
+  const tokens = Object.keys(totalBalances).map(token => token.split(':')[1]).filter(token => token !== gasAddress)
+  tokens.unshift(gasQuery)
+  const balances = (await api.multiCall({
+    target,
+    calls: tokens.map(token => ({ params: [chainId, token] })),
+    abi: "function chainBalance(uint256 chainId, address l1Token) view returns (uint256 balance)",
+    permitFailure: true,
+  })).map(i => i ?? 0)
+  tokens[0] = gasAddress
+  api.add(tokens, balances)
+  return api.getBalances()
+}