eth-portfolio-temp 0.2.10.dev0__tar.gz → 0.2.11__tar.gz

{eth_portfolio_temp-0.2.10.dev0 → eth_portfolio_temp-0.2.11}/.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.10.dev0 → eth_portfolio_temp-0.2.11}/.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.10.dev0 → eth_portfolio_temp-0.2.11}/.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,6 +111,10 @@ 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
 
@@ -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,8 +158,10 @@ 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
@@ -170,9 +203,10 @@ jobs:
           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.10.dev0 → eth_portfolio_temp-0.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth_portfolio_temp
-Version: 0.2.10.dev0
+Version: 0.2.11
 Summary: eth-portfolio makes it easy to analyze your portfolio.
 Home-page: https://github.com/BobTheBuidler/eth-portfolio
 Author: BobTheBuidler
@@ -8,7 +8,7 @@ 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
@@ -16,7 +16,7 @@ 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.7.1.dev0
+Requires-Dist: ypricemagic<5,>=4.10.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: home-page

{eth_portfolio_temp-0.2.10.dev0 → eth_portfolio_temp-0.2.11}/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.10.dev0 → eth_portfolio_temp-0.2.11}/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.10.dev0 → eth_portfolio_temp-0.2.11}/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.10.dev0 → eth_portfolio_temp-0.2.11}/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.10.dev0 → eth_portfolio_temp-0.2.11}/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.10.dev0 → eth_portfolio_temp-0.2.11}/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

{eth_portfolio_temp-0.2.10.dev0 → eth_portfolio_temp-0.2.11}/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.10.dev0 → eth_portfolio_temp-0.2.11}/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.10.dev0 → eth_portfolio_temp-0.2.11}/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.10.dev0 → eth_portfolio_temp-0.2.11}/eth_portfolio_scripts/_portfolio.py

@@ -58,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,

{eth_portfolio_temp-0.2.10.dev0 → eth_portfolio_temp-0.2.11}/eth_portfolio_scripts/docker/docker-compose.yaml

@@ -47,7 +47,7 @@ services:
     restart: always
 
   victoria-metrics:
-    image: victoriametrics/victoria-metrics:v1.126.0
+    image: victoriametrics/victoria-metrics:v1.127.0
     volumes:
       - ~/.eth-portfolio/data/victoria/:/victoria-metrics-data
     command:

{eth_portfolio_temp-0.2.10.dev0 → eth_portfolio_temp-0.2.11}/eth_portfolio_scripts/main.py

@@ -57,8 +57,8 @@ export_parser.add_argument(
 export_parser.add_argument(
     "--concurrency",
     type=int,
-    help="The max number of historical blocks to export concurrently. default: 60",
-    default=60,
+    help="The max number of historical blocks to export concurrently. default: 40",
+    default=40,
 )
 export_parser.add_argument(
     "--first-tx-block",

{eth_portfolio_temp-0.2.10.dev0 → eth_portfolio_temp-0.2.11}/eth_portfolio_temp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth_portfolio_temp
-Version: 0.2.10.dev0
+Version: 0.2.11
 Summary: eth-portfolio makes it easy to analyze your portfolio.
 Home-page: https://github.com/BobTheBuidler/eth-portfolio
 Author: BobTheBuidler
@@ -8,7 +8,7 @@ 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
@@ -16,7 +16,7 @@ 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.7.1.dev0
+Requires-Dist: ypricemagic<5,>=4.10.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: home-page

{eth_portfolio_temp-0.2.10.dev0 → eth_portfolio_temp-0.2.11}/eth_portfolio_temp.egg-info/requires.txt

@@ -1,6 +1,6 @@
 checksum_dict>=2.1.7
 dank_mids>=4.20.154
-eth-brownie<1.23,>=1.21.0
+eth-brownie<1.23,>=1.22.0.dev0
 eth_retry<1,>=0.3.4
 evmspec>=0.4.1
 ez-a-sync>=0.32.27
@@ -8,4 +8,4 @@ faster-eth-utils
 numpy<3
 pandas<3,>=1.4.3
 typed-envs>=0.0.9
-ypricemagic<5,>=4.7.1.dev0
+ypricemagic<5,>=4.10.0

{eth_portfolio_temp-0.2.10.dev0 → eth_portfolio_temp-0.2.11}/eth_portfolio_temp.egg-info/top_level.txt

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

{eth_portfolio_temp-0.2.10.dev0 → eth_portfolio_temp-0.2.11}/pyproject.toml

@@ -4,8 +4,8 @@ requires = [
     "wheel",
     "mypy[mypyc]>=1.18.2,<1.18.3",
     "types-aiofiles",
-    "eth-brownie==1.21.0; sys_platform=='linux'",
-    "eth-typing==4.4.0",
+    "eth-brownie==1.22.0.dev0; sys_platform=='linux' and platform_machine != 'i686'",
+    "eth-typing==5.2.1",
     "ez-a-sync>=0.32.7,<0.33",
 ]
 

{eth_portfolio_temp-0.2.10.dev0 → eth_portfolio_temp-0.2.11}/requirements.txt

@@ -1,6 +1,6 @@
 checksum_dict>=2.1.7
 dank_mids>=4.20.154
-eth-brownie>=1.21.0,<1.23
+eth-brownie>=1.22.0.dev0,<1.23
 eth_retry>=0.3.4,<1
 evmspec>=0.4.1
 ez-a-sync>=0.32.27
@@ -8,4 +8,4 @@ faster-eth-utils
 numpy<3
 pandas>=1.4.3,<3
 typed-envs>=0.0.9
-ypricemagic>=4.7.1.dev0,<5
+ypricemagic>=4.10.0,<5

{eth_portfolio_temp-0.2.10.dev0 → eth_portfolio_temp-0.2.11}/setup.py

@@ -95,6 +95,7 @@ try:
             "--disable-error-code=typeddict-item",
             "--disable-error-code=index",
         ],
+        group_name="eth_portfolio",
     )
 except Exception as e:  # fallback in case build fails
     logging.error("Error compiling eth-portfolio:", exc_info=True)