eth-portfolio-temp 0.1.1.dev0__cp310-cp310-win_amd64.whl → 0.2.17__cp310-cp310-win_amd64.whl

eth_portfolio/_cache.py

@@ -30,7 +30,7 @@ def cache_to_disk(fn: Callable[P, T]) -> Callable[P, T]:
     cache_path_for_fn = f"{BASE_PATH}{fn.__module__.replace('.', '/')}/{name}"
     logger = getLogger(f"eth_portfolio.cache_to_disk.{name}")
 
-    def get_cache_file_path(args, kwargs):
+    def get_cache_file_path(args: tuple[Any, ...], kwargs: dict[str, Any]) -> str:
         # Create a unique filename based on the function arguments
         key = md5(dumps((args, sorted(kwargs.items())))).hexdigest()
         return join(cache_path_for_fn, f"{key}.json")
@@ -46,7 +46,7 @@ def cache_to_disk(fn: Callable[P, T]) -> Callable[P, T]:
 
         queue: PriorityQueue = PriorityQueue()
 
-        async def cache_deco_worker_coro(func) -> NoReturn:
+        async def cache_deco_worker_coro(func: Callable[..., Any]) -> NoReturn:
             try:
                 while True:
                     _, fut, cache_path, args, kwargs = await queue.get()

eth_portfolio/_db/utils.py

@@ -7,8 +7,7 @@ import evmspec
 import y._db.common
 import y._db.config as config
 from a_sync import PruningThreadPoolExecutor, a_sync
-from brownie import chain
-from eth_typing import ChecksumAddress
+from eth_typing import ChecksumAddress, HexAddress
 from evmspec.data import _decode_hook
 from logging import getLogger
 from msgspec import ValidationError, json
@@ -32,7 +31,6 @@ from eth_portfolio._db.decorators import break_locks, requery_objs_on_diff_tx_er
 from eth_portfolio._db.entities import (
     AddressExtended,
     BlockExtended,
-    ContractExtended,
     TokenExtended,
 )
 from eth_portfolio._decimal import Decimal
@@ -42,7 +40,7 @@ from eth_portfolio.typing import _P, _T, Fn
 logger = getLogger(__name__)
 
 
-def __bind():
+def __bind() -> None:
     try:
         db.bind(**config.connection_settings)
     except BindingError as e:
@@ -176,7 +174,7 @@ def ensure_block(block: int) -> None:
 # )
 
 
-def is_token(address) -> bool:
+def is_token(address: ChecksumAddress) -> bool:
     if address == EEE_ADDRESS:
         return False
     # with suppress(NonStandardERC20):
@@ -188,7 +186,7 @@ def is_token(address) -> bool:
     return get_event_loop().run_until_complete(_is_token(address))
 
 
-async def _is_token(address) -> bool:
+async def _is_token(address: HexAddress) -> bool:
     # just breaking a weird lock, dont mind me
     if retval := await get_event_loop().run_in_executor(process, __is_token, address):  # type: ignore [name-defined]
         logger.debug("%s is token")
@@ -197,7 +195,7 @@ async def _is_token(address) -> bool:
     return retval
 
 
-def __is_token(address) -> bool:
+def __is_token(address: HexAddress) -> bool:
     with suppress(NonStandardERC20):
         erc = ERC20(address, asynchronous=True)
         if all(
@@ -322,7 +320,7 @@ async def get_transaction(sender: ChecksumAddress, nonce: int) -> Optional[Trans
 _decoded = 0
 
 
-async def _yield_to_loop():
+async def _yield_to_loop() -> None:
     """dont let the event loop get congested, let your rpc begin work asap"""
     global _decoded
     _decoded += 1

eth_portfolio/_decimal.py

@@ -3,6 +3,7 @@ import logging
 from typing import Union
 
 from evmspec.data import Wei
+from typing_extensions import Self
 
 
 logger = logging.getLogger(__name__)
@@ -69,61 +70,61 @@ class Decimal(decimal.Decimal):
 
         return string
 
-    def __add__(self, other):
+    def __add__(self, other) -> Self:
         try:
             return type(self)(super().__add__(other))
         except TypeError as e:
             raise TypeError(str(e), other) from e.__cause__
 
-    def __radd__(self, other):
+    def __radd__(self, other) -> Self:
         try:
             return type(self)(super().__radd__(other))
         except TypeError as e:
             raise TypeError(str(e), other) from e.__cause__
 
-    def __sub__(self, other):
+    def __sub__(self, other) -> Self:
         try:
             return type(self)(super().__sub__(other))
         except TypeError as e:
             raise TypeError(str(e), other) from e.__cause__
 
-    def __rsub__(self, other):
+    def __rsub__(self, other) -> Self:
         try:
             return type(self)(super().__rsub__(other))
         except TypeError as e:
             raise TypeError(str(e), other) from e.__cause__
 
-    def __mul__(self, other):
+    def __mul__(self, other) -> Self:
         try:
             return type(self)(super().__mul__(other))
         except TypeError as e:
             raise TypeError(str(e), other) from e.__cause__
 
-    def __rmul__(self, other):
+    def __rmul__(self, other) -> Self:
         try:
             return type(self)(super().__rmul__(other))
         except TypeError as e:
             raise TypeError(str(e), other) from e.__cause__
 
-    def __truediv__(self, other):
+    def __truediv__(self, other) -> Self:
         try:
             return type(self)(super().__truediv__(other))
         except TypeError as e:
             raise TypeError(str(e), other) from e.__cause__
 
-    def __rtruediv__(self, other):
+    def __rtruediv__(self, other) -> Self:
         try:
             return type(self)(super().__rtruediv__(other))
         except TypeError as e:
             raise TypeError(str(e), other) from e.__cause__
 
-    def __floordiv__(self, other):
+    def __floordiv__(self, other) -> Self:
         try:
             return type(self)(super().__floordiv__(other))
         except TypeError as e:
             raise TypeError(str(e), other) from e.__cause__
 
-    def __rfloordiv__(self, other):
+    def __rfloordiv__(self, other) -> Self:
         try:
             return type(self)(super().__rfloordiv__(other))
         except TypeError as e:

eth_portfolio/_ledgers/address.py

@@ -37,13 +37,13 @@ import dank_mids
 import eth_retry
 from a_sync.asyncio import sleep0 as yield_to_loop
 from aiohttp import ClientResponseError
-from async_lru import alru_cache
 from brownie import chain
 from dank_mids.eth import TraceFilterParams
 from eth_typing import BlockNumber, ChecksumAddress
 from evmspec import FilterTrace
 from evmspec.structs.receipt import Status
 from evmspec.structs.trace import call, reward
+from faster_async_lru import alru_cache
 from typing_extensions import Unpack
 from pandas import DataFrame  # type: ignore
 from tqdm import tqdm

eth_portfolio/_loaders/token_transfer.py

@@ -7,10 +7,10 @@ from logging import getLogger
 from typing import Final, Optional, Set
 
 from a_sync import create_task, gather
-from async_lru import alru_cache
 from dank_mids import BlockSemaphore
 from eth_typing import ChecksumAddress
 from evmspec.data import TransactionIndex
+from faster_async_lru import alru_cache
 from msgspec import Struct, ValidationError
 from msgspec.json import decode
 from pony.orm import TransactionIntegrityError, UnexpectedError

eth_portfolio/_loaders/transaction.py

@@ -15,9 +15,9 @@ import eth_retry
 import evmspec
 import msgspec
 from a_sync import SmartProcessingQueue
-from async_lru import alru_cache
 from eth_typing import ChecksumAddress
 from evmspec import data
+from faster_async_lru import alru_cache
 from pony.orm import TransactionIntegrityError
 from y import get_price
 from y._decorators import stuck_coro_debugger

eth_portfolio/_loaders/utils.py

@@ -4,8 +4,8 @@ import dank_mids
 import eth_retry
 import msgspec
 from a_sync import SmartProcessingQueue
-from async_lru import alru_cache
 from eth_typing import HexStr
+from faster_async_lru import alru_cache
 from y._decorators import stuck_coro_debugger
 
 

eth_portfolio/_shitcoins.py

@@ -20,6 +20,7 @@ shitcoins: Final = {
         "0xBFA9180729f1c549334080005Ca37093593fB7Aa",
         "0x643695D282f6BA237afe27FFE0Acd89a86b50d3e",
         # Tagged as spam on Etherscan
+        "0x3B809ABd5a7597F8d1cf7dEB2747A1e1580C1488",
         "0xCfB0Ef3e179427316FBD7F0D0296F173762BeEE0",
         "0xfAFe8a7c0A9b3807CC1df0DEB0BA0B5a5fb7A872",
         "0xdf66B9727553fB9Bfa417699CB8F60425d62d1E3",
@@ -67,6 +68,11 @@ shitcoins: Final = {
         "0x635701CC5fE41FE8AbD02aa74Beb02e3540E9BB2",
         "0xF709642622729feafC8bf0934679706df49d8A30",
         # Tagged as phishing on Etherscan
+        "0x4AeDC0B9Acdf5BE1d312Ace7c2df425C2f56F9C3",
+        "0xd16A07Ac860c95F3E225b3A847F81C267b3f929d",
+        "0x211c1eB92D74cbdA58bA82116502fD02dd8F319E",
+        "0x6ef7D6682086Ad4936D2bC141cD94b2c43476FeD",
+        "0x0C98216a20f8e19C1483cf8B307A5E9ce758428D",
         "0x6426b6C2A9108Fa815bcccA3a3232301E1895742",
         "0x0bF377fb3b5F1dD601e693B8fAF6b0bD249f37D3",
         "0xBf5fB1563ef58ba41325454ca61Cc3D62bd40744",
@@ -91,6 +97,22 @@ shitcoins: Final = {
         "0x0e1CD6d2715432e4DBedFE969b0Eb2867FF61d5b",
         "0x9aE357521153FB07bE6F5792CE7a49752638fbb7",
         # Generally looks like shit
+        "0x5e43e50A3cB43Fb71eD2500bC847E8d25b8335f9",
+        "0xE8ED1fca5af1c7dd46A3D5bbDFf7e99749D9e0aa",
+        "0x00d0F0250364C431376cC64AADd3aa13c6A8998D",
+        "0x256099A072ea5fd35eC134758440413095967109",
+        "0xe975ACEb3b61a88A355B066D9cCC910CAb8b4853",
+        "0x59fF00f75b49089385377c7f7D905E193c9eb5e2",
+        "0x99304A346F8FD562336Fd3485301c02cEbE4F0ae",
+        "0x74b1C36268B5dC659aEEA588cb1683E96DaaB71a",
+        "0x92BF340B2c67be6911095675f744F9a3aD22d8F0",
+        "0xa635305B4a6A1E4A55Eb6A6B54a8D2a55e914F6f",
+        "0xC76f77Bff99Ec269050Ca929F4d37B00f012c65F",
+        "0x56BcBef8f5Ca4Fc224fE58187c66EA34d3A1ef4a",
+        "0xdc6050Ec75Bc4692333A1C301eB799e348d0b77e",
+        "0x0542e502cec25bD51b4f3461f4F704807FA1A6D8",
+        "0xc01e807Cc73469e9983B614A96847BC01332447d",
+        "0x87D38d662A4aae29BB60057e71AFf923C7523DC3",
         "0xDFC01a7956C0d151ae197274B974fA7527EbAFB9",
         "0xE256CF1C7caEff4383DabafEe6Dd53910F97213D",
         "0x7CD6143B8781dC7e0667e50DB02Eb6539799722F",
@@ -164,7 +186,32 @@ shitcoins: Final = {
         "0xc6a76f7ad66d0e6Ccd1AaAd6e7568c9bd55Dce62",
         "0xB4d4334eB5a251cbE5cC7Afb0Ba26119aCE62281",
         "0xE5c5AE39B98eFd9D3c9E0F2a5457D98fFA4b0b46",
+        # Generally looks like shit (symbol ERC20)
+        "0x2adA6e459089292264133d8D7c85f6907423E444",
+        "0x356F680eE21c8CeFfA460c38D20A137F3D07D9af",
+        "0x683eAca6CD17383FA93e95f17e7DE443666160eB",
+        "0x7452cc6Bd1FA968dd1672FF447f3D7ff1ce210A8",
+        "0x773F67800a6d79C0198E8Ac798658f80cb346083",
+        "0xaE977D03F5A3999c762eb42a203c436dFF3Df03C",
+        "0xbD67D76edFD88719efD7669583258209015B0aB5",
+        "0xd814cd86ed2e85156d9Cf3A9319261259458f50c",
+        "0xd0E6420b900dE49113B3404b437ee153Bf220B36",
+        "0xf1D1C6ea9166bcF97A099A1388E1663933bB2E48",
+        "0xF8B49aEC3E356f911f86F58Ff9204242d4b0e6A5",
+        "0xe37be01D1337E77aCB0b4293DDb4D410D80010a7",
+        "0x7EeAcC32C81e4D78E9705fBf0b977f5A858Bf0F3",
+        "0x90133FF815ade1977EA2f1454dBC1d309EAA33f6",
+        "0x82ff6D346E424025B1F07e4C8D6527806e50fCA5",
+        "0x7C2bc9F685e1f78e42d236Ff819D89DDA864359d",
+        "0x3ea463dD031A384DB68d6fD2f37574248E7ffCfE",
+        "0x241b047e810c70AB2bB5C567391E0888c4791cbe",
+        "0x47D1b57e5B542808eeEd0C509583Fa12d023f05e",
+        "0x8a33B3e6f5C0049Cff6dEca0564F5fbDa0eBe9f9",
+        "0x84b2e82Ef534e8bE05276DBf4F9e5474fBeD5E59",
+        "0x022b5fE59fc45a29d58a7e45a2567b69b649d623",
+        "0x178d20220c22008cc1886d2E689cAeE4A5c3239b",
         # Tagged as well known address scam on Etherscan
+        "0x59bed83a385571ffac0FC15A43f0f6f72e66Dccb",
         "0x2Ec109a0ceFEC70661a242a8B54cae8f45630397",
         "0x11d666B9C8fa057774324a9bFe6B53eB8d23079f",
         "0x0598BEf845934d83463cEaDd8C86F0801e2Ee058",
@@ -212,6 +259,7 @@ shitcoins: Final = {
         "0xAba86342C3f57E002F47F6eb38099A577312F2e8",
         "0x94C4bfDD351A2EeA9d57e602C2a24d6Fe823Fd1a",
         "0xAfF006725DeeAF5BF6750A6C7c98D9e70cB189a4",
+        "0x54c4D37aD550f9776CE2021df245d98B4Bb5Cb5E",
         # fake USDC
         "0x98a7800EB17e1A0e2b2A4b69e83c58F4535F2180",
         "0xdC5BCA9992191c900D7A7F5b8e1b3e4161d1aa51",
@@ -219,6 +267,8 @@ shitcoins: Final = {
         "0xbADbe6619c0563c60E62C7409681440a80391a27",
         "0x89D3Ac7C32Aa14bEE6Fa90E041241dc4eEbbDFB3",
         "0x640c6fdAfbDaC9bfCe79943890fdc98f8d39bE3e",
+        "0xA04a3a553548090a7b81D2de75B8a08Ee45860e1",
+        "0x1b8F28C0d410456FE04b8f421d00d6654F66AbB6",
         # fake DAI
         "0xf84f908E78f9295b53883AD9ACa38F86d513f03F",
         "0x20Dd160716b0387220Eea7B9951bDb51B3728DC4",
@@ -228,6 +278,9 @@ shitcoins: Final = {
         "0x9257Cf49802E00048A30a6429e9c4d86210F4253",
         "0x6b1b80b4b3228060EA21C292a3b9c576691Ca6cC",
         "0xfCDFf724385Dcb47f2E62f7F2E383a7822Ed9718",
+        "0x94a2a4d842F522Dac0E793f2f9Ad08058997D06d",
+        "0xb44D28295E3D7C898C087A1cB209A444DeD5E4c1",
+        "0xFf3A7EE33203F5d3C69C309B5425b0E3fEfB736B",
         # fake ETH
         "0x225795bb6D20773a4A34c682Ae8457D00C80F955",
         "0x25741E94782d3EaA7fb0A02D78256bf065AEC3B9",

eth_portfolio/_utils.py

@@ -18,10 +18,10 @@ from typing import (
 
 import dank_mids
 from a_sync import ASyncGenericBase, ASyncIterable, ASyncIterator, as_yielded
-from async_lru import alru_cache
 from brownie import chain
 from brownie.exceptions import ContractNotFound
-from eth_abi.exceptions import InsufficientDataBytes
+from faster_async_lru import alru_cache
+from faster_eth_abi.exceptions import InsufficientDataBytes
 from eth_typing import ChecksumAddress
 from pandas import DataFrame  # type: ignore
 from y import ERC20, Contract, Network
@@ -47,10 +47,15 @@ if TYPE_CHECKING:
 
 logger: Final = logging.getLogger(__name__)
 
-NON_STANDARD_ERC721: Final = {
+NON_STANDARD_ERC721: Final[List[ChecksumAddress]] = {
     Network.Mainnet: ["0xb47e3cd837dDF8e4c57F05d70Ab865de6e193BBB"],  # CryptoPunks
 }.get(CHAINID, [])
 
+SUPPRESS_ERROR_LOGS: Final[List[ChecksumAddress]] = {
+    # put tokens here when you don't expect them to price successfully and do not want to see the associated error logs
+}.get(CHAINID, [])
+"""Put tokens here when you don't expect them to price successfully and do not want to see the associated error logs."""
+
 
 async def get_buffered_chain_height() -> int:
     """Returns an int equal to the current height of the chain minus `_config.REORG_BUFFER`."""
@@ -74,10 +79,6 @@ class Decimal(_decimal.Decimal):
 
     # TODO i forget why I had this lol, should I delete?
 
-    def __init__(self, v) -> None:
-        # assert not isinstance(v, _decimal.Decimal)
-        super().__init__()
-
 
 async def _describe_err(token: AddressOrContract, block: Optional[Block]) -> str:
     """
@@ -132,9 +133,10 @@ async def _get_price(token: AddressOrContract, block: Optional[int] = None) -> _
                 # Can't get symbol for handling like other excs
                 logger.warning(f"NonStandardERC20 while fetching price for {token}")
             elif isinstance(e.exception, PriceError):
-                logger.warning(
-                    f"PriceError while fetching price for {await _describe_err(token, block)}"
-                )
+                if token not in SUPPRESS_ERROR_LOGS:
+                    logger.warning(
+                        f"PriceError while fetching price for {await _describe_err(token, block)}"
+                    )
             else:
                 logger.warning(f"{e} while fetching price for {await _describe_err(token, block)}")
                 logger.warning(e, exc_info=True)

eth_portfolio/_ydb/token_transfers.py

@@ -1,7 +1,7 @@
 from abc import abstractmethod
 from asyncio import Task, create_task, sleep
 from logging import DEBUG, getLogger
-from typing import AsyncIterator, Final, List
+from typing import Any, AsyncIterator, Final, List
 
 import dank_mids
 import evmspec
@@ -9,6 +9,7 @@ import y._db.log
 from a_sync import ASyncIterable, ASyncIterator, as_yielded
 from brownie import chain
 from eth_typing import BlockNumber, ChecksumAddress
+from faster_eth_abi import encode
 from faster_eth_utils import encode_hex
 from y.utils.events import ProcessedEvents
 
@@ -18,21 +19,15 @@ from eth_portfolio.constants import TRANSFER_SIGS
 from eth_portfolio.structs import TokenTransfer
 
 
-try:
-    # this is only available in 4.0.0+
-    from eth_abi import encode
-
-    encode_address = lambda address: encode_hex(encode(["address"], [str(address)]))
-except ImportError:
-    from eth_abi import encode_single
-
-    encode_address = lambda address: encode_hex(encode_single("address", str(address)))
-
 logger: Final = getLogger(__name__)
 _logger_is_enabled_for: Final = logger.isEnabledFor
 _logger_log: Final = logger._log
 
 
+def encode_address(address: Any) -> bytes:
+    return encode_hex(encode(["address"], [str(address)]))
+
+
 class _TokenTransfers(ProcessedEvents["Task[TokenTransfer]"]):
     """A helper mixin that contains all logic for fetching token transfers for a particular wallet address"""
 

eth_portfolio/buckets.py

@@ -2,8 +2,8 @@ import logging
 from typing import Any, Final, Optional, Set
 
 from a_sync import igather
-from async_lru import alru_cache
 from eth_typing import ChecksumAddress
+from faster_async_lru import alru_cache
 from y.constants import CHAINID, STABLECOINS, WRAPPED_GAS_COIN
 from y.convert import to_address
 from y.datatypes import Address, AnyAddressType

eth_portfolio/portfolio.py

@@ -37,7 +37,7 @@ from eth_portfolio.typing import Addresses, PortfolioBalances
 logger = logging.getLogger(__name__)
 
 
-class PortfolioWallets(Iterable[PortfolioAddress], Dict[Address, PortfolioAddress]):  # type: ignore [misc]
+class PortfolioWallets(Iterable[PortfolioAddress], Dict[Address, PortfolioAddress]):  # type: ignore [metaclass]
     """
     A container that holds all :class:`~eth_portfolio.address.PortfolioAddress` objects for a specific :class:`~eth_portfolio.Portfolio`.
 

eth_portfolio/protocols/lending/liquity.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from async_lru import alru_cache
+from faster_async_lru import alru_cache
 from y import Contract, Network, get_price
 from y._decorators import stuck_coro_debugger
 from y.constants import EEE_ADDRESS

eth_portfolio/protocols/lending/maker.py

@@ -1,10 +1,12 @@
 from asyncio import gather
-from typing import List, Optional
+from typing import Final, List, Optional
 
 from a_sync import igather
-from async_lru import alru_cache
+from brownie import ZERO_ADDRESS
 from dank_mids.exceptions import Revert
 from eth_typing import HexStr
+from faster_async_lru import alru_cache
+from faster_eth_abi import encode
 from y import Contract, Network, contract_creation_block_async, get_price
 from y._decorators import stuck_coro_debugger
 from y.constants import dai
@@ -14,18 +16,15 @@ from eth_portfolio._utils import Decimal
 from eth_portfolio.protocols.lending._base import LendingProtocolWithLockedCollateral
 from eth_portfolio.typing import Balance, TokenBalances
 
-try:
-    # this is only available in 4.0.0+
-    from eth_abi import encode
 
-    encode_bytes = lambda bytestring: encode(["bytes32"], [bytestring])
-except ImportError:
-    from eth_abi import encode_single
+yfi: Final = "0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e"
+dai: Contract
+_1e18: Final = Decimal(10**18)
+_1e45: Final = Decimal(10**45)
 
-    encode_bytes = lambda bytestring: encode_single("bytes32", bytestring)
 
-yfi = "0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e"
-dai: Contract
+def encode_bytes(bytestring: str) -> bytes:
+    return encode(["bytes32"], [bytestring])
 
 
 class Maker(LendingProtocolWithLockedCollateral):
@@ -50,8 +49,8 @@ class Maker(LendingProtocolWithLockedCollateral):
 
         balances: TokenBalances = TokenBalances(block=block)
         for token, data in zip(gems, ink_data):
-            if ink := data.dict()["ink"]:
-                balance = ink / Decimal(10**18)
+            if token != ZERO_ADDRESS and (ink := data.dict()["ink"]):
+                balance = ink / _1e18
                 value = round(balance * Decimal(await get_price(token, block, sync=False)), 18)
                 balances[token] = Balance(balance, value, token=token, block=block)
         return balances
@@ -75,7 +74,7 @@ class Maker(LendingProtocolWithLockedCollateral):
         for urns, ilk_info in data:
             art = urns.dict()["art"]
             rate = ilk_info.dict()["rate"]
-            debt = art * rate / Decimal(1e45)
+            debt = art * rate / _1e45
             balances[dai.address] += Balance(debt, debt, token=dai, block=block)
         return balances
 

eth_portfolio/structs/structs.py

@@ -80,7 +80,7 @@ class _LedgerEntryBase(DictStruct, kw_only=True, frozen=True, omit_defaults=True
     The USD value of the cryptocurrency transferred in the {cls_name}, if price is known.
     """
 
-    def __init_subclass__(cls, **kwargs):
+    def __init_subclass__(cls, **kwargs: Any) -> None:
         super().__init_subclass__(**kwargs)
 
         # Replace {cls_name} in attribute-level docstrings
@@ -273,7 +273,7 @@ class _TransactionBase(
         return self.transaction.yParity
 
     @property
-    def __db_primary_key__(self):
+    def __db_primary_key__(self) -> Dict[str, tuple[int, Address] | int]:
         return {"from_address": (chain.id, self.from_address), "nonce": self.nonce}
 
 

eth_portfolio/typing/__init__.py

@@ -43,7 +43,7 @@ from typing import (
 )
 
 from checksum_dict import DefaultChecksumDict
-from eth_typing import BlockNumber
+from eth_typing import BlockNumber, HexAddress
 from pandas import DataFrame, concat
 from typing_extensions import ParamSpec, Self
 from y import Contract, ERC20
@@ -159,10 +159,10 @@ class TokenBalances(DefaultChecksumDict[Balance], _SummableNonNumericMixin):  #
                     raise
                 self[token.address] += balance
 
-    def __getitem__(self, key) -> Balance:
+    def __getitem__(self, key: HexAddress) -> Balance:
         return super().__getitem__(key) if key in self else Balance(token=key, block=self.block)
 
-    def __setitem__(self, key, value):
+    def __setitem__(self, key: HexAddress, value: Balance) -> None:
         """
         Sets the balance for a given token address.
 
@@ -911,7 +911,7 @@ class PortfolioBalances(DefaultChecksumDict[WalletBalances], _SummableNonNumeric
                 )
             self[wallet] += balances
 
-    def __setitem__(self, key, value):
+    def __setitem__(self, key: HexAddress, value: WalletBalances) -> None:
         if not isinstance(value, WalletBalances):
             raise TypeError(
                 f"value must be a `WalletBalances` object. You passed {value}"

eth_portfolio_scripts/_portfolio.py

@@ -1,3 +1,4 @@
+import asyncio
 from datetime import datetime, timezone
 from logging import getLogger
 from math import floor
@@ -5,10 +6,11 @@ from typing import Awaitable, Callable, Final, Iterator, List, Optional, Tuple
 
 import a_sync
 import eth_retry
+import y
 from a_sync.functools import cached_property_unsafe as cached_property
 from eth_typing import BlockNumber, ChecksumAddress
 from msgspec import ValidationError, json
-from y import ERC20, Network, NonStandardERC20, get_block_at_timestamp
+from y import ERC20, Network, NonStandardERC20
 from y.constants import CHAINID
 from y.time import NoBlockFound
 
@@ -33,6 +35,19 @@ logger: Final = getLogger("eth_portfolio")
 log_debug: Final = logger.debug
 log_error: Final = logger.error
 
+_block_at_timestamp_semaphore: Final = a_sync.Semaphore(
+    50, name="eth-portfolio get_block_at_timestamp"
+)
+
+
+async def get_block_at_timestamp(dt: datetime) -> BlockNumber:
+    async with _block_at_timestamp_semaphore:
+        while True:
+            try:
+                return await y.get_block_at_timestamp(dt, sync=False)
+            except NoBlockFound:
+                await asyncio.sleep(10)
+
 
 class ExportablePortfolio(Portfolio):
     """Adds methods to export full portoflio data."""
@@ -40,8 +55,10 @@ class ExportablePortfolio(Portfolio):
     def __init__(
         self,
         addresses: Addresses,
+        *,
         start_block: int = 0,
         label: str = _DEFAULT_LABEL,
+        concurrency: int = 40,
         load_prices: bool = True,
         get_bucket: Callable[[ChecksumAddress], Awaitable[str]] = get_token_bucket,
         num_workers_transactions: int = 1000,
@@ -51,6 +68,7 @@ class ExportablePortfolio(Portfolio):
             addresses, start_block, label, load_prices, num_workers_transactions, asynchronous
         )
         self.get_bucket = get_bucket
+        self._semaphore = a_sync.Semaphore(concurrency)
 
     @cached_property
     def _data_queries(self) -> Tuple[str, str]:
@@ -74,50 +92,45 @@ class ExportablePortfolio(Portfolio):
     async def export_snapshot(self, dt: datetime) -> None:
         log_debug("checking data at %s for %s", dt, self.label)
         try:
-            if not await self.data_exists(dt, sync=False):
-                while True:
-                    try:
-                        block = await get_block_at_timestamp(dt, sync=False)
-                    except NoBlockFound:
-                        pass
-                    else:
-                        break
-                log_debug("block at %s: %s", dt, block)
-                data = await self.get_data_for_export(block, dt, sync=False)
-                await victoria.post_data(data)
+            if await self.data_exists(dt, sync=False):
+                return
+            block = await get_block_at_timestamp(dt)
+            log_debug("block at %s: %s", dt, block)
+            data = await self.get_data_for_export(block, dt, sync=False)
+            await victoria.post_data(data)
         except Exception as e:
             log_error("Error processing %s:", dt, exc_info=True)
 
-    @a_sync.Semaphore(60)
     async def get_data_for_export(self, block: BlockNumber, ts: datetime) -> List[victoria.Metric]:
-        print(f"exporting {ts} for {self.label}")
-        start = datetime.now(tz=timezone.utc)
-
-        metrics_to_export = []
-        data: PortfolioBalances = await self.describe(block, sync=False)
-
-        for wallet, wallet_data in dict.items(data):
-            for section, section_data in wallet_data.items():
-                if isinstance(section_data, TokenBalances):
-                    for token, bals in dict.items(section_data):
-                        metrics_to_export.extend(
-                            await self.__process_token(ts, section, wallet, token, bals)
-                        )
-                elif isinstance(section_data, RemoteTokenBalances):
-                    if section == "external":
-                        section = "assets"
-                    for protocol, token_bals in section_data.items():
-                        for token, bals in dict.items(token_bals):
+        async with self._semaphore:
+            print(f"exporting {ts} for {self.label}")
+            start = datetime.now(tz=timezone.utc)
+
+            metrics_to_export = []
+            data: PortfolioBalances = await self.describe(block, sync=False)
+
+            for wallet, wallet_data in dict.items(data):
+                for section, section_data in wallet_data.items():
+                    if isinstance(section_data, TokenBalances):
+                        for token, bals in dict.items(section_data):
                             metrics_to_export.extend(
-                                await self.__process_token(
-                                    ts, section, wallet, token, bals, protocol=protocol
-                                )
+                                await self.__process_token(ts, section, wallet, token, bals)
                             )
-                else:
-                    raise NotImplementedError()
+                    elif isinstance(section_data, RemoteTokenBalances):
+                        if section == "external":
+                            section = "assets"
+                        for protocol, token_bals in section_data.items():
+                            for token, bals in dict.items(token_bals):
+                                metrics_to_export.extend(
+                                    await self.__process_token(
+                                        ts, section, wallet, token, bals, protocol=protocol
+                                    )
+                                )
+                    else:
+                        raise NotImplementedError()
 
-        print(f"got data for {ts} in {datetime.now(tz=timezone.utc) - start}")
-        return metrics_to_export
+            print(f"got data for {ts} in {datetime.now(tz=timezone.utc) - start}")
+            return metrics_to_export
 
     def __get_data_exists_coros(self, dt: datetime) -> Iterator[str]:
         for query in self._data_queries:

eth_portfolio_scripts/_utils.py

@@ -1,18 +1,18 @@
 import re
 from asyncio import Task, create_task, sleep
 from datetime import datetime, timedelta, timezone
-from typing import Any, AsyncGenerator, Dict, List, Optional
+from typing import Any, AsyncGenerator, Dict, Final, List, Optional
 
 from brownie import chain
 
 
-def parse_timedelta(value: str) -> timedelta:
-    regex = re.compile(r"(\d+)([dhms]?)")
-    result = regex.findall(value)
+timedelta_pattern: Final = re.compile(r"(\d+)([dhms]?)")
+
 
+def parse_timedelta(value: str) -> timedelta:
     days, hours, minutes, seconds = 0, 0, 0, 0
 
-    for val, unit in result:
+    for val, unit in timedelta_pattern.findall(value):
         val = int(val)
         if unit == "d":
             days = val
@@ -58,10 +58,24 @@ async def aiter_timestamps(
 
     timestamp = start
 
+    timestamps = []
     while timestamp <= datetime.now(tz=timezone.utc):
-        yield timestamp
+        timestamps.append(timestamp)
         timestamp = timestamp + interval
 
+    # cycle between yielding earliest, latest, and middle from `timestamps` until complete
+    while timestamps:
+        # yield the earliest timestamp
+        yield timestamps.pop(0)
+        # yield the most recent timestamp if there is one
+        if timestamps:
+            yield timestamps.pop(-1)
+            # yield the most middle timestamp if there is one
+            if timestamps:
+                yield timestamps.pop(len(timestamps) // 2)
+
+    del timestamps
+
     while run_forever:
         while timestamp > datetime.now(tz=timezone.utc):
             await _get_waiter(timestamp)

eth_portfolio_scripts/balances.py

@@ -26,13 +26,16 @@ async def export_balances(args: Namespace) -> None:
 
     interval = parse_timedelta(args.interval)
     portfolio = ExportablePortfolio(
-        args.wallet, label=args.label, start_block=args.first_tx_block, load_prices=False
+        args.wallet,
+        label=args.label,
+        start_block=args.first_tx_block,
+        concurrency=args.concurrency,
+        load_prices=False,
     )
 
     if export_start_block := args.export_start_block or args.first_tx_block:
-        start = datetime.fromtimestamp(
-            await dank_mids.eth.get_block_timestamp(args.export_start_block), tz=timezone.utc
-        )
+        start_ts = await dank_mids.eth.get_block_timestamp(export_start_block)
+        start = datetime.fromtimestamp(start_ts, tz=timezone.utc)
     else:
         start = None
 

eth_portfolio_scripts/docker/check.py

@@ -1,5 +1,6 @@
 from functools import lru_cache
 from subprocess import CalledProcessError, check_output
+from typing import List
 
 
 def check_docker() -> None:
@@ -9,48 +10,58 @@ def check_docker() -> None:
     Raises:
         RuntimeError: If docker is not installed.
     """
+    print(" 🔍 checking your computer for docker")
     try:
         check_output(["docker", "--version"])
-        print("docker found!")
     except (CalledProcessError, FileNotFoundError):
-        print("checking your computer for docker")
         raise RuntimeError(
             "Docker is not installed. You must install Docker before using dao-treasury."
         ) from None
+    else:
+        print(" ✔️ eth-portfolio found docker!")
 
 
-def check_docker_compose() -> None:
+def check_docker_compose() -> List[str]:
     """
-    Check that docker-compose is installed on the user's system.
+    Check that either `docker-compose` or `docker compose` is installed on the user's system.
+
+    Returns:
+        A valid compose command.
 
     Raises:
         RuntimeError: If docker-compose is not installed.
     """
-    try:
-        check_output(["docker-compose", "--version"])
-        print("docker-compose found!")
-    except (CalledProcessError, FileNotFoundError):
-        print("checking your computer for docker-compose")
+    for cmd in ["docker-compose", "docker compose"]:
+        print(f" 🔍 checking your computer for {cmd}")
+
         try:
-            check_output(["docker", "compose", "--version"])
-            print("docker compose found!")
+            check_output([*cmd.split(" "), "--version"])
         except (CalledProcessError, FileNotFoundError):
-            print("docker-compose not found, checking your computer for docker compose")
-            raise RuntimeError(
-                "Docker Compose is not installed. You must install Docker Compose before using dao-treasury."
-            ) from None
+            print(f" ❌ {cmd} not found")
+            continue
+        else:
+            print(f" ✔️ eth-portfolio found {cmd}!")
+            return cmd.split(" ")
+
+    raise RuntimeError(
+        "Docker Compose is not installed. You must install Docker Compose before using dao-treasury."
+    ) from None
 
 
 @lru_cache(maxsize=None)
-def check_system() -> None:
+def check_system() -> List[str]:
     """
     Check that docker and docker-compose is installed on the user's system.
 
+    Returns:
+        A valid compose command.
+
     Raises:
         RuntimeError: If docker-compose is not installed.
     """
+    print("eth-portfolio is checking for the required docker dependencies...")
     check_docker()
-    check_docker_compose()
+    return check_docker_compose()
 
 
 __all__ = ["check_docker", "check_docker_compose", "check_system"]

eth_portfolio_scripts/docker/docker-compose.yaml

@@ -3,7 +3,7 @@ networks:
 
 services:
   grafana:
-    image: grafana/grafana:10.2.0
+    image: grafana/grafana:12.2.1
     ports:
       - 127.0.0.1:${GRAFANA_PORT:-3000}:3000
     environment:
@@ -47,7 +47,7 @@ services:
     restart: always
 
   victoria-metrics:
-    image: victoriametrics/victoria-metrics:v1.81.1
+    image: victoriametrics/victoria-metrics:v1.129.1
     volumes:
       - ~/.eth-portfolio/data/victoria/:/victoria-metrics-data
     command:

eth_portfolio_scripts/docker/docker_compose.py

@@ -3,7 +3,7 @@ from functools import wraps
 from importlib import resources
 from os import path
 from subprocess import CalledProcessError, check_output
-from typing import Callable, Final, Iterable, List, Tuple, TypeVar
+from typing import Callable, Final, Iterable, List, Literal, Tuple, TypeVar
 
 from typing_extensions import ParamSpec
 
@@ -12,33 +12,33 @@ from eth_portfolio_scripts.docker.check import check_system
 
 logger: Final = logging.getLogger(__name__)
 
-compose_file: Final = str(
+COMPOSE_FILE: Final = str(
     resources.files("eth_portfolio_scripts").joinpath("docker/docker-compose.yaml")
 )
 
 
 def up(*services: str) -> None:
+    """Build and start the specified docker-compose services."""
     build(*services)
-    print("starting the infra containers...")
+    _print_notice("starting", services)
     _exec_command(["up", "-d", *services])
 
 
 def down() -> None:
+    """Stop all of eth-portfolio's docker-compose services."""
     _exec_command(["down"])
 
 
 def build(*services: str) -> None:
-    print("building the grafana containers")
+    """Build the specified docker-compose services."""
+    _print_notice("building", services)
     _exec_command(["build", *services])
 
 
-def stop(container_name: str) -> None:
-    """
-    Stop the specified container if it is running.
-    Defaults to stopping the 'renderer' container.
-    """
-    print(f"stopping the {container_name} container...")
-    _exec_command(["stop", container_name])
+def stop(*services: str) -> None:
+    """Stop the specified docker-compose services, if running."""
+    _print_notice("stopping", services)
+    _exec_command(["stop", *services])
 
 
 _P = ParamSpec("_P")
@@ -67,12 +67,32 @@ def ensure_containers(fn: Callable[_P, _T]) -> Callable[_P, _T]:
     return compose_wrap
 
 
-def _exec_command(command: List[str], *, compose_options: Tuple[str, ...] = ()) -> None:
-    check_system()
+def _print_notice(
+    doing: Literal["building", "starting", "stopping"],
+    services: Tuple[str, ...],
+) -> None:
+    if len(services) == 0:
+        print(f"{doing} the backend containers")
+    elif len(services) == 1:
+        container = services[0]
+        print(f"{doing} the {container} container")
+    elif len(services) == 2:
+        first, second = services
+        print(f"{doing} the {first} and {second} containers")
+    else:
+        *all_but_last, last = services
+        print(f"{doing} the {', '.join(all_but_last)}, and {last} containers")
+
+
+def _exec_command(
+    command: List[str],
+    *,
+    compose_file: str = COMPOSE_FILE,
+    compose_options: Tuple[str, ...] = (),
+) -> None:
+    compose = check_system()
+    full_command = [*compose, *compose_options, "-f", compose_file, *command]
     try:
-        check_output(["docker", "compose", *compose_options, "-f", compose_file, *command])
+        check_output(full_command)
     except (CalledProcessError, FileNotFoundError) as e:
-        try:
-            check_output(["docker-compose", *compose_options, "-f", compose_file, *command])
-        except (CalledProcessError, FileNotFoundError) as _e:
-            raise RuntimeError(f"Error occurred while running {' '.join(command)}: {_e}") from _e
+        raise RuntimeError(f"Error occurred while running `{' '.join(full_command)}`: {e}") from e

eth_portfolio_scripts/main.py

@@ -54,6 +54,12 @@ export_parser.add_argument(
     help="The time interval between datapoints. default: 6h",
     default="6h",
 )
+export_parser.add_argument(
+    "--concurrency",
+    type=int,
+    help="The max number of historical blocks to export concurrently. default: 40",
+    default=40,
+)
 export_parser.add_argument(
     "--first-tx-block",
     type=int,

{eth_portfolio_temp-0.1.1.dev0.dist-info → eth_portfolio_temp-0.2.17.dist-info}/METADATA

@@ -1,22 +1,23 @@
 Metadata-Version: 2.4
 Name: eth_portfolio_temp
-Version: 0.1.1.dev0
+Version: 0.2.17
 Summary: eth-portfolio makes it easy to analyze your portfolio.
 Home-page: https://github.com/BobTheBuidler/eth-portfolio
 Author: BobTheBuidler
 Author-email: bobthebuidlerdefi@gmail.com
-Requires-Python: >=3.10,<3.13
+Requires-Python: >=3.10,<3.14
 Requires-Dist: checksum_dict>=2.1.7
 Requires-Dist: dank_mids>=4.20.154
-Requires-Dist: eth-brownie<1.23,>=1.21.0
+Requires-Dist: eth-brownie<1.23,>=1.22.0.dev0
 Requires-Dist: eth_retry<1,>=0.3.4
 Requires-Dist: evmspec>=0.4.1
-Requires-Dist: ez-a-sync>=0.32.7
+Requires-Dist: ez-a-sync>=0.32.27
+Requires-Dist: faster-async-lru==2.0.5
 Requires-Dist: faster-eth-utils
-Requires-Dist: numpy<2
+Requires-Dist: numpy<3
 Requires-Dist: pandas<3,>=1.4.3
 Requires-Dist: typed-envs>=0.0.9
-Requires-Dist: ypricemagic<5,>=4.6.21.dev0
+Requires-Dist: ypricemagic<5,>=4.10.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: home-page

{eth_portfolio_temp-0.1.1.dev0.dist-info → eth_portfolio_temp-0.2.17.dist-info}/RECORD

@@ -1,43 +1,43 @@
-295eace8438df6ec133b__mypyc.cp310-win_amd64.pyd,sha256=tBF9aJs9UsOvDGFEXCUoLPdXgdKXxOVwxft4PLlWfd4,265728
+eth_portfolio__mypyc.cp310-win_amd64.pyd,sha256=bk_x4lnn5UHCqcLFNwC8UwxCCk_SU8RRN0OkM0hP_MY,279040
 eth_portfolio/__init__.py,sha256=5GmHYzhUX2gOC4MScgXnqS8x2MawbpWOuWPmqlvCotA,525
-eth_portfolio/_argspec.cp310-win_amd64.pyd,sha256=HgWR-dkrtgvVnONz-25w0pukWib_eSwlJuM4yHBAIhE,10752
+eth_portfolio/_argspec.cp310-win_amd64.pyd,sha256=ShPLpfF-_rz7BUuoUxuHOoONzRYasqOII-eef-vhbhQ,10752
 eth_portfolio/_argspec.py,sha256=au8ycJ56-7UzbQVzYUOoMX9sToH0QNi2tS1O820xB3A,1637
-eth_portfolio/_cache.py,sha256=H8n8x0Xo-iHQ8Q-NPuk57mmbIG6qDj4Wal6_-tK9Pfs,4866
-eth_portfolio/_config.cp310-win_amd64.pyd,sha256=gWvti2BxstiALzvUp45uAN8szS5BU4NX8kLZJ5QP0Jw,10752
+eth_portfolio/_cache.py,sha256=OntwbiDOrBV5JzHHDzJlxcEVrmKK5GG0uXeLeoDDbpA,4926
+eth_portfolio/_config.cp310-win_amd64.pyd,sha256=YOBKVY0vx7B8JluRHTvsj16JIYgvRaDGXtCcioz8Qug,10752
 eth_portfolio/_config.py,sha256=BSOvFS4D0oqgVTtBbtW2g2kpL8Mk6xiP0PipfXs_91A,102
-eth_portfolio/_decimal.py,sha256=XhuxnVTAhJF6OILJ1MpbdwkAiy1D5NuS9jRmDRpCSYg,4886
+eth_portfolio/_decimal.py,sha256=DwLUg8pzeTIREG2sHgRK48hoWmjelWNvpEKj10Ra7to,5002
 eth_portfolio/_decorators.py,sha256=AvB-q69MvaFe0Ykh1os6hSewcUujURQ9onqobMaONOM,2899
 eth_portfolio/_exceptions.py,sha256=xb5VmCtBtXy9WXu_1ofoG4j9BJsMQXMVydCJNUulrNY,2500
-eth_portfolio/_shitcoins.cp310-win_amd64.pyd,sha256=RkOv0rPJdjgSuVPZSlUksXHYwdZzv-aFtbialcP61cU,10752
-eth_portfolio/_shitcoins.py,sha256=7oJavDOL9wPptHmJK_3OQs-T4XfugWh_om8Zx1DfzZo,14439
-eth_portfolio/_stableish.cp310-win_amd64.pyd,sha256=R7RyYPGXoBCQk-whe_Cy6wiCysqz34YV1NTJgCHrIY0,10752
+eth_portfolio/_shitcoins.cp310-win_amd64.pyd,sha256=eysBgfwrkiL4jtdyRJaqP3XeT5lKDf8q93dVCjVtoQU,10752
+eth_portfolio/_shitcoins.py,sha256=9i7tcwZN620oQkDBa_gSE4jqZn0TK52AyqZh0MIP8m4,17351
+eth_portfolio/_stableish.cp310-win_amd64.pyd,sha256=RBhItaf5yN4KDzwO5QQTjyw4KC3dK522kjOCY8aLE8I,10752
 eth_portfolio/_stableish.py,sha256=8pdlYe2YcZ8rTzdCzg-ihRQLPtSFXBNDjtnvuTgPRcQ,2063
 eth_portfolio/_submodules.py,sha256=zne-2YyVFoKHwkLuHx8cdz5lpcwwSDw1edJ9v8G4c1A,2263
-eth_portfolio/_utils.py,sha256=LQtg467tXBCQh7sGFepOe440XgTOu9bqJsY9qSg-Xs8,7583
+eth_portfolio/_utils.py,sha256=iGck5SKUwpfnuZvLnKDR1A00obZNKx622Y9GY_TYiZA,7886
 eth_portfolio/address.py,sha256=RrFIWSx6jSITwh16Hqs6W6S9fz1KEaebQEk1vqL3HwI,14536
-eth_portfolio/buckets.py,sha256=pm2-_8VbGKpe6hHM6eysj17JK7Rhngr9-_gpVi-J1uA,6889
-eth_portfolio/constants.cp310-win_amd64.pyd,sha256=S3eDz-h83Sc54WlbB0xEgMH-ObTTTZ9qmXvY0PopXlE,10752
+eth_portfolio/buckets.py,sha256=c5_RLfMyJbnK_PBx5mmdL3YlIX67dD6LqnBxiAr52N0,6896
+eth_portfolio/constants.cp310-win_amd64.pyd,sha256=Z-_tRO2wGgKZ0T2Pz0EcKvA652FbAyI9bhfy3rsLwf0,10752
 eth_portfolio/constants.py,sha256=rUXWFaCGrrF_qzIdDvVzakQJsLnrGtFNn2EgRbZh8fQ,3741
-eth_portfolio/portfolio.py,sha256=FVx4QwnJH4llTWcYln9UpDkKridHSEAENbTHCBOSq_o,24904
+eth_portfolio/portfolio.py,sha256=FSJ1_FG120dN5vWSPyhbHfyuFHdmFqTHJ5_Ci-4Rts4,24909
 eth_portfolio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eth_portfolio/_db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eth_portfolio/_db/decorators.py,sha256=RS-RiuOAgbrMKQpCwwAtP3lPRs8vKM6aPhh9LP4SwtI,5308
 eth_portfolio/_db/entities.py,sha256=1Z1AsR400SJYzDrDGxUJt1HuSKB3ErvxIytFtju7UHU,10345
-eth_portfolio/_db/utils.py,sha256=j3bPtbbhFQ0wARkZwOnsmaxS-TY72HaWJSYno5N4iZI,21567
+eth_portfolio/_db/utils.py,sha256=3P4EVQ5cHLbDrAnBESAIKhoDpJLXLS8IDJNnsh7T2Sc,21586
 eth_portfolio/_ledgers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-eth_portfolio/_ledgers/address.py,sha256=ZI4lVsxtXoffDHFBm0pUrSKU42KleBKThNdDHm1Nqtg,33823
+eth_portfolio/_ledgers/address.py,sha256=wght92UXf6UIO9GNRzdMy3H43Em7kUk9ArtBsRF-xjw,33830
 eth_portfolio/_ledgers/portfolio.py,sha256=rAr5S1tksgLPUOK1J1FbIWgvTQNzTqrRp8oukiP2BTo,13427
 eth_portfolio/_loaders/__init__.py,sha256=YrBeRuA48cN2Bg2R2nXiNt1CsUIG_7N6ENIpY6aISPo,1735
-eth_portfolio/_loaders/_nonce.cp310-win_amd64.pyd,sha256=o8K1zNxsXsj2a_Eyd_8fRN_9CbfUtAZgc6wrb2szv7A,10752
+eth_portfolio/_loaders/_nonce.cp310-win_amd64.pyd,sha256=U7IexsT47g_413dtjuggNiuI3Qv9faSpFgQvRJb-4o4,10752
 eth_portfolio/_loaders/_nonce.py,sha256=bA-5fZG8ALuADgQGrnoxt6p6j7QEwI6vIGnZRF1Zx7M,6481
-eth_portfolio/_loaders/balances.cp310-win_amd64.pyd,sha256=j2oc8Zs1vTFJ3FyBHSKGTFhKWBtwOBXphOxJXXBp-B4,10752
+eth_portfolio/_loaders/balances.cp310-win_amd64.pyd,sha256=_2aooQHv2pwBITEfUl3RtjWxd39IRT6lEvcW-xDs1CY,10752
 eth_portfolio/_loaders/balances.py,sha256=_v-x1M3lzDHPt8svHmCcpxZKw0BaGHfZimhkwgphY8A,3226
-eth_portfolio/_loaders/token_transfer.py,sha256=58NoMc28CRSjuxP-_kNmXL7jS1oEFZayTZ9VAKQcVow,8741
-eth_portfolio/_loaders/transaction.py,sha256=WXsiNahcb5jNbXCX2-ceao3Cybfi-7_th8bnw9elmP0,9386
-eth_portfolio/_loaders/utils.cp310-win_amd64.pyd,sha256=nVFhOxcAVyrgbOnSMqbJl9wsTIVnb2K-pjcuLLgt1yY,10752
-eth_portfolio/_loaders/utils.py,sha256=_nhPmGq_h_y_JPU9vXvhzqoKAWtgLRhYy_PdJXbyUdw,2326
+eth_portfolio/_loaders/token_transfer.py,sha256=itaWVDyotG0EYPb4o94UOpxYvTdE6YIuUR2pzpXAnwI,8748
+eth_portfolio/_loaders/transaction.py,sha256=oOG3cFdLAa10k2hpN17GO7Wtq-rpUJ1oo7hLAKDjbDc,9393
+eth_portfolio/_loaders/utils.cp310-win_amd64.pyd,sha256=TbmE8jR1hw0cVZHIUaNQEOP-GFHqt4DfibouZnQKuJE,10752
+eth_portfolio/_loaders/utils.py,sha256=gJvIikinjCPj-elQVep55VTya9slSARApx-FJKYwnkE,2333
 eth_portfolio/_ydb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-eth_portfolio/_ydb/token_transfers.py,sha256=6xxV6YDoiAYmr9twO-e914vXjgWX_cmTI6zABPTlx9A,5468
+eth_portfolio/_ydb/token_transfers.py,sha256=HUTeWShcQD4IzocTHmBOreml0jbVttLcaed1fNiJ2qg,5297
 eth_portfolio/protocols/__init__.py,sha256=k1e4MI8KPALIg7awaVA9LbBuEjqxWZF7uGgxysQ4y90,2623
 eth_portfolio/protocols/_base.py,sha256=nuMnnltg4HZ0Z5Nl83ofwAsTE3A9jLYhDZFkRhAKIIY,3793
 eth_portfolio/protocols/convex.py,sha256=az8FhxLtXf0WKo25Ke0IDRGF8x1yMlffoCRz9aG2fGE,535
@@ -47,37 +47,37 @@ eth_portfolio/protocols/lending/README.md,sha256=0C941RnyfQwT1DE9bvxwLP-gBTHlQcQ
 eth_portfolio/protocols/lending/__init__.py,sha256=4jKDPx3sb7Iyi9kOdJRpM6LJy_GhUpviLIbpV_6noYU,1693
 eth_portfolio/protocols/lending/_base.py,sha256=_1zXroYHlliLP685xiRfw8I_tQOoZyaPlnxA_gzLytU,2311
 eth_portfolio/protocols/lending/compound.py,sha256=1aoksFSvIIsk-cNDs2-Kdwl-RtIdTzh3QgpksXG1kEs,7439
-eth_portfolio/protocols/lending/liquity.py,sha256=JQLObd59whRiZ9NADCLs94_3P-1Ff7xVGcTmqrOV_2w,4287
-eth_portfolio/protocols/lending/maker.py,sha256=ZbXd3PQ2b5ZX1DE3PxX8dhsrbz-nNbbthC3KXYZBxJo,4105
+eth_portfolio/protocols/lending/liquity.py,sha256=bJ5TKD-WTVn3S1tlbSGGVFCoKFvgStHVOzKBM2LbsRY,4294
+eth_portfolio/protocols/lending/maker.py,sha256=zqi1E5yQ_QDFOk5OMR4gB5_Ag74RMIkp6u3TyX-P3fg,4073
 eth_portfolio/protocols/lending/unit.py,sha256=OQGDZWdsTOUL4jOKJ1xef6wXhWLHnsRFJjAzn0XSBmM,2011
 eth_portfolio/structs/__init__.py,sha256=x-9CdKe8XMukp8Kjr_lD49ohrSd0iGEvvsMAHtAPrLI,1486
 eth_portfolio/structs/modified.py,sha256=QIuFh-u5VTHe0oborn3oHAiAGD0wqhUQW7XFJVZu2KI,1853
-eth_portfolio/structs/structs.py,sha256=3y-evrdOqNme51OnOsOR7s7PZLeqX_pFqBCzhZLIE_o,20437
-eth_portfolio/typing/__init__.py,sha256=wRJFZzXCPS8EOcDgvI3gYQdbqqYtrQ5aMw7YGnMeUno,58674
+eth_portfolio/structs/structs.py,sha256=TDJ4u3E_H8uG7iX-C1Pux8TesY2zXRhQUJxmN7cp4cc,20490
+eth_portfolio/typing/__init__.py,sha256=v_KbOgqTKcR4y-05Bel_mg6uAV-IsGurGR-jDW46SMg,58763
 eth_portfolio/typing/balance/single.py,sha256=NmtWXqCWMIkaoyvfL67Rh0wWurLf55fVaDkyUxZ27oY,6501
 eth_portfolio_scripts/__init__.py,sha256=DIBnQmjmhmNL1lO9Lq4QptrZmC7u6_N3p9zRjcZ9vbY,281
 eth_portfolio_scripts/_args.py,sha256=M33vPkja62XEJeCZAqacNSBCqbzse07wepwyBOtkvVo,682
 eth_portfolio_scripts/_logging.py,sha256=EgW8ozQZLAgt_cUgqe5BYZLMVQwB6X-0gq0T-BvqlTY,369
-eth_portfolio_scripts/_portfolio.py,sha256=xa-xNI3w6P54evq0qfRL0Vv2LEZ-6GnNKsSfDVaK-H0,6905
-eth_portfolio_scripts/_utils.py,sha256=7maEWyS5i_Kp7iVaa5puf2ZyefqHDsUOqTDLz-UwIQY,2630
-eth_portfolio_scripts/balances.cp310-win_amd64.pyd,sha256=VBEs9WzHHe9d_1iTtii6Xa-2TndIiAfXXms6qjCJ73k,10752
-eth_portfolio_scripts/balances.py,sha256=reli3W6K9-8F8I_n0tIwS9SuUykpPJnbiMsnJgY9N_w,1573
-eth_portfolio_scripts/main.py,sha256=vSYt6Ajq2wZ1ErSoEdLaLQmfpZnFcN6S-kSYaKQ0KEY,3633
+eth_portfolio_scripts/_portfolio.py,sha256=XP6fUfZfv2hBdW6PCBdpUyT3TRAU56u2QKWwhmHBTAE,7333
+eth_portfolio_scripts/_utils.py,sha256=lj2B79G8YX21ATNp_v-onsU_kNFZF3unBclCVp3AIn8,3163
+eth_portfolio_scripts/balances.cp310-win_amd64.pyd,sha256=3hF_1hFg8Ra8bkAijZimV77V5d9yzkJ8RNf17q9Bfl4,10752
+eth_portfolio_scripts/balances.py,sha256=Fr8NGCt5yhvu7LnLH27oOVKcL2XwowmAVezXUOIEzd0,1640
+eth_portfolio_scripts/main.py,sha256=VfwWEVOu4oxp5M-rQLGo-XlDKlG_Q7Y4cLiXMUSXeZg,3804
 eth_portfolio_scripts/py.typed,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-eth_portfolio_scripts/docker/__init__.cp310-win_amd64.pyd,sha256=optcsvyemTS9TuBBmDIXptLtedSxeOZ9fG9_ZSDfcqg,10752
+eth_portfolio_scripts/docker/__init__.cp310-win_amd64.pyd,sha256=vVEIDZQmFDmX7NKyOW31bhJBqes7ow0AEw8uhfltJ8U,10752
 eth_portfolio_scripts/docker/__init__.py,sha256=R27uZPLUEK2--fb9IrxrDUk6R5_IVFJSv7s_ia7p5Xk,409
-eth_portfolio_scripts/docker/check.cp310-win_amd64.pyd,sha256=zonk0oZHziBLahoU2jZakMRKY1P1qbjs2SjGBWFE7gw,10752
-eth_portfolio_scripts/docker/check.py,sha256=JFxUxGRSz20EgjKqCLBkCqR4N1ihzO_3ykU3jPzp_UU,1801
-eth_portfolio_scripts/docker/docker-compose.yaml,sha256=vx1HGuqBoB7Tpu2-J322oMtMWW46O7knDGtys99mYb4,1869
-eth_portfolio_scripts/docker/docker_compose.cp310-win_amd64.pyd,sha256=yM2UHlQ0C1we6bGVNEqJSwxWmg1dS5ZWg2KfWwVZTUw,10752
-eth_portfolio_scripts/docker/docker_compose.py,sha256=tewgCWZP6g9sVFHbQnGC1au-bTnvuvXMZgTKKgpmeOc,2304
+eth_portfolio_scripts/docker/check.cp310-win_amd64.pyd,sha256=3lYELU58DRlyg8oWmW8ZDD4lbRjTHEZBnmHz8c4oZu4,10752
+eth_portfolio_scripts/docker/check.py,sha256=mf853kj0_M2iI3d2KuWuwsXtSieP9qWhvTJdrqX8iU8,1997
+eth_portfolio_scripts/docker/docker-compose.yaml,sha256=lCLNTFUYGty_ogZPrhiQMh-lHiw25hrhWXr7T7jyss4,1870
+eth_portfolio_scripts/docker/docker_compose.cp310-win_amd64.pyd,sha256=st2IZdwvbVOR_mUkGh9igeBlxiCgn1p_-r5r0OYvLdg,10752
+eth_portfolio_scripts/docker/docker_compose.py,sha256=w1Z4XfSCC1vVLnss74XbkHUBVb0P2-zOIkMyidkZh38,2903
 eth_portfolio_scripts/docker/.grafana/dashboards/dashboards.yaml,sha256=wktTI-OAdF_khhbciZFo4Gt2V9bUjbe7GLqwdzTKf0U,212
 eth_portfolio_scripts/docker/.grafana/dashboards/Portfolio/Balances.json,sha256=XGMV8e4tDak53e9bmymwAB4uqZmAIcU5JlRT3OiwTeU,70750
 eth_portfolio_scripts/docker/.grafana/datasources/datasources.yml,sha256=8PPH_QDhfbRRh3IidskW46rifJejloa1a9I1KCw2FTk,199
 eth_portfolio_scripts/victoria/__init__.py,sha256=R0VvKiAC0e57zZNihcCptVkFO5CBHIbp2trFYuyY01M,2038
 eth_portfolio_scripts/victoria/types.py,sha256=KNq8aIiNXeiDnCKL7xycmouo0YeKI-sbQkIcTymcSYk,745
-eth_portfolio_temp-0.1.1.dev0.dist-info/METADATA,sha256=PFbnX3q8rdassCcnPAp8md5vYvcftT-Aro6BLfRwuvQ,803
-eth_portfolio_temp-0.1.1.dev0.dist-info/WHEEL,sha256=KUuBC6lxAbHCKilKua8R9W_TM71_-9Sg5uEP3uDWcoU,101
-eth_portfolio_temp-0.1.1.dev0.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
-eth_portfolio_temp-0.1.1.dev0.dist-info/top_level.txt,sha256=CmTLi8Lvs3RulV5ZNdziaDVvF_WRsgRpM17GSMECxrg,64
-eth_portfolio_temp-0.1.1.dev0.dist-info/RECORD,,
+eth_portfolio_temp-0.2.17.dist-info/METADATA,sha256=vZtFUNdKJF5u14oqr0klpNn_ik07bpj1J3jhovPi2Mw,840
+eth_portfolio_temp-0.2.17.dist-info/WHEEL,sha256=KUuBC6lxAbHCKilKua8R9W_TM71_-9Sg5uEP3uDWcoU,101
+eth_portfolio_temp-0.2.17.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
+eth_portfolio_temp-0.2.17.dist-info/top_level.txt,sha256=4MlbY-Yj8oGBGL8piXiO4SOpk2gZFF9ZXVTObTZOzqM,57
+eth_portfolio_temp-0.2.17.dist-info/RECORD,,

{eth_portfolio_temp-0.1.1.dev0.dist-info → eth_portfolio_temp-0.2.17.dist-info}/top_level.txt

@@ -1,3 +1,3 @@
-295eace8438df6ec133b__mypyc
 eth_portfolio
+eth_portfolio__mypyc
 eth_portfolio_scripts