Skip to content

Commit 14dc100

Browse files
DackieSwapDackieSwap
authored
Merge branch 'DefiLlama:main' into main
2 parents 6317d0b + d0d7731 commit 14dc100

File tree

22 files changed

+270
-383
lines changed

22 files changed

+270
-383
lines changed

‎projects/LairFinance/index.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
const contracts = {
2+
stKAIA: '0x42952B873ed6f7f0A7E4992E2a9818E3A9001995',
3+
node: '0x7949597f453592B782EC9036Af27d63Ed9774b2d',
4+
}
5+
6+
async function tvl(api) {
7+
const tvl = await api.call({ target: contracts.node, abi: "uint256:getTotalStakingAmount" })
8+
api.addGasToken(tvl)
9+
}
10+
11+
module.exports = {
12+
klaytn: { tvl }
13+
}

‎projects/capybara-exchange/config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ module.exports = {
33
pools: {
44
mainPool: "0x540cce8ed7d210f71eeabb9e7ed7698ac745e077",
55
volatilePool: "0x6389dbfa1427a3b0a89cddc7ea9bbda6e73dece7",
6+
lstPool: "0x5CDE63386D78362267d9A3edC8DA204bB64D07D3",
7+
stargatePool: "0x1dE1578476d9B4237F963eca5D37500Fc33DF3D1",
68
},
79
},
810
};

‎projects/clearpool/index.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ const config = {
6969
factory: "0x44fEF0fAB3A96CA34b06d5142350Ef9223F65A7e",
7070
fromBlock: 226174706,
7171
},
72+
vaults: {
73+
factory: "0xA8e8AccabCf29e7d8b33D086085D87F9F38a6Ed7",
74+
fromBlock: 226193395
75+
}
7276
},
7377
[CHAIN.MANTLE]: {
7478
dynamic: {
@@ -78,6 +82,10 @@ const config = {
7882
vaults: {
7983
factory: "0xF041A2838794266d19f79709F416A2977F896A9B",
8084
fromBlock: 59594636
85+
},
86+
prime: {
87+
factory: "0x29157e2B6A34Ae1787CDdD05Ad54DD4aa9783A5c",
88+
fromBlock: 68483768
8189
}
8290
},
8391
[CHAIN.BASE]: {
@@ -185,7 +193,7 @@ Object.keys(config).forEach((chain) => {
185193

186194
await Promise.all(promiseArray)
187195

188-
return sumTokens2({ api, tokensAndOwners2: [allTokens, allPools], blacklistedTokens: blacklistedTokens[chain]})
196+
return sumTokens2({ api, tokensAndOwners2: [allTokens, allPools], blacklistedTokens: blacklistedTokens[chain] })
189197
}
190198

191199
const borrowed = async (api) => {
@@ -210,7 +218,7 @@ Object.keys(config).forEach((chain) => {
210218

211219
api.addTokens(allTokens, balances)
212220
if (blacklistedTokens[chain]) {
213-
blacklistedTokens[chain].forEach((token) => api.removeTokenBalance(token))
221+
blacklistedTokens[chain].forEach((token) => api.removeTokenBalance(token))
214222
}
215223
}
216224
module.exports[chain] = { tvl, borrowed }

‎projects/compound-v3/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ module.exports = compoundV3Exports({
1313
'0xA5EDBDD9646f8dFF606d7448e414884C7d905dCA', // USDC.e Market
1414
'0x9c4ec768c28520B50860ea7a15bd7213a9fF58bf', // USDC Market
1515
'0x6f7D514bbD4aFf3BcD1140B7344b32f063dEe486', // WETH Market
16-
'0x5C58d4479A1E9b2d19EE052143FA73F0ee79A36e', // USDT Market
16+
'0xd98Be00b5D27fc98112BdE293e487f8D4cA57d07', // USDT Market
1717
],
1818
},
1919
polygon: {
2020
markets: [
2121
'0xF25212E676D1F7F89Cd72fFEe66158f541246445', // USDC.e Market
2222
'0xaeB318360f27748Acb200CE616E389A6C9409a07', // USDT Market
23-
],
23+
],
2424
},
2525
base: {
2626
markets: [

‎projects/dinari/index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ const config = {
1313
kinto: {
1414
factory: "0xE4Daa69e99F48AD0C4D4843deF4447253248A906",
1515
usdplus: "0x6F086dB0f6A621a915bC90295175065c9e5d9b8c"
16+
},
17+
base: {
18+
factory: "0xBCE6410A175a1C9B1a25D38d7e1A900F8393BC4D",
19+
usdplus: "0x98C6616F1CC0D3E938A16200830DD55663dd7DD3"
1620
}
1721
}
1822

‎projects/ethervista/index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
const { uniTvlExports } = require('../helper/unknownTokens')
2+
module.exports = uniTvlExports({
3+
'ethereum': '0x9a27cb5ae0B2cEe0bb71f9A85C0D60f3920757B4'
4+
})

‎projects/florence-finance/index.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ const ETH_EURS = "0xdb25f211ab05b1c97d595516f45794528a807ad8";
55
const ARB_FLR = "0x9b6226dd0191a77d032f56a6d383044ee99944c3";
66
const ARB_AGEUR = "0xfa5ed56a203466cbbc2430a43c66b9d8723528e7";
77

8+
const BASE_FLR = "0x4ee4bea687D5cE6245198db136D32aeC02806A83";
9+
const BASE_EURC = "0x60a3E35Cc302bFA44Cb288Bc5a4F316Fdb1adb42";
10+
811
async function getTotalSupply(token, { api }) {
912
const totalSupply = await api.call({
1013
abi: "function totalSupply() external view returns (uint256)",
@@ -30,9 +33,15 @@ async function getBorrowedOnArbitrum(api) {
3033
api.add(ARB_AGEUR, borrowed); //Decimals of FLR and agEUR are both 18. No conversion needed.
3134
}
3235

36+
async function getBorrowedOnBase(api) {
37+
const borrowed = await getTotalSupply(BASE_FLR, { api }); //FLR on Base are not multi-chain so there is no need to subtract anything yet.
38+
api.add(BASE_EURC, borrowed / 1e12); //12 decimals (FLR) -> 2 decimals (EURC)
39+
}
40+
3341
module.exports = {
3442
methodology:
3543
"The Florin token (FLR) is minted whenever a new loan is funded and burned when a loan matures and is repaid. Since the Florin token is 1:1 redeemable for EUR the borrowed amount is denominated in the protocols treasuries EUR stablecoin of the respective chain. Consequently the total supply of Florin equals the amount borrowed through the protocol. To avoid double counting, the amount of FLR held in the bridge contract is subtracted from the total supply. ",
3644
ethereum: { start: 16077400, borrowed: getBorrowedOnEthereum, tvl: () => ({}) },
3745
arbitrum: { start: 126183369, borrowed: getBorrowedOnArbitrum, tvl: () => ({}) },
46+
base: { start: 18941407, borrowed: getBorrowedOnBase, tvl: () => ({}) },
3847
};

‎projects/gaspump/index.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
const ADDRESSES = require("../helper/coreAssets.json");
2+
const { fetchURL } = require('../helper/utils');
3+
4+
async function fetchTvl(api) {
5+
const response = await fetchURL("https://api.gas111.com/api/v1/internal/tokens/balances-list")
6+
for (const pool of response.data) {
7+
api.add(ADDRESSES.ton.TON, pool.bonding_curve_balance/2) // we include only the TON part of the pool
8+
}
9+
}
10+
11+
12+
module.exports = {
13+
methodology: `
14+
Each token launched via gaspump has a bonding curve. The TVL is the sum of all bonding curve balances.
15+
It is slightly different from the address balance, which is composed from curve balance + fees accumulated.
16+
`.trim(),
17+
timetravel: false,
18+
ton: {
19+
tvl: fetchTvl
20+
}
21+
}

‎projects/goldlink/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@ module.exports = {
77
arbitrum: {
88
tvl: sumERC4626VaultsExport({ vaults: ['0xd8dd54df1a7d2ea022b983756d8a481eea2a382a',], isOG4626: true, }),
99
},
10+
avax: {
11+
tvl: sumERC4626VaultsExport({ vaults: ['0xbE6eB54D1e96CC59338BE9A281d840AcE82df095',], isOG4626: true, }),
12+
}
1013
}

‎projects/helio-money/index.js

Lines changed: 58 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -2,65 +2,68 @@ const ADDRESSES = require("../helper/coreAssets.json");
22
const { sumTokensExport } = require("../helper/unknownTokens");
33

44
module.exports = {
5-
methodology: "The TVL is calculated by summing the values of tokens held in the specified vault addresses",
6-
hallmarks: [
7-
[1669939200, "aBNBc exploit"],
8-
//[1670544000,"aBNBc to AnkrBNB swap & HAY buyback"]
9-
],
10-
bsc: {
11-
tvl: sumTokensExport({
12-
tokensAndOwners: [
13-
// BNB
14-
[ADDRESSES.null, "0x986b40C2618fF295a49AC442c5ec40febB26CC54"],
5+
methodology: "The TVL is calculated by summing the values of tokens held in the specified vault addresses",
6+
hallmarks: [
7+
[1669939200, "aBNBc exploit"],
8+
//[1670544000,"aBNBc to AnkrBNB swap & HAY buyback"]
9+
],
10+
bsc: {
11+
tvl: sumTokensExport({
12+
tokensAndOwners: [
13+
// BNB
14+
[ADDRESSES.null, "0x986b40C2618fF295a49AC442c5ec40febB26CC54"],
1515

16-
//slisBNB
17-
[
18-
"0xB0b84D294e0C75A6abe60171b70edEb2EFd14A1B",
19-
"0x6F28FeC449dbd2056b76ac666350Af8773E03873",
20-
],
16+
//slisBNB
17+
[
18+
"0xB0b84D294e0C75A6abe60171b70edEb2EFd14A1B",
19+
"0x6F28FeC449dbd2056b76ac666350Af8773E03873",
20+
],
2121

22-
// slisBNB
23-
[
24-
"0xB0b84D294e0C75A6abe60171b70edEb2EFd14A1B",
25-
"0x91e49983598685DD5ACAc90CEb4061A772f6E5Ae",
26-
],
22+
// slisBNB
23+
[
24+
"0xB0b84D294e0C75A6abe60171b70edEb2EFd14A1B",
25+
"0x91e49983598685DD5ACAc90CEb4061A772f6E5Ae",
26+
],
2727

28-
// eth
29-
[ADDRESSES.bsc.ETH, "0xA230805C28121cc97B348f8209c79BEBEa3839C0"],
28+
// eth
29+
[ADDRESSES.bsc.ETH, "0xA230805C28121cc97B348f8209c79BEBEa3839C0"],
3030

31-
// eth => wBETH
32-
[
33-
"0xa2E3356610840701BDf5611a53974510Ae27E2e1",
34-
"0xf45C3b619Ee86F653805E007fE211B7e930E0b3B",
35-
],
31+
// eth => wBETH
32+
[
33+
"0xa2E3356610840701BDf5611a53974510Ae27E2e1",
34+
"0xf45C3b619Ee86F653805E007fE211B7e930E0b3B",
35+
],
3636

37-
// wbeth
38-
[
39-
"0xa2E3356610840701BDf5611a53974510Ae27E2e1",
40-
"0xA230805C28121cc97B348f8209c79BEBEa3839C0",
41-
],
37+
// wbeth
38+
[
39+
"0xa2E3356610840701BDf5611a53974510Ae27E2e1",
40+
"0xA230805C28121cc97B348f8209c79BEBEa3839C0",
41+
],
4242

43-
// BTCB
44-
[
45-
ADDRESSES.bsc.BTCB,
46-
"0xad9eAAe95617c39019aCC42301a1dCa4ea5b6f65",
47-
],
48-
// ezETH
49-
[
50-
ADDRESSES.blast.ezETH,
51-
"0xd7E33948e2a43e7C1ec2F19937bf5bf8BbF9BaE8",
52-
],
53-
// weETH
54-
[
55-
ADDRESSES.blast.weETH,
56-
"0x2367f2Da6fd39De6944218CC9EC706BCdc9a6918",
57-
],
58-
// STONE
59-
[
60-
ADDRESSES.scroll.STONE,
61-
"0x876cd9a380Ee7712129b52f8293F6f06056c3104",
62-
],
63-
],
64-
}),
65-
},
43+
// BTCB
44+
[ADDRESSES.bsc.BTCB, "0xad9eAAe95617c39019aCC42301a1dCa4ea5b6f65"],
45+
// ezETH
46+
[ADDRESSES.blast.ezETH, "0xd7E33948e2a43e7C1ec2F19937bf5bf8BbF9BaE8"],
47+
// weETH
48+
[ADDRESSES.blast.weETH, "0x2367f2Da6fd39De6944218CC9EC706BCdc9a6918"],
49+
// STONE
50+
[ADDRESSES.scroll.STONE, "0x876cd9a380Ee7712129b52f8293F6f06056c3104"],
51+
// solvBTC
52+
[
53+
"0x4aae823a6a0b376De6A78e74eCC5b079d38cBCf7",
54+
"0xA94AA72e033b39AD7CD448f38Bc1eda5B52f7079",
55+
],
56+
// BBTC
57+
[
58+
"0xF5e11df1ebCf78b6b6D26E04FF19cD786a1e81dC",
59+
"0x157c9a692ee99C39272856055957083a928cE299",
60+
],
61+
// wstETH
62+
[
63+
"0x26c5e01524d2E6280A48F2c50fF6De7e52E9611C",
64+
"0xf8Ca8D2B59A97125751af1069d4a5C4F7eB7A677",
65+
],
66+
],
67+
}),
68+
},
6669
};

0 commit comments

Comments
 (0)