Skip to content

Commit

Permalink
logArrays
Browse files Browse the repository at this point in the history
  • Loading branch information
waynebruce0x committed Nov 15, 2023
1 parent 6b22ff4 commit 5061073
Show file tree
Hide file tree
Showing 12 changed files with 5,212 additions and 2,027 deletions.
7,204 changes: 5,191 additions & 2,013 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions projects/ad-astra/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ module.exports={
tvl: sumTokensExport({
owner: '0x92a26975433a61cf1134802586aa669bab8b69f3',
tokens: [ADDRESSES.ethereum.USDC, ADDRESSES.ethereum.USDT, ADDRESSES.ethereum.BUSD, '0xdc9Ac3C20D1ed0B540dF9b1feDC10039Df13F99c', ],
logCalls: true
})
}
}
6 changes: 3 additions & 3 deletions projects/alexar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const chainListTotal = ['avax', 'bsc', 'moonbeam', 'polygon', 'fantom', 'arbitru

chainListSupply.concat(chainListTotal).forEach(chain => {
module.exports[chain] = { tvl };
async function tvl(_, _b, _cb, { api, }) {
async function tvl(_, _b, _cb, { api, logArray }) {
const config = await getConfig('alexar', 'https://api.axelarscan.io/cross-chain/tvl')
const tokensAndOwners = []
const owners = []
Expand All @@ -34,8 +34,8 @@ chainListSupply.concat(chainListTotal).forEach(chain => {
}
})
if (tokensAndOwners.length > 0)
return api.sumTokens({ tokensAndOwners })
return sumTokens({ chain, owners })
return api.sumTokens({ tokensAndOwners, logArray })
return sumTokens({ chain, owners, logArray })
}
});

Expand Down
4 changes: 2 additions & 2 deletions projects/anetabtc/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ module.exports = {
timetravel: false,
cardano: {
tvl,
staking: sumTokensExport({ tokens: ['b34b3ea80060ace9427bda98690a73d33840e27aaa8d6edb7f0c757a634e455441'], owner: 'addr1w8p79rekquuw5kmdg4z36y9gpnm88k5huddwqluk9mjjeqgc3xmss'})
staking: sumTokensExport({ tokens: ['b34b3ea80060ace9427bda98690a73d33840e27aaa8d6edb7f0c757a634e455441'], owner: 'addr1w8p79rekquuw5kmdg4z36y9gpnm88k5huddwqluk9mjjeqgc3xmss', logCalls: true })
},
ergo: {
staking: sumTokensExport({ tokens: ['472c3d4ecaa08fb7392ff041ee2e6af75f4a558810a74b28600549d5392810e8'], owner: '5ASYVJ2w8tH3bDQx5ZLz6rZUdokD1kmTXSRZ8GfrsAUW4vqy9eg5omtTYVzY22ibHANf7GgSc2E5FiThgo8qXzWpU3RDLohN277hksbAf9yykajXbYPUaXUeMPfSXbS1GdE4y2GoYKaXHR3H57MV5CDZE58YteqWe3XVXzmMvj1192AD7UZ1N6nguRfjgijxEWTrLq2ZrykjRAut2JBGYHanAKn46tYWW3chpxNosXG7ZW2ShDzKju2ttHhfxeZVMBydryuoEya5E9KVagjsfa9E2qPUdLpbh8enppVWcwoQ4GF1ktgzSX32QbfKhfpD23iWQixThUbcCca14FjXDt94GVFPuhAT5tQyiKen863Cq5eRAEgsQ7otX6pWa32Q28sxSF9Az4abwiJKNbFhbhb3cDCs6A45ZnW6aB6AkfwTJSAZ2ZzqqG7LXT4HdxNpdmiwno9sJWxPf2PC4vRhVqBPdxxyCgoodjyutf4UuinSCibhfqdhUJLc1JM8zX9UcD699mChgUZoKE8kXD4soVGSgQD3qfGXC6RP7n8dtowArNLm3H5QJ3EobDCbEgECLHFaHN2BPwwWscAt5eejKeFvkp3CuQ3mqFW7vfQG4n9tTLnshj8cjxnpkBdfFKC83sW8A3AoZAX4K1UrhndfLSFh4w'})
staking: sumTokensExport({ tokens: ['472c3d4ecaa08fb7392ff041ee2e6af75f4a558810a74b28600549d5392810e8'], owner: '5ASYVJ2w8tH3bDQx5ZLz6rZUdokD1kmTXSRZ8GfrsAUW4vqy9eg5omtTYVzY22ibHANf7GgSc2E5FiThgo8qXzWpU3RDLohN277hksbAf9yykajXbYPUaXUeMPfSXbS1GdE4y2GoYKaXHR3H57MV5CDZE58YteqWe3XVXzmMvj1192AD7UZ1N6nguRfjgijxEWTrLq2ZrykjRAut2JBGYHanAKn46tYWW3chpxNosXG7ZW2ShDzKju2ttHhfxeZVMBydryuoEya5E9KVagjsfa9E2qPUdLpbh8enppVWcwoQ4GF1ktgzSX32QbfKhfpD23iWQixThUbcCca14FjXDt94GVFPuhAT5tQyiKen863Cq5eRAEgsQ7otX6pWa32Q28sxSF9Az4abwiJKNbFhbhb3cDCs6A45ZnW6aB6AkfwTJSAZ2ZzqqG7LXT4HdxNpdmiwno9sJWxPf2PC4vRhVqBPdxxyCgoodjyutf4UuinSCibhfqdhUJLc1JM8zX9UcD699mChgUZoKE8kXD4soVGSgQD3qfGXC6RP7n8dtowArNLm3H5QJ3EobDCbEgECLHFaHN2BPwwWscAt5eejKeFvkp3CuQ3mqFW7vfQG4n9tTLnshj8cjxnpkBdfFKC83sW8A3AoZAX4K1UrhndfLSFh4w', logCalls: true })
}
}
2 changes: 1 addition & 1 deletion projects/butternetwork/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ module.exports = {
Object.keys(config).forEach(chain => {
const { mosContract, tokens } = config[chain]
module.exports[chain] = {
tvl:sumTokensExport({ owner: mosContract, tokens: Object.values(tokens), })
tvl:sumTokensExport({ owner: mosContract, tokens: Object.values(tokens), logCalls: true })
}
})
2 changes: 1 addition & 1 deletion projects/chainport/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,6 @@ const config = {
Object.keys(config).forEach(chain => {
const {owners, tokens} = config[chain]
module.exports[chain] = {
tvl: sumTokensExport({ owners, tokens })
tvl: sumTokensExport({ owners, tokens, logCalls: true })
}
})
4 changes: 3 additions & 1 deletion projects/equito-finance/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,19 @@ module.exports = {
],
methodology:
"TVL counts native tokens locked in EquitoFinance bridge vaults.",
algorand: { tvl: sumTokensExport({ owners: [ALGO_VAULT1, ALGO_VAULT2] }) },
algorand: { tvl: sumTokensExport({ owners: [ALGO_VAULT1, ALGO_VAULT2], logCalls: true }) },
ethereum: {
tvl: sumTokensExport({
owners: [ETH_VAULT1, ETH_VAULT2],
tokens: [ADDRESSES.null, ADDRESSES.ethereum.INU, ETH_PSYOP],
logCalls: true
}),
},
bsc: {
tvl: sumTokensExport({
owners: [BSC_VAULT1, BSC_VAULT2],
tokens: [ADDRESSES.null],
logCalls: true
}),
},
};
4 changes: 3 additions & 1 deletion projects/helper/sumTokens.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ async function getBalance(chain, account) {
}

function sumTokensExport(options) {
return async (_, _b, _cb, { api }) => sumTokens({ ...api, api, ...options})
return async (_, _b, _cb, { api, logArray }) => sumTokens(
{ ...api, api, logArray: options.logCalls ? logArray : undefined, ...options }
)
}

async function sumTokens(options) {
Expand Down
4 changes: 2 additions & 2 deletions projects/helper/unwrapLPs.js
Original file line number Diff line number Diff line change
Expand Up @@ -754,8 +754,8 @@ async function sumTokens2({
}
}

function sumTokensExport({ balances, tokensAndOwners, tokensAndOwners2, tokens, owner, owners, transformAddress, unwrapAll, resolveLP, blacklistedLPs, blacklistedTokens, skipFixBalances, ownerTokens, resolveUniV3, resolveArtBlocks, resolveNFTs, fetchCoValentTokens, ...args }) {
return async (_, _b, _cb, { api }) => sumTokens2({ api, balances, tokensAndOwners, tokensAndOwners2, tokens, owner, owners, transformAddress, unwrapAll, resolveLP, blacklistedLPs, blacklistedTokens, skipFixBalances, ownerTokens, resolveUniV3, resolveArtBlocks, resolveNFTs, fetchCoValentTokens, ...args, })
function sumTokensExport({ balances, tokensAndOwners, tokensAndOwners2, tokens, owner, owners, transformAddress, unwrapAll, resolveLP, blacklistedLPs, blacklistedTokens, skipFixBalances, ownerTokens, resolveUniV3, resolveArtBlocks, resolveNFTs, fetchCoValentTokens, logCalls, ...args }) {
return async (_, _b, _cb, { api, logArray }) => sumTokens2({ api, balances, tokensAndOwners, tokensAndOwners2, tokens, owner, owners, transformAddress, unwrapAll, resolveLP, blacklistedLPs, blacklistedTokens, skipFixBalances, ownerTokens, resolveUniV3, resolveArtBlocks, resolveNFTs, fetchCoValentTokens, logArray: logCalls ? logArray : undefined, ...args, })
}

async function unwrapBalancerToken({ api, chain, block, balancerToken, owner, balances = {}, isBPool = false, isV2 = true }) {
Expand Down
2 changes: 1 addition & 1 deletion projects/injective/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ const { sumTokensExport } = require('../helper/unwrapLPs')

module.exports = {
methodology: 'TVL accounts for all liquidity on the Injective chain, using the chain\'s bank module as the source.',
ethereum: { tvl: sumTokensExport({ owner: '0xf955c57f9ea9dc8781965feae0b6a2ace2bad6f3', fetchCoValentTokens: true, blacklistedTokens: ['0xe28b3B32B6c345A34Ff64674606124Dd5Aceca30'] }) },
ethereum: { tvl: sumTokensExport({ owner: '0xf955c57f9ea9dc8781965feae0b6a2ace2bad6f3', fetchCoValentTokens: true, blacklistedTokens: ['0xe28b3B32B6c345A34Ff64674606124Dd5Aceca30'], logCalls: true }) },
};
3 changes: 2 additions & 1 deletion projects/terra-bridge/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ module.exports = {
'terra13yxhrk08qvdf5zdc9ss5mwsg5sf7zva9xrgwgc',
'terra1g6llg3zed35nd3mh9zx6n64tfw3z67w2c48tn2',
'terra1rtn03a9l3qsc0a9verxwj00afs93mlm0yr7chk',
]
],
logCalls: true
})
},
hallmarks: [
Expand Down
3 changes: 2 additions & 1 deletion test.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ async function getTvl(
const chain = storedKey.split('-')[0]
const block = chainBlocks[chain]
const api = new sdk.ChainApi({ chain, block: chainBlocks[chain], timestamp: unixTimestamp, })
let tvlBalances = await tvlFunction(unixTimestamp, ethBlock, chainBlocks, { api, chain, block, storedKey });
const logArray = []
let tvlBalances = await tvlFunction(unixTimestamp, ethBlock, chainBlocks, { api, chain, block, storedKey, logArray });
if (!tvlBalances && Object.keys(api.getBalances()).length) tvlBalances = api.getBalances()
const tvlResults = await computeTVL(
tvlBalances,
Expand Down

0 comments on commit 5061073

Please sign in to comment.