eth-portfolio-temp 0.2.5.dev0__tar.gz → 0.2.14__tar.gz

{eth_portfolio_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/.github/workflows/black.yaml

@@ -4,6 +4,9 @@ on:
   pull_request:
     branches:
       - master
+    paths-ignore:
+      - '.github/workflows/**'
+      - '!.github/workflows/black.yaml'
 
 jobs:
   format:

{eth_portfolio_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/.github/workflows/compile.yaml

@@ -4,6 +4,9 @@ on:
   pull_request:
     branches:
       - master
+    paths-ignore:
+      - '.github/workflows/**'
+      - '!.github/workflows/compile.yaml'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -23,12 +26,26 @@ jobs:
         uses: actions/setup-python@v6
         with:
           python-version: "3.13"
-          
-      - name: Install Requirements
-        run: pip install -r requirements.txt
+
+      - name: Delete existing build files
+        run: rm -rf build
         
       - name: Install Eth Portfolio
         run: pip install .
+          
+      - name: Normalize C files for diffchecking
+        # This makes it much easier to diffcheck changes in the C files
+        run: |
+          # Insert DIFFCHECK_PLACEHOLDER macro at the top if not present
+          for f in build/*.c; do
+            if ! grep -q 'DIFFCHECK_PLACEHOLDER' "$f"; then
+              sed -i '1i#ifndef DIFFCHECK_PLACEHOLDER\n#define DIFFCHECK_PLACEHOLDER 0\n#endif' "$f"
+            fi
+          done
+          # Replace line number in CPy_AddTraceback with macro
+          sed -i 's/\(CPy_AddTraceback([^,]*, *[^,]*, *\)[0-9]\+\(, *[^)]*)\)/\1DIFFCHECK_PLACEHOLDER\2/g' build/*.c
+          # Replace index in CPyStatics[...] with macro
+          sed -i 's/CPyStatics\[[0-9]\+\]/CPyStatics[DIFFCHECK_PLACEHOLDER]/g' build/*.c
 
       - name: Check for changes
         run: |

{eth_portfolio_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/.github/workflows/release.yaml

@@ -5,6 +5,11 @@ on:
     branches:
       - master
     types: [published]
+  workflow_dispatch:
+    inputs:
+      fake_tag:
+        description: 'Fake tag name to use for dry run (e.g. v2.3.4)'
+        required: true
 
 jobs:
   build_wheels:
@@ -73,8 +78,19 @@ jobs:
         uses: actions/checkout@v5
         with:
           fetch-depth: 0
-          fetch-tags: true
-          ref: refs/tags/${{ github.event.release.tag_name }}
+
+      # ----------------------------------------------------
+      # Extract version from git tag or use fake tag for dry run (strip leading 'v')
+      # ----------------------------------------------------
+      - name: Extract version from tag
+        id: get_version
+        shell: bash
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            echo "version=$(echo '${{ github.event.inputs.fake_tag }}' | sed 's/^v//')" >> $GITHUB_OUTPUT
+          else
+            echo "version=${GITHUB_REF_NAME#v}" >> $GITHUB_OUTPUT
+          fi
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -95,11 +111,15 @@ jobs:
           CIBW_ARCHS_WINDOWS: ${{ matrix.cibw_archs_windows || '' }}
           # Which wheels to build for Linux (manylinux vs. musllinux)
           CIBW_BUILD: ${{ matrix.cibw_build || '' }}
+          # Use version from git tag (stripped 'v')
+          SETUPTOOLS_SCM_PRETEND_VERSION: ${{ steps.get_version.outputs.version }}
+          # Pass version into Docker for Linux builds
+          CIBW_ENVIRONMENT: "SETUPTOOLS_SCM_PRETEND_VERSION=${{ steps.get_version.outputs.version }}"
         run: |
           python -m cibuildwheel --output-dir wheelhouse
 
       - name: Upload wheels
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ matrix.artifact_name }}
           path: wheelhouse/*.whl
@@ -113,8 +133,19 @@ jobs:
         uses: actions/checkout@v5
         with:
           fetch-depth: 0
-          fetch-tags: true
-          ref: refs/tags/${{ github.event.release.tag_name }}
+
+      # ----------------------------------------------------
+      # Extract version from git tag or use fake tag for dry run (strip leading 'v')
+      # ----------------------------------------------------
+      - name: Extract version from tag
+        id: get_version
+        shell: bash
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            echo "version=$(echo '${{ github.event.inputs.fake_tag }}' | sed 's/^v//')" >> $GITHUB_OUTPUT
+          else
+            echo "version=${GITHUB_REF_NAME#v}" >> $GITHUB_OUTPUT
+          fi
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -127,52 +158,55 @@ jobs:
           pip install setuptools wheel twine mypy[mypyc] types-aiofiles
 
       - name: Build sdist
-        run: |
-          python setup.py sdist
+        env:
+          # Use version from git tag (stripped 'v')
+          SETUPTOOLS_SCM_PRETEND_VERSION: ${{ steps.get_version.outputs.version }}
+        run: python setup.py sdist
 
       # ----------------------------------------------------
       # Download wheels built on each runner
       # ----------------------------------------------------
       - name: Download manylinux 64-bit wheels
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: "wheels-ubuntu-latest-manylinux-x64"
           path: wheelhouse/linux-many-x64
 
       - name: Download manylinux 32-bit wheels
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: "wheels-ubuntu-latest-manylinux-x86"
           path: wheelhouse/linux-many-x86
 
       - name: Download musllinux 64-bit wheels
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: "wheels-ubuntu-latest-musllinux-x64"
           path: wheelhouse/linux-musl-x64
 
       - name: Download macOS wheels
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: "wheels-macos-latest"
           path: wheelhouse/macos
 
       - name: Download Windows 64-bit wheels
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: "wheels-windows-latest-x64"
           path: wheelhouse/windows-x64
 
       - name: Download Windows 32-bit wheels
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: "wheels-windows-latest-x86"
           path: wheelhouse/windows-x86
 
       # ----------------------------------------------------
-      # Publish all built artifacts to PyPI
+      # Publish sdist and wheels to PyPI
       # ----------------------------------------------------
       - name: Publish sdist and wheels to PyPI
+        if: ${{ github.event_name != 'workflow_dispatch' }}
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}

{eth_portfolio_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth_portfolio_temp
-Version: 0.2.5.dev0
+Version: 0.2.14
 Summary: eth-portfolio makes it easy to analyze your portfolio.
 Home-page: https://github.com/BobTheBuidler/eth-portfolio
 Author: BobTheBuidler
@@ -8,15 +8,16 @@ Author-email: bobthebuidlerdefi@gmail.com
 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.27
+Requires-Dist: faster-async-lru==2.0.5
 Requires-Dist: faster-eth-utils
 Requires-Dist: numpy<3
 Requires-Dist: pandas<3,>=1.4.3
 Requires-Dist: typed-envs>=0.0.9
-Requires-Dist: ypricemagic<5,>=4.6.29.dev0
+Requires-Dist: ypricemagic<5,>=4.10.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: home-page

{eth_portfolio_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/docs/exporter.rst

@@ -34,7 +34,7 @@ The Portfolio Exporter supports several command-line options to customize its be
   The time interval between datapoints. default: 6h
 
 - ``--concurrency <concurrency>``
-  The max number of historical blocks to export concurrently. default: 60
+  The max number of historical blocks to export concurrently. default: 40
 
 - ``--first-tx-block <block>``
   The block of your portfolio's first transaction, if known. This value, if provided, allows us to speed up processing of your data by limiting the block range we need to query. If not provided, the whole blockchain will be scanned. default: 0

{eth_portfolio_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/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_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/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_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/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_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/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_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/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_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/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_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/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_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/eth_portfolio/_shitcoins.py

@@ -97,6 +97,21 @@ shitcoins: Final = {
         "0x0e1CD6d2715432e4DBedFE969b0Eb2867FF61d5b",
         "0x9aE357521153FB07bE6F5792CE7a49752638fbb7",
         # Generally looks like shit
+        "0xE8ED1fca5af1c7dd46A3D5bbDFf7e99749D9e0aa",
+        "0x00d0F0250364C431376cC64AADd3aa13c6A8998D",
+        "0x256099A072ea5fd35eC134758440413095967109",
+        "0xe975ACEb3b61a88A355B066D9cCC910CAb8b4853",
+        "0x59fF00f75b49089385377c7f7D905E193c9eb5e2",
+        "0x99304A346F8FD562336Fd3485301c02cEbE4F0ae",
+        "0x74b1C36268B5dC659aEEA588cb1683E96DaaB71a",
+        "0x92BF340B2c67be6911095675f744F9a3aD22d8F0",
+        "0xa635305B4a6A1E4A55Eb6A6B54a8D2a55e914F6f",
+        "0xC76f77Bff99Ec269050Ca929F4d37B00f012c65F",
+        "0x56BcBef8f5Ca4Fc224fE58187c66EA34d3A1ef4a",
+        "0xdc6050Ec75Bc4692333A1C301eB799e348d0b77e",
+        "0x0542e502cec25bD51b4f3461f4F704807FA1A6D8",
+        "0xc01e807Cc73469e9983B614A96847BC01332447d",
+        "0x87D38d662A4aae29BB60057e71AFf923C7523DC3",
         "0xDFC01a7956C0d151ae197274B974fA7527EbAFB9",
         "0xE256CF1C7caEff4383DabafEe6Dd53910F97213D",
         "0x7CD6143B8781dC7e0667e50DB02Eb6539799722F",
@@ -171,6 +186,17 @@ shitcoins: Final = {
         "0xB4d4334eB5a251cbE5cC7Afb0Ba26119aCE62281",
         "0xE5c5AE39B98eFd9D3c9E0F2a5457D98fFA4b0b46",
         # Generally looks like shit (symbol ERC20)
+        "0x2adA6e459089292264133d8D7c85f6907423E444",
+        "0x356F680eE21c8CeFfA460c38D20A137F3D07D9af",
+        "0x683eAca6CD17383FA93e95f17e7DE443666160eB",
+        "0x7452cc6Bd1FA968dd1672FF447f3D7ff1ce210A8",
+        "0x773F67800a6d79C0198E8Ac798658f80cb346083",
+        "0xaE977D03F5A3999c762eb42a203c436dFF3Df03C",
+        "0xbD67D76edFD88719efD7669583258209015B0aB5",
+        "0xd814cd86ed2e85156d9Cf3A9319261259458f50c",
+        "0xd0E6420b900dE49113B3404b437ee153Bf220B36",
+        "0xf1D1C6ea9166bcF97A099A1388E1663933bB2E48",
+        "0xF8B49aEC3E356f911f86F58Ff9204242d4b0e6A5",
         "0xe37be01D1337E77aCB0b4293DDb4D410D80010a7",
         "0x7EeAcC32C81e4D78E9705fBf0b977f5A858Bf0F3",
         "0x90133FF815ade1977EA2f1454dBC1d309EAA33f6",

{eth_portfolio_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/eth_portfolio/_utils.py

@@ -18,9 +18,9 @@ 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 faster_async_lru import alru_cache
 from faster_eth_abi.exceptions import InsufficientDataBytes
 from eth_typing import ChecksumAddress
 from pandas import DataFrame  # type: ignore
@@ -79,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:
     """

{eth_portfolio_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/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_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/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_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/eth_portfolio/protocols/lending/maker.py

@@ -2,10 +2,10 @@ from asyncio import gather
 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

{eth_portfolio_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/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_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/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_temp-0.2.5.dev0 → eth_portfolio_temp-0.2.14}/eth_portfolio_scripts/_portfolio.py

@@ -35,13 +35,18 @@ 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:
-    while True:
-        try:
-            return await y.get_block_at_timestamp(dt, sync=False)
-        except NoBlockFound:
-            await asyncio.sleep(10)
+    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):
@@ -53,7 +58,7 @@ class ExportablePortfolio(Portfolio):
         *,
         start_block: int = 0,
         label: str = _DEFAULT_LABEL,
-        concurrency: int = 60,
+        concurrency: int = 40,
         load_prices: bool = True,
         get_bucket: Callable[[ChecksumAddress], Awaitable[str]] = get_token_bucket,
         num_workers_transactions: int = 1000,