eth-portfolio-temp 0.0.35.dev0__cp310-cp310-win32.whl → 0.2.17__cp310-cp310-win32.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,16 +186,16 @@ 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):
+    if retval := await get_event_loop().run_in_executor(process, __is_token, address):  # type: ignore [name-defined]
         logger.debug("%s is token")
     else:
         logger.debug("%s is not token")
     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/_nonce.py

@@ -2,7 +2,7 @@ import asyncio
 import logging
 from collections import defaultdict
 from time import time
-from typing import ClassVar, DefaultDict, Dict, Final, Tuple, final
+from typing import ClassVar, DefaultDict, Dict, Final, Optional, Tuple, final
 
 import a_sync
 import dank_mids
@@ -145,7 +145,7 @@ async def _get_area(
     return lo, hi
 
 
-def _update_nonces(address: ChecksumAddress, nonce: Nonce, block: BlockNumber):
+def _update_nonces(address: ChecksumAddress, nonce: Nonce, block: BlockNumber) -> None:
     # if you are searching for `nonce` and you verified it occurs AT or ABOVE `block` call this fn.
     if block > nonces[address][nonce]:
         nonces[address][nonce] = block
@@ -178,13 +178,13 @@ def _get_num_chunks(range_size: int) -> int:
 
 @final
 class BlockCache:
-    block: ClassVar = 0
+    block: ClassVar[BlockNumber] = 0
     updated_at: ClassVar = 0.0
     lock: Final = asyncio.Lock()
     ttl: Final = 5.0
 
 
-async def get_block_number():
+async def get_block_number() -> BlockNumber:
     if now() - BlockCache.updated_at < BlockCache.ttl:
         return BlockCache.block
     async with BlockCache.lock:

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,12 @@ shitcoins: Final = {
         "0x635701CC5fE41FE8AbD02aa74Beb02e3540E9BB2",
         "0xF709642622729feafC8bf0934679706df49d8A30",
         # Tagged as phishing on Etherscan
+        "0x4AeDC0B9Acdf5BE1d312Ace7c2df425C2f56F9C3",
+        "0xd16A07Ac860c95F3E225b3A847F81C267b3f929d",
+        "0x211c1eB92D74cbdA58bA82116502fD02dd8F319E",
+        "0x6ef7D6682086Ad4936D2bC141cD94b2c43476FeD",
+        "0x0C98216a20f8e19C1483cf8B307A5E9ce758428D",
+        "0x6426b6C2A9108Fa815bcccA3a3232301E1895742",
         "0x0bF377fb3b5F1dD601e693B8fAF6b0bD249f37D3",
         "0xBf5fB1563ef58ba41325454ca61Cc3D62bd40744",
         "0x54fd62228C6e1234fd5Fded28555CA963Dcf6d26",
@@ -90,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",
@@ -163,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",
@@ -211,6 +259,7 @@ shitcoins: Final = {
         "0xAba86342C3f57E002F47F6eb38099A577312F2e8",
         "0x94C4bfDD351A2EeA9d57e602C2a24d6Fe823Fd1a",
         "0xAfF006725DeeAF5BF6750A6C7c98D9e70cB189a4",
+        "0x54c4D37aD550f9776CE2021df245d98B4Bb5Cb5E",
         # fake USDC
         "0x98a7800EB17e1A0e2b2A4b69e83c58F4535F2180",
         "0xdC5BCA9992191c900D7A7F5b8e1b3e4161d1aa51",
@@ -218,6 +267,8 @@ shitcoins: Final = {
         "0xbADbe6619c0563c60E62C7409681440a80391a27",
         "0x89D3Ac7C32Aa14bEE6Fa90E041241dc4eEbbDFB3",
         "0x640c6fdAfbDaC9bfCe79943890fdc98f8d39bE3e",
+        "0xA04a3a553548090a7b81D2de75B8a08Ee45860e1",
+        "0x1b8F28C0d410456FE04b8f421d00d6654F66AbB6",
         # fake DAI
         "0xf84f908E78f9295b53883AD9ACa38F86d513f03F",
         "0x20Dd160716b0387220Eea7B9951bDb51B3728DC4",
@@ -227,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,15 +1,16 @@
 from abc import abstractmethod
 from asyncio import Task, create_task, sleep
 from logging import DEBUG, getLogger
-from typing import AsyncIterator, List
+from typing import Any, AsyncIterator, Final, List
 
 import dank_mids
 import evmspec
 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.datatypes import Address
 from y.utils.events import ProcessedEvents
 
 from eth_portfolio._loaders import load_token_transfer
@@ -18,19 +19,13 @@ 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
+logger: Final = getLogger(__name__)
+_logger_is_enabled_for: Final = logger.isEnabledFor
+_logger_log: Final = logger._log
 
-    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 = getLogger(__name__)
-_logger_is_enabled_for = logger.isEnabledFor
-_logger_log = logger._log
+def encode_address(address: Any) -> bytes:
+    return encode_hex(encode(["address"], [str(address)]))
 
 
 class _TokenTransfers(ProcessedEvents["Task[TokenTransfer]"]):
@@ -38,9 +33,14 @@ class _TokenTransfers(ProcessedEvents["Task[TokenTransfer]"]):
 
     __slots__ = "address", "_load_prices"
 
-    def __init__(self, address: Address, from_block: int, load_prices: bool = False):
-        self.address = address
-        self._load_prices = load_prices
+    def __init__(
+        self,
+        address: ChecksumAddress,
+        from_block: BlockNumber,
+        load_prices: bool = False,
+    ) -> None:
+        self.address: Final = address
+        self._load_prices: Final = load_prices
         super().__init__(topics=self._topics, from_block=from_block)
 
     def __repr__(self) -> str:
@@ -51,7 +51,7 @@ class _TokenTransfers(ProcessedEvents["Task[TokenTransfer]"]):
     def _topics(self) -> List: ...
 
     @ASyncIterator.wrap  # type: ignore [call-overload]
-    async def yield_thru_block(self, block) -> AsyncIterator["Task[TokenTransfer]"]:
+    async def yield_thru_block(self, block: BlockNumber) -> AsyncIterator["Task[TokenTransfer]"]:
         if not _logger_is_enabled_for(DEBUG):
             async for task in self._objects_thru(block=block):
                 yield task
@@ -119,18 +119,27 @@ class TokenTransfers(ASyncIterable[TokenTransfer]):
     NOTE: These do not come back in chronologcal order.
     """
 
-    def __init__(self, address: Address, from_block: int, load_prices: bool = False):
-        self.transfers_in = InboundTokenTransfers(address, from_block, load_prices=load_prices)
-        self.transfers_out = OutboundTokenTransfers(address, from_block, load_prices=load_prices)
+    def __init__(
+        self,
+        address: ChecksumAddress,
+        from_block: BlockNumber,
+        load_prices: bool = False,
+    ) -> None:
+        self.transfers_in: Final = InboundTokenTransfers(
+            address, from_block, load_prices=load_prices
+        )
+        self.transfers_out: Final = OutboundTokenTransfers(
+            address, from_block, load_prices=load_prices
+        )
 
-    async def __aiter__(self):
+    async def __aiter__(self) -> AsyncIterator["Task[TokenTransfer]"]:
         async for transfer in self.__yield_thru_block(await dank_mids.eth.block_number):
             yield transfer
 
-    def yield_thru_block(self, block: int) -> ASyncIterator["Task[TokenTransfer]"]:
+    def yield_thru_block(self, block: BlockNumber) -> ASyncIterator["Task[TokenTransfer]"]:
         return ASyncIterator(self.__yield_thru_block(block))
 
-    def __yield_thru_block(self, block: int) -> AsyncIterator["Task[TokenTransfer]"]:
+    def __yield_thru_block(self, block: BlockNumber) -> AsyncIterator["Task[TokenTransfer]"]:
         return as_yielded(
             self.transfers_in.yield_thru_block(block), self.transfers_out.yield_thru_block(block)
         )

eth_portfolio/address.py

@@ -23,6 +23,7 @@ import dank_mids
 import eth_retry
 import y
 from a_sync.exceptions import MappingIsEmptyError
+from eth_typing import BlockNumber
 from y import convert
 from y._decorators import stuck_coro_debugger
 from y.datatypes import Address, Block
@@ -312,7 +313,7 @@ class PortfolioAddress(_LedgeredBase[AddressLedgerBase]):
         return Balance(token=y.EEE_ADDRESS, block=block)
 
     @stuck_coro_debugger
-    async def token_balances(self, block) -> TokenBalances:
+    async def token_balances(self, block: BlockNumber) -> TokenBalances:
         """
         Retrieves the balances for all tokens in the wallet at a given block.
 

eth_portfolio/buckets.py

@@ -1,9 +1,9 @@
 import logging
-from typing import Final, Optional, Set
+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
@@ -76,7 +76,7 @@ async def get_token_bucket(token: AnyAddressType) -> str:
 
 
 @alru_cache(maxsize=None)
-async def _unwrap_token(token) -> ChecksumAddress:
+async def _unwrap_token(token: Any) -> ChecksumAddress:
     """
     Recursively unwrap a token to its underlying asset.
 

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