From 07ee6a589a616c061b22669ed1524a719ed6c13e Mon Sep 17 00:00:00 2001 From: g1nt0ki <99907941+g1nt0ki@users.noreply.github.com> Date: Fri, 7 Apr 2023 16:40:28 +0200 Subject: [PATCH] minor refactor --- projects/helper/unknownTokens.js | 5 +++-- projects/jbc/index.js | 27 +++++---------------------- utils/formatAbis.js | 2 ++ 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/projects/helper/unknownTokens.js b/projects/helper/unknownTokens.js index 3c63405b1..c7a17dabf 100644 --- a/projects/helper/unknownTokens.js +++ b/projects/helper/unknownTokens.js @@ -71,11 +71,12 @@ function unknownTombs({ token = [], shares = [], rewardPool = [], masonry = [], } } -function pool2({ stakingContract, lpToken, chain = "ethereum", transformAddress, coreAssets = [], useDefaultCoreAssets = false, }) { +function pool2({ stakingContract, lpToken, chain, transformAddress, coreAssets = [], useDefaultCoreAssets = false, }) { if (!coreAssets.length && useDefaultCoreAssets) coreAssets = getCoreAssets(chain) - return async (_timestamp, _ethBlock, chainBlocks) => { + return async (_timestamp, _ethBlock, chainBlocks, { api }) => { + if (!chain) chain = api.chain const block = chainBlocks[chain] if (!transformAddress) transformAddress = await getChainTransform(chain) diff --git a/projects/jbc/index.js b/projects/jbc/index.js index 657066241..744712f9a 100644 --- a/projects/jbc/index.js +++ b/projects/jbc/index.js @@ -1,6 +1,5 @@ -const { pool2 } = require("../helper/unknownTokens"); +const { pool2, staking } = require("../helper/unknownTokens"); const { nullAddress, sumTokensExport, } = require("../helper/unwrapLPs"); -const sdk = require("@defillama/sdk"); const tokensAndOwners = [ ['0x1addd80e6039594ee970e5872d247bf0414c8903', '0xe964b6083F24dBC06e94C662b195c22C76923b22'], // GLP @@ -8,28 +7,12 @@ const tokensAndOwners = [ ['0x2f2a2543b76a4166549f7aab2e75bef0aefc5b0f', '0xCC13E077F54577cE3Ea52916fDd70305C461A3ED'], // WBTC ['0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', '0xcA2F482B067D354B3cdB6926911f42F5d1f0e872'], // USDC ] - -function staking(stakingAddr, token, chain) { - return async (_timestamp, _block, chainBlocks) => { - let balances = {}; - let balance = ( - await sdk.api.erc20.balanceOf({ - target: token, - owner: stakingAddr, - block: chainBlocks[chain], - chain, - }) - ).output; - sdk.util.sumSingleBalance(balances, `arbitrum:${token}`, balance); - return balances; - }; -} +const lpToken = '0x85c6da933a7451bf2a6d836304b30967f3e76e11' module.exports = { arbitrum: { tvl: sumTokensExport({ tokensAndOwners }), - pool2: pool2({ stakingContract: '0x0F6f73c7ecCE4FB9861E25dabde79CBA112550b3', lpToken: '0x85c6da933a7451bf2a6d836304b30967f3e76e11', chain: 'arbitrum', useDefaultCoreAssets: true, }), - staking: staking("0xaF70e6DF6d34dbcd284BC4CCa047Bd232110A2CF", "0xb67c175701fD60cD670cB9D331368367BF072e47", "arbitrum") + pool2: pool2({ stakingContract: '0x0F6f73c7ecCE4FB9861E25dabde79CBA112550b3', lpToken, useDefaultCoreAssets: true, }), + staking: staking({owner: "0xaF70e6DF6d34dbcd284BC4CCa047Bd232110A2CF", tokens: ["0xb67c175701fD60cD670cB9D331368367BF072e47"], lps: [lpToken]}) } -}; - +} \ No newline at end of file diff --git a/utils/formatAbis.js b/utils/formatAbis.js index f1721cd2e..5359828c8 100644 --- a/utils/formatAbis.js +++ b/utils/formatAbis.js @@ -1,6 +1,7 @@ const ethers = require('ethers') const glob = require('glob') const jsonfile = require('jsonfile') +const fs = require('fs') let data = require('../projects/test/abi.js') const rootFolder = '../projects' @@ -86,6 +87,7 @@ function print() { } console.log(res) res = transform(res) + fs.writeFileSync(__dirname+'/../projects/test/abi.js', 'module.exports = '+JSON.stringify(res, null, 2)) // console.log(res) console.log(JSON.stringify(res, null, 2)) }