Skip to content

Commit b46feb5

Browse files
authored
Merge branch 'DefiLlama:main' into main
2 parents 516942b + a0c90ae commit b46feb5

File tree

88 files changed

+1348
-520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+1348
-520
lines changed

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

projects/Akitaswap/index.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
const { getUniTVL } = require("../helper/unknownTokens");
2+
module.exports = {
3+
misrepresentedTokens: true,
4+
5+
blast: {
6+
tvl: getUniTVL({
7+
factory: "0x27C429dfF0e6d3B43B2C404C35f58C2b36cef916",
8+
useDefaultCoreAssets: true,
9+
}),
10+
},
11+
};

projects/AvoLend/index.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
const { compoundExports2 } = require('../helper/compound');
2+
3+
module.exports = {
4+
blast: compoundExports2({
5+
comptroller: '0xe20cE0Db739e4B6Afa9989c87bE7C8C25cbeB5Ea',
6+
cether: '0x29e15766d6b203C35c2D51AAEc4Cf964129Af088',
7+
}),
8+
};

projects/BlastNYAN/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ const opts = { useDefaultCoreAssets: true, lps: [BLNYAN_WETH_SLP] }
1212
module.exports = {
1313
misrepresentedTokens: true,
1414
blast: {
15-
tvl: sumTokensExport({ owners: [feeDistro, button], tokens: [WETH], ...opts, }),
15+
tvl: sumTokensExport({ owners: [stakeLpEarnWeth, feeDistro, button], tokens: [WETH], ...opts, }),
1616
pool2: sumTokensExport({ ...opts, owners: [stakeLpEarnWeth], tokens: [BLNYAN_WETH_SLP], }),
1717
staking: sumTokensExport({ owners: [stakingBLNYANContract], tokens: [BLNYAN], ...opts, }),
1818
},
1919
methodology:
20-
'Counts as TVL the ETH, blNYAN and LP assets deposited through-out the protocol',
20+
'Counts as TVL the ETH only. blNYAN and LP assets deposited are counted as Pool2 and staking Respectively',
2121
}

projects/Gas404Swap/index.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
const { getUniTVL } = require("../helper/unknownTokens");
2+
module.exports = {
3+
misrepresentedTokens: true,
4+
5+
bsc: {
6+
tvl: getUniTVL({
7+
factory: "0xb6aC3914b53Cd3b39F11Fc9B380c3E605E994E20",
8+
useDefaultCoreAssets: true,
9+
}),
10+
},
11+
};

projects/LemonBlast/index.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
const { getUniTVL } = require('../helper/unknownTokens')
2+
3+
module.exports = {
4+
misrepresentedTokens: true,
5+
blast: { tvl: getUniTVL({ factory: '0x31329BcDC90faD4d65764ccf91f833ec1d5fB5A4', useDefaultCoreAssets: true, fetchBalances: true, }), },
6+
}

projects/aada/index.js

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,30 @@
1-
const { sumTokensExport, } = require("../helper/chain/cardano");
1+
const { sumTokensExport } = require("../helper/chain/cardano");
22

33
const scriptAdresses = [
4-
'addr1zy9940grv28qxz9k82l9gmqd80vfd8a2734e35yzsz9cqktfjcnq9fczt4qkxgec2hz6x7f38vnj8xuxywk4x4qgzh9smq5w00', //request.hs -- Request created. Lender to fund
5-
'addr1zykhtew0z93z6hmgu2ew7kl9puqz0wmafp0f3jypuejkwmrfjcnq9fczt4qkxgec2hz6x7f38vnj8xuxywk4x4qgzh9skq4p22', //collateral.hs -- Loan funded. Borrower to repay
6-
'addr1zxfgvtfgp9476dhmq8fkm3x8wg20v33s6c9unyxmnpm0y5rfjcnq9fczt4qkxgec2hz6x7f38vnj8xuxywk4x4qgzh9st8q78h', //interest.hs -- Borrower repaid -- Lender to claim
7-
'addr1zxcjtxuc7mj8w6v9l3dfxvm30kxf78nzw387mqjqvszxr4mfjcnq9fczt4qkxgec2hz6x7f38vnj8xuxywk4x4qgzh9sp92046', //liquidation.hs -- Funds were liquidated. Borrower to claim
8-
'addr1zytwe3qhc0kf5k8yaur60cnhcxjg9zvfdnftp0rfu2czprtfjcnq9fczt4qkxgec2hz6x7f38vnj8xuxywk4x4qgzh9sgzwepc', //debt_request.hs -- Funds locked as liquidity deposits 'addr1z8tjrqy2dj5uk6her4ksltyxy2flzykktxkahzlahm9nwctfjcnq9fczt4qkxgec2hz6x7f38vnj8xuxywk4x4qgzh9st86ewu', //request.hs v2 -- Funds locked as liquidity deposits
9-
'addr1zyc7w5n699ews00yujnhw59g4nuzykuzgl5x6nzqp49zv5tfjcnq9fczt4qkxgec2hz6x7f38vnj8xuxywk4x4qgzh9sdyxnxc', //collateral.hs v2-- Funds locked as liquidity deposits
10-
'addr1zy6v8c7xdhftln7zk5uvt9h6jaknaxlx6hz5nkw63mpgwamfjcnq9fczt4qkxgec2hz6x7f38vnj8xuxywk4x4qgzh9sw9snf6', //debt_request.hs v2-- Funds locked as liquidity deposits
4+
"addr1zy9940grv28qxz9k82l9gmqd80vfd8a2734e35yzsz9cqktfjcnq9fczt4qkxgec2hz6x7f38vnj8xuxywk4x4qgzh9smq5w00", //request.hs -- Request created. Lender to fund
5+
"addr1zykhtew0z93z6hmgu2ew7kl9puqz0wmafp0f3jypuejkwmrfjcnq9fczt4qkxgec2hz6x7f38vnj8xuxywk4x4qgzh9skq4p22", //collateral.hs -- Loan funded. Borrower to repay
6+
"addr1zxfgvtfgp9476dhmq8fkm3x8wg20v33s6c9unyxmnpm0y5rfjcnq9fczt4qkxgec2hz6x7f38vnj8xuxywk4x4qgzh9st8q78h", //interest.hs -- Borrower repaid -- Lender to claim
7+
"addr1zxcjtxuc7mj8w6v9l3dfxvm30kxf78nzw387mqjqvszxr4mfjcnq9fczt4qkxgec2hz6x7f38vnj8xuxywk4x4qgzh9sp92046", //liquidation.hs -- Funds were liquidated. Borrower to claim
8+
"addr1zytwe3qhc0kf5k8yaur60cnhcxjg9zvfdnftp0rfu2czprtfjcnq9fczt4qkxgec2hz6x7f38vnj8xuxywk4x4qgzh9sgzwepc", //debt_request.hs -- Funds locked as liquidity deposits 'addr1z8tjrqy2dj5uk6her4ksltyxy2flzykktxkahzlahm9nwctfjcnq9fczt4qkxgec2hz6x7f38vnj8xuxywk4x4qgzh9st86ewu', //request.hs v2 -- Funds locked as liquidity deposits
9+
"addr1zyc7w5n699ews00yujnhw59g4nuzykuzgl5x6nzqp49zv5tfjcnq9fczt4qkxgec2hz6x7f38vnj8xuxywk4x4qgzh9sdyxnxc", //collateral.hs v2-- Funds locked as liquidity deposits
10+
"addr1zy6v8c7xdhftln7zk5uvt9h6jaknaxlx6hz5nkw63mpgwamfjcnq9fczt4qkxgec2hz6x7f38vnj8xuxywk4x4qgzh9sw9snf6", //debt_request.hs v2-- Funds locked as liquidity deposits
11+
"script1xt5vpt33fm6tu3fvz65enpnlvmg6z7gle9evktmuwn3c6gjfc7p", // Pool contract
12+
"script1nwvlaa0wnf43wzjp3xv738k6myam74dlrlh027mq20trg3ng772", // Collateral contract
13+
"script1sqscxzh7mkzlmgf98k3tuadkds8xt3yzzj8t3jnfpypukld9xck", // Leftovers contract
1114
];
1215

1316
module.exports = {
14-
methodology: 'Counts amount of AADA staked; by a price of ADA sitting in the orderbook.',
17+
methodology:
18+
"Calculates the total of idle tokens held in pool contracts or collateral tokens secured in the collateral contract.",
1519
timetravel: false,
1620
cardano: {
17-
staking: sumTokensExport({ owner: 'addr1wyvej5rmcrhfpcwrwmnqsjtwvf8gv3dn64vwy3xzekp95wqqhdkwa' , tokens: ['8fef2d34078659493ce161a6c7fba4b56afefa8535296a5743f6958741414441']}),
18-
tvl: sumTokensExport({ scripts: scriptAdresses, })
19-
}
21+
staking: sumTokensExport({
22+
owner: "addr1wyvej5rmcrhfpcwrwmnqsjtwvf8gv3dn64vwy3xzekp95wqqhdkwa",
23+
tokens: [
24+
"8fef2d34078659493ce161a6c7fba4b56afefa8535296a5743f6958741414441",
25+
],
26+
}),
27+
tvl: sumTokensExport({ scripts: scriptAdresses }),
28+
},
29+
hallmarks: [[1708560053, "V2 Launch"]],
2030
};

projects/allbridge-core/contracts.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,15 @@
9191
}
9292
],
9393
"bridgeAddress": "BrdgN2RPzEMWF96ZbnnJaUtQDQx7VRXYaHHbYCBvceWB"
94+
},
95+
"base": {
96+
"tokens": [
97+
{
98+
"poolAddress": "0xDA6bb1ec3BaBA68B26bEa0508d6f81c9ec5e96d5",
99+
"tokenAddress": "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"
100+
}
101+
],
102+
"bridgeAddress": "0x001E3f136c2f804854581Da55Ad7660a2b35DEf7"
94103
}
95104
}
96105

projects/alongside/index.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
const sdk = require("@defillama/sdk");
1+
const { sumTokens2 } = require("../helper/unwrapLPs")
2+
const ADDRESSES = require('../helper/coreAssets.json')
23

3-
const INDEX = "0xF17A3fE536F8F7847F1385ec1bC967b2Ca9caE8D";
4+
async function tvl(_, block, _cb, { api }) {
5+
const aSTETH = "0x27C2B9fd547EAd2c05C305BeE2399A55811257c2"
6+
const vault = "0xf3bCeDaB2998933c6AAD1cB31430D8bAb329dD8C"
7+
const astBal = await api.call({ abi: 'erc20:balanceOf', target: aSTETH, params: vault })
8+
const stethBal = await api.call({ abi: 'erc20:balanceOf', target: ADDRESSES.ethereum.STETH, params: aSTETH })
9+
const astethSupply = await api.call({ abi: 'erc20:totalSupply', target: aSTETH })
10+
api.add(ADDRESSES.ethereum.STETH, stethBal * astBal / astethSupply)
411

5-
async function tvl(_, block, _cb) {
6-
const balances = {}
7-
const supply = await sdk.api2.abi.call({ abi: 'uint256:totalSupply', target: INDEX, block })
8-
sdk.util.sumSingleBalance(balances, INDEX, supply, 'ethereum')
9-
return balances
12+
return sumTokens2({ api, owner: vault, fetchCoValentTokens: true, blacklistedTokens: [aSTETH] })
1013
}
1114

1215
module.exports = {
13-
doublecounted: true,
14-
misrepresentedTokens: true,
1516
methodology:
1617
"Data is retrieved from calculation of market price and total supply",
1718
ethereum: {

projects/alta-finance/index.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
module.exports = {
2+
methodology: "Sums the amount of funded real-world assets on ALTA Finance as borrowed. Tokens left in the countract are counted towards tvl",
3+
}
4+
5+
const config = {
6+
polygon: { investments: ['0xcf152E9f60E197A44FAdce961c6B822Dcb6c9dcc'], debts: ['0xE92F580C930dd24aACB38Ab0EA18F6c1dEf31369'], token: '0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174' },
7+
}
8+
9+
Object.keys(config).forEach(chain => {
10+
const { investments, debts, token } = config[chain]
11+
module.exports[chain] = {
12+
tvl: async (_, _b, _cb, { api, }) => {
13+
return api.sumTokens({ owners: investments.concat(debts), tokens: [token] })
14+
},
15+
borrowed: async (_, _b, _cb, { api, }) => {
16+
const nftCount = (await api.multiCall({ abi: 'uint256:_tokenIdCounter', calls: investments, permitFailure: true })).map(i => i ?? 0)
17+
const amount = (await api.multiCall({ abi: 'uint256:amountPerNft', calls: investments, permitFailure: true })).map(i => i ?? 0)
18+
api.add(token, nftCount.map((v, i) => v * amount[i]))
19+
20+
const bals = (await api.multiCall({ abi: 'uint256:amount', calls: debts, permitFailure: true })).map(i => i ?? 0)
21+
api.add(token, bals)
22+
return api.getBalances()
23+
},
24+
}
25+
})

0 commit comments

Comments
 (0)