Skip to content

Commit

Permalink
Merge branch 'DefiLlama:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
h2physics authored Jul 10, 2024
2 parents 6e90c26 + 45b89d1 commit 10a5cfe
Show file tree
Hide file tree
Showing 118 changed files with 2,405 additions and 2,907 deletions.
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Ignore all files
*
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

107 changes: 101 additions & 6 deletions projects/alchemix/contracts.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,31 @@
},
"underlyingTokens": {
"USDC": "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
"WETH": "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1"
"WETH": "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1",
"wstETH": "0x5979D7b546E38E414F7E9822514be443A4800529"
},
"yvTokens": {
"aUSDC": "0x248a431116c6f6FCD5Fe1097d16d0597E24100f5"
},
"cvxLPpools": {
"crAMM-FRAX-alUSD": {
"poolAddress": "0x43fbf34df6da5fC66E15E023D3b690Fd0dE33cD7",
"holder": "0x7e108711771DfdB10743F016D46d75A9379cA043",
"tokenAddress": "0xfd599DB360Cd9713657C95dF66650A427d213010",
"alToken": "0xCB8FA9a76b8e203D8C3797bF438d8FB81Ea3326A"
},
"crAMM-GRAI-alUSD": {
"poolAddress": "0x72B6594a0c8D9eE9725ce780f87F9E00615D4b10",
"holder": "0x7e108711771DfdB10743F016D46d75A9379cA043",
"tokenAddress": "0x510a496b2443ba52A3B269Fee5A241a4ED4cCA58",
"alToken": "0xCB8FA9a76b8e203D8C3797bF438d8FB81Ea3326A"
},
"crAMM-alETH-frxETH": {
"poolAddress": "0xC3f26d2Fa16129a8d4A5A0f94D25F2cdd9005CDb",
"holder": "0x7e108711771DfdB10743F016D46d75A9379cA043",
"tokenAddress": "0xfB4fE921F724f3C7B610a826c827F9F6eCEf6886",
"alToken": "0x17573150d67d820542EFb24210371545a4868B03"
}
}
},
"fantom": {
Expand Down Expand Up @@ -40,13 +64,73 @@
"DAI": "0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1",
"USDC": "0x7F5c764cBc14f9669B88837ca1490cCa17c31607",
"USDT": "0x94b008aA00579c1307B0EF2c499aD98a8ce58e58",
"WETH": "0x4200000000000000000000000000000000000006"
"WETH": "0x4200000000000000000000000000000000000006",
"wstETH": "0x1F32b1c2345538c0c6f582fCB022739c4A194Ebb"
},
"yvTokens": {
"aDAI": "0x43A502D7e947c8A2eBBaf7627E104Ddcc253aBc6",
"aUSDC": "0x4186Eb285b1efdf372AC5896a08C346c7E373cC4",
"aUSDT": "0x2680b58945A31602E4B6122C965c2849Eb76Dd3B",
"aWETH": "0x337B4B933d60F40CB57DD19AE834Af103F049810"
"aWETH": "0x337B4B933d60F40CB57DD19AE834Af103F049810",
"ysUSDC": "0x059Eaa296B18E0d954632c8242dDb4a271175EeD",
"ysDAI": "0x0A86aDbF58424EE2e304b395aF0697E850730eCD",
"ysWETH": "0xE62DDa84e579e6A37296bCFC74c97349D2C59ce3"
},
"cvxLPpools": {
"aAMM-USDC-alUSD": {
"poolAddress": "0xE8b219c285e4e4ec28ac80Fdc4b9739b18cB8890",
"holder": "0xb29617209961DB995dD30a4AB94BA0034A4284f9",
"tokenAddress": "0x124D69DaeDA338b1b31fFC8e429e39c9A991164e",
"alToken": "0xCB8FA9a76b8e203D8C3797bF438d8FB81Ea3326A"
},
"sAMM-DOLA-alUSD": {
"poolAddress": "0x13bAeC9C12544066a7918efc3D8b626dBbFE1615",
"holder": "0xb29617209961DB995dD30a4AB94BA0034A4284f9",
"tokenAddress": "0x67C253eB6C2e69F9E1114aEeAD0DB4FA8F417AC3",
"alToken": "0xCB8FA9a76b8e203D8C3797bF438d8FB81Ea3326A"
},
"sAMM-FRAX-alUSD": {
"poolAddress": "0xA8E0754dd8Ef3700Ac8478Fdb8d4B8473de3817C",
"holder": "0xb29617209961DB995dD30a4AB94BA0034A4284f9",
"tokenAddress": "0xaF03f51DE7a0E62BF061F6Fc3931cF79166B0a29",
"alToken": "0xCB8FA9a76b8e203D8C3797bF438d8FB81Ea3326A"
},
"sAMM-alUSD-MAI": {
"poolAddress": "0xA688080CA069231C6D5713CD009662Ea54437A02",
"holder": "0xb29617209961DB995dD30a4AB94BA0034A4284f9",
"tokenAddress": "0xfA09479d72E2b3f8B6dF63399772237Ad6658D76",
"alToken": "0xCB8FA9a76b8e203D8C3797bF438d8FB81Ea3326A"
},
"vAMM-OP-alUSD": {
"poolAddress": "0x6101236Fd0E04427952799323D89B99BE0eab52f",
"holder": "0xb29617209961DB995dD30a4AB94BA0034A4284f9",
"tokenAddress": "0x60BE3FB22DDF30C17604b86eC005F6173B1170Aa",
"alToken": "0xCB8FA9a76b8e203D8C3797bF438d8FB81Ea3326A"
},
"sAMMM-USDC.e-alUSD": {
"poolAddress": "0x4d7959d17B9710BE87e3657e69d946914221BB88",
"holder": "0xb29617209961DB995dD30a4AB94BA0034A4284f9",
"tokenAddress": "0x4d7959d17B9710BE87e3657e69d946914221BB88",
"alToken": "0xCB8FA9a76b8e203D8C3797bF438d8FB81Ea3326A"
},
"sAMM-alETH-WETH": {
"poolAddress": "0xc16adBf2d01d6524B79CbB610cE31d5db80eee3C",
"holder": "0xb29617209961DB995dD30a4AB94BA0034A4284f9",
"tokenAddress": "0xa1055762336F92b4B8d2eDC032A0Ce45ead6280a",
"alToken": "0x3E29D3A9316dAB217754d13b28646B76607c5f04"
},
"sAMM-alETH-frxETH": {
"poolAddress": "0xFc0B9A9C2b63E6ACACa91A77A80bfa83C615e6C5",
"holder": "0xb29617209961DB995dD30a4AB94BA0034A4284f9",
"tokenAddress": "0x1AD06Ca54de04DBe9e2817F4C13eCB406DCbeAf0",
"alToken": "0x3E29D3A9316dAB217754d13b28646B76607c5f04"
},
"vAMM-alETH-OP": {
"poolAddress": "0xB715D27CCe97e869Cff840072ce1Eab1d982791E",
"holder": "0xb29617209961DB995dD30a4AB94BA0034A4284f9",
"tokenAddress": "0xA5EDb0EF932f7c2f37B8FC75CB01948F6258a4f8",
"alToken": "0x3E29D3A9316dAB217754d13b28646B76607c5f04"
}
}
},
"ethereum": {
Expand All @@ -71,13 +155,24 @@
"USDT": "0xdAC17F958D2ee523a2206206994597C13D831ec7",
"wstETH": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0",
"rETH": "0xae78736Cd615f374D3085123A210448E74Fc6393",
"WETH": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
"WETH": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
"FRAX": "0x853d955aCEf822Db058eb8505911ED77F175b99e",
"sfrxETH": "0xac3E018457B222d93114458476f3E3416Abbe38F"
},
"yvTokens": {
"yvDAI": "0xda816459f1ab5631232fe5e97a05bbbb94970c95",
"yvUSDC": "0xa354f35829ae975e850e23e9615b11da1b3dc4de",
"yvUSDT": "0x7da96a3891add058ada2e826306d812c638d87a7",
"yvWETH": "0xa258c4606ca8206d8aa700ce2143d7db854d168c"
"yvWETH": "0xa258c4606ca8206d8aa700ce2143d7db854d168c",
"aDAI": "0xcE4a49d7ed99C7c8746B713EE2f0C9aA631688d8",
"aUSDC": "0xf591D878608e2e5c7D4f1E499330f4AB9BbaE37a",
"aUSDT": "0xBC11De1F20e83F0a6889B8c7A7868E722694E315",
"vaUSDC": "0xa8b607Aa09B6A2E306F93e74c282Fb13f6A80452",
"vaDAI": "0x0538C8bAc84E95A9dF8aC10Aad17DbE81b9E36ee",
"vaFRAX": "0xc14900dFB1Aa54e7674e1eCf9ce02b3b35157ba5",
"aFRAX": "0x318334A6dD21d16A8442aB0b7204E81Aa3FB416E",
"aWETH": "0x61134511187a9a2DF38D10DBe07Ba2e8E5563967",
"vaETH": "0xd1C117319B3595fbc39b471AB1fd485629eb05F2"
},
"staking": {
"token": "0xdBdb4d16EdA451D0503b854CF79D55697F90c8DF",
Expand All @@ -87,7 +182,7 @@
"cvxLPpools": {
"alUSD+FRAXBP": {
"poolAddress": "0x26598e3E511ADFadefD70ab2C3475Ff741741104",
"holder": "0xBE1C919cA137299715e9c929BC7126Af14f76091",
"holder": "0x06378717d86B8cd2DBa58c87383dA1EDA92d3495",
"tokenAddress": "0xb30da2376f63de30b42dc055c93fa474f31330a5",
"alToken": "0xBC6DA0FE9aD5f3b0d58160288917AA56653660E9"
},
Expand Down
94 changes: 94 additions & 0 deletions projects/alphafi/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
const sui = require("../helper/chain/sui")
const { addUniV3LikePosition } = require("../helper/unwrapLPs")

const ALPHAFI_TVL_IDS = [
{

poolID: "0x30066d9879374276dc01177fbd239a9377b497bcd347c82811d75fcda35b18e5",
cetusPoolID: "0xc8d7a1503dc2f9f5b05449a87d8733593e2f0f3e7bffd90541252782e4d2ca20",
investorID: "0x87a76889bf4ed211276b16eb482bf6df8d4e27749ebecd13017d19a63f75a6d5",
token0Type: "0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c::coin::COIN",
token1Type: "0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf::coin::COIN"
},
{
poolID: "0xa7239a0c727c40ee3a139689b16b281acfd0682a06c23531b184a61721ece437",
cetusPoolID: "0x0e809689d04d87f4bd4e660cd1b84bf5448c5a7997e3d22fc480e7e5e0b3f58d",
investorID: "0x1b923520f19660d4eb013242c6d03c84fdea034b8f784cfd71173ef72ece50e1",
token0Type: "0x960b531667636f39e85867775f52f6b1f220a058c4de786905bdf761e06a56bb::usdy::USDY",
token1Type: "0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf::coin::COIN"
},
{
poolID: "0xee6f6392cbd9e1997f6e4cf71db0c1ae1611f1f5f7f23f90ad2c64b8f23cceab",
cetusPoolID: "0xcf994611fd4c48e277ce3ffd4d4364c914af2c3cbb05f7bf6facd371de688630",
investorID: "0xb6ca8aba0fb26ed264a3ae3d9c1461ac7c96cdcbeabb01e71086e9a8340b9c55",
token0Type: "0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf::coin::COIN",
token1Type: "0x2::sui::SUI"
},
{
poolID: "0x676fc5cad79f51f6a7d03bfa3474ecd3c695d322380fc68e3d4f61819da3bf8a",
cetusPoolID: "0xaa57c66ba6ee8f2219376659f727f2b13d49ead66435aa99f57bb008a64a8042",
investorID: "0x9ae0e56aa0ebc27f9d8a17b5a9118d368ba262118d878977b6194a10a671bbbc",
token0Type: "0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf::coin::COIN",
token1Type: "0x027792d9fed7f9844eb4839566001bb6f6cb4804f66aa2da6fe1ee242d896881::coin::COIN"
},
{
poolID: "0xbdf4f673b34274f36be284bca3f765083380fefb29141f971db289294bf679c6",
cetusPoolID: "0x5b0b24c27ccf6d0e98f3a8704d2e577de83fa574d3a9060eb8945eeb82b3e2df",
investorID: "0x05fa099d1df7b5bfb2e420d5ee2d63508db17c40ce7c4e0ca0305cd5df974e43",
token0Type: "0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5::coin::COIN",
token1Type: "0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf::coin::COIN"
},
]

const ALPHAFI_POOL2_IDS = [{
poolID: "0x594f13b8f287003fd48e4264e7056e274b84709ada31e3657f00eeedc1547e37",
cetusPoolID: "0xda7347c3192a27ddac32e659c9d9cbed6f8c9d1344e605c71c8886d7b787d720",
investorID: "0x46d901d5e1dba34103038bd2ba789b775861ea0bf4d6566afd5029cf466a3d88",
token0Type: "0xfe3afec26c59e874f3c1d60b8203cb3852d2bb2aa415df9548b8d688e6683f93::alpha::ALPHA",
token1Type: "0x2::sui::SUI"
},
]

const ALPHA_POOL_ID = "0x6ee8f60226edf48772f81e5986994745dae249c2605a5b12de6602ef1b05b0c1"
const ALPHA_COIN_TYPE = "0xfe3afec26c59e874f3c1d60b8203cb3852d2bb2aa415df9548b8d688e6683f93::alpha::ALPHA"

function asIntN(int, bits = 32) {
return Number(BigInt.asIntN(bits, BigInt(int)))
}

async function addPoolTVL(api, pools) {
for (const { poolID, cetusPoolID, investorID, token0Type, token1Type } of pools) {
let investorObject = await sui.getObject(investorID)
let poolObject = await sui.getObject(poolID)
let cetusPoolObject = await sui.getObject(cetusPoolID)
addUniV3LikePosition({
api,
tickLower: asIntN(investorObject.fields.lower_tick),
tickUpper: asIntN(investorObject.fields.upper_tick),
tick: asIntN(cetusPoolObject.fields.current_tick_index.fields.bits),
liquidity: poolObject.fields.tokensInvested,
token0: token0Type,
token1: token1Type
})
}
}

async function tvl(api) {
await addPoolTVL(api, ALPHAFI_TVL_IDS)
}
async function pool2(api) {
await addPoolTVL(api, ALPHAFI_POOL2_IDS)
}

async function staking(api) {
let alphaPoolObject = await sui.getObject(ALPHA_POOL_ID)
api.addToken(ALPHA_COIN_TYPE, Number(alphaPoolObject.fields.alpha_bal))
}

module.exports = {
timetravel: false,
doublecounted: true,
sui: {
tvl, pool2, staking,
},
}
32 changes: 23 additions & 9 deletions projects/amphor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,18 @@ const sdk = require('@defillama/sdk');
const config = {
ethereum: {
lvTokens: {
'ampr-LP-USD': '0x3b022EdECD65b63288704a6fa33A8B9185b5096b',
'ampr-LP-ETH': '0x2791EB5807D69Fe10C02eED6B4DC12baC0701744',
'ampr-LP-BTC': '0xC4A324fDF8a2495776B4d6cA46599B5a52f96489',
amprPTweETH: '0xf97ecda5F9ff31d83f635a6EA70D2D3B9C8f2e00',
amprPTrsETH: '0x0498b85FB4EC85EF5EFe82513aa9DaF767358A15',
amprPTezETH: '0x920F17e741029D904936c58a545DFFC72f82C079',
amprETH: '0xcdc51f2b0e5f0906f2fd5f557de49d99c34df54e',
totalAssets: [
'0x3b022EdECD65b63288704a6fa33A8B9185b5096b', // ampr-LP-USD
'0x2791EB5807D69Fe10C02eED6B4DC12baC0701744', // ampr-LP-ETH
'0xC4A324fDF8a2495776B4d6cA46599B5a52f96489', // ampr-LP-BTC
'0xf97ecda5F9ff31d83f635a6EA70D2D3B9C8f2e00', // amprPTweETH
'0x0498b85FB4EC85EF5EFe82513aa9DaF767358A15', // amprPTrsETH
'0x920F17e741029D904936c58a545DFFC72f82C079', // amprPTezETH
'0xcdc51f2b0e5f0906f2fd5f557de49d99c34df54e', // amprETH
],
totalSupply: [
'0x06824C27C8a0DbDe5F72f770eC82e3c0FD4DcEc3', // amphrLRT
],
},
},
};
Expand All @@ -21,17 +26,26 @@ const claimableSilo = '0x06eCFaAde8fcb8C1bC58CB05104604282f8a8144';
const pendingSilo = '0x361a027e660844f336d5fa07E4cb38c40d5880d9';
const WETH = ADDRESSES.ethereum.WETH;

const totalAssetsVaults = config.ethereum.lvTokens.totalAssets;
const totalSupplyVaults = config.ethereum.lvTokens.totalSupply;

const tvl = sdk.util.sumChainTvls([
sumERC4626VaultsExport({
vaults: Object.values(config.ethereum.lvTokens),
vaults: totalAssetsVaults,
tokenAbi: 'asset',
balanceAbi: 'totalAssets',
}),
sumERC4626VaultsExport({
vaults: totalSupplyVaults,
tokenAbi: 'asset',
balanceAbi: 'totalSupply',
}),
sumTokensExport({ owners: [claimableSilo, pendingSilo], tokens: [WETH] }),
]);
module.exports['ethereum'] = { tvl };

module.exports.hallmarks = [
[1710115200, 'Beta test closing'],
[1712361600, 'LRT vault release'],
[1712361600, 'ETH Boosted Vault Release'],
[1718927999, 'Symbiotic LRT Vault Release'],
];
9 changes: 9 additions & 0 deletions projects/anzen-v2/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const sdk = require('@defillama/sdk')

const USDz = '0xa469b7ee9ee773642b3e93e842e5d9b5baa10067';
const Base_USDz = '0x04d5ddf5f3a8939889f11e97f8c4bb48317f1938';
const Blast_USDz = '0x52056ed29fe015f4ba2e3b079d10c0b87f46e8c6';
const SPCT = '0xf30a29f1c540724fd8c5c4be1af604a6c6800d29'; // Secured collateral

const mainnet_tvl = async (api) => {
Expand All @@ -16,6 +17,11 @@ const base_tvl = async (api) => {
api.add(Base_USDz, supply)
}

const blast_tvl = async (api) => {
const supply = await api.call({ abi: 'erc20:totalSupply', target: Blast_USDz })
api.add(Blast_USDz, supply)
}

const collateral_assets = async (api) => {
const supply = await api.call({ abi: 'erc20:totalSupply', target: SPCT })
api.add(SPCT, supply)
Expand All @@ -29,4 +35,7 @@ module.exports = {
base: {
tvl: base_tvl,
},
blast: {
tvl: blast_tvl,
},
};
1 change: 1 addition & 0 deletions projects/arbitrum/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ module.exports = {
"0xA10c7CE4b876998858b1a9E12b10092229539400",
],
fetchCoValentTokens: true,
permitFailure: true
}),
},
};
21 changes: 21 additions & 0 deletions projects/arca-labs/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
const ADDRESSES = require('../helper/coreAssets.json')

const RCOIN = "0x252739487c1fa66eaeae7ced41d6358ab2a6bca9"

module.exports = {
ethereum: {
tvl: async (api) => {
const [usdcDecimals, rcoinDecimals,totalSupply] = await Promise.all([
api.call({target: ADDRESSES.ethereum.USDC, abi:'erc20:decimals'}),
api.call({target: RCOIN, abi:'erc20:decimals'}),
api.call({target: RCOIN, abi:'erc20:totalSupply'})
])
// Adjusting the total supply of RCOIN to match the decimal places of USDC
// USDC has 6 decimals, whereas RCOIN has 8 decimals
const rcoinDecimalAdjustment = Math.pow(10, usdcDecimals) / Math.pow(10, rcoinDecimals);
const adjustedSupply = totalSupply * rcoinDecimalAdjustment

return api.add(ADDRESSES.ethereum.USDC, adjustedSupply)
}
}
}
Loading

0 comments on commit 10a5cfe

Please sign in to comment.