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.

Sign up for GitHub

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

Jump to bottom

Remove v1 pools from LpSugar #29

Merged
merged 4 commits into from
Sep 28, 2023
Merged

Remove v1 pools from LpSugar #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc13a6c
Remove v1 pools from LpSugar
ethzoomer Sep 25, 2023
53e15b5
Remove all v1 calls from LpSugar
ethzoomer Sep 25, 2023
9118162
Point to latest LpSugar deployment
ethzoomer Sep 26, 2023
f39768b
Add latest LpSugar address
ethzoomer Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 17 additions & 122 deletions contracts/LpSugar.vy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@ interface IPoolFactory:
def allPoolsLength() -> uint256: view
def allPools(_index: uint256) -> address: view
def getFee(_pool_addr: address, _stable: bool) -> uint256: view
# Backwards compatibility with V1
def allPairsLength() -> uint256: view
def allPairs(_index: uint256) -> address: view

interface IPool:
def token0() -> address: view
Expand All @@ -125,10 +122,6 @@ interface IVoter:
def isWhitelistedToken(_token_addr: address) -> bool: view
def v1Factory() -> address: view

interface IGaugeV1:
def earned(_token:address, _account: address) -> uint256: view
def rewardRate(_token:address) -> uint256: view

interface IGauge:
def fees0() -> uint256: view
def fees1() -> uint256: view
Expand All @@ -151,35 +144,25 @@ interface IReward:
registry: public(IFactoryRegistry)
voter: public(IVoter)
convertor: public(address)
v1_voter: public(IVoter)
v1_factory: public(address)
v1_token: public(address)

# Methods

@external
def __init__(
_voter: address,
_registry: address,
_v1_voter: address,
_convertor: address
):
def __init__(_voter: address, _registry: address, _convertor: address):
"""
@dev Sets up our external contract addresses
"""
self.voter = IVoter(_voter)
self.v1_voter = IVoter(_v1_voter)
self.registry = IFactoryRegistry(_registry)
self.convertor = _convertor

self.v1_factory = self.voter.v1Factory()
self.v1_token = IPool(self.convertor).token0()

@internal
@view
def _pools(with_convertor: bool) -> DynArray[address[3], MAX_POOLS]:
def _pools() -> DynArray[address[3], MAX_POOLS]:
"""
@notice Returns a compiled list of pool and its factory and gauge (sans v1)
@notice Returns a compiled list of pool and its factory and gauge
@return Array of three addresses (factory, pool, gauge)
"""
factories_count: uint256 = self.registry.poolFactoriesLength()
Expand All @@ -205,7 +188,7 @@ def _pools(with_convertor: bool) -> DynArray[address[3], MAX_POOLS]:

pool_addr: address = factory.allPools(pindex)

if with_convertor == False and pool_addr == self.convertor:
if pool_addr == self.convertor:
continue

gauge_addr: address = self.voter.gauges(pool_addr)
Expand All @@ -214,88 +197,11 @@ def _pools(with_convertor: bool) -> DynArray[address[3], MAX_POOLS]:

return pools

@external
@view
def toMigrate(_account: address) -> DynArray[Lp, MAX_POOLS]:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ethzoomer this is still used by the dapp, I'm down to remove the migration, but will need it cleaned up from the app repo as well

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will make app Linear task and start working on this

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ty ty, this is good to merge otherwise.

"""
@notice Returns a collection of pool data to be migrated (from v1)
@return `LP` structs
"""
pools: DynArray[Lp, MAX_POOLS] = empty(DynArray[Lp, MAX_POOLS])

if _account == empty(address):
return pools

factory: IPoolFactory = IPoolFactory(self.v1_factory)
pools_count: uint256 = factory.allPairsLength()

for pindex in range(0, MAX_POOLS):
if pindex >= pools_count:
break

pool: IPool = IPool(factory.allPairs(pindex))
gauge: IGauge = IGauge(self.v1_voter.gauges(pool.address))

account_balance: uint256 = pool.balanceOf(_account)
account_staked: uint256 = 0
gauge_total_supply: uint256 = 0
earned: uint256 = 0
emissions: uint256 = 0

if gauge.address != empty(address):
account_staked = gauge.balanceOf(_account)

if account_balance == 0 and account_staked == 0:
continue

if account_staked > 0:
earned = IGaugeV1(gauge.address).earned(self.v1_token, _account)
gauge_total_supply = gauge.totalSupply()
emissions = IGaugeV1(gauge.address).rewardRate(self.v1_token)

pools.append(Lp({
lp: pool.address,
symbol: pool.symbol(),
decimals: pool.decimals(),
stable: pool.stable(),
total_supply: pool.totalSupply(),

token0: pool.token0(),
reserve0: pool.reserve0(),
claimable0: pool.claimable0(_account),

token1: pool.token1(),
reserve1: pool.reserve1(),
claimable1: pool.claimable1(_account),

gauge: gauge.address,
gauge_total_supply: gauge_total_supply,
# Save gas...
gauge_alive: False,

fee: empty(address),
bribe: empty(address),
factory: self.v1_factory,

emissions: emissions,
emissions_token: self.v1_token,

account_balance: pool.balanceOf(_account),
account_earned: earned,
account_staked: account_staked,

pool_fee: 0,
token0_fees: 0,
token1_fees: 0
}))

return pools

@external
@view
def forSwaps(_limit: uint256, _offset: uint256) -> DynArray[SwapLp, MAX_POOLS]:
"""
@notice Returns a compiled list of pools for swaps from all pool factories
@notice Returns a compiled list of pools for swaps from pool factories (sans v1)
@param _limit The max amount of tokens to return
@param _offset The amount of pools to skip
@return `SwapLp` structs
Expand All @@ -309,30 +215,22 @@ def forSwaps(_limit: uint256, _offset: uint256) -> DynArray[SwapLp, MAX_POOLS]:
if index >= factories_count:
break

factory: IPoolFactory = IPoolFactory(factories[index])
if factories[index] == self.v1_factory:
continue

pools_count: uint256 = 0
legacy: bool = factory.address == self.v1_factory
factory: IPoolFactory = IPoolFactory(factories[index])

if legacy:
pools_count = factory.allPairsLength()
else:
pools_count = factory.allPoolsLength()
pools_count: uint256 = factory.allPoolsLength()

for pindex in range(_offset, _offset + MAX_POOLS):
if len(pools) >= _limit or pindex >= pools_count:
break

pool_addr: address = empty(address)

if legacy:
pool_addr = factory.allPairs(pindex)
else:
pool_addr = factory.allPools(pindex)
pool_addr: address = factory.allPools(pindex)

pool: IPool = IPool(pool_addr)

if pool.reserve0() > 0 or pool_addr == self.convertor:
if pool.reserve0() > 0:
pools.append(SwapLp({
lp: pool_addr,
stable: pool.stable(),
Expand All @@ -354,7 +252,7 @@ def tokens(_limit: uint256, _offset: uint256, _account: address)\
@param _account The account to check the balances
@return Array for Token structs
"""
pools: DynArray[address[3], MAX_POOLS] = self._pools(True)
pools: DynArray[address[3], MAX_POOLS] = self._pools()
pools_count: uint256 = len(pools)
col: DynArray[Token, MAX_TOKENS] = empty(DynArray[Token, MAX_TOKENS])
seen: DynArray[address, MAX_TOKENS] = empty(DynArray[address, MAX_TOKENS])
Expand Down Expand Up @@ -408,7 +306,7 @@ def all(_limit: uint256, _offset: uint256, _account: address) \
@return Array for Lp structs
"""
col: DynArray[Lp, MAX_POOLS] = empty(DynArray[Lp, MAX_POOLS])
pools: DynArray[address[3], MAX_POOLS] = self._pools(False)
pools: DynArray[address[3], MAX_POOLS] = self._pools()
pools_count: uint256 = len(pools)

for index in range(_offset, _offset + MAX_POOLS):
Expand All @@ -428,7 +326,7 @@ def byIndex(_index: uint256, _account: address) -> Lp:
@param _account The account to check the staked and earned balances
@return Lp struct
"""
pools: DynArray[address[3], MAX_POOLS] = self._pools(False)
pools: DynArray[address[3], MAX_POOLS] = self._pools()

return self._byData(pools[_index], _account)

Expand All @@ -450,7 +348,7 @@ def _byData(_data: address[3], _account: address) -> Lp:
emissions: uint256 = 0
emissions_token: address = empty(address)
is_stable: bool = pool.stable()
pool_fee: uint256 = 0
pool_fee: uint256 = IPoolFactory(_data[0]).getFee(_data[1], is_stable)
pool_fees: address = pool.poolFees()
token0: IERC20 = IERC20(pool.token0())
token1: IERC20 = IERC20(pool.token1())
Expand All @@ -465,9 +363,6 @@ def _byData(_data: address[3], _account: address) -> Lp:
if gauge_alive:
emissions = gauge.rewardRate()

if _data[0] != self.v1_factory:
pool_fee = IPoolFactory(_data[0]).getFee(_data[1], is_stable)

return Lp({
lp: _data[1],
symbol: pool.symbol(),
Expand Down Expand Up @@ -513,7 +408,7 @@ def epochsLatest(_limit: uint256, _offset: uint256) \
@param _offset The amount of pools to skip
@return Array for LpEpoch structs
"""
pools: DynArray[address[3], MAX_POOLS] = self._pools(False)
pools: DynArray[address[3], MAX_POOLS] = self._pools()
pools_count: uint256 = len(pools)
counted: uint256 = 0

Expand Down Expand Up @@ -677,7 +572,7 @@ def rewards(_limit: uint256, _offset: uint256, _venft_id: uint256) \
@param _venft_id The veNFT ID to get rewards for
@return Array for VeNFT Reward structs
"""
pools: DynArray[address[3], MAX_POOLS] = self._pools(False)
pools: DynArray[address[3], MAX_POOLS] = self._pools()
pools_count: uint256 = len(pools)
counted: uint256 = 0

Expand Down
3 changes: 1 addition & 2 deletions env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
VOTER_ADDRESS=0x41C914ee0c7E1A5edCD0295623e6dC557B5aBf3C
REGISTRY_ADDRESS=0xF4c67CdEAaB8360370F41514d06e32CcD8aA1d7B
V1_VOTER_ADDRESS=0x09236cfF45047DBee6B921e00704bed6D6B8Cf7e
DIST_ADDRESS=0x9D4736EC60715e71aFe72973f7885DCBC21EA99b
CONVERTOR_ADDRESS=0x585Af0b397AC42dbeF7f18395426BF878634f18D
LP_SUGAR_ADDRESS=0xD2B1D1B75a0f226722b3A174dAE54e6dD14af1a1
LP_SUGAR_ADDRESS=0x6eDCAb198EAdDBDA3865f813A83F6bC9012F16e9
VE_SUGAR_ADDRESS=0x0eCc2593E3a6A9be3628940Fa4D928CC257B588B
2 changes: 1 addition & 1 deletion readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Below is the list of datasets we support.

### Liquidity Pools Data

`LpSugar.vy` is deployed at `0x4D996E294B00cE8287C16A2b9A4e637ecA5c939f`
`LpSugar.vy` is deployed at `0xa1f09427fa89b92e9b4e4c7003508c8614f19791`

It allows fetching on-chain pools data.
The returned data/struct of type `Lp` values represent:
Expand Down
1 change: 0 additions & 1 deletion scripts/deploy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ def main():
LpSugar.deploy(
os.getenv('VOTER_ADDRESS'),
os.getenv('REGISTRY_ADDRESS'),
os.getenv('V1_VOTER_ADDRESS'),
os.getenv('CONVERTOR_ADDRESS'),
{'from': account}
)
Expand Down
Loading