Skip to content

Commit

Permalink
feat: add support for fluid smart vaults
Browse files Browse the repository at this point in the history
  • Loading branch information
@bergben
bergben committed Jan 31, 2025
1 parent 8d3f944 commit 992d2ed
Show file tree
Hide file tree
Showing 7 changed files with 333 additions and 103 deletions.
1 change: 1 addition & 0 deletions .python-version
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.10.6
19 changes: 8 additions & 11 deletions integrations/fluid_susde.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
from utils.fluid import vaultResolver_contract, vaultPositionResolver_contract
from constants.fluid import sUSDe


# covers all Fluid normal col SUSDE vaults.
class FluidIntegration(Integration):

def __init__(self):
super().__init__(
IntegrationID.FLUID,
IntegrationID.FLUID_SUSDE,
21016131,
Chain.ETHEREUM,
[],
Expand All @@ -28,7 +28,7 @@ def get_balance(self, user: str, block: int) -> float:
vaultResolver_contract.functions.positionsByUser(user), block
)
for i in range(len(userPositions)):
if vaultEntireDatas[i][3][8][0] == sUSDe:
if (vaultEntireDatas[i][3][8][0] == sUSDe) and not (vaultEntireDatas[i][1]): # not smart col types
balance += userPositions[i][9]
return balance / 1e18
except Exception as e:
Expand Down Expand Up @@ -80,13 +80,10 @@ def get_relevant_vaults(self, block: int) -> list:
)
relevantVaults = []
for vaultAddress in vaults:
supplyTokenOfVault = (
call_with_retry(
vaultResolver_contract.functions.getVaultEntireData(vaultAddress),
block,
)
)[3][8][0]
if supplyTokenOfVault == sUSDe:
vaultData = call_with_retry(
vaultResolver_contract.functions.getVaultEntireData(vaultAddress), block
)
if (vaultData[3][8][0] == sUSDe) and not (vaultData[1]): # not smart col types
relevantVaults.append(vaultAddress)
self.blocknumber_to_susdeVaults[block] = relevantVaults
return relevantVaults
Expand All @@ -95,7 +92,7 @@ def get_relevant_vaults(self, block: int) -> list:
if __name__ == "__main__":
example_integration = FluidIntegration()
print("getting relevant vaults")
print(example_integration.get_relevant_vaults(21088189))
print(example_integration.get_relevant_vaults(21745303))

print("\n\n\ngetting participants")
print(example_integration.get_participants(None))
Expand Down
162 changes: 162 additions & 0 deletions integrations/fluid_susde_smart.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
from constants.chains import Chain
from integrations.integration_ids import IntegrationID
from integrations.integration import Integration
from utils.web3_utils import call_with_retry, W3_BY_CHAIN
from utils.fluid import (
vaultResolver_contract,
vaultPositionResolver_contract,
dexResolver_contract,
)
from constants.fluid import sUSDe
import json

# covers all Fluid smart col SUSDE vaults (LP positions)
class FluidIntegration(Integration):

def __init__(self):
super().__init__(
IntegrationID.FLUID_SUSDE_SMART,
21673938,
Chain.ETHEREUM,
[],
30,
1,
None,
None,
)
self.blocknumber_to_susdeVaults = {}

def get_balance(self, user: str, block: int) -> float:
balance = 0
try:
userPositions, vaultEntireDatas = call_with_retry(
vaultResolver_contract.functions.positionsByUser(user), block
)
dexEntireDatas = {}
for i in range(len(userPositions)):
if (vaultEntireDatas[i][3][8][0] == sUSDe or vaultEntireDatas[i][3][8][1] == sUSDe) and (vaultEntireDatas[i][1]): # ONLY smart col types
# underlying dex as supply token in the vault
# fetching the dex state to get the shares to tokens ratio
dexAddress = vaultEntireDatas[i][3][6]
if dexAddress not in dexEntireDatas:
dexEntireDatas[dexAddress] = (
dexResolver_contract.functions.getDexEntireData(dexAddress).call(
block_identifier=block
)
)

# Example:
# "totalSupplyShares": "16969369723826778595219443",
# "token0PerSupplyShare": "948923904934732323",
# "token1PerSupplyShare": "911761",
# assuming example user has 1% of total supply 169693697238267785952194:
# userPositionToken0 = 169693697238267785952194 * 948923904934732323 / 1e18 = 161_026.405826149269461177 SUSDE 161026405826149269461177
# userPositionToken1 = 169693697238267785952194 * 911761 / 1e18 = 154_720.095087 USDT 154720095087

# add token1 position converted to SUSDE:
# e.g."pex.lastStoredPrice": "1151956348186710776274223104",
# 154720095087 * 1e54 / 1151956348186710776274223104 / 1e27 = 134310727425 SUSDE, adjust for decimals:
# whatever decimals token1 has, doing * token1NumeratorPrecision / token1DenominatorPrecision brings it to 1e12.
# 134310727425 * token1NumeratorPrecision / token1DenominatorPrecision * 1e6 =
# 134310727425 * 1e6 / 1 * 1e6 = 134310727425000000000000

# so total pos = 161026405826149269461177 + 134310727425000000000000 = 295_337.133251149269461177 SUSDE

# userShares = userPositions[i][9]
# token0PerSupplyShare = dexEntireDatas[dexAddress][7][-4]
# token1PerSupplyShare = dexEntireDatas[dexAddress][7][-3]
userPositionToken0 = userPositions[i][9] * dexEntireDatas[dexAddress][7][-4] / 1e18
userPositionToken1 = userPositions[i][9] * dexEntireDatas[dexAddress][7][-3] / 1e18

if (vaultEntireDatas[i][3][8][0] == sUSDe):
# token0 at the dex is sUSDE
balance += userPositionToken0
# lastStoredPrice = dexEntireDatas[dexAddress][4][0]
userPositionToken1 = userPositionToken1 * 1e54 / dexEntireDatas[dexAddress][4][0] / 1e27;
# * 1e6 * numeratorPrecision / denominatorPrecision
userPositionToken1 = userPositionToken1 * 1e6 * dexEntireDatas[dexAddress][2][2] / dexEntireDatas[dexAddress][2][3]

balance += userPositionToken1
else:
# token1 at the dex is sUSDE
balance += userPositionToken1
# lastStoredPrice = dexEntireDatas[dexAddress][4][0]
userPositionToken0 = userPositionToken0 * dexEntireDatas[dexAddress][4][0] / 1e27;
# * 1e6 * numeratorPrecision / denominatorPrecision
userPositionToken0 = userPositionToken0 * 1e6 * dexEntireDatas[dexAddress][2][0] / dexEntireDatas[dexAddress][2][1]

balance += userPositionToken1
return balance / 1e18
except Exception as e:
return 0

def get_participants(self, blocks: list[int] | None) -> set[str]:
participants = []
current_block = W3_BY_CHAIN[self.chain]["w3"].eth.get_block_number()

relevant_vaults = self.get_relevant_vaults(current_block)
relavantUserPositions = []

try:
for vault in relevant_vaults:
relavantUserPositions += call_with_retry(
vaultPositionResolver_contract.functions.getAllVaultPositions(
vault
),
current_block,
)
for userPosition in relavantUserPositions:
owner = userPosition[1]
if owner not in participants:
participants.append(owner)
except Exception as e:
print(f"Error: {str(e)}")
return set(participants)

def get_relevant_vaults(self, block: int) -> list:
if block in self.blocknumber_to_susdeVaults:
return self.blocknumber_to_susdeVaults[block]

if self.blocknumber_to_susdeVaults != {}:
totalVaults = call_with_retry(
vaultResolver_contract.functions.getTotalVaults(), block
)
for block_number in self.blocknumber_to_susdeVaults:
totalVaults_at_block = call_with_retry(
vaultResolver_contract.functions.getTotalVaults(), block_number
)
if totalVaults == totalVaults_at_block:
self.blocknumber_to_susdeVaults[block] = (
self.blocknumber_to_susdeVaults[block_number]
)
return self.blocknumber_to_susdeVaults[block_number]

vaults = call_with_retry(
vaultResolver_contract.functions.getAllVaultsAddresses(), block
)
relevantVaults = []
for vaultAddress in vaults:
vaultData = call_with_retry(
vaultResolver_contract.functions.getVaultEntireData(vaultAddress), block
)
if (vaultData[3][8][0] == sUSDe or vaultData[3][8][1] == sUSDe) and (vaultData[1]): # ONLY smart col types
relevantVaults.append(vaultAddress)
self.blocknumber_to_susdeVaults[block] = relevantVaults
return relevantVaults


if __name__ == "__main__":
example_integration = FluidIntegration()
print("getting relevant vaults")
print(example_integration.get_relevant_vaults(21745303))

print("\n\n\ngetting participants")
print(example_integration.get_participants(None))

print("\n\n\n getting balance")
print(
example_integration.get_balance(
# should be ~1_117_500 SUSDE
"0xDB611d682cb1ad72fcBACd944a8a6e2606a6d158", 21745303
)
)
20 changes: 11 additions & 9 deletions integrations/fluid_usde.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
from utils.fluid import vaultResolver_contract, vaultPositionResolver_contract
from constants.fluid import USDe


# covers all Fluid normal col USDE vaults.
class FluidIntegration(Integration):

def __init__(self):
super().__init__(
IntegrationID.FLUID,
IntegrationID.FLUID_USDE,
21016131,
Chain.ETHEREUM,
[],
Expand All @@ -28,10 +28,7 @@ def get_balance(self, user: str, block: int) -> float:
vaultResolver_contract.functions.positionsByUser(user), block
)
for i in range(len(userPositions)):
if (
vaultEntireDatas[i][3][8][0] == USDe
or vaultEntireDatas[i][3][8][1] == USDe
) and userPositions[i][10] != 40000:
if (vaultEntireDatas[i][3][8][0] == USDe) and not (vaultEntireDatas[i][1]): # not smart col types
balance += userPositions[i][9]
return balance / 1e18
except Exception as e:
Expand Down Expand Up @@ -86,9 +83,7 @@ def get_relevant_vaults(self, block: int) -> list:
vaultData = call_with_retry(
vaultResolver_contract.functions.getVaultEntireData(vaultAddress), block
)
if (vaultData[3][8][0] == USDe or vaultData[3][8][1] == USDe) and not (
vaultData[1] and vaultData[2]
):
if (vaultData[3][8][0] == USDe) and not (vaultData[1]): # not smart col types
relevantVaults.append(vaultAddress)
self.blocknumber_to_usdeVaults[block] = relevantVaults
return relevantVaults
Expand All @@ -102,3 +97,10 @@ def get_relevant_vaults(self, block: int) -> list:

print("\n\n\ngetting participants")
print(example_integration.get_participants(None))

print("\n\n\n getting balance")
print(
example_integration.get_balance(
"0xD15B0aA03Bc9F74Aa3d07d078502867Da3B7d198", 21745303
)
)
Loading

0 comments on commit 992d2ed

Please sign in to comment.