eth-portfolio-temp 0.2.11__cp310-cp310-macosx_11_0_arm64.whl → 0.2.16__cp310-cp310-macosx_11_0_arm64.whl

eth_portfolio/_shitcoins.py

@@ -97,6 +97,7 @@ shitcoins: Final = {
         "0x0e1CD6d2715432e4DBedFE969b0Eb2867FF61d5b",
         "0x9aE357521153FB07bE6F5792CE7a49752638fbb7",
         # Generally looks like shit
+        "0x5e43e50A3cB43Fb71eD2500bC847E8d25b8335f9",
         "0xE8ED1fca5af1c7dd46A3D5bbDFf7e99749D9e0aa",
         "0x00d0F0250364C431376cC64AADd3aa13c6A8998D",
         "0x256099A072ea5fd35eC134758440413095967109",

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:12.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.127.0
+    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,30 @@ 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) == 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_temp-0.2.11.dist-info → eth_portfolio_temp-0.2.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth_portfolio_temp
-Version: 0.2.11
+Version: 0.2.16
 Summary: eth-portfolio makes it easy to analyze your portfolio.
 Home-page: https://github.com/BobTheBuidler/eth-portfolio
 Author: BobTheBuidler
@@ -12,6 +12,7 @@ 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

{eth_portfolio_temp-0.2.11.dist-info → eth_portfolio_temp-0.2.16.dist-info}/RECORD

@@ -1,39 +1,39 @@
-eth_portfolio__mypyc.cpython-310-darwin.so,sha256=E_anZe0Vmnv5CdqCM3TYGflucSBtA2wjE8Fcx3JkrT8,693032
-eth_portfolio_temp-0.2.11.dist-info/RECORD,,
-eth_portfolio_temp-0.2.11.dist-info/WHEEL,sha256=11kMdE9gzbsaQG30fRcsAYxBLEVRsqJo098Y5iL60Xo,136
-eth_portfolio_temp-0.2.11.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
-eth_portfolio_temp-0.2.11.dist-info/top_level.txt,sha256=4MlbY-Yj8oGBGL8piXiO4SOpk2gZFF9ZXVTObTZOzqM,57
-eth_portfolio_temp-0.2.11.dist-info/METADATA,sha256=5yX676JOgUY-l57B5Yj_4z6CjuxzoSFrbsR_IJ177wY,775
+eth_portfolio__mypyc.cpython-310-darwin.so,sha256=sHzVbvmjD1W5GialEDK34jAmo1FQVlAFoJ55NULUriM,694568
+eth_portfolio_temp-0.2.16.dist-info/RECORD,,
+eth_portfolio_temp-0.2.16.dist-info/WHEEL,sha256=11kMdE9gzbsaQG30fRcsAYxBLEVRsqJo098Y5iL60Xo,136
+eth_portfolio_temp-0.2.16.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
+eth_portfolio_temp-0.2.16.dist-info/top_level.txt,sha256=4MlbY-Yj8oGBGL8piXiO4SOpk2gZFF9ZXVTObTZOzqM,57
+eth_portfolio_temp-0.2.16.dist-info/METADATA,sha256=X95Jf9P3LsjGll4sD_H9ibkF4HtBzr7OzBD0_-zoF1Q,814
 eth_portfolio/address.py,sha256=LvBh4Vp2DBC3gQ0WD-TZ6jfe9s6FZbET1krYG9_KMAA,14139
 eth_portfolio/_cache.py,sha256=IOeMXvMgOlEEk01yHP0RARRZXyonuKXUNZbNLFM_KBU,4805
-eth_portfolio/_stableish.cpython-310-darwin.so,sha256=LHz-7Jl9JWLKut7o6RF18wx301AMnf4eU0pFfBv3pl0,50656
+eth_portfolio/_stableish.cpython-310-darwin.so,sha256=xArw1kQHaYwl7c7LaFYZvR1k1Ob1T720RmgqcHBMfvY,50656
 eth_portfolio/_argspec.py,sha256=VzUZkbDkmOSgNUZBGbGblqtxBfDcmBAB89dY2OX0j-U,1595
 eth_portfolio/_submodules.py,sha256=J8ht9bAAvblUXqwOGN7UIOXUPxrTiq7m1RWiB0-ObaE,2190
 eth_portfolio/constants.py,sha256=LS9H2P_Qfcreb6z6NknErxvq6OAtIHbHykXy0spol9E,3659
 eth_portfolio/__init__.py,sha256=0sO4cSJaLYwJfnfVOJRFw7p5_Lzhsr95YuJ1aNQM83A,500
-eth_portfolio/_argspec.cpython-310-darwin.so,sha256=3sbwJ064mcjgrK5v5c-kzydWePM0kyhHUHi0VrXe6iA,50640
+eth_portfolio/_argspec.cpython-310-darwin.so,sha256=D76B2sV6youNM7wPUZKuTisbfgkHQRCQtZIKVzicCwg,50640
 eth_portfolio/_decimal.py,sha256=tYS0miNoQYZguy0yd1bb3bf49l9F3YICyN8ov6r7VBs,4846
-eth_portfolio/_config.cpython-310-darwin.so,sha256=F4OtYmadRd3eozC833oY5T3woihF32v30Vd9Yo_JIW4,50640
+eth_portfolio/_config.cpython-310-darwin.so,sha256=-9kB79WuafiIOyyb8HJ2UC8fNZWT8sIoYD4m7fJ9FjU,50640
 eth_portfolio/buckets.py,sha256=30Tv5Tq-IL6NsACKbxp7hge84Q-upWsiWGdDTKkXeqE,6702
-eth_portfolio/_shitcoins.cpython-310-darwin.so,sha256=Qx--L02CqjnNkT8vZrVaK3fP6R1MsYP8RR1BwyIMPEo,50656
+eth_portfolio/_shitcoins.cpython-310-darwin.so,sha256=n3kuiPgQMNigY3-SNlSjaI7diC3-JS28preWfLuAp24,50656
 eth_portfolio/_decorators.py,sha256=_ZSurUFEIwZRiMFMhLcIXkD-Ey1CqfBqGaE24hLzOuA,2815
 eth_portfolio/_stableish.py,sha256=VTv69Q91AHxbNbbY0LB4PFwKEseHdkE4_6fLPKH1uW0,2021
 eth_portfolio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-eth_portfolio/_shitcoins.py,sha256=Sd9HKq7yC5GR0lcjO-gwiIEOrXqBMQwMgKyjNL6CHpU,16967
-eth_portfolio/constants.cpython-310-darwin.so,sha256=nfHrRvqj2U4gZfSwqJyLsEmG8bLZrlPo9nANAFh2OV0,50656
+eth_portfolio/_shitcoins.py,sha256=5OsOC6dYXG6MA2V1hajdiHRfXAX4eG94Wzmh9Dh_5IM,17021
+eth_portfolio/constants.cpython-310-darwin.so,sha256=zeYMepS-mhZ5Y0pOoGsL6w-1-fAz79ZFixAUbf3tsUU,50656
 eth_portfolio/_config.py,sha256=mw-OA3M8rUA2hqy5wNt30AZRHkWFgR8K2sJg0o5Baxg,98
 eth_portfolio/_exceptions.py,sha256=bw3IdXhqrWxeFqYLm7pJZqRHKZas_cCg8A5Ih1WQEqQ,2433
 eth_portfolio/portfolio.py,sha256=MP_0Y6fXw8TNoyoFCPiu-MUA44jnMm0L_33gec6MjKU,24248
 eth_portfolio/_utils.py,sha256=8403ioVA6VX4XaF56CDI9IA4ilTZUf_TrdlQ78chXbQ,7661
-eth_portfolio/_loaders/_nonce.cpython-310-darwin.so,sha256=5s2CZxgQT6qthyK3vEGxfzVXsXOzJlD0ZhUf90E_XNs,50656
+eth_portfolio/_loaders/_nonce.cpython-310-darwin.so,sha256=a0H7n8YDoo52eOddx_qH7SXcyrjvNYAuazz_ZBIe0mY,50656
 eth_portfolio/_loaders/transaction.py,sha256=XLIziLy3YnBPP0E639tQcZfT2Xy4I5VCz6jnfn_C4mE,9153
 eth_portfolio/_loaders/__init__.py,sha256=lb45_0ak32Z7N3-Nx1CAoRKiZ1_w-_YGbmSCNuunro8,1702
 eth_portfolio/_loaders/_nonce.py,sha256=cx0EjTAhVU2EudMKSO-7-t1jl3y4dYn6as4XiY6KyS8,6285
 eth_portfolio/_loaders/utils.py,sha256=aoGgWl9ra9F-qb0wA-sX3qelUNGI-fGvM90297L7xWM,2265
-eth_portfolio/_loaders/balances.cpython-310-darwin.so,sha256=nvtMwlpI4XHMtGNiThC5lT_IfDa9prUniO5KYJ8roPg,50656
+eth_portfolio/_loaders/balances.cpython-310-darwin.so,sha256=DOCIRzl7JjLQaKKJPiGjoTKe_ezjt_ewqRHTsKHp6_A,50656
 eth_portfolio/_loaders/balances.py,sha256=BTWfkJIoSraUMe94Wuj8NPyg5EO0OByIjbXu7j6PZEo,3132
 eth_portfolio/_loaders/token_transfer.py,sha256=JupdQRdTPPsnqFhyRv7vt7IhoC2oEtypjxhEfpzTy9E,8531
-eth_portfolio/_loaders/utils.cpython-310-darwin.so,sha256=2ayUQww1avMkVrPR1cFSBvpcz3gg8Ol1k36IcLOFvBg,50648
+eth_portfolio/_loaders/utils.cpython-310-darwin.so,sha256=5R3y35chu5XF2UJ84ZeT7zeN5SZhdEdzrpMoIqUp4n0,50648
 eth_portfolio/_ydb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eth_portfolio/_ydb/token_transfers.py,sha256=aKaYSDnJehEcDb_c6YTmcKZxSfZ1jwHMXMOAmE8XH30,5152
 eth_portfolio/_db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -63,19 +63,19 @@ eth_portfolio/protocols/lending/unit.py,sha256=7oRvIkoKUm8IOnDv59pILSSJWFNNjwr4C
 eth_portfolio_scripts/_logging.py,sha256=B_rQMYt_1PhpwCOLBRpkKK6M1ljcF0wAIgqfPIsFUGU,354
 eth_portfolio_scripts/_args.py,sha256=k6J6XkRe1VuN1DiyGuXLCR7NBSvzH5jnVChfzodKuB8,656
 eth_portfolio_scripts/__init__.py,sha256=TC5c4WZdzSHhTIBYuwzrAyzFuGzBmHiDX_g6ghO09jQ,261
-eth_portfolio_scripts/balances.cpython-310-darwin.so,sha256=iS1ADXQCkspScU12QuV-qExwBk6dtv4apK15HF1U16Y,50656
+eth_portfolio_scripts/balances.cpython-310-darwin.so,sha256=buMa_aNmSa_Vmszhc9kb2pkXuvZgoh0gLm6NoMa2_nE,50656
 eth_portfolio_scripts/_portfolio.py,sha256=umA-70yv2PGdHgoQVycknkSKk6QurB86FOXlIqBVY38,7139
 eth_portfolio_scripts/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 eth_portfolio_scripts/balances.py,sha256=QvpOdXnH1V-tOuEmAOPxH3MrincDExlIP1eEJ2IG2Lk,1588
 eth_portfolio_scripts/main.py,sha256=crhObJ5P0B45zTBE2QOIOPYCxtJ8zhsciarcSZN1HHE,3685
 eth_portfolio_scripts/_utils.py,sha256=-JiZLpSa8P2_ZFXw1AfpVmTO6X65yPeVVdnrDpNFzNQ,3057
-eth_portfolio_scripts/docker/docker_compose.cpython-310-darwin.so,sha256=JGkZ6Ym6OpeXl8rN5JIEddpfzJQLhMTCwPB2vPdAH3E,50712
-eth_portfolio_scripts/docker/docker-compose.yaml,sha256=EWaPAppR1TzyMOucsMoGGh2uu9fXyzYTeO0IIU12fvc,1809
-eth_portfolio_scripts/docker/docker_compose.py,sha256=K7_Y_8NeN5s0pb9WUamgfi9OppjpaU0Mlz2nDzewcRA,2226
-eth_portfolio_scripts/docker/check.cpython-310-darwin.so,sha256=Z44NEmhLaklVJ0NL7koDzfBZr7KiRtln7u0GaoOYHRc,50664
-eth_portfolio_scripts/docker/check.py,sha256=E6_Ar4dr6HfVAgpwoDPcObIolikHKQr8VFkH01sOuIM,1745
+eth_portfolio_scripts/docker/docker_compose.cpython-310-darwin.so,sha256=pH8zCeIqhRvyeQjP5ef9_lCKDIcRgyxvY_3iYYf0jXk,50712
+eth_portfolio_scripts/docker/docker-compose.yaml,sha256=ZZo_aOYw-Wm2XDpqJpXjUKbtyqbOE5BWa1gR3h-8fUw,1809
+eth_portfolio_scripts/docker/docker_compose.py,sha256=kVsx2FlRBAsYm8xyax3jvrk-IHKgiZvDqPdpQR8yHKI,2727
+eth_portfolio_scripts/docker/check.cpython-310-darwin.so,sha256=gxscyc-lV-yq00qnKknVpPJCVBsZvEqeHo2jWNO4_jw,50664
+eth_portfolio_scripts/docker/check.py,sha256=80fRi6WvxSQM1NxIhtM6vg6fLOjGuqq5F2mGCf4VSvc,1930
 eth_portfolio_scripts/docker/__init__.py,sha256=ZXSIYcjp94c0O9o39BDGWju3YrCMLl4gtov7YChc9Ig,393
-eth_portfolio_scripts/docker/__init__.cpython-310-darwin.so,sha256=7C56y2X-EjADo3LKrD0bcXHFGk8SvKHdu4agnQH2Kps,50656
+eth_portfolio_scripts/docker/__init__.cpython-310-darwin.so,sha256=ueaBPNx0tefebQJ4qGZNS4unM80tWuBFk4NKCbbB5kU,50656
 eth_portfolio_scripts/docker/.grafana/datasources/datasources.yml,sha256=pBE_0Nh_J7d9Fiy3Xu6vuac_HWCBcFsJJSV-ryjQR1Y,188
 eth_portfolio_scripts/docker/.grafana/dashboards/dashboards.yaml,sha256=MynNDOk69IihoYdd2bL7j8CnRb2Co4gdqW7T4m6AaEU,202
 eth_portfolio_scripts/docker/.grafana/dashboards/Portfolio/Balances.json,sha256=dBmjogLJRuixCHWSs4ROE0_FXb-PUbqWBHEdLoP-1MU,68788