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

feat: 1200 less getCode calls @ startup #668

Merged
merged 1 commit into from
Nov 12, 2023
Merged

feat: 1200 less getCode calls @ startup #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions yearn/iearn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
from collections import defaultdict

from brownie import chain
from y import Contract
from y.contracts import contract_creation_block_async
from y.networks import Network
from y.prices import magic

from yearn.exceptions import UnsupportedNetwork
from yearn.multicall2 import fetch_multicall_async, multicall_matrix_async
from yearn.utils import contract

IEARN = {
# v1 - deprecated
Expand All @@ -30,7 +30,7 @@
class Earn:
def __init__(self, name, vault):
self.name = name
self.vault = contract(vault)
self.vault = Contract(vault)
self.token = self.vault.token()
self.scale = 10 ** self.vault.decimals()

Expand Down
33 changes: 16 additions & 17 deletions yearn/prices/curve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,20 @@
from enum import IntEnum
from typing import Dict, List, Optional

from brownie import ZERO_ADDRESS, Contract, chain, convert, interface
from brownie import ZERO_ADDRESS, chain, convert, interface
from brownie.convert import to_address
from brownie.convert.datatypes import EthAddress
from cachetools.func import lru_cache, ttl_cache
from y import Contract, Network, magic
from y.constants import EEE_ADDRESS
from y.exceptions import NodeNotSynced, PriceError
from y.networks import Network
from y.prices import magic

from yearn.decorators import sentry_catch_all, wait_or_exit_after
from yearn.events import decode_logs, get_logs_asap
from yearn.exceptions import UnsupportedNetwork
from yearn.multicall2 import fetch_multicall, fetch_multicall_async
from yearn.typing import Address, AddressOrContract, Block
from yearn.utils import Singleton, contract, get_event_loop
from yearn.utils import Singleton, contract

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -112,16 +111,16 @@ def __init__(self) -> None:

addrs = curve_contracts[chain.id]
if chain.id == Network.Mainnet:
self.voting_escrow = contract(addrs['voting_escrow'])
self.gauge_controller = contract(addrs['gauge_controller'])
self.voting_escrow = Contract(addrs['voting_escrow'])
self.gauge_controller = Contract(addrs['gauge_controller'])

self.crv = contract(addrs['crv'])
self.identifiers = defaultdict(list) # id -> versions
self.registries = defaultdict(set) # registry -> pools
self.factories = defaultdict(set) # factory -> pools
self.token_to_pool = dict() # lp_token -> pool
self.coin_to_pools = defaultdict(list)
self.address_provider = contract(addrs['address_provider'])
self.address_provider = Contract(addrs['address_provider'])

self._done = threading.Event()
self._thread = threading.Thread(target=self.watch_events, daemon=True)
Expand Down Expand Up @@ -171,7 +170,7 @@ def watch_events(self) -> None:
for event in decode_logs(registry_logs):
if event.name == 'PoolAdded':
self.registries[event.address].add(event['pool'])
lp_token = contract(event.address).get_lp_token(event['pool'])
lp_token = Contract(event.address).get_lp_token(event['pool'])
pool = event['pool']
self.token_to_pool[lp_token] = pool
for coin in self.get_coins(pool):
Expand Down Expand Up @@ -228,7 +227,7 @@ def load_factories(self) -> None:
if pool in self.factories[factory]:
continue
# for curve v5 pools, pool and lp token are separate
lp_token = contract(factory).get_token(pool)
lp_token = Contract(factory).get_token(pool)
self.token_to_pool[lp_token] = pool
self.factories[factory].add(pool)
for coin in self.get_coins(pool):
Expand Down Expand Up @@ -285,17 +284,17 @@ def get_gauge(self, pool: AddressOrContract, lp_token: AddressOrContract) -> Eth
# for ethereum mainnet: gauges can be retrieved from the pool factory
factory = self.get_factory(pool)
registry = self.get_registry(pool)
if factory and hasattr(contract(factory), 'get_gauge'):
gauge = contract(factory).get_gauge(pool)
if factory and hasattr(Contract(factory), 'get_gauge'):
gauge = Contract(factory).get_gauge(pool)
if gauge != ZERO_ADDRESS:
return gauge
if registry:
gauges, _ = contract(registry).get_gauges(pool)
gauges, _ = Contract(registry).get_gauges(pool)
if gauges[0] != ZERO_ADDRESS:
return gauges[0]
else:
# for chains != ethereum: get gauges from special XCHAIN_GAUGE_FACTORY contract
factory = contract(XCHAIN_GAUGE_FACTORY)
factory = Contract(XCHAIN_GAUGE_FACTORY)
gauge = factory.get_gauge_from_lp_token(lp_token)
if gauge != ZERO_ADDRESS:
return gauge
Expand All @@ -310,13 +309,13 @@ def get_coins(self, pool: AddressOrContract) -> List[EthAddress]:
factory = self.get_factory(pool)
registry = self.get_registry(pool)
if factory:
coins = contract(factory).get_coins(pool)
coins = Contract(factory).get_coins(pool)
elif registry:
coins = contract(registry).get_coins(pool)
coins = Contract(registry).get_coins(pool)

# pool not in registry
if set(coins) == {ZERO_ADDRESS}:
coins = fetch_multicall(*[[contract(pool), 'coins', i] for i in range(8)])
coins = fetch_multicall(*[[Contract(pool), 'coins', i] for i in range(8)])

return [coin for coin in coins if coin not in {None, ZERO_ADDRESS}]

Expand Down Expand Up @@ -555,7 +554,7 @@ async def calculate_boost(self, gauge: Contract, addr: Address, block: Optional[
}

async def calculate_apy(self, gauge: Contract, lp_token: AddressOrContract, block: Optional[Block] = None) -> Dict[str,float]:
pool = contract(self.get_pool(lp_token))
pool = await Contract.coroutine(self.get_pool(lp_token))
results = fetch_multicall_async(
[gauge, "working_supply"],
[self.gauge_controller, "gauge_relative_weight", gauge],
Expand Down
Loading