Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added fluid-vaults #1659

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

added fluid-vaults #1659

wants to merge 14 commits into from

Conversation

0xprinc
Copy link

@0xprinc 0xprinc commented Dec 18, 2024

No description provided.

@llamatester
Copy link

Error while running fluid-vaults adapter:

Test Suites: 1 failed, 1 total
Tests: 2 failed, 583 passed, 585 total
Snapshots: 0 total
Time: 0.471 s
Ran all test suites.

Nb of pools: 83
 

Sample pools:
┌─────────┬────────────────┬──────────────────────────────────────────────┬────────────────────┬─────────────────┬────────────────────────────────────────────────────────────────────────────────────────────────┬────────────────────────────────────────────────────────────────────────────────────────────────┬────────────┬─────────┬───────────────┬───────────┬─────────────────┐
│ (index) │    project     │                     pool                     │       tvlUsd       │     symbol      │                                        underlyingTokens                                        │                                          rewardTokens                                          │   chain    │ apyBase │ apyBaseBorrow │ apyReward │ apyRewardBorrow │
├─────────┼────────────────┼──────────────────────────────────────────────┼────────────────────┼─────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────┼────────────┼─────────┼───────────────┼───────────┼─────────────────┤
│    0    │ 'fluid-vaults' │ '0x82B27fA821419F5689381b565a8B0786aA2548De' │ 149533292.69841057 │  'wstETH/ETH'   │ [ '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0', '0x0000000000000000000000000000000000000000' ] │ [ '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0', '0x0000000000000000000000000000000000000000' ] │ 'ethereum' │  0.33   │     2.89      │     0     │        0        │
│    1    │ 'fluid-vaults' │ '0x1c6068eC051f0Ac1688cA1FE76810FA9c8644278' │  78194030.6818464  │ 'weETHs/wstETH' │ [ '0x917ceE801a67f933F2e6b33fC0cD1ED2d5909D88', '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0' ] │ [ '0x917ceE801a67f933F2e6b33fC0cD1ED2d5909D88', '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0' ] │ 'ethereum' │    0    │     0.79      │     0     │        0        │
│    2    │ 'fluid-vaults' │ '0xE16A6f5359ABB1f61cE71e25dD0932e3E00B00eB' │ 63116609.90937281  │   'ETH/USDT'    │ [ '0x0000000000000000000000000000000000000000', '0xdAC17F958D2ee523a2206206994597C13D831ec7' ] │ [ '0x0000000000000000000000000000000000000000', '0xdAC17F958D2ee523a2206206994597C13D831ec7' ] │ 'ethereum' │  2.12   │     11.87     │     0     │        0        │
│    3    │ 'fluid-vaults' │ '0x0C8C77B7FF4c2aF7F6CEBbe67350A490E3DD6cB3' │ 56458803.88002357  │   'ETH/USDC'    │ [ '0x0000000000000000000000000000000000000000', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ [ '0x0000000000000000000000000000000000000000', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ 'ethereum' │  2.12   │     13.64     │     0     │        0        │
│    4    │ 'fluid-vaults' │ '0xeAEf563015634a9d0EE6CF1357A3b205C35e028D' │ 49386853.49164325  │ 'weETH/wstETH'  │ [ '0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee', '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0' ] │ [ '0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee', '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0' ] │ 'ethereum' │    0    │     0.79      │     0     │        0        │
│    5    │ 'fluid-vaults' │ '0x6F72895Cf6904489Bcd862c941c3D02a3eE4f03e' │ 40670709.22076048  │   'wbtc/USDC'   │ [ '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ [ '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ 'ethereum' │  0.65   │     13.64     │     0     │        0        │
│    6    │ 'fluid-vaults' │ '0xF2c8F54447cbd591C396b0Dd7ac15FAF552d0FA4' │ 39002634.889793634 │  'weETH/USDC'   │ [ '0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ [ '0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ 'ethereum' │    0    │     13.64     │     0     │        0        │
│    7    │ 'fluid-vaults' │ '0x3996464c0fCCa8183e13ea5E5e74375e2c8744Dd' │ 32407791.429082576 │  'sUSDe/USDC'   │ [ '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ [ '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ 'ethereum' │    0    │     13.64     │     0     │        0        │
│    8    │ 'fluid-vaults' │ '0xb4F3bf2d96139563777C0231899cE06EE95Cc946' │ 29972688.72500455  │  'wstETH/USDT'  │ [ '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0', '0xdAC17F958D2ee523a2206206994597C13D831ec7' ] │ [ '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0', '0xdAC17F958D2ee523a2206206994597C13D831ec7' ] │ 'ethereum' │  0.33   │     11.87     │     0     │        0        │
│    9    │ 'fluid-vaults' │ '0xeAbBfca72F8a8bf14C4ac59e69ECB2eB69F0811C' │ 29813802.59263558  │   'ETH/USDC'    │ [ '0x0000000000000000000000000000000000000000', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ [ '0x0000000000000000000000000000000000000000', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ 'ethereum' │  2.12   │     13.64     │     0     │        0        │
└─────────┴────────────────┴──────────────────────────────────────────────┴────────────────────┴─────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────┴────────────┴─────────┴───────────────┴───────────┴─────────────────┘
This adapter contains some pools with <10k TVL, these pools won't be shown in DefiLlama
}

@0xprinc
Copy link
Author

0xprinc commented Dec 19, 2024

@llamatester
Two testcases failing are:

  • fluid-vault not in protocolSlugs; how can I add fluidVaults data in protocolSlugs?
  • pools address same in different chains : we have some vaults of same address on mainnet, base and arbitrum. Is there any way around of this to supress that error?

@slasher125
Copy link
Collaborator

slasher125 commented Dec 19, 2024

@0xprinc gm, we require a tvl adapter first. only then can we list a yield adapter

as for the address conflict, you can just use the chain as suffix to distinguish btw them

@0xprinc
Copy link
Author

0xprinc commented Dec 20, 2024

gm @slasher125 , we already have the TVL, but the yields differ based on the Lending protocol and Vault protocol. The TVL displayed is a combination of both. Also, Fluid Lending protocol is already listed under yields: Fluid Lending on DefiLlama.

Let me know if there’s anything else required to proceed!

@llamatester
Copy link

Error while running fluid-vaults adapter:

Test Suites: 1 failed, 1 total
Tests: 1 failed, 584 passed, 585 total
Snapshots: 0 total
Time: 0.443 s
Ran all test suites.

Nb of pools: 83
 

Sample pools:
┌─────────┬────────────────┬───────────────────────────────────────────────────────┬────────────────────┬─────────────────┬────────────────────────────────────────────────────────────────────────────────────────────────┬────────────────────────────────────────────────────────────────────────────────────────────────┬────────────┬─────────┬───────────────┬───────────┬─────────────────┐
│ (index) │    project     │                         pool                          │       tvlUsd       │     symbol      │                                        underlyingTokens                                        │                                          rewardTokens                                          │   chain    │ apyBase │ apyBaseBorrow │ apyReward │ apyRewardBorrow │
├─────────┼────────────────┼───────────────────────────────────────────────────────┼────────────────────┼─────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────┼────────────┼─────────┼───────────────┼───────────┼─────────────────┤
│    0    │ 'fluid-vaults' │ 'ethereum_0x82B27fA821419F5689381b565a8B0786aA2548De' │ 129836412.42079385 │  'wstETH/ETH'   │ [ '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0', '0x0000000000000000000000000000000000000000' ] │ [ '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0', '0x0000000000000000000000000000000000000000' ] │ 'ethereum' │  0.33   │      2.9      │     0     │        0        │
│    1    │ 'fluid-vaults' │ 'ethereum_0x1c6068eC051f0Ac1688cA1FE76810FA9c8644278' │ 68609822.19790997  │ 'weETHs/wstETH' │ [ '0x917ceE801a67f933F2e6b33fC0cD1ED2d5909D88', '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0' ] │ [ '0x917ceE801a67f933F2e6b33fC0cD1ED2d5909D88', '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0' ] │ 'ethereum' │    0    │     0.79      │     0     │        0        │
│    2    │ 'fluid-vaults' │ 'ethereum_0xE16A6f5359ABB1f61cE71e25dD0932e3E00B00eB' │ 58010538.29685679  │   'ETH/USDT'    │ [ '0x0000000000000000000000000000000000000000', '0xdAC17F958D2ee523a2206206994597C13D831ec7' ] │ [ '0x0000000000000000000000000000000000000000', '0xdAC17F958D2ee523a2206206994597C13D831ec7' ] │ 'ethereum' │  2.15   │     10.34     │     0     │        0        │
│    3    │ 'fluid-vaults' │ 'ethereum_0x0C8C77B7FF4c2aF7F6CEBbe67350A490E3DD6cB3' │ 48719823.25535378  │   'ETH/USDC'    │ [ '0x0000000000000000000000000000000000000000', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ [ '0x0000000000000000000000000000000000000000', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ 'ethereum' │  2.15   │     14.78     │     0     │        0        │
│    4    │ 'fluid-vaults' │ 'ethereum_0xeAEf563015634a9d0EE6CF1357A3b205C35e028D' │ 43634221.61093337  │ 'weETH/wstETH'  │ [ '0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee', '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0' ] │ [ '0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee', '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0' ] │ 'ethereum' │    0    │     0.79      │     0     │        0        │
│    5    │ 'fluid-vaults' │ 'ethereum_0x6F72895Cf6904489Bcd862c941c3D02a3eE4f03e' │ 37929208.67645832  │   'wbtc/USDC'   │ [ '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ [ '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ 'ethereum' │  0.76   │     14.78     │     0     │        0        │
│    6    │ 'fluid-vaults' │ 'ethereum_0xF2c8F54447cbd591C396b0Dd7ac15FAF552d0FA4' │ 33362268.097509794 │  'weETH/USDC'   │ [ '0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ [ '0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ 'ethereum' │    0    │     14.78     │     0     │        0        │
│    7    │ 'fluid-vaults' │ 'ethereum_0x3996464c0fCCa8183e13ea5E5e74375e2c8744Dd' │ 33310364.857208505 │  'sUSDe/USDC'   │ [ '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ [ '0x9D39A5DE30e57443BfF2A8307A4256c8797A3497', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ 'ethereum' │    0    │     14.78     │     0     │        0        │
│    8    │ 'fluid-vaults' │ 'ethereum_0x92643E964CA4b2c165a95CA919b0A819acA6D5F1' │ 28648720.015912104 │  'weETH/USDT'   │ [ '0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee', '0xdAC17F958D2ee523a2206206994597C13D831ec7' ] │ [ '0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee', '0xdAC17F958D2ee523a2206206994597C13D831ec7' ] │ 'ethereum' │    0    │     10.34     │     0     │        0        │
│    9    │ 'fluid-vaults' │ 'ethereum_0xeAbBfca72F8a8bf14C4ac59e69ECB2eB69F0811C' │ 25860555.46929111  │   'ETH/USDC'    │ [ '0x0000000000000000000000000000000000000000', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ [ '0x0000000000000000000000000000000000000000', '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ] │ 'ethereum' │  2.15   │     14.78     │     0     │        0        │
└─────────┴────────────────┴───────────────────────────────────────────────────────┴────────────────────┴─────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────┴────────────┴─────────┴───────────────┴───────────┴─────────────────┘
This adapter contains some pools with <10k TVL, these pools won't be shown in DefiLlama
}

@slasher125
Copy link
Collaborator

@0xprinc
so the above is a new project or are these pools part of fluid-lending? we don't have a tvl adapter for fluid-vaults, this slug doesn't exist which is why the tests are failing

@0xprinc
Copy link
Author

0xprinc commented Dec 20, 2024

Hey @slasher125
As I mentioned, our current tvl adapter shows the total TVL(lending + vaults)
If we split the current TVL adapter into separate ones for Lending and Vault, will the total still be displayed the same way on the UI?

@slasher125
Copy link
Collaborator

yes the parent projects tvl is the sum of the individual project adapters.

ok, just to be clear: on yields we list only if we have a tvl adapter, so fluid-vaults doens't existing on the tvl repo, which is why we can't use that slug here either. we'd have to create it there first.
that being said, can you confirm that the above are actually the borrow stats yes? i'm having a hard time finding the actual info on your ui

@llamatester
Copy link

The fluid-lending adapter exports pools:

Test Suites: 1 passed, 1 total
Tests: 690 passed, 690 total
Snapshots: 0 total
Time: 0.436 s
Ran all test suites.

Nb of pools: 98
 

Sample pools:
┌─────────┬─────────────────┬───────────────────────────────────────────────────────┬────────────────────┬─────────────────┬────────────────────────────────────────────────────────────────────────────────────────────────┬────────────────────────────────────────────────────────────────────────────────────────────────┬────────────┬─────────┬───────────┬───────────────┬─────────────────┐
│ (index) │     project     │                         pool                          │       tvlUsd       │     symbol      │                                        underlyingTokens                                        │                                          rewardTokens                                          │   chain    │ apyBase │ apyReward │ apyBaseBorrow │ apyRewardBorrow │
├─────────┼─────────────────┼───────────────────────────────────────────────────────┼────────────────────┼─────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────┼────────────────────────────────────────────────────────────────────────────────────────────────┼────────────┼─────────┼───────────┼───────────────┼─────────────────┤
│    0    │ 'fluid-lending' │ 'ethereum_0x9Fb7b4477576Fe5B32be4C1843aFB1e55F251B33' │ 156153890.5083688  │     'USDC'      │                        [ '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ]                        │                        [ '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48' ]                        │ 'ethereum' │  16.77  │   3.89    │               │                 │
│    1    │ 'fluid-lending' │ 'ethereum_0x82B27fA821419F5689381b565a8B0786aA2548De' │ 153949237.7572327  │  'wstETH/ETH'   │ [ '0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0', '0x0000000000000000000000000000000000000000' ] │ [ '0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0', '0x0000000000000000000000000000000000000000' ] │ 'ethereum' │  0.29   │     0     │     2.93      │        0        │
│    2    │ 'fluid-lending' │ 'ethereum_0x5C20B550819128074FD538Edf79791733ccEdd18' │ 150274575.14859298 │     'USDT'      │                        [ '0xdAC17F958D2ee523a2206206994597C13D831ec7' ]                        │                        [ '0xdAC17F958D2ee523a2206206994597C13D831ec7' ]                        │ 'ethereum' │  8.08   │   4.04    │               │                 │
│    3    │ 'fluid-lending' │ 'ethereum_0x1c6068eC051f0Ac1688cA1FE76810FA9c8644278' │ 68687273.45431308  │ 'weETHs/wstETH' │ [ '0x917cee801a67f933f2e6b33fc0cd1ed2d5909d88', '0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0' ] │ [ '0x917cee801a67f933f2e6b33fc0cd1ed2d5909d88', '0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0' ] │ 'ethereum' │    0    │     0     │     0.77      │        0        │
│    4    │ 'fluid-lending' │ 'ethereum_0xE16A6f5359ABB1f61cE71e25dD0932e3E00B00eB' │  67955705.8854066  │   'ETH/USDT'    │ [ '0x0000000000000000000000000000000000000000', '0xdac17f958d2ee523a2206206994597c13d831ec7' ] │ [ '0x0000000000000000000000000000000000000000', '0xdac17f958d2ee523a2206206994597c13d831ec7' ] │ 'ethereum' │  2.23   │     0     │     11.26     │        0        │
│    5    │ 'fluid-lending' │ 'ethereum_0x0C8C77B7FF4c2aF7F6CEBbe67350A490E3DD6cB3' │ 53966005.99798633  │   'ETH/USDC'    │ [ '0x0000000000000000000000000000000000000000', '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48' ] │ [ '0x0000000000000000000000000000000000000000', '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48' ] │ 'ethereum' │  2.23   │     0     │     19.74     │        0        │
│    6    │ 'fluid-lending' │ 'ethereum_0xeAEf563015634a9d0EE6CF1357A3b205C35e028D' │  43481607.2478989  │ 'weETH/wstETH'  │ [ '0xcd5fe23c85820f7b72d0926fc9b05b43e359b7ee', '0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0' ] │ [ '0xcd5fe23c85820f7b72d0926fc9b05b43e359b7ee', '0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0' ] │ 'ethereum' │    0    │     0     │     0.77      │        0        │
│    7    │ 'fluid-lending' │ 'ethereum_0x6F72895Cf6904489Bcd862c941c3D02a3eE4f03e' │ 37706404.59926604  │   'wbtc/USDC'   │ [ '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599', '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48' ] │ [ '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599', '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48' ] │ 'ethereum' │  0.74   │     0     │     19.74     │        0        │
│    8    │ 'fluid-lending' │ 'ethereum_0xF2c8F54447cbd591C396b0Dd7ac15FAF552d0FA4' │ 33857015.33434217  │  'weETH/USDC'   │ [ '0xcd5fe23c85820f7b72d0926fc9b05b43e359b7ee', '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48' ] │ [ '0xcd5fe23c85820f7b72d0926fc9b05b43e359b7ee', '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48' ] │ 'ethereum' │    0    │     0     │     19.74     │        0        │
│    9    │ 'fluid-lending' │ 'ethereum_0x92643E964CA4b2c165a95CA919b0A819acA6D5F1' │ 28983826.329755664 │  'weETH/USDT'   │ [ '0xcd5fe23c85820f7b72d0926fc9b05b43e359b7ee', '0xdac17f958d2ee523a2206206994597c13d831ec7' ] │ [ '0xcd5fe23c85820f7b72d0926fc9b05b43e359b7ee', '0xdac17f958d2ee523a2206206994597c13d831ec7' ] │ 'ethereum' │    0    │     0     │     11.26     │        0        │
└─────────┴─────────────────┴───────────────────────────────────────────────────────┴────────────────────┴─────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────┴────────────────────────────────────────────────────────────────────────────────────────────────┴────────────┴─────────┴───────────┴───────────────┴─────────────────┘
This adapter contains some pools with <10k TVL, these pools won't be shown in DefiLlama

@0xprinc
Copy link
Author

0xprinc commented Dec 24, 2024

@slasher125 for now, we’d like to add the vault protocol yield rates into lending itself, since it includes vaults TVL also. We’ll prepare another PR soon to split Fluid into different protocols and separate TVLs.

Also to confirm the borrow stats, you can visit this link

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants