eth-portfolio-temp 0.0.38.dev0__tar.gz → 0.1.1.dev0__tar.gz

{eth_portfolio_temp-0.0.38.dev0 → eth_portfolio_temp-0.1.1.dev0}/.github/workflows/mypy.yaml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        pyversion: [ "3.9", "3.10", "3.11", "3.12" ]
+        pyversion: [ "3.10", "3.11", "3.12" ]
 
     steps:
     - name: Checkout

{eth_portfolio_temp-0.0.38.dev0 → eth_portfolio_temp-0.1.1.dev0}/.github/workflows/release.yaml

@@ -104,6 +104,8 @@ jobs:
           CIBW_ARCHS_WINDOWS: ${{ matrix.cibw_archs_windows || '' }}
           # Which wheels to build for Linux (manylinux vs. musllinux)
           CIBW_BUILD: ${{ matrix.cibw_build || '' }}
+          # Download wheels for deps, don't build from source
+          PIP_ONLY_BINARY: ":all:"
         run: |
           python -m cibuildwheel --output-dir wheelhouse
 
@@ -133,7 +135,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install setuptools wheel twine mypy[mypyc]
+          pip install setuptools wheel twine mypy[mypyc] types-aiofiles
 
       - name: Build sdist
         run: |

{eth_portfolio_temp-0.0.38.dev0 → eth_portfolio_temp-0.1.1.dev0}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: eth_portfolio_temp
-Version: 0.0.38.dev0
+Version: 0.1.1.dev0
 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.9,<3.13
+Requires-Python: >=3.10,<3.13

{eth_portfolio_temp-0.0.38.dev0 → eth_portfolio_temp-0.1.1.dev0}/eth_portfolio/_db/utils.py

@@ -190,7 +190,7 @@ def is_token(address) -> bool:
 
 async def _is_token(address) -> 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")

{eth_portfolio_temp-0.0.38.dev0 → eth_portfolio_temp-0.1.1.dev0}/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_temp-0.0.38.dev0 → eth_portfolio_temp-0.1.1.dev0}/eth_portfolio/_ydb/token_transfers.py

@@ -1,15 +1,15 @@
 from abc import abstractmethod
 from asyncio import Task, create_task, sleep
 from logging import DEBUG, getLogger
-from typing import AsyncIterator, List
+from typing import 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_utils import encode_hex
-from y.datatypes import Address
 from y.utils.events import ProcessedEvents
 
 from eth_portfolio._loaders import load_token_transfer
@@ -28,9 +28,9 @@ except ImportError:
 
     encode_address = lambda address: encode_hex(encode_single("address", str(address)))
 
-logger = getLogger(__name__)
-_logger_is_enabled_for = logger.isEnabledFor
-_logger_log = logger._log
+logger: Final = getLogger(__name__)
+_logger_is_enabled_for: Final = logger.isEnabledFor
+_logger_log: Final = logger._log
 
 
 class _TokenTransfers(ProcessedEvents["Task[TokenTransfer]"]):
@@ -38,9 +38,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 +56,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 +124,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_temp-0.0.38.dev0 → eth_portfolio_temp-0.1.1.dev0}/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_temp-0.0.38.dev0 → eth_portfolio_temp-0.1.1.dev0}/eth_portfolio/buckets.py

@@ -1,5 +1,5 @@
 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
@@ -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_temp-0.0.38.dev0 → eth_portfolio_temp-0.1.1.dev0}/eth_portfolio/typing/__init__.py

@@ -46,7 +46,7 @@ from checksum_dict import DefaultChecksumDict
 from eth_typing import BlockNumber
 from pandas import DataFrame, concat
 from typing_extensions import ParamSpec, Self
-from y import ERC20
+from y import Contract, ERC20
 from y.datatypes import Address
 
 from eth_portfolio._decimal import Decimal
@@ -393,7 +393,7 @@ class RemoteTokenBalances(DefaultDict[ProtocolLabel, TokenBalances], _SummableNo
                 )
             self[remote] += token_balances  # type: ignore [has-type]
 
-    def __setitem__(self, protocol: str, value: TokenBalances):
+    def __setitem__(self, protocol: str, value: TokenBalances) -> None:
         """
         Sets the token balances for a given protocol.
 

{eth_portfolio_temp-0.0.38.dev0 → eth_portfolio_temp-0.1.1.dev0}/eth_portfolio_scripts/_portfolio.py

@@ -71,7 +71,7 @@ class ExportablePortfolio(Portfolio):
                 return True
         return False
 
-    async def export_snapshot(self, dt: datetime):
+    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):
@@ -131,7 +131,7 @@ class ExportablePortfolio(Portfolio):
         token: ChecksumAddress,
         bal: Balance,
         protocol: Optional[str] = None,
-    ):
+    ) -> Tuple[victoria.types.PrometheusItem, victoria.types.PrometheusItem]:
         # TODO wallet nicknames in grafana
         # wallet = KNOWN_ADDRESSES[wallet] if wallet in KNOWN_ADDRESSES else wallet
         if protocol is not None:
@@ -172,7 +172,7 @@ class ExportablePortfolio(Portfolio):
         )
 
 
-async def _get_symbol(token) -> str:
+async def _get_symbol(token: str) -> str:
     if token == "ETH":
         return "ETH"
     try:

{eth_portfolio_temp-0.0.38.dev0 → eth_portfolio_temp-0.1.1.dev0}/eth_portfolio_scripts/victoria/__init__.py

@@ -68,3 +68,6 @@ async def post_data(metrics_to_export: List["Metric"]) -> None:
 def __set_session(sesh: ClientSession) -> None:
     global session
     session = sesh
+
+
+__all__ = ["Metric", "get", "post_data"]

{eth_portfolio_temp-0.0.38.dev0 → eth_portfolio_temp-0.1.1.dev0}/eth_portfolio_temp.egg-info/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: eth-portfolio-temp
-Version: 0.0.38.dev0
+Version: 0.1.1.dev0
 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.9,<3.13
+Requires-Python: >=3.10,<3.13

{eth_portfolio_temp-0.0.38.dev0 → eth_portfolio_temp-0.1.1.dev0}/eth_portfolio_temp.egg-info/requires.txt

@@ -6,6 +6,6 @@ evmspec>=0.4.1
 ez-a-sync>=0.32.7
 faster-eth-utils
 numpy<2
-pandas<1.6,>=1.4.3
+pandas<3,>=1.4.3
 typed-envs>=0.0.9
-ypricemagic<5,>=4.6.17.dev0
+ypricemagic<5,>=4.6.21.dev0

{eth_portfolio_temp-0.0.38.dev0 → eth_portfolio_temp-0.1.1.dev0}/pyproject.toml

@@ -1,5 +1,13 @@
 [build-system]
-requires = ["setuptools","wheel","mypy[mypyc]>=1.14.1,<1.17.1"]
+requires = [
+    "setuptools",
+    "wheel",
+    "mypy[mypyc]>=1.14.1,<1.17.1",
+    "types-aiofiles",
+    "eth-brownie==1.21.0; sys_platform=='Linux'",
+    "eth-typing==4.4.0",
+    "ez-a-sync>=0.32.7,<0.33",
+]
 
 [tool.mypy]
 exclude = ["build/","cache/","env/"]

{eth_portfolio_temp-0.0.38.dev0 → eth_portfolio_temp-0.1.1.dev0}/requirements.txt

@@ -6,6 +6,6 @@ evmspec>=0.4.1
 ez-a-sync>=0.32.7
 faster-eth-utils
 numpy<2
-pandas>=1.4.3,<1.6
+pandas>=1.4.3,<3
 typed-envs>=0.0.9
-ypricemagic>=4.6.17.dev0,<5
+ypricemagic>=4.6.21.dev0,<5

{eth_portfolio_temp-0.0.38.dev0 → eth_portfolio_temp-0.1.1.dev0}/setup.py

@@ -72,13 +72,11 @@ try:
             "--install-types",
             "--disable-error-code=unused-ignore",
             "--disable-error-code=import-not-found",
-            "--disable-error-code=import-untyped",
             # temporary
             "--disable-error-code=call-arg",
             "--disable-error-code=misc",
             "--disable-error-code=type-arg",
             "--disable-error-code=attr-defined",
-            "--disable-error-code=name-defined",
             "--disable-error-code=no-any-return",
             "--disable-error-code=arg-type",
             "--disable-error-code=no-untyped-call",
@@ -95,7 +93,6 @@ try:
             "--disable-error-code=dict-item",
             "--disable-error-code=has-type",
             "--disable-error-code=typeddict-item",
-            "--disable-error-code=str-bytes-safe",
             "--disable-error-code=index",
         ],
     )
@@ -107,7 +104,7 @@ except Exception as e:  # fallback in case build fails
 setup(
     # NOTE: somebody stole our name on pypi, we have this placeholder until we steal it back
     name="eth_portfolio_temp",
-    python_requires=">=3.9,<3.13",
+    python_requires=">=3.10,<3.13",
     # name="eth-portfolio",
     packages=find_packages(),
     use_scm_version={